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

Fixed missing dialogue parts in A Morning After...

Browse source 
...and did some WML cleaning on Across the Harsh Sands and made hp
recovery at oases difficulty-dependent.
This commit is contained in:
Jan Rietema 2007-09-12 19:50:48 +00:00
parent 5ab1093fe7
commit bc5495272e
2 changed files with 65 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg
View file

@ -309,7 +309,7 @@
[/variable]
[then]
{MUDCRAWLER_TALK SPEAKER}
{MUDCRAWLER_TALK {SPEAKER}}
[/then]
[else]
{MUDCRAWLER_WARCRY}
@ -333,11 +333,9 @@
{ADD rescued_elves 1}
{CREATE_UNIT 1 "Desert Fighter" 24 25 "Vecnu" (user_description=_"Vecnu"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Archer" 24 27 "Eranor" (user_description=_"Eranor"
random_traits="yes")}
description="Vecnu")}
{CREATE_UNIT 1 "Desert Archer" 24 27 "Eranor" (user_description=_"Eranor")}
{CREATE_UNIT 1 "Desert Archer" 21 25 "Seela" (user_description=_"Seela"
random_traits="yes"
gender="female")}
{CREATE_UNIT 2 "Giant Mudcrawler" 20 24 "" ()}
@ -378,12 +376,10 @@
[/set_variable]
{CREATE_UNIT 1 "Desert Hunter" 24 34 "Eloshi" (user_description=_"Eloshi"
random_traits="yes")}
description="Eloshi")}
{CREATE_UNIT 1 "Desert Archer" 19 33 "Illuvia" (user_description=_"Illuvia"
random_traits="yes"
gender="female")}
{CREATE_UNIT 1 "Desert Hunter" 21 35 "Raynor" (user_description=_"Raynor"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Hunter" 21 35 "Raynor" (user_description=_"Raynor")}
{CREATE_UNIT 2 "Giant Mudcrawler" 25 34 "" ()}
{CREATE_UNIT 2 "Small Mudcrawler" 21 36 "" ()}
@ -465,10 +461,8 @@
{IS_HERO}
[/unit]
{CREATE_UNIT 1 "Desert Fighter" 36 33 "Jorazan" (user_description=_"Jorazan"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Fighter" 36 33 "Jorazan" (user_description=_"Jorazan")}
{CREATE_UNIT 1 "Desert Fighter" 35 35 "Zyara" (user_description=_"Zyara"
random_traits="yes"
gender="female")}
[message]
@ -588,10 +582,8 @@
{IS_HERO}
[/unit]
{CREATE_UNIT 1 "Desert Shaman" 30 27 "Ryoko" (user_description=_"Ryoko"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Shaman" 32 27 "Yuni" (user_description=_"Yuni"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Shaman" 30 27 "Ryoko" (user_description=_"Ryoko")}
{CREATE_UNIT 1 "Desert Shaman" 32 27 "Yuni" (user_description=_"Yuni")}
[message]
speaker=Zhul
@ -733,7 +725,7 @@
[/message]
{CREATE_UNIT 1 "Desert Scout" 43 28 "Naru" (user_description=_"Naru"
random_traits="yes")}
description="Naru")}
[message]
description="Naru"
@ -747,8 +739,8 @@
message= _ "I think I see movement in the stables. Is anyone there?"
[/message]
{CREATE_UNIT 1 "Desert Scout" 43 28 "Naru" (user_description=_"Naru"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Scout" 43 28 "Naru" (user_description=_"Naru"#
description="Naru")}
[message]
description=Naru
@ -798,7 +790,7 @@
[/message]
{CREATE_UNIT 1 "Desert Scout" 43 31 "Nisa" (user_description=_"Nisa"
random_traits="yes")}
description="Nisa")}
[message]
description=Nisa
@ -813,7 +805,7 @@
[/message]
{CREATE_UNIT 1 "Desert Scout" 43 31 "Nisa" (user_description=_"Nisa"
random_traits="yes")}
description="Nisa")}
[message]
description=Nisa
@ -959,6 +951,16 @@
[filter]
description=Xanthos
[/filter]
[sound]
name=wail-long.wav
[/sound]
[kill]
side=3
race=undead
animate=yes
[/kill]
[message]
description=Kaleh
@ -1057,6 +1059,7 @@
[/remove_shroud]
{CREATE_UNIT 1 "Desert Hunter" 29 2 "Pythos" (user_description=_"Pythos"
description="Pythos"
random_traits="yes")}
{CREATE_UNIT 1 "Desert Fighter" 28 2 "Shea" (user_description=_"Shea"
random_traits="yes")}

134
data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
View file

