From 3c0c9098cf516620d8a022be9c8313ca86283282 Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 21 Mar 2022 06:58:13 +0000 Subject: [PATCH] Adjust animal stances. There have been complaints on the forums (e.g. https://wildfiregames.com/forum/topic/51245-how-do-you-guys-feel-about-a25-in-terms-of-how-much-fun-you-have-compared-to-a23-or-a24/#comment-446690). Boar and walrus now behave the same as the elephants (only attack back when attacked), whilst most other animals have defensive stance (attack only within some smaller distance and chase until left vision). Differential revision: https://code.wildfiregames.com/D4533 Reviewed by: @marder, @wowgetoffyourcellphone Comment by: @Silier This was SVN commit r26694. --- .../public/simulation/templates/gaia/fauna_bear_black.xml | 2 +- .../public/simulation/templates/gaia/fauna_bear_brown.xml | 2 +- .../public/simulation/templates/gaia/fauna_bear_polar.xml | 2 +- .../mods/public/simulation/templates/gaia/fauna_boar.xml | 2 +- .../public/simulation/templates/gaia/fauna_cattle_bull.xml | 2 +- .../simulation/templates/gaia/fauna_crocodile_nile.xml | 2 +- .../templates/gaia/fauna_elephant_african_bush.xml | 2 +- .../simulation/templates/gaia/fauna_elephant_asian.xml | 2 +- .../templates/gaia/fauna_elephant_north_african.xml | 2 +- .../public/simulation/templates/gaia/fauna_hippopotamus.xml | 2 +- .../mods/public/simulation/templates/gaia/fauna_lion.xml | 2 +- .../simulation/templates/gaia/fauna_rhinoceros_white.xml | 2 +- .../mods/public/simulation/templates/gaia/fauna_tiger.xml | 2 +- .../mods/public/simulation/templates/gaia/fauna_walrus.xml | 2 +- .../mods/public/simulation/templates/gaia/fauna_wolf.xml | 2 +- .../public/simulation/templates/gaia/fauna_wolf_arctic.xml | 3 +++ .../public/simulation/templates/template_unit_fauna.xml | 2 +- .../templates/template_unit_fauna_hunt_defensive.xml | 2 +- ...bear.xml => template_unit_fauna_hunt_defensive_bear.xml} | 2 +- .../template_unit_fauna_hunt_passive-defensive.xml | 6 ++++++ ... => template_unit_fauna_hunt_passive-defensive_bull.xml} | 2 +- ...template_unit_fauna_hunt_passive-defensive_elephant.xml} | 2 +- .../templates/template_unit_fauna_wild_defensive.xml | 2 +- 23 files changed, 30 insertions(+), 21 deletions(-) rename binaries/data/mods/public/simulation/templates/{template_unit_fauna_hunt_aggressive_bear.xml => template_unit_fauna_hunt_defensive_bear.xml} (86%) create mode 100644 binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml rename binaries/data/mods/public/simulation/templates/{template_unit_fauna_hunt_defensive_bull.xml => template_unit_fauna_hunt_passive-defensive_bull.xml} (91%) rename binaries/data/mods/public/simulation/templates/{template_unit_fauna_hunt_defensive_elephant.xml => template_unit_fauna_hunt_passive-defensive_elephant.xml} (92%) diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml index 190d89074c..f198520406 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml @@ -1,5 +1,5 @@ - + Paws diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml index a155c3804e..1b688f8881 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml @@ -1,5 +1,5 @@ - + Paws diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml index 9c11bb927a..45c693b477 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml @@ -1,5 +1,5 @@ - + Paws diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml index aadb265a86..916451e8df 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml @@ -1,5 +1,5 @@ - + Tusks diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml index db8e721785..6bc63a741a 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml @@ -1,5 +1,5 @@ - + Horns diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml index 451aab53c3..446e2eb115 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml @@ -1,5 +1,5 @@ - + Teeth diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml index f58e946f9f..4a9cb4ddb1 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml @@ -1,5 +1,5 @@ - + Trunk diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml index bde8176c34..4dd06690c5 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml @@ -1,5 +1,5 @@ - + Trunk diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml index a1d867219b..c015dee284 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml @@ -1,5 +1,5 @@ - + Trunk diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml index e8f711957d..b3655e12ed 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml @@ -1,5 +1,5 @@ - + Tusks diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml index 26d3145b67..4fcca48387 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml @@ -1,5 +1,5 @@ - + Paws diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml index e49a4fa3dc..4553874a3c 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml @@ -1,5 +1,5 @@ - + Horn diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml index 3bf30802fe..e0e32a7b3c 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml @@ -1,5 +1,5 @@ - + Paws diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml index f438bd76c5..7571dac6eb 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml @@ -1,5 +1,5 @@ - + Tusks diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml index 7930fdafd8..d0e6acf3dd 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml @@ -1,5 +1,5 @@ - + Fangs diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml index f7771d2320..adc8aeee42 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml @@ -4,6 +4,9 @@ Arctic Wolf gaia/fauna_arctic_wolf.png + + aggressive + fauna/arctic_wolf.xml diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml index c18683ce57..fcdf4b94fd 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml @@ -52,6 +52,6 @@ true - 60 + 90 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml index 8e0d6b2705..d9022c3f01 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml @@ -1,6 +1,6 @@ - passive-defensive + defensive diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml similarity index 86% rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml rename to binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml index a3a7bcd38b..af6c81cdc8 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml @@ -1,5 +1,5 @@ - + 300 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml new file mode 100644 index 0000000000..8e0d6b2705 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml @@ -0,0 +1,6 @@ + + + + passive-defensive + + diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml similarity index 91% rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml rename to binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml index 71876186cb..87649e38bc 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml @@ -1,5 +1,5 @@ - + diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml similarity index 92% rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml rename to binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml index ac6e078622..4988342a13 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml @@ -1,5 +1,5 @@ - + Elephant diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml index 57f8cb1d7a..2f9f62d92b 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml @@ -1,6 +1,6 @@ - passive-defensive + defensive