Make fauna names consistent

Patch By: Nescio
Differential Revision: D3012
This was SVN commit r24062.

binaries/data/mods/public/maps/random/african_plains.js

@@ -19,7 +19,7 @@ var oPalm = "gaia/flora_tree_senegal_date_palm";
 var oBerryBush = "gaia/flora_bush_berry";
 var oWildebeest = "gaia/fauna_wildebeest";
 var oZebra = "gaia/fauna_zebra";
-var oRhino = "gaia/fauna_rhino";
+var oRhino = "gaia/fauna_rhinoceros_white";
 var oLion = "gaia/fauna_lion";
 var oLioness = "gaia/fauna_lioness";
 var oHawk = "birds/buzzard";
@@ -28,7 +28,7 @@ var oGiraffe2 = "gaia/fauna_giraffe_infant";
 var oGazelle = "gaia/fauna_gazelle";
 var oElephant = "gaia/fauna_elephant_african_bush";
 var oElephant2 = "gaia/fauna_elephant_african_infant";
-var oCrocodile = "gaia/fauna_crocodile";
+var oCrocodile = "gaia/fauna_crocodile_nile";
 var oFish = "gaia/fish/generic";
 var oStoneSmall = "gaia/geology_stone_savanna_small";
 var oMetalLarge = "gaia/geology_metal_savanna_slabs";

binaries/data/mods/public/maps/random/botswanan_haven.js

@@ -19,8 +19,8 @@ const oGazelle = "gaia/fauna_gazelle";
 const oZebra = "gaia/fauna_zebra";
 const oWildebeest = "gaia/fauna_wildebeest";
 const oLion = "gaia/fauna_lion";
-const oRhino = "gaia/fauna_rhino";
-const oCrocodile = "gaia/fauna_crocodile";
+const oRhino = "gaia/fauna_rhinoceros_white";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oElephant = "gaia/fauna_elephant_north_african";
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLioness = "gaia/fauna_lioness";

binaries/data/mods/public/maps/random/elephantine.js

@@ -53,7 +53,7 @@ const oTreasure = [
 ];
 const oBerryBush = "gaia/flora_bush_berry_desert";
 const oGazelle = "gaia/fauna_gazelle";
-const oRhino = "gaia/fauna_rhino";
+const oRhino = "gaia/fauna_rhinoceros_white";
 const oWarthog = "gaia/fauna_boar";
 const oGiraffe = "gaia/fauna_giraffe";
 const oGiraffeInfant = "gaia/fauna_giraffe_infant";
@@ -61,7 +61,7 @@ const oElephant = "gaia/fauna_elephant_african_bush";
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLion = "gaia/fauna_lion";
 const oLioness = "gaia/fauna_lioness";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/tilapia";
 const oHawk = "birds/buzzard";
 

binaries/data/mods/public/maps/random/hellas_biomes.json

@@ -163,7 +163,7 @@
 				"goat": "gaia/fauna_goat",
 				"hawk": "birds/buzzard",
 				"horse": "gaia/fauna_horse",
