From 13d89fc3470f8d39bd95fcd54f421ab68510df26 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 3 Nov 2014 21:33:16 -0800 Subject: [PATCH] Give fireproof genes a name --- .../forestry/arboriculture/genetics/TreeTemplates.java | 6 +++--- src/main/java/forestry/core/genetics/Allele.java | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java index bc66caaa2..13e0d11ad 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java @@ -80,7 +80,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.EFFECT.ordinal()] = Allele.leavesNone; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationAverage; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int1; - alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolFalse; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.fireproofFalse; return alleles; } @@ -150,7 +150,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLower; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationSlower; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int3; - alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolTrue; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.fireproofTrue; return alleles; } @@ -161,7 +161,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLowest; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationSlowest; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int4; - alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolTrue; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.fireproofTrue; return alleles; } diff --git a/src/main/java/forestry/core/genetics/Allele.java b/src/main/java/forestry/core/genetics/Allele.java index aae64f6a2..af3246431 100755 --- a/src/main/java/forestry/core/genetics/Allele.java +++ b/src/main/java/forestry/core/genetics/Allele.java @@ -408,6 +408,10 @@ public class Allele implements IAllele { public static Allele plantTypeNether; public static Allele plantTypeCrop; + // / TREES // FIREPROOF + public static Allele fireproofFalse; + public static Allele fireproofTrue; + public static void initialize() { // ALL // GENERIC boolFalse = new AlleleBoolean("boolFalse", false); @@ -550,6 +554,9 @@ public class Allele implements IAllele { plantTypeNether = new AllelePlantType("plantTypeNether", EnumPlantType.Nether); plantTypeCrop = new AllelePlantType("plantTypeCrop", EnumPlantType.Crop); + fireproofFalse = new AlleleBoolean("fireproofFalse", false); + fireproofTrue = new AlleleBoolean("fireproofTrue", true); + // LEGACY MAPPINGS ILegacyHandler legacy = (ILegacyHandler) AlleleManager.alleleRegistry;