utbs: change traits for higher unit types too,

because they are nowadays displayed in the help. Also keep them sorted the same way as usual. [ci skip] (cherry-picked from commit 2e8f6c2)
wesnoth · Oct 7, 2018 · d0709c5 · d0709c5
1 parent fb1e7eb
commit d0709c5
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 1 deletion.
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg
@@ -4,6 +4,11 @@
     id=Quenoth Champion
     name= _ "Quenoth Champion"
     race=elf
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_QUICK}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
     image=units/quenoth/champion.png
     hitpoints=64
     movement_type=quenoth_foot

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
@@ -6,9 +6,9 @@
     race=elf
     ignore_race_traits=yes
     {TRAIT_STRONG}
+    {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    {TRAIT_QUICK}
     image=units/quenoth/fighter.png
     hitpoints=34
     movement_type=quenoth_foot

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg
@@ -6,6 +6,14 @@
     image=units/quenoth/flagbearer.png
     image_icon="units/quenoth/flagbearer.png~CROP(0,0,72,72)"
     race=elf
+    # Base movement of 4 is too little, but we don't want them to get 6 either
+    # if they're quick, so instead they just have 5 movement but can't get quick
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_DEXTROUS}
+    {TRAIT_HEALTHY}
     hitpoints=62
     movement_type=quenoth_beast
     #mostly like a foot Elf, but they are bad at defending in villages

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
@@ -4,6 +4,11 @@
     id=Quenoth Flanker
     name= _ "Quenoth Flanker"
     race=elf
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_QUICK}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
     image=units/quenoth/flanker.png
     hitpoints=44
     movement_type=quenoth_foot

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg
@@ -6,6 +6,14 @@
     image=units/quenoth/protector.png
     image_icon="units/quenoth/protector.png~CROP(0,0,72,72)"
     race=elf
+    # Base movement of 4 is too little, but we don't want them to get 6 either
+    # if they're quick, so instead they just have 5 movement but can't get quick
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_DEXTROUS}
+    {TRAIT_HEALTHY}
     hitpoints=68
     movement_type=quenoth_beast
     #mostly like a foot Elf, but they are bad at defending in villages

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
@@ -4,6 +4,11 @@
     id=Quenoth Ranger
     name= _ "Quenoth Ranger"
     race=elf
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_QUICK}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
     image=units/quenoth/ranger.png
     hitpoints=57
     movement_type=quenoth_foot

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg
@@ -6,6 +6,14 @@
     image=units/quenoth/stalwart.png
     image_icon="units/quenoth/stalwart.png~CROP(0,0,72,72)"
     race=elf
+    # Base movement of 4 is too little, but we don't want them to get 6 either
+    # if they're quick, so instead they just have 5 movement but can't get quick
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_DEXTROUS}
+    {TRAIT_HEALTHY}
     hitpoints=54
     movement_type=quenoth_beast
     #mostly like a foot Elf, but they are bad at defending in villages

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg
@@ -6,6 +6,14 @@
     image=units/quenoth/vanguard.png
     image_icon="units/quenoth/vanguard.png~CROP(0,0,72,72)"
     race=elf
+    # Base movement of 4 is too little, but we don't want them to get 6 either
+    # if they're quick, so instead they just have 5 movement but can't get quick
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_DEXTROUS}
+    {TRAIT_HEALTHY}
     hitpoints=50
     movement_type=quenoth_beast
     #mostly like a foot Elf, but they are bad at defending in villages

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg
@@ -4,6 +4,11 @@
     id=Quenoth Warrior
     name= _ "Quenoth Warrior"
     race=elf
+    ignore_race_traits=yes
+    {TRAIT_STRONG}
+    {TRAIT_QUICK}
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
     image=units/quenoth/warrior.png
     hitpoints=48
     movement_type=quenoth_foot