Merge pull request #4015 from nemaara/scorpion

Change Giant Scorpion/Scorpling resists

changelog.md

@@ -61,6 +61,8 @@
    * OpenMP support has been removed. It is no longer an optional build-time dependency.
  ### Units
    * Saurian warriors are now female. (issue #3392)
+   * Giant Scorpion now has 20% resistance to arcane and 0% to all other resists
+   * Added Sand Scuttler variation to the Giant Scorpion with same resists as original unit
  ### WML engine
    * Support formula= key in [variable] ConditionalWML
    * Support to_location in [move_unit], taking a special location ID

data/core/units/monsters/Giant_Scorpion.cfg

@@ -22,6 +22,14 @@
     [/standing_anim]
     hitpoints=40
     movement_type=scuttlefoot
+    [resistance]
+        blade=100
+        pierce=100
+        impact=100
+        fire=100
+        cold=100
+        arcane=80
+    [/resistance]
     movement=8
     experience=50
     level=1
@@ -97,4 +105,80 @@
         [/frame]
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
+    [variation]
+        variation_id=scuttler
+        variation_name= _ "Sand Scuttler"
+        name= _ "Sand Scuttler"
+        inherit=yes
+        image="units/monsters/scorpion/sand-scuttler.png"
+        description= _ "Blending in nearly seamlessly into sandy dunes, these critters are an odd mix of mundane creature and elemental beast. Though usually timid, Sand Scuttlers sometimes attack unwary travelers, especially when startled."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON}
+        [standing_anim]
+            start_time=0
+            direction=s,sw,se
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler.png:150"
+            [/frame]
+        [/standing_anim]
+        [standing_anim]
+            start_time=0
+            direction=n,nw,ne
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler-ne.png:150"
+            [/frame]
+        [/standing_anim]
+        [resistance]
+            blade=90
+            pierce=90
+            impact=30
+            fire=200
+            cold=120
+            arcane=150
+        [/resistance]
+        {DEFENSE_ANIM_DIRECTIONAL "units/monsters/scorpion/sand-scuttler-defend2.png" "units/monsters/scorpion/sand-scuttler-defend1.png" "units/monsters/scorpion/sand-scuttler-ne-defend2.png" "units/monsters/scorpion/sand-scuttler-ne-defend1.png" hiss.wav }
+
+        [attack_anim]
+            [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
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler-pincer-[1~6].png:[100,100,80*2,120,120]"
+            [/frame]
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler.png:1"
+            [/frame]
+            {SOUND:HIT_AND_MISS pincers.ogg {SOUND_LIST:MISS} -150}
+        [/attack_anim]
+        [attack_anim]
+            [filter_attack]
+                name=pincers
+            [/filter_attack]
+            direction=n,nw,ne
+            start_time=-240
+            offset=0.0~-0.2:200,-0.2~0.6:160,0.6~0.0:240
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler-ne-pincer[1~6].png:[100,120,100,80,100,100]"
+            [/frame]
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler-ne.png:1"
+            [/frame]
+            {SOUND:HIT_AND_MISS pincers.ogg {SOUND_LIST:MISS} -150}
+        [/attack_anim]
+        [attack_anim]
+            [filter_attack]
+                name=sting
+            [/filter_attack]
+            start_time=-620
+            offset=0.0:320,0.0~0.8:240,0.8~0.0:320
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler-stinger-[1~7,6,5,4,1].png:[80,100,120,80*8]"
+            [/frame]
+            [frame]
+                image="units/monsters/scorpion/sand-scuttler.png:1"
+            [/frame]
+            {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
+        [/attack_anim]
+    [/variation]
 [/unit_type]

data/core/units/monsters/Giant_Scorpling.cfg

@@ -8,6 +8,14 @@
     profile="portraits/monsters/scorpion.png~RIGHT()"
     hitpoints=24
     movement_type=scuttlefoot
+    [resistance]
+        blade=100
+        pierce=100
+        impact=100
+        fire=100
+        cold=100
+        arcane=80
+    [/resistance]
     movement=6
     experience=20
     level=0