mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-16 18:31:32 +00:00
1.17 move Sand Scuttler out of scorpion (#7236)
* move sand scuttler out of giant scorpion * convert mainline campaign scuttler variation usage * convert mainline MP scenario scuttler variation usage * leave hidden, compatibility scuttler variarion
This commit is contained in:
doofus-01
GitHub
parent
b9e4fdffb4
commit
9d48e0331a
@ -192,20 +192,20 @@
|
||||
message= _ "We don’t have any other choice. If we remain here, we’ll die."
|
||||
[/message]
|
||||
|
||||
{UNIT 3 "Giant Scorpion" 8 13 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 15 6 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 19 12 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 13 10 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 11 16 variation=scuttler}
|
||||
{UNIT 3 "Sand Scuttler" 8 13 ()}
|
||||
{UNIT 3 "Sand Scuttler" 15 6 ()}
|
||||
{UNIT 3 "Sand Scuttler" 19 12 ()}
|
||||
{UNIT 3 "Sand Scuttler" 13 10 ()}
|
||||
{UNIT 3 "Sand Scuttler" 11 16 ()}
|
||||
#ifdef NORMAL
|
||||
{UNIT 3 "Giant Scorpion" 15 3 variation=scuttler}
|
||||
{UNIT 3 "Sand Scuttler" 15 3 ()}
|
||||
#endif
|
||||
#ifdef HARD
|
||||
{UNIT 3 "Giant Scorpion" 6 14 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 15 3 variation=scuttler}
|
||||
{UNIT 3 "Sand Scuttler" 6 14 ()}
|
||||
{UNIT 3 "Sand Scuttler" 15 3 ()}
|
||||
#endif
|
||||
{UNIT 3 "Giant Scorpion" 26 4 variation=scuttler}
|
||||
{UNIT 3 "Giant Scorpion" 11 22 variation=scuttler}
|
||||
{UNIT 3 "Sand Scuttler" 26 4 ()}
|
||||
{UNIT 3 "Sand Scuttler" 11 22 ()}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
@ -262,7 +262,7 @@
|
||||
include_borders=no
|
||||
[/filter_location]
|
||||
[command]
|
||||
{UNIT 3 "Giant Scorpion" $scorpion_loc.x $scorpion_loc.y variation=scuttler}
|
||||
{UNIT 3 "Sand Scuttler" $scorpion_loc.x $scorpion_loc.y ()}
|
||||
[/command]
|
||||
[/random_placement]
|
||||
[/then]
|
||||
@ -304,7 +304,7 @@
|
||||
name=die
|
||||
|
||||
[filter]
|
||||
type=Giant Scorpion
|
||||
type=Sand Scuttler
|
||||
[/filter]
|
||||
|
||||
[filter_second]
|
||||
|
||||
@ -362,10 +362,9 @@
|
||||
# Encounter 1: Scorpions attack
|
||||
|
||||
#define SCORPION_PLACEMENT
|
||||
{SCATTER_UNITS {ON_DIFFICULTY 6 7 8} "Giant Scorpion" 0 x,y,radius=29,62,2 (
|
||||
{SCATTER_UNITS {ON_DIFFICULTY 6 7 8} "Sand Scuttler" 0 x,y,radius=29,62,2 (
|
||||
side=3
|
||||
name= _ "Scuttler"
|
||||
variation=scuttler
|
||||
ai_special=guardian
|
||||
animate=yes
|
||||
)}
|
||||
@ -448,13 +447,13 @@
|
||||
name=die
|
||||
|
||||
[filter]
|
||||
type=Giant Scorpion
|
||||
type=Sand Scuttler
|
||||
[/filter]
|
||||
|
||||
[filter_condition]
|
||||
[not]
|
||||
[have_unit]
|
||||
type=Giant Scorpion
|
||||
type=Sand Scuttler
|
||||
[/have_unit]
|
||||
[/not]
|
||||
[/filter_condition]
|
||||
|
||||
@ -11,7 +11,7 @@ Hd, Dd*, Dd^E*, Rd #enddef
|
||||
race=undead
|
||||
[/not]
|
||||
[not]
|
||||
type=Giant Scorpion
|
||||
type=Sand Scuttler
|
||||
[/not]
|
||||
[not]
|
||||
type=Dust Devil
|
||||
|
||||
@ -111,6 +111,7 @@
|
||||
variation_name= _ "scuttler"
|
||||
name= _ "Sand Scuttler"
|
||||
inherit=yes
|
||||
hide_help=yes
|
||||
small_profile="portraits/monsters/scuttler.webp~FL()"
|
||||
profile="portraits/monsters/scuttler.webp~RIGHT()"
|
||||
image="units/monsters/scorpion/sand-scuttler.png"
|
||||
@ -185,5 +186,20 @@
|
||||
[/frame]
|
||||
{SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
|
||||
[/attack_anim]
|
||||
[event]
|
||||
id=unit_deprecation_message_scuttler
|
||||
name=unit placed
|
||||
[filter]
|
||||
type=Giant Scorpion
|
||||
variation=scuttler
|
||||
[/filter]
|
||||
|
||||
[deprecated_message]
|
||||
what="Giant Scorpion scuttler variation"
|
||||
level=3
|
||||
message="This variation has been moved to a separate unit, use unit type Sand Scuttler instead."
|
||||
version=1.19
|
||||
[/deprecated_message]
|
||||
[/event]
|
||||
[/variation]
|
||||
[/unit_type]
|
||||
|
||||
83
data/core/units/monsters/Sand_Scuttler.cfg
Normal file
83
data/core/units/monsters/Sand_Scuttler.cfg
Normal file
@ -0,0 +1,83 @@
|
||||
#textdomain wesnoth-units
|
||||
|
||||
[unit_type]
|
||||
id=Sand Scuttler
|
||||
[base_unit]
|
||||
id=Giant Scorpion
|
||||
[/base_unit]
|
||||
name= _ "Sand Scuttler"
|
||||
small_profile="portraits/monsters/scuttler.webp~FL()"
|
||||
profile="portraits/monsters/scuttler.webp~RIGHT()"
|
||||
image="units/monsters/scorpion/sand-scuttler.png"
|
||||
undead_variation=sand_scorpion
|
||||
description= _ "Making their homes in 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."
|
||||
[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]
|
||||
hitpoints=40
|
||||
[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]
|
||||
[/unit_type]
|
||||
@ -487,8 +487,7 @@
|
||||
[/unit]
|
||||
[unit]
|
||||
side=1
|
||||
type=Giant Scorpion
|
||||
variation=scuttler
|
||||
type=Sand Scuttler
|
||||
x,y=1,1
|
||||
[modifications]
|
||||
{TRAIT_LOYAL}
|
||||
@ -905,8 +904,7 @@
|
||||
[/unit]
|
||||
[unit]
|
||||
side=2
|
||||
type=Giant Scorpion
|
||||
variation=scuttler
|
||||
type=Sand Scuttler
|
||||
x,y=28,24
|
||||
[modifications]
|
||||
{TRAIT_LOYAL}
|
||||
|
||||
@ -186,10 +186,10 @@
|
||||
{MPWILD_UNIT 58 42 (Cuttle Fish)}
|
||||
{MPWILD_UNIT 59 60 (Yeti)}
|
||||
{MPWILD_UNIT 1 48 (Skeletal Dragon)}
|
||||
{MPWILD_UNIT 27 35 (Giant Scorpion) (VARIATION=variation=scuttler)}
|
||||
{MPWILD_UNIT 32 38 (Giant Scorpion) (VARIATION=variation=scuttler)}
|
||||
{MPWILD_UNIT 23 43 (Giant Scorpion) (VARIATION=variation=scuttler)}
|
||||
{MPWILD_UNIT 38 19 (Giant Scorpion) (VARIATION=variation=scuttler)}
|
||||
{MPWILD_UNIT 27 35 (Sand Scuttler)}
|
||||
{MPWILD_UNIT 32 38 (Sand Scuttler)}
|
||||
{MPWILD_UNIT 23 43 (Sand Scuttler)}
|
||||
{MPWILD_UNIT 38 19 (Sand Scuttler)}
|
||||
{MPWILD_UNIT 58 18 (Giant Spider)}
|
||||
{MPWILD_UNIT 59 23 (Giant Spider)}
|
||||
{MPWILD_UNIT 29 55 (Tentacle of the Deep)}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user