@ -938,10 +938,6 @@
{ADD y_coord -4}
#Create Red Mage
#define ELLYSA_FEATURING
#enddef
[unit]
# Elyssa used to have her own unit type. This was
# unnecessary except as a hook to hang her portrait on.
@ -1442,6 +1438,8 @@
recruit=Bandit, Trapper, Footpad, Outlaw
#endif
[/unit]
{SETUP_ENEMY_THIRST 2}
[modify_side]
side=2
@ -1718,10 +1716,18 @@
[if]
[variable]
name=hp_to_regain
#ifdef EASY
greater_than=8
#else
greater_than=4
#endif
[/variable]
[then]
#ifdef EASY
{VARIABLE hp_to_regain 8}
#else
{VARIABLE hp_to_regain 4}
#endif
[/then]
[/if]
{VARIABLE thirst 0}
@ -1774,12 +1780,15 @@
greater_than=0
[/variable]
[then]
{VARIABLE_OP affected_unit[$i].hitpoints add -2}
{VARIABLE_OP affected_unit[$i].max_hitpoints add -2}
{VARIABLE_OP affected_unit[$i].hitpoints add -$dehydration_loss}
{VARIABLE_OP affected_unit[$i].max_hitpoints add -$dehydration_loss}
{VARIABLE affected_unit[$i].variables.dehydration $thirst}
[/then]
[else]
#ifdef HARD
#else
{VARIABLE_OP affected_unit[$i].hitpoints add $hp_to_regain}
#endif
{VARIABLE affected_unit[$i].max_hitpoints $affected_unit[$i].variables.max_hitpoints}
{VARIABLE affected_unit[$i].variables.dehydration 0}
[/else]
@ -1829,43 +1838,7 @@
{CLEAR_VARIABLE blue}
#enddef
#define INIT_HYDRATION_FOR_PLAYER_UNIT
{VARIABLE hp $player_unit.max_hitpoints}
{FOREACH player_unit.modifications.trait j}
{VARIABLE trait_id $player_unit.modifications.trait[$j].id}
[if]
[variable]
name=trait_id
equals="strong"
[/variable]
[then]
{VARIABLE_OP hp add 1}
[/then]
[else]
[if]
[variable]
name=trait_id
equals=resilient
[/variable]
[then]
{VARIABLE_OP hp add 4}
{VARIABLE_OP hp add $player_unit.level}
[/then]
[/if]
[/else]
[/if]
{NEXT j}
{VARIABLE player_unit.variables.full_hitpoints $player_unit.hitpoints}
{VARIABLE player_unit.variables.max_hitpoints $player_unit.max_hitpoints}
{VARIABLE player_unit.variables.dehydration 0}
[unstore_unit]
variable=player_unit
find_vacant=no
[/unstore_unit]
#enddef
# store full_hitpoints at start, recruit and on
# advance
# store full_hitpoints at start, recruit and on advance
[event]
name=start
[store_unit]
@ -1877,44 +1850,11 @@
[/filter]
[/store_unit]
{FOREACH player_unit i}
{VARIABLE hp $player_unit[$i].max_hitpoints}
{FOREACH player_unit[$i].modifications.trait j}
{VARIABLE trait_id $player_unit[$i].modifications.trait[$j].id}
# [message]
# description=$player_unit[$i].description
# message= "Found $trait_id for $player_unit[$i].user_description"
# [/message]
[if]
[variable]
name=trait_id
equals="strong"
[/variable]
[then]
#{VARIABLE_OP hp add -1}
[/then]
[else]
[if]
[variable]
name=trait_id
equals=resilient
[/variable]
[then]
#{VARIABLE_OP hp add 4}
#{VARIABLE_OP hp add -$player_unit[$i].level}
[/then]
[/if]
[/else]
[/if]
{NEXT j}
{VARIABLE player_unit[$i].variables.full_hitpoints $player_unit[$i].hitpoints}
{VARIABLE player_unit[$i].variables.max_hitpoints $player_unit[$i].max_hitpoints}
# [message]
# description=$player_unit[$i].description
# message= "Storing $hp full hitpoints for $player_unit[$i].user_description
#
#(previous:
#max_hitpoints: $player_unit[$i].max_hitpoints
#hitpoints: $player_unit[$i].hitpoints )"
# message= "Storing $player_unit[$i].max_hitpoints full hitpoints for $player_unit[$i].user_description"
# [/message]
{VARIABLE player_unit[$i].variables.dehydration 0}
[unstore_unit]
@ -1924,6 +1864,16 @@
{NEXT i}
[/event]
#define INIT_HYDRATION_FOR_PLAYER_UNIT
{VARIABLE player_unit.variables.full_hitpoints $player_unit.hitpoints}
{VARIABLE player_unit.variables.max_hitpoints $player_unit.max_hitpoints}
{VARIABLE player_unit.variables.dehydration 0}
[unstore_unit]
variable=player_unit
find_vacant=no
[/unstore_unit]
#enddef
[event]
name=recruit
first_time_only=no
@ -1938,21 +1888,19 @@
{INIT_HYDRATION_FOR_PLAYER_UNIT}
[/event]
#!Clear the desert heat flag on unit advancement
# and adjust full_hitpoints
[event]
name=post_advance
first_time_only=no
[store_unit]
[filter]
x=$x1
y=$y1
[/filter]
variable=player_unit
kill=yes
[/store_unit]
{INIT_HYDRATION_FOR_PLAYER_UNIT}
[/event]
[event]
name=post_advance
first_time_only=no
[store_unit]
[filter]
x=$x1
y=$y1
[/filter]
variable=player_unit
kill=yes
[/store_unit]
{INIT_HYDRATION_FOR_PLAYER_UNIT}
[/event]
# Adjust max_hitpoints just before healing
# to make sure the dehydration damage
@ -1985,7 +1933,7 @@
greater_than=0
[/variable]
[then]
{VARIABLE_OP thirst multiply -2}
{VARIABLE_OP thirst multiply -$dehydration_loss}
{VARIABLE_OP thirst add $player_unit[$i].variables.max_hitpoints}
# [message]
# description=$player_unit[$i].description