0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UtBS S02 Ogre now dissappears before Nym starts moving or talking (#6343)

Browse source 
* Ogre now dissappears before Nym starts moving/talks

* Changed the adjacency filter to fit the changes to the event

* Updated comment with a proper explanation of what occurs

(cherry picked from commit d9ea4105a6)
This commit is contained in:
Descacharrado 2021-12-02 09:41:32 +01:00 • committed by Wedge009
parent 055097f202
commit e08b1e7f52
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -703,10 +703,12 @@
[/have_unit]
[/filter_condition]
[message]
speaker=Kaleh
message= _ "That’s the last of them. This looks like a hunting party, they must have a camp around here somewhere."
[/message]
[kill]
role="Hunting Ogre"
[/kill]
[redraw]
[/redraw]
[item]
x=$x1
@ -714,27 +716,27 @@
image=items/potion-grey.png
[/item]
[redraw]
[/redraw]
[message]
speaker=Kaleh
message= _ "That’s the last of them. This looks like a hunting party, they must have a camp around here somewhere."
[/message]
[message]
speaker=Nym
message=_"Hey! Look there, they dropped something... A stone bottle, sealed. I wonder what’s inside..."
[/message]
# Move Nym adjacent to the bottle. During a die event, $unit is still blocking the hex, so
# Nym probably ends up running to the hex north-west of $x1,$y1.
#
# Don't move her if she's already adjacent to it - if she landed the killing blow, moving
# her now means that she doesn't get the XP. Also, the unit still has ZoC, and she'll take a
# longer route to avoid it, which looks particularly obvious if Nym was adjacent the ogre.
# Move Nym to the bottle, but don't move her if she's already adjacent to it
# if she landed the killing blow, moving her now means that she doesn't get the XP.
[if]
[not]
[have_unit]
id=Nym
[filter_adjacent]
id=$unit.id
[/filter_adjacent]
[filter_location]
x,y=$x1,$y1
radius=1
[/filter_location]
[/have_unit]
[/not]
[then]