mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-17 11:28:16 +00:00
UtBS::6a: Fixed bug #13068 .
This commit is contained in:
Fabian Müller
parent
292792f6e8
commit
4ee98ccbbc
@ -446,6 +446,7 @@
|
||||
y=5
|
||||
side=3
|
||||
ai_special=guardian
|
||||
facing=sw
|
||||
[modifications]
|
||||
{TRAIT_STRONG}
|
||||
{TRAIT_INTELLIGENT}
|
||||
@ -735,6 +736,9 @@
|
||||
terrain=Re
|
||||
[/terrain]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
{PLACE_IMAGE scenery/rubble.png 16 7}
|
||||
|
||||
# Reveal dwarven cavern
|
||||
@ -820,13 +824,7 @@
|
||||
# Moveto version (sighted version is disabled)
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
|
||||
[filter]
|
||||
x=27-35
|
||||
y=3-8
|
||||
side=1
|
||||
[/filter]
|
||||
name=interrogation
|
||||
|
||||
[remove_shroud]
|
||||
x=28-35
|
||||
@ -869,44 +867,38 @@
|
||||
message= _ "Yes master, I'll make him suffer."
|
||||
[/message]
|
||||
|
||||
[teleport]
|
||||
{MOVE_UNIT id=Ulg 40 4}
|
||||
|
||||
[animate_unit]
|
||||
[filter]
|
||||
id=Ulg
|
||||
id=Troll Interrogator
|
||||
[/filter]
|
||||
x,y=40,4
|
||||
[/teleport]
|
||||
flag=attack
|
||||
hit=yes
|
||||
#TODO seems not to work, the troll is attacking but not with the club.
|
||||
[primary_attack]
|
||||
name=club
|
||||
[/primary_attack]
|
||||
[facing]
|
||||
[filter]
|
||||
id=Wounded Dwarf
|
||||
[/filter]
|
||||
[/facing]
|
||||
|
||||
[move_unit_fake]
|
||||
type=Troll Whelp
|
||||
side=3
|
||||
x=15,14,13,12,11,10
|
||||
y=48,48,48,47,47,46
|
||||
[/move_unit_fake]
|
||||
|
||||
[hide_unit]
|
||||
id=Troll Interrogator
|
||||
[/hide_unit]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
# TODO: use [animate_unit] instead of this ancient item image hack
|
||||
|
||||
{PLACE_IMAGE units/trolls/grunt-attack-1.png 34 5}
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=300
|
||||
[/delay]
|
||||
|
||||
[removeitem]
|
||||
x,y=34,5
|
||||
[/removeitem]
|
||||
|
||||
[unhide_unit]
|
||||
[/unhide_unit]
|
||||
#TODO why is the defend animation not displayed?
|
||||
[animate]
|
||||
[filter]
|
||||
id=Wounded Dwarf
|
||||
[/filter]
|
||||
flag=defend
|
||||
hit=yes
|
||||
[facing]
|
||||
[filter]
|
||||
id=Troll Interrogator
|
||||
[/filter]
|
||||
[/facing]
|
||||
[/animate]
|
||||
[/animate_unit]
|
||||
|
||||
[message]
|
||||
speaker=Wounded Dwarf
|
||||
@ -918,34 +910,16 @@
|
||||
animate=yes
|
||||
[/kill]
|
||||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.id
|
||||
message= _ "If we move fast we might be able to save the other prisoner before he gets killed too."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
||||
[/event]
|
||||
|
||||
# Event 2.2: Wounded Dwarf
|
||||
|
||||
# Troll whelp tries to kill wounded Dwarvish Stalwart
|
||||
|
||||
# (sighted version is disabled)
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
|
||||
[filter]
|
||||
x=35-41
|
||||
y=4-7
|
||||
side=1
|
||||
[/filter]
|
||||
|
||||
[remove_shroud]
|
||||
x=34-42
|
||||
y=4-8
|
||||
side=1
|
||||
[/remove_shroud]
|
||||
name=rogrimir
|
||||
|
||||
[unit]
|
||||
type=Dwarvish Stalwart
|
||||
@ -963,10 +937,67 @@
|
||||
[/modifications]
|
||||
[/unit]
|
||||
|
||||
[remove_shroud]
|
||||
x=34-42
|
||||
y=4-8
|
||||
side=1
|
||||
[/remove_shroud]
|
||||
|
||||
[message]
|
||||
speaker=Ulg
|
||||
message= _ "I'm gonna make you squeal, dwarf!"
|
||||
[/message]
|
||||
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
first_time_only=no
|
||||
|
||||
[if]
|
||||
[have_unit]
|
||||
id=Troll Interrogator
|
||||
[filter_vision]
|
||||
visible=yes
|
||||
viewing_side=1
|
||||
[/filter_vision]
|
||||
[/have_unit]
|
||||
|
||||
[then]
|
||||
|
||||
{CHECK_EXPLORER}
|
||||
[fire_event]
|
||||
name=interrogation
|
||||
[/fire_event]
|
||||
|
||||
# Event 2.2: Wounded Dwarf
|
||||
|
||||
# Troll whelp tries to kill wounded Dwarvish Stalwart
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
first_time_only=no
|
||||
|
||||
[if]
|
||||
[have_unit]
|
||||
id=Ulg
|
||||
side=3
|
||||
[filter_vision]
|
||||
visible=yes
|
||||
viewing_side=1
|
||||
[/filter_vision]
|
||||
[/have_unit]
|
||||
|
||||
[then]
|
||||
[fire_event]
|
||||
name=rogrimir
|
||||
[/fire_event]
|
||||
[/then]
|
||||
[/if]
|
||||
[/event]
|
||||
|
||||
[/then]
|
||||
[/if]
|
||||
[/event]
|
||||
|
||||
# when Ulg dies, Rogrimir thanks player
|
||||
@ -988,29 +1019,8 @@
|
||||
message= _ "I owe you my life. I can't believe I was captured when those all around me died fighting gloriously. I'm so ashamed. I could not protect them...but I will guard you with my life, even if I have to follow you to the ends of the earth. Now lead me to the trolls and let me avenge my friends' deaths!"
|
||||
[/message]
|
||||
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=Rogrimir
|
||||
[/filter]
|
||||
|
||||
variable=dwarfstats
|
||||
[/store_unit]
|
||||
|
||||
[set_variable]
|
||||
name=dwarfstats.side
|
||||
value=1
|
||||
[/set_variable]
|
||||
|
||||
[set_variable]
|
||||
name=dwarfstats.moves
|
||||
value=5
|
||||
[/set_variable]
|
||||
|
||||
[unstore_unit]
|
||||
variable=dwarfstats
|
||||
[/unstore_unit]
|
||||
|
||||
{CLEAR_VARIABLE dwarfstats}
|
||||
{MODIFY_UNIT id=Rogrimir side 1}
|
||||
{MODIFY_UNIT id=Rogrimir moves 5}
|
||||
[/event]
|
||||
|
||||
# Event 3: Troll Lava Maze
|
||||
@ -1097,7 +1107,7 @@
|
||||
[/if]
|
||||
{CLEAR_VARIABLE unit_on_lava}
|
||||
{CLEAR_VARIABLE damage_msg}
|
||||
{NEXT i}
|
||||
{NEXT i}
|
||||
|
||||
{CLEAR_VARIABLE lava_hex}
|
||||
[/event]
|
||||
@ -1205,7 +1215,7 @@
|
||||
[/unstore_unit]
|
||||
|
||||
{CLEAR_VARIABLE unitstats}
|
||||
{NEXT i}
|
||||
{NEXT i}
|
||||
|
||||
{CLEAR_VARIABLE locs}
|
||||
{CLEAR_VARIABLE damage_msg}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user