-				"pony": "gaia/fauna_pony"
+				"pony": "gaia/fauna_horse_pony"
 			},
 			"athen": {
 				"temple": "structures/athen_temple",

binaries/data/mods/public/maps/random/india.js

@@ -12,7 +12,7 @@ const oTree = "gaia/flora_tree_palm_tropic";
 const oBerryBush = "gaia/flora_bush_berry";
 const oRabbit = "gaia/fauna_rabbit";
 const oTiger = "gaia/fauna_tiger";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/generic";
 const oElephant = "gaia/fauna_elephant_asian";
 const oElephantInfant = "gaia/fauna_elephant_asian_infant";

binaries/data/mods/public/maps/random/jebel_barkal.js

@@ -53,13 +53,13 @@ const oTreasuresCity = [oFoodTreasureBin, oFoodTreasureCrate, oFoodTreasureJars]
 const oGiraffe = "gaia/fauna_giraffe";
 const oGiraffeInfant = "gaia/fauna_giraffe_infant";
 const oGazelle = "gaia/fauna_gazelle";
-const oRhino = "gaia/fauna_rhino";
+const oRhino = "gaia/fauna_rhinoceros_white";
 const oWarthog = "gaia/fauna_boar";
 const oElephant = "gaia/fauna_elephant_african_bush";
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLion = "gaia/fauna_lion";
 const oLioness = "gaia/fauna_lioness";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/tilapia";
 const oHawk = "birds/buzzard";
 const oTempleApedemak = "structures/kush_temple";

binaries/data/mods/public/maps/random/ngorongoro.js

@@ -81,7 +81,7 @@ function setBiomeHighlands()
 
 function setBiomeEden()
 {
-	g_Gaia.mainHuntableAnimal = "gaia/fauna_rhino";
+	g_Gaia.mainHuntableAnimal = "gaia/fauna_rhinoceros_white";
 	g_Gaia.secondaryHuntableAnimal =  "gaia/fauna_elephant_african_bush";
 }
 

binaries/data/mods/public/maps/random/northern_lights.js

@@ -20,7 +20,7 @@ const oStoneSmall = "gaia/geology_stone_alpine_a";
 const oMetalLarge = "gaia/geology_metal_alpine_slabs";
 const oFish = "gaia/fish/generic";
 const oWalrus = "gaia/fauna_walrus";
-const oArcticWolf = "gaia/fauna_arctic_wolf";
+const oArcticWolf = "gaia/fauna_wolf_arctic";
 
 const aIceberg = "actor|props/special/eyecandy/iceberg.xml";
 

binaries/data/mods/public/maps/random/polar_sea.js

@@ -12,7 +12,7 @@ var tShore = "polar_ice_snow";
 var tWater = "polar_ice_c";
 
 var oArcticFox = "gaia/fauna_fox_arctic";
-var oArcticWolf = "gaia/fauna_arctic_wolf_domestic";
+var oArcticWolf = "gaia/fauna_wolf_arctic_domestic";
 var oMuskox = "gaia/fauna_muskox";
 var oWalrus = "gaia/fauna_walrus";
 var oWhaleFin = "gaia/fauna_whale_fin";

binaries/data/mods/public/maps/random/polar_sea_triggers.js

@@ -1,6 +1,6 @@
 const debugLog = false;
 
-var attackerTemplate = "gaia/fauna_arctic_wolf_domestic";
+var attackerTemplate = "gaia/fauna_wolf_arctic_domestic";
 
 var minWaveSize = 1;
 var maxWaveSize = 3;

binaries/data/mods/public/maps/random/scythian_rivulet.js

@@ -22,7 +22,7 @@ const oBush = "gaia/flora_bush_badlands";
 const oDeer = "gaia/fauna_deer";
 const oRabbit = "gaia/fauna_rabbit";
 const oWolf1 = "gaia/fauna_wolf";
-const oWolf2 = "gaia/fauna_arctic_wolf";
+const oWolf2 = "gaia/fauna_wolf_arctic";
 const oHawk = "birds/buzzard";
 const oFish = "gaia/fish/generic";
 const oStoneLarge = "gaia/geology_stonemine_alpine_quarry";

binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Arctic Wolf</GenericName>
-    <SpecificName>Canis lupus</SpecificName>
-    <Icon>gaia/fauna_arctic_wolf.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/arctic_wolf.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="gaia/fauna_wolf">
+  <Identity>
+    <GenericName>Arctic Wolf</GenericName>
+    <Icon>gaia/fauna_arctic_wolf.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/arctic_wolf.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_arctic_wolf">
+<Entity parent="gaia/fauna_wolf_arctic">
   <Identity>
     <Classes datatype="tokens">Domestic</Classes>
   </Identity>