Various fauna-related things (#5671)

* rock scorpion pincer attack anim

* New sprite graphics for piglet

* add piglet portrait

* New sprite graphics for woodland boar

* simple horn attack anim for scarab

* scarab horn attack icon

data/core/units/monsters/Boar.cfg

@@ -42,65 +42,22 @@
             image="units/monsters/boar/woodland-moving.png"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/monsters/boar/woodland-defend.png" "units/monsters/boar/woodland.png" tusker-hit.ogg }
+    {DEFENSE_ANIM "units/monsters/boar/woodland-defend2.png" "units/monsters/boar/woodland-defend.png" tusker-hit.ogg }
     [defense]
         village=50
     [/defense]
     [attack]
-        name=tusks
-        description=_"Tusks"
-        icon=attacks/tusk.png
+        name=bite
+        description=_"Bite"
+        icon=attacks/fangs-animal.png
         type=blade
         range=melee
         damage=6
         number=3
     [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=tusks
-        [/filter_attack]
-        [if]
-            hits=no
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/woodland.png"
-                sound=tusker-charge-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/woodland.png"
-                sound=tusker-charge.ogg
-            [/frame]
-        [/else]
-        [frame]
-            begin=-200
-            end=-100
-            image="units/monsters/boar/woodland-moving.png"
-        [/frame]
-        [frame]
-            begin=-100
-            end=50
-            image="units/monsters/boar/woodland-attack.png"
-        [/frame]
-        [frame]
-            begin=50
-            end=100
-            image="units/monsters/boar/woodland-moving.png"
-        [/frame]
-        [frame]
-            begin=100
-            end=200
-            image="units/monsters/boar/woodland.png"
-        [/frame]
-    [/attack_anim]
     [attack]
-        name=tusk-charge
-        description=_"Tusk Charge"
+        name=tusk
+        description=_"Tusk"
         icon=attacks/tusk.png
         type=pierce
         [specials]
@@ -112,50 +69,35 @@
     [/attack]
     [attack_anim]
         [filter_attack]
-            name=tusk-charge
+            name=bite
         [/filter_attack]
-        [if]
-            hits=no
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/woodland.png"
-                sound=tusker-charge-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/woodland.png"
-                sound=tusker-charge.ogg
-            [/frame]
-        [/else]
+        start_time=-390
+        offset=0.0:220,0.0~0.6:170,0.6~0.0240
         [frame]
-            begin=-200
-            end=-100
-            image="units/monsters/boar/woodland-moving.png"
+            image="units/monsters/boar/woodland-bite[1~7].png:[60*5,90,120]"
         [/frame]
         [frame]
-            begin=-100
-            end=50
-            image="units/monsters/boar/woodland-charge.png"
+            image="units/monsters/boar/woodland.png:120"
         [/frame]
+        {SOUND:HIT bite.ogg -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=tusk
+        [/filter_attack]
+        start_time=-600
+        dust_start_time=-600
+        dust_offset=0.0
+        offset=0.0~-0.05:210,-0.05~0.05:210,0.05~0.8:180,0.8~0.0:230
+        [dust_frame]
+            image="units/monsters/boar/woodland-dust[1~5].png:[120*5],units/monsters/boar/woodland-dust1.png~O(0%):1"
+            layer=1
+            auto_vflip=no
+        [/dust_frame]
         [frame]
-            begin=-100
-            end=50
-            image="units/monsters/boar/woodland-charge-2.png"
-        [/frame]
-        [frame]
-            begin=100
-            end=150
-            image="units/monsters/boar/woodland-moving.png"
-        [/frame]
-        [frame]
-            begin=150
-            end=250
-            image="units/monsters/boar/woodland.png"
+            image="units/monsters/boar/woodland-charge[1~3,2,1~4,5].png:[70*7,110,230]"
+            layer=2
         [/frame]
+        {SOUND:HIT_AND_MISS tusker-charge.ogg tusker-charge-miss.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/monsters/Boar_Piglet.cfg

@@ -4,6 +4,7 @@
     name= _ "Piglet"
     race=monster
     image="units/monsters/boar/piglet.png"
+    profile=portraits/monsters/piglet.png
     [standing_anim]
         start_time=-50
         [frame]
@@ -33,20 +34,20 @@
     description=_ "Young piglets are curious but just as ill-tempered as their parents, if a little less of a challenge in combat.  But seldom is a piglet found that does not have a protective adult boar watching over them."
     die_sound=tusker-die.ogg
     [movement_anim]
+        start_time=0
+        y=0~3:37,3~-3:76,-3~0:37
         [frame]
-            begin=0
-            end=150
-            image="units/monsters/boar/piglet-moving.png"
+            image="units/monsters/boar/piglet-moving[1,2].png:[75*2]"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/monsters/boar/piglet-defend.png" "units/monsters/boar/piglet.png" tusker-hit.ogg }
+    {DEFENSE_ANIM "units/monsters/boar/piglet-defend2.png" "units/monsters/boar/piglet-defend.png" tusker-hit.ogg }
     [defense]
         village=50
     [/defense]
     [attack]
-        name=tusks
-        description=_"Tusks"
-        icon=attacks/tusk.png
+        name=bite
+        description=_"Bite"
+        icon=attacks/fangs-animal.png
         type=blade
         range=melee
         damage=4
@@ -54,45 +55,19 @@
     [/attack]
     [attack_anim]
         [filter_attack]
-            name=tusks
+            name=bite
         [/filter_attack]
-        [if]
-            hits=no
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/piglet.png"
-                sound=tusker-charge-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-            [frame]
-                begin=-250
-                end=-200
-                image="units/monsters/boar/piglet.png"
-                sound=tusker-charge.ogg
-            [/frame]
-        [/else]
+        start_time=-250
+        offset=0.0~-0.05:80,-0.05~0.6:170,0.6~0.0:260
         [frame]
-            begin=-200
-            end=-100
-            image="units/monsters/boar/piglet-moving.png"
+            image="units/monsters/boar/piglet-attack[1,2].png:[100,150]"
         [/frame]
         [frame]
-            begin=-100
-            end=50
-            image="units/monsters/boar/piglet-attack.png"
+            image="units/monsters/boar/piglet-moving2.png:150"
         [/frame]
         [frame]
-            begin=50
-            end=100
-            image="units/monsters/boar/piglet-moving.png"
-        [/frame]
-        [frame]
-            begin=100
-            end=200
-            image="units/monsters/boar/piglet.png"
+            image="units/monsters/boar/piglet.png:1"
         [/frame]
+        {SOUND:HIT bite-small.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/monsters/Rock_Scorpion.cfg

@@ -72,15 +72,14 @@
         [filter_attack]
             name=pincers
         [/filter_attack]
-        direction=s,sw,se
-        start_time=-240
-        offset=0.0~-0.1:200,-0.1~0.7:160,0.7~0.0:240
+        # direction=s,sw,se
+        start_time=-560
+        offset=0.0~-0.1:360,-0.1~0.7:200,0.7~0.0:240
         [frame]
-            image="units/monsters/scorpion/rock-scorpion.png:600"
-            # image="units/monsters/scorpion/rock-scorpion-pincer-[1~6].png:[100,100,80*2,120,120]"
+            image="units/monsters/scorpion/rock-scorpion-pincer-[1~8].png:[80*7,120]"
         [/frame]
         [frame]
-            image="units/monsters/scorpion/rock-scorpion.png:1"
+            image="units/monsters/scorpion/rock-scorpion.png:120"
         [/frame]
         {SOUND:HIT_AND_MISS pincers.ogg {SOUND_LIST:MISS} -150}
     [/attack_anim]

data/core/units/monsters/Scarab.cfg

@@ -51,7 +51,7 @@
     [attack]
         name=horn
         description= _"horn"
-        icon=attacks/tusk.png
+        icon=attacks/scarab-horn.png
         type=pierce
         range=melee
         damage=14
@@ -72,10 +72,13 @@
         [filter_attack]
             name=horn
         [/filter_attack]
-        start_time=-250
-        offset=0.0~-0.05:80,-0.05~0.6:170,0.6~0.0:200
+        start_time=-300
+        offset=0.0~-0.05:120,-0.05~0.6:180,0.6~0.0:220
         [frame]
-            image=units/monsters/scarab/scarab.png:450
+            image=units/monsters/scarab/scarab-horn-[1,2].png:[130,170]
+        [/frame]
+        [frame]
+            image=units/monsters/scarab/scarab.png:220
         [/frame]
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
     [/attack_anim]