ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main 

# Conflicts:
#	.idea/misc.xml
This commit is contained in:
MikeZyeman 2021-11-29 15:57:01 +01:00
parent ce31d0f439 ef51b7c980
commit d70a3daed0
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

10
.idea/runConfigurations.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

16
src/ch/zhaw/catan/Settlement.java
View File

@ -1,22 +1,8 @@
package ch.zhaw.catan; package ch.zhaw.catan;
import java.util.HashMap;
public class Settlement { public class Settlement {
private HashMap<Config.Resource,Integer> buildCost;
private Config.Faction faction;
public Settlement(Config.Faction faction) { public Settlement(Config.Faction faction) {
this.faction = faction; super(faction);
buildCost = new HashMap<>();
buildCost.put(Config.Resource.LUMBER,1);
buildCost.put(Config.Resource.BRICK,1);
buildCost.put(Config.Resource.GRAIN,1);
buildCost.put(Config.Resource.WOOL,1);
} }
public HashMap<Config.Resource,Integer> getBuildCost() {
return buildCost;
}
} }