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

Backport the proper fix for bug #12341.

Browse source
This commit is contained in:
Lari Nieminen 2008-09-22 18:06:06 +00:00
parent 120c646c1f
commit 970aae2eda
2 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
View file

@ -41,7 +41,6 @@
[/event]
{campaigns/Heir_To_The_Throne/utils/deaths.cfg}
{campaigns/Heir_To_The_Throne/utils/httt_utils.cfg}
[side]
type=Commander
@ -163,13 +162,5 @@
[/message]
[/event]
[event]
name=moveto
[filter]
side=1
x=29
y=9
[/filter]
{OBJ_SWORD_FIRE 29 9 flame_sword}
[/event]
{OBJ_SWORD_FIRE 29 9 flame_sword}
[/scenario]

49
data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
View file

@ -11,8 +11,18 @@
#
#define OBJ_SWORD_FIRE X Y ID
{PLACE_IMAGE items/flame-sword.png ({X}) ({Y})}
{VARIABLE sword_taken 0}
[event]
name=moveto
[filter]
side=1
x={X}
y={Y}
[/filter]
{PLACE_IMAGE items/flame-sword.png ({X}) ({Y})}
{VARIABLE sword_taken 0}
[/event]
[event]
name=moveto
first_time_only=no
@ -106,11 +116,22 @@
[/object]
[/command]
[/option]
[option]
message= _ "No"
[command]
[allow_undo]
[/allow_undo]
[/command]
[/option]
[/message]
[/then]
[else]
[allow_undo]
[/allow_undo]
[/else]
[/if]
[/event]
#enddef
@ -160,16 +181,16 @@
image="wesnoth-icon.png"
message= _ "You struggle to lift and don the heavy plate. Once worn, however, it is amazingly comfortable. You have increased resistance to all physical damage!"
[/message]
[store_unit]
[filter]
x,y=$x1,$y1
[/filter]
kill=yes
variable=void_armor_taker
[/store_unit]
{VARIABLE armor_taken 1}
{VARIABLE void_armor_trait_i $void_armor_taker.modifications.trait.length}
@ -317,42 +338,42 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
_f, _f, _f, _f, Re, _f, _f, _f, _f, _f, _f, Re, Re, Re, Re, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f, Re, _f, _f, Re
_f, Re, _f, _f, Re, _f, _f, _f, Re, Re, _f, _f, Re, _f, Uu^Vud, _f, Re, Re, _f, _f, _f, Re, _f, Re, _f, _f, _f, Uu^Vud, Re, Uu^Uf, _f, _f, _f, Uu^Uf, Re, _f, _f, Re, _f, Re, _f, Uu^Vud, Re, _f, Re, Re, Re, Re, _f, Uu^Uf
"
[rule] # Make sure your castle is not converted
[rule] # Make sure your castle is not converted
old=Cud
new=Re, Uu^Vud, Uh, Uu^Uf
terrain=Cud
[/rule]
[rule] # Make sure cave walls are not converted
[rule] # Make sure cave walls are not converted
old=Xu
new=Re, Uu^Vud, Uh, Uu^Uf
terrain=Xu
[/rule]
[rule] # Make sure the keep is not converted
[rule] # Make sure the keep is not converted
old=Kud
new=Re, Uu^Vud, Uh, Uu^Uf
terrain=Kud
[/rule]
[rule] # Convert cave villages to stone villages
[rule] # Convert cave villages to stone villages
old=Vu
new=_f, Re, Uu^Vud, Uh, Uu^Uf # wmllint: ignore
new=_f, Re, Uu^Vud, Uh, Uu^Uf # wmllint: ignore
terrain=Uu^Vud
[/rule]
[rule] # Add stone villages
[rule] # Add stone villages
old=Uu
new=Uu^Vud
terrain=Uu^Vud
[/rule]
[rule] # Add roads
[rule] # Add roads
old=Uu
new=Re
terrain=Re
[/rule]
[rule] # Add hilly caves
[rule] # Add hilly caves
old=Uu
new=Uh
terrain=Uh
[/rule]
[rule] # Add a mushroom forest
[rule] # Add a mushroom forest
old=Uu
new=Uu^Uf
terrain=Uu^Uf