units: roc changes

- now beloning to monsters - removed lvl 1 variant (there is only one sprite for both)
wesnoth · Aug 17, 2019 · 13626f4 · 13626f4
1 parent 29349b0
commit 13626f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 89 deletions.
diff --git a/...mages/units/monsters/young-roc-attack.png → ...core/images/units/monsters/roc-attack.png b/...mages/units/monsters/young-roc-attack.png → ...core/images/units/monsters/roc-attack.png
diff --git a/.../core/images/units/monsters/young-roc.png → data/core/images/units/monsters/roc.png b/.../core/images/units/monsters/young-roc.png → data/core/images/units/monsters/roc.png
diff --git a/data/core/units.cfg b/data/core/units.cfg
@@ -135,18 +135,6 @@ Elves are the eldest race of the continent, with the possible exception of troll
         {OGRE_NAMES}
     [/race]
 
-    [race]
-        id=roc
-        male_name= _ "race^Roc"
-        female_name= _ "race+female^Roc"
-        plural_name= _ "race^Rocs"
-        description=""
-        num_traits=2
-        undead_variation=bat
-        markov_chain_size=2
-        {OGRE_NAMES}
-    [/race]
-
     # wmllint: general spelling goblin goblins
     [race]
         id=goblin

diff --git a/data/core/units/monsters/Roc.cfg b/data/core/units/monsters/Roc.cfg
@@ -2,8 +2,10 @@
 [unit_type]
     id=Roc
     name= _ "Roc"
-    race=roc
-    image="units/monsters/young-roc.png"
+    race=monster
+    num_traits=2
+    undead_variation=gryphon
+    image="units/monsters/roc.png"
     hitpoints=56
     movement_type=fly
     movement=10
@@ -16,7 +18,7 @@
     usage=scout
     description=""
     die_sound={SOUND_LIST:GRYPHON_DIE}
-    {DEFENSE_ANIM "units/monsters/young-roc.png" "units/monsters/young-roc.png" {SOUND_LIST:GRYPHON_HIT} }
+    {DEFENSE_ANIM "units/monsters/roc.png" "units/monsters/roc.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
@@ -32,7 +34,6 @@
     [attack]
         name=beak
         description= _ "beak"
-        icon=attacks/beak.png
         type=pierce
         range=melee
         damage=12
@@ -50,7 +51,7 @@
         start_time=-200
 
         [frame]
-            image="units/monsters/young-roc-attack.png:300"
+            image="units/monsters/roc-attack.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
@@ -63,7 +64,7 @@
         start_time=-200
 
         [frame]
-            image="units/monsters/young-roc-attack.png:300"
+            image="units/monsters/roc-attack.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}

diff --git a/data/core/units/monsters/Young_Roc.cfg b/data/core/units/monsters/Young_Roc.cfg