Fix horse colors

Author: ago1024

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/creatures/ModCreatures.java

@@ -39,11 +39,11 @@ enum CustomTrait {
 		piebaldpinto(24),
 		bloodbay(25),
 		Custom4(26),
-		Custom7(30),
-		Custom8(31),
-		Custom9(32),
-		Custom10(33),
-		Custom11(34),
+		skewbaldpinto(30),
+		goldbuckskin(31),
+		blacksilver(32),
+		appaloosa(33),
+		chestnut(34),
 		Custom12(35),
 		Custom13(36),
 		Custom14(37),

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/creatures/ModTraits.java

@@ -43,16 +43,23 @@ public class ModTraits {
 	public static final int TRAIT_RIFT = 27;
 	public static final int TRAIT_TRAITOR = 28;
 	public static final int TRAIT_VALREI = 29;
+	public static final int TRAIT_IS_BRED = 63;
 
-	public static final int COLOR_EBONY_BLACK = 23;
-	public static final int COLOR_BLOOD_BAY = 25;
-	public static final int COLOR_PIEBALD_PINTO = 24;
-	public static final int COLOR_WHITE = 18;
-	public static final int COLOR_BLACK = 17;
-	public static final int COLOR_GOLD = 16;
+	// Colors in order as defined in CreatureTemplate.colourNameOverrides
 	public static final int COLOR_BROWN = 15;
+	public static final int COLOR_GOLD = 16;
+	public static final int COLOR_BLACK = 17;
+	public static final int COLOR_WHITE = 18;
+	public static final int COLOR_PIEBALD_PINTO = 24;
+	public static final int COLOR_BLOOD_BAY = 25;
+	public static final int COLOR_EBONY_BLACK = 23;
+	public static final int COLOR_SKEWBALD_PINTO = 30;
+	public static final int COLOR_GOLD_BUCKSKIN = 31;
+	public static final int COLOR_BLACK_SILVER = 32;
+	public static final int COLOR_APPALOOSA = 33;
+	public static final int COLOR_CHESTNUT = 34;
 
-	public static final int REGULAR_TRAITS = 
+	public static final int REGULAR_TRAITS =
 			1 << TRAIT_FIERCLY |
 			1 << TRAIT_FLEETER |
 			1 << TRAIT_TOUGH_BUGGER |
@@ -72,15 +79,21 @@ public class ModTraits {
 			1 << TRAIT_STRONG_AND_HEALTHY |
 			1 << TRAIT_SPARK;
 
-	public static final int COLOR_TRAITS = 
-			1 << COLOR_EBONY_BLACK |
-			1 << COLOR_BLOOD_BAY |
-			1 << COLOR_PIEBALD_PINTO |
-			1 << COLOR_WHITE |
-			1 << COLOR_BLACK |
+	public static final int COLOR_TRAITS =
+			1 << COLOR_BROWN |
 			1 << COLOR_GOLD |
-			1 << COLOR_BROWN;
-
+			1 << COLOR_BLACK |
+			1 << COLOR_WHITE |
+			1 << COLOR_PIEBALD_PINTO |
+			1 << COLOR_BLOOD_BAY |
+			1 << COLOR_EBONY_BLACK |
+			1 << COLOR_SKEWBALD_PINTO |
+			1 << COLOR_GOLD_BUCKSKIN |
+			1 << COLOR_BLACK_SILVER |
+			1 << COLOR_APPALOOSA |
+			1 << COLOR_CHESTNUT |
+			0;
+	
 	private static final Logger LOGGER = Logger.getLogger(Traits.class.getName());
 
 	private static Method creatureGetTraits;

modules/modlauncher/src/test/java/org/gotti/wurmunlimited/modsupport/creatures/ModTraitsTest.java

@@ -6,9 +6,12 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.TreeMap;
+import java.util.stream.IntStream;
 
 import org.junit.Test;
 
+import com.wurmonline.server.MiscConstants;
+
 public class ModTraitsTest {
 
 	@Test
@@ -35,19 +38,27 @@ public void testCalcNewTrais() {
 		long traits = ModTraits.calcNewTraits(random, 90, false, mothertraits, fathertraits, regulartraits, colortraits, false);
 
 		BitSet expected = new BitSet();
-		expected.set(4);
-		expected.set(10);
-		expected.set(13);
-		expected.set(16);
-		expected.set(20);
-		expected.set(28);
-		expected.set(63);
+		IntStream.of(7, 28, 49, 54, 59, 63).forEach(expected::set);
 
 		BitSet traitBits = new BitSet();
 		ModTraits.setTraitBits(traits, traitBits);
 
 		assertThat(traitBits).isEqualTo(expected);
 	}
 
-
+	/**
+	 * verify that the server code did not change the number of traits
+	 */
+	@Test
+	public void testMaxColorTraits() {
+		assertThat(MiscConstants.CURRENT_MAX_TRAIT).isEqualTo(34);
+	}
+	
+	/**
+	 * verify that the server code did not change the number of creature colours
+	 */
+	@Test
+	public void testNumCreatureColours() {
+		assertThat(MiscConstants.CURRENT_NUM_CREATURE_COLOURS).isEqualTo(13);
+	}
 }