Merge pull request #4765 from Hejnewar/Wyverns-and-other-units

Wyverns and other units
wesnoth · Mar 24, 2020 · dd7dea1 · dd7dea1
2 parents 92ce9d7 + 4f602cb
commit dd7dea1
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 39 deletions.
diff --git a/data/core/units/dunefolk/Wyvern_Rider.cfg b/data/core/units/dunefolk/Wyvern_Rider.cfg
@@ -4,15 +4,15 @@
     name= _ "Wyvern Rider"
     race=monster
     image="units/dunefolk/wyvern-rider.png"
-    hitpoints=32
+    hitpoints=85
     movement_type=fly
-    movement=8
+    movement=7
     experience=50
-    level=1
+    level=4
     alignment=liminal
     advances_to=null
     {AMLA_DEFAULT}
-    cost=21
+    cost=80
     usage=scout
     description=""
     die_sound={SOUND_LIST:HUMAN_DIE}
@@ -24,17 +24,17 @@
         icon=attacks/fangs-animal.png
         type=blade
         range=melee
-        damage=6
-        number=3
+        damage=11
+        number=4
     [/attack]
     [attack]
         name=javelin
         description=_"javelin"
         icon=attacks/javelin-human.png
         type=pierce
         range=ranged
-        damage=9
-        number=1
+        damage=11
+        number=3
     [/attack]
 
     [attack_anim]

diff --git a/data/core/units/monsters/Elder_Falcon.cfg b/data/core/units/monsters/Elder_Falcon.cfg
@@ -23,18 +23,18 @@
         village=50
     [/defense]
     [attack]
-        name=claws
-        description= _ "claws"
-        icon=attacks/claws-animal.png
-        type=blade
+        name=beak
+        description= _ "beak"
+        type=pierce
         range=melee
         damage=4
         number=3
     [/attack]
     [attack]
-        name=beak
-        description= _ "beak"
-        type=pierce
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws-animal.png
+        type=blade    
         range=melee
         damage=9
         number=1

diff --git a/data/core/units/monsters/Falcon.cfg b/data/core/units/monsters/Falcon.cfg
@@ -22,18 +22,18 @@
         village=50
     [/defense]
     [attack]
-        name=claws
-        description= _ "claws"
-        icon=attacks/claws-animal.png
-        type=blade
+        name=beak
+        description= _ "beak"
+        type=pierce
         range=melee
         damage=2
         number=3
     [/attack]
     [attack]
-        name=beak
-        description= _ "beak"
-        type=pierce
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws-animal.png
+        type=blade
         range=melee
         damage=5
         number=1

diff --git a/data/core/units/monsters/Roc.cfg b/data/core/units/monsters/Roc.cfg
@@ -6,15 +6,15 @@
     num_traits=2
     undead_variation=gryphon
     image="units/monsters/roc.png"
-    hitpoints=56
+    hitpoints=44
     movement_type=fly
     movement=10
     experience=100
     level=2
     alignment=neutral
     advances_to=null
     {AMLA_DEFAULT}
-    cost=45
+    cost=36
     usage=scout
     description=""
     {NOTE_CHARGE}
@@ -24,20 +24,20 @@
         village=50
     [/defense]
     [attack]
-        name=claws
-        description= _ "claws"
-        icon=attacks/claws-animal.png
-        type=blade
+        name=beak
+        description= _ "beak"
+        type=pierce
         range=melee
         damage=6
         number=4
     [/attack]
     [attack]
-        name=beak
-        description= _ "beak"
-        type=pierce
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws-animal.png
+        type=blade
         range=melee
-        damage=12
+        damage=10
         number=2
         [specials]
             {WEAPON_SPECIAL_CHARGE}

diff --git a/data/core/units/monsters/Wild_Wyvern.cfg b/data/core/units/monsters/Wild_Wyvern.cfg
@@ -3,16 +3,17 @@
     id=Wild Wyvern
     name= _ "Wild Wyvern"
     race=monster
+    num_traits=2
     image="units/monsters/wild-wyvern.png"
-    hitpoints=32
+    hitpoints=72
     movement_type=fly
-    movement=9
-    experience=50
-    level=1
+    movement=8
+    experience=150
+    level=3
     alignment=liminal
     advances_to=null
     {AMLA_DEFAULT}
-    cost=16
+    cost=54
     usage=scout
     description=""
     die_sound=drake-die.ogg
@@ -24,8 +25,8 @@
         icon=attacks/fangs-animal.png
         type=blade
         range=melee
-        damage=5
-        number=3
+        damage=10
+        number=4
     [/attack]
 
     [attack_anim]