Index: ps/trunk/binaries/data/mods/public/art/actors/fauna/arctic_wolf.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/actors/fauna/arctic_wolf.xml +++ ps/trunk/binaries/data/mods/public/art/actors/fauna/arctic_wolf.xml @@ -0,0 +1,33 @@ + + + + + + skeletal/wolf.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ps/trunk/binaries/data/mods/public/art/actors/fauna/wolf_snow.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/actors/fauna/wolf_snow.xml +++ ps/trunk/binaries/data/mods/public/art/actors/fauna/wolf_snow.xml @@ -1,33 +0,0 @@ - - - - - - skeletal/wolf.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js +++ ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js @@ -19,7 +19,7 @@ const oMetalLarge = "gaia/geology_metal_alpine_slabs"; const oFish = "gaia/fauna_fish"; const oWalrus = "gaia/fauna_walrus"; -const oWolf = "gaia/fauna_wolf_snow"; +const oArcticWolf = "gaia/fauna_arctic_wolf"; const aIceberg = "actor|props/special/eyecandy/iceberg.xml"; @@ -294,7 +294,7 @@ log("Creating sheep..."); group = new SimpleGroup( - [new SimpleObject(oWolf, 2,3, 0,2)], + [new SimpleObject(oArcticWolf, 2,3, 0,2)], true, clFood ); createObjectGroupsDeprecated(group, 0, Index: ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js +++ ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js @@ -12,7 +12,7 @@ var tWater = "polar_ice_c"; var oArcticFox = "gaia/fauna_fox_arctic"; -var oWolf = "trigger/fauna_wolf_snow_attack"; +var oArcticWolf = "trigger/fauna_arctic_wolf_attack"; var oMuskox = "gaia/fauna_muskox"; var oWalrus = "gaia/fauna_walrus"; var oWhaleFin = "gaia/fauna_whale_fin"; @@ -41,7 +41,7 @@ var clHill = createTileClass(); var clFood = createTileClass(); var clBaseResource = createTileClass(); -var clWolf = createTileClass(); +var clArcticWolf = createTileClass(); var [playerIDs, playerX, playerZ] = radialPlayerPlacement(); @@ -242,7 +242,7 @@ createFood( [ [new SimpleObject(oArcticFox, 1, 2, 0, 3)], - [new SimpleObject(oWolf, 4, 6, 0, 4)], + [new SimpleObject(oArcticWolf, 4, 6, 0, 4)], [new SimpleObject(oWalrus, 2, 3, 0, 2)], [new SimpleObject(oMuskox, 2, 3, 0, 2)] ], @@ -280,9 +280,9 @@ // Create trigger points where wolves spawn createObjectGroupsDeprecated( - new SimpleGroup([new SimpleObject("trigger/trigger_point_A", 1, 1, 0, 0)], true, clWolf), + new SimpleGroup([new SimpleObject("trigger/trigger_point_A", 1, 1, 0, 0)], true, clArcticWolf), 0, - avoidClasses(clWater, 2, clMetal, 4, clRock, 4, clPlayer, 15, clHill, 2, clWolf, 20), + avoidClasses(clWater, 2, clMetal, 4, clRock, 4, clPlayer, 15, clHill, 2, clArcticWolf, 20), 1000, 100); Engine.SetProgress(95); Index: ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js +++ ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js @@ -1,6 +1,6 @@ const debugLog = false; -var attackerTemplate = "trigger/fauna_wolf_snow_attack"; +var attackerTemplate = "trigger/fauna_arctic_wolf_attack"; var minWaveSize = 1; var maxWaveSize = 3; Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml @@ -2321,56 +2321,56 @@ - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Valleys_(2).xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Valleys_(2).xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Valleys_(2).xml @@ -14636,14 +14636,14 @@ - + 0 - + 0 Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml @@ -15222,210 +15222,210 @@ - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml @@ -6134,7 +6134,7 @@ - + 0 @@ -12535,28 +12535,28 @@ - + 0 - + 0 - + 0 - + 0 @@ -12605,14 +12605,14 @@ - + 0 - + 0 Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml @@ -0,0 +1,10 @@ + + + + Arctic Wolf + gaia/fauna_arctic_wolf.png + + + fauna/arctic_wolf.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml @@ -1,5 +1,5 @@ - + Wolf gaia/fauna_wolf.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml @@ -1,10 +0,0 @@ - - - - Snow Wolf - gaia/fauna_wolf_snow.png - - - fauna/wolf_snow.xml - - Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml @@ -0,0 +1,22 @@ + + + + + 10.0 + 10.0 + 0.0 + 4.0 + 1000 + + + + + 1.5 + + + gaia + + + pitch + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wolf.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wolf.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wolf.xml @@ -1,22 +0,0 @@ - - - - - 10.0 - 10.0 - 0.0 - 4.0 - 1000 - - - - - 1.5 - - - gaia - - - pitch - - Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_arctic_wolf_attack.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_arctic_wolf_attack.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_arctic_wolf_attack.xml @@ -0,0 +1,9 @@ + + + + Domestic + + + violent + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_attack.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_attack.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_attack.xml @@ -1,9 +0,0 @@ - - - - Domestic - - - violent - -