fix typos and duplications revealed by WML_tree_tools

ProditorMagnus · Jul 9, 2023 · 457022c · 457022c
1 parent 136af6d
commit 457022c
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 75 deletions.
diff --git a/units/EE_units/chaos/Hell_Crab.cfg b/units/EE_units/chaos/Hell_Crab.cfg
@@ -6,12 +6,8 @@
     race=AE_ext_chaos_demon_race
     image="units/chaos/greater-crab.png"
     profile="portraits/chaos/greater-crab.png~RC(magenta>black)"
-    [abilities]
-        {ABILITY_SUBMERGE}
-    [/abilities]
     hitpoints=58
     movement_type=AE_ext_chaos_chaoscrab
-    # keep in mind the minumum cost is 2 ## not anymore
     movement=6
     experience=100
     level=2
@@ -22,13 +18,14 @@
     usage=mixed fighter
     undead_variation=troll
     description= _ "This unit is from Extended Era. Its coding and art were done by the Various people who created Extended Era.
- 
+
 Within each species there are often freakishly strong and powerful aberrations born through seemingly blind chance. Successful servants of chaos can find their bodies shifting and growing as these latent traits are brought out. The Hell Crab is a powerful example of the potential all Evil Crabs carry inside them."
     {DEFENSE_ANIM "units/chaos/greater-crab.png" "units/chaos/greater-crab.png" {SOUND_LIST:TROLL_HIT} }
     die_sound={SOUND_LIST:TROLL_DIE}
 
     [abilities]
         {ABILITY_FEEDING}
+        {ABILITY_SUBMERGE}
     [/abilities]
 
     [attack]

diff --git a/units/EOS_units/saurians/Saurian_Shockfrost.cfg b/units/EOS_units/saurians/Saurian_Shockfrost.cfg
@@ -17,7 +17,7 @@
         frozen=30
     [/defense]
     [resistance]
-        cold=60
+        cold=70
     [/resistance]
     movement=5
     experience=130
@@ -32,10 +32,6 @@
     {DEFENSE_ANIM "units/saurians/shockfrost.png" "units/saurians/shockfrost.png" hiss-die.wav }
     die_sound=hiss-die.wav
 
-    [resistance]
-        cold=70
-    [/resistance]
-
     [attack]
         name=staff
         #textdomain wesnoth-units

diff --git a/units/EOS_units/saurians/Saurian_Soulmage.cfg b/units/EOS_units/saurians/Saurian_Soulmage.cfg
@@ -17,7 +17,7 @@
         frozen=30
     [/defense]
     [resistance]
-        cold=70
+        cold=80
     [/resistance]
     movement=5
     experience=72
@@ -32,10 +32,6 @@
     {DEFENSE_ANIM "units/saurians/frosty-defend.png" "units/saurians/frosty-defend.png" hiss-hit.wav }
     die_sound=hiss-die.wav
 
-    [resistance]
-        cold=80
-    [/resistance]
-
     [attack]
         name=staff
         #textdomain wesnoth-units

diff --git a/units/FL_units/altaris/Pegasus_Master.cfg b/units/FL_units/altaris/Pegasus_Master.cfg
@@ -7,9 +7,6 @@
 
     hitpoints=50
     movement_type=fly
-    [resistance]
-        pierce=120
-    [/resistance]
     movement=9
     experience=150
     level=2
@@ -28,6 +25,7 @@
     [resistance]
         arcane=70
         cold=90
+        pierce=120
     [/resistance]
 
     [attack]

diff --git a/units/FL_units/bloodelf/Fire_Bird.cfg b/units/FL_units/bloodelf/Fire_Bird.cfg
@@ -26,9 +26,15 @@
     [/abilities]
 
     [defense]
+        cave=60
+        frozen=60
         mountains=40
         hills=40
     [/defense]
+    [movement_costs]
+        cave=1
+        fungus=1
+    [/movement_costs]
 
     [attack]
         name=claws
@@ -146,14 +152,6 @@
             image="frakcja3/firebird-flying-5.png"
         [/frame]
     [/attack_anim]
-    [movement_costs]
-        cave=1
-        fungus=1
-    [/movement_costs]
-    [defense]
-        cave=60
-        frozen=60
-    [/defense]
     [attack_anim]
         [filter_attack]
             name=ognisty

diff --git a/units/FL_units/bloodelf/Phoenix.cfg b/units/FL_units/bloodelf/Phoenix.cfg
@@ -27,9 +27,15 @@
     [/abilities]
 
     [defense]
+        cave=60
+        frozen=60
         mountains=40
         hills=40
     [/defense]
+    [movement_costs]
+        cave=1
+        fungus=1
+    [/movement_costs]
 
     [attack]
         name=claws
@@ -157,14 +163,6 @@
             image="frakcja3/phoenix-flying-5.png"
         [/frame]
     [/attack_anim]
-    [movement_costs]
-        cave=1
-        fungus=1
-    [/movement_costs]
-    [defense]
-        cave=60
-        frozen=60
-    [/defense]
     [attack_anim]
         [filter_attack]
             name=ognisty

diff --git a/units/ME_units/avians/d3-Rocket.cfg b/units/ME_units/avians/d3-Rocket.cfg
@@ -26,6 +26,7 @@
     [/defense]
     [resistance]
         cold=90
+        pierce=120
     [/resistance]
     [attack]
         name=spear
@@ -49,9 +50,6 @@
         damage=6
         number=3
     [/attack]
-    [resistance]
-        pierce=120
-    [/resistance]
     {DEFENSE_ANIM "units/avians/rocket.png" "units/avians/rocket.png" {SOUND_LIST:GRYPHON_HIT} }
 
     [attack_anim]

diff --git a/units/MiE_units/centaurs/3_Oracle.cfg b/units/MiE_units/centaurs/3_Oracle.cfg
@@ -10,7 +10,7 @@
     hitpoints=57
     movement_type=AE_mie_centaurfoot
     [resistance]
-        fire=90
+        fire=80
         cold=90
         arcane=90
     [/resistance]
@@ -24,10 +24,6 @@
     usage=mixed fighter
     die_sound={SOUND_LIST:HUMAN_DIE}
 
-    [resistance]
-        fire=80
-    [/resistance]
-
     [attack]
         name=hooves
         description=_"hooves"

diff --git a/units/RE_units/human-forest/f3_beastmaster.cfg b/units/RE_units/human-forest/f3_beastmaster.cfg
@@ -27,7 +27,7 @@
     [/movement_costs]
     [resistance]
         pierce=80
-        cols=90
+        cold=90
     [/resistance]
     [abilities]
         {AE_RHY_ABILITY_BEASTTAMER 20}

diff --git a/units/RE_units/human-mountain/Scout_Adventurer.cfg b/units/RE_units/human-mountain/Scout_Adventurer.cfg
@@ -28,15 +28,12 @@
     [defense]
         hills=40
         mountains=30
-        frozen=70
+        frozen=60
+        shallow_water=70
     [/defense]
     [resistance]
         cold=90
     [/resistance]
-    [defense]
-        shallow_water=70
-        frozen=60
-    [/defense]
     [attack]
         name=stick
         description= _"alpenstock"

diff --git a/units/RE_units/trarashy/mb1-MageResearcher.cfg b/units/RE_units/trarashy/mb1-MageResearcher.cfg
@@ -19,7 +19,7 @@
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/trarashy/mage-researcher.png" "units/trarashy/mage-researcher.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     [resistance]
-        impacte=100
+        impact=100
         arcane=80
     [/resistance]
     [attack]

diff --git a/units/archaic_units/phantom/Tomb_Stalker.cfg b/units/archaic_units/phantom/Tomb_Stalker.cfg
@@ -32,9 +32,6 @@
         hills=50
         forest=50
         fungus=50
-    [/defense]
-
-    [defense]
         sand=50
     [/defense]
     [defend]

diff --git a/units/imperial_units/human-lavinians/Archuballistarius.cfg b/units/imperial_units/human-lavinians/Archuballistarius.cfg
@@ -17,7 +17,7 @@
     cost=52
     usage=archer
     description= _ "This unit is from Imperial Era. Its coding and art were done by Turin and Various others.
- 
+
 The Lavinian Legion will often, in its conquests, come across a fortified town that refuses to surrender. Instead of storming the walls of the city, they simply wheel out the artillery. The town invariably falls. The Archuballistarius is also effective on the battlefield, although it moves rather slowly."
 
     [resistance]
@@ -48,9 +48,6 @@ The Lavinian Legion will often, in its conquests, come across a fortified town t
     #anims
     {DEFENSE_ANIM "units/human-lavinians/archuballistarius-defend.png" "units/human-lavinians/archuballistarius.png" {SOUND_LIST:HUMAN_HIT}}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    [resistance]
-        fire=120
-    [/resistance]
     [death]
         [frame]
             begin=0

diff --git a/units/imperial_units/human-lavinians/Ballista.cfg b/units/imperial_units/human-lavinians/Ballista.cfg
@@ -16,7 +16,7 @@
     cost=29
     usage=archer
     description= _ "This unit is from Imperial Era. Its coding and art were done by Turin and Various others.
- 
+
 A Lavinian Field Ballista's primary purpose is attacking the cities that oppose the Legion's expansion. However, it is also deadly against enemies on the battlefield. It is small enough that transportation is possible, although not exactly fast, and the ballista's controller is able to defend himself with a gladius if the ballista is attacked."
 
     [resistance]
@@ -47,9 +47,6 @@ A Lavinian Field Ballista's primary purpose is attacking the cities that oppose
     #anims
     {DEFENSE_ANIM "units/human-lavinians/ballista-defend.png" "units/human-lavinians/ballista.png" {SOUND_LIST:HUMAN_HIT}}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    [resistance]
-        fire=120
-    [/resistance]
     [death]
         [frame]
             begin=0

diff --git a/units/misc_units/deep-elves/Black_Tyrhai.cfg b/units/misc_units/deep-elves/Black_Tyrhai.cfg
@@ -26,6 +26,7 @@
     [defense]
         sand=60
         frozen=60
+        village=50
     [/defense]
 
     [resistance]
@@ -37,10 +38,6 @@
         pierce=100
     [/resistance]
 
-    [defense]
-        village=50
-    [/defense]
-
     [attack]
         name=fangs
         description={STR_FANGS}

diff --git a/units/misc_units/deep-elves/Shadow_Tyrhai.cfg b/units/misc_units/deep-elves/Shadow_Tyrhai.cfg
@@ -26,6 +26,7 @@
     [defense]
         sand=60
         frozen=60
+        village=50
     [/defense]
 
     [resistance]
@@ -37,10 +38,6 @@
         pierce=100
     [/resistance]
 
-    [defense]
-        village=50
-    [/defense]
-
     [abilities]
         [teleport]
             name=_ "Descend into darkness"

diff --git a/units/misc_units/frozen/FrostGunnerMaster.cfg b/units/misc_units/frozen/FrostGunnerMaster.cfg
@@ -22,11 +22,6 @@
     [abilities]
     [/abilities]
 
-    [resistance]
-        fire=120
-        arcane=100
-    [/resistance]
-
     [movement_costs]
         shallow_water=1
         reef=1
@@ -66,9 +61,9 @@
         blade=85
         pierce=70
         impact=90
-        fire=130
+        fire=120
         cold=60
-        arcane=80
+        arcane=100
     [/resistance]
     [attack]
         name=frosty_spikes