From 03a6fdeca632e52f5e37258102451f77208d2339 Mon Sep 17 00:00:00 2001 From: matteo Date: Tue, 19 Mar 2024 09:34:02 +0100 Subject: [PATCH] Removed "isDominant" trait #3 --- .../com/mettsmirnov/mycology/capabilities/FungusDataModel.java | 1 - .../java/com/mettsmirnov/mycology/data/FungusSpeciesLoader.java | 1 - .../java/com/mettsmirnov/mycology/genetics/FungusTraits.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/main/java/com/mettsmirnov/mycology/capabilities/FungusDataModel.java b/src/main/java/com/mettsmirnov/mycology/capabilities/FungusDataModel.java index 9723a81f..9a94b490 100644 --- a/src/main/java/com/mettsmirnov/mycology/capabilities/FungusDataModel.java +++ b/src/main/java/com/mettsmirnov/mycology/capabilities/FungusDataModel.java @@ -43,7 +43,6 @@ public FungusDataModel() { dominantTraits=new HashMap<>(); dominantTraits.put("species","Boletus salubrium"); - //dominantTraits.put("isDominant", true); //maybe useless dominantTraits.put("spreading", 25); dominantTraits.put("spreadboost", 1f); dominantTraits.put("light", 15); diff --git a/src/main/java/com/mettsmirnov/mycology/data/FungusSpeciesLoader.java b/src/main/java/com/mettsmirnov/mycology/data/FungusSpeciesLoader.java index 5e780096..53d3bf47 100644 --- a/src/main/java/com/mettsmirnov/mycology/data/FungusSpeciesLoader.java +++ b/src/main/java/com/mettsmirnov/mycology/data/FungusSpeciesLoader.java @@ -40,7 +40,6 @@ private void loadFungusSpecies(JsonObject obj) { FungusTraits defaultTraits = new FungusTraits(); defaultTraits.species=obj.get("species").getAsString(); - defaultTraits.isDominant=obj.get("dominant").getAsBoolean(); defaultTraits.spreading=obj.get("spreading").getAsInt(); defaultTraits.spreadboost=obj.get("spreadboost").getAsFloat(); defaultTraits.light=obj.get("light").getAsInt(); diff --git a/src/main/java/com/mettsmirnov/mycology/genetics/FungusTraits.java b/src/main/java/com/mettsmirnov/mycology/genetics/FungusTraits.java index 96e01fbf..2a3887f5 100644 --- a/src/main/java/com/mettsmirnov/mycology/genetics/FungusTraits.java +++ b/src/main/java/com/mettsmirnov/mycology/genetics/FungusTraits.java @@ -5,7 +5,6 @@ public class FungusTraits { public String species; - public Boolean isDominant; public Integer spreading; public Float spreadboost; public Integer light; @@ -17,7 +16,6 @@ public class FungusTraits public static final String[] traitsDictionary = new String[]{ "species", - "isDominant", "spreading", "spreadboost", "light",