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

Rename *_challenged to *_defeated

Browse source 
Value is set on defeat, not challenge - name should reflect that
This commit is contained in:
Alarantalara 2013-11-09 22:09:18 -05:00
parent c4a532ea5f
commit 6e64145779
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -228,8 +228,8 @@
#! -- setting up objectives,variables and map objects sets
#! -- variables : $ambush_turn, $sneak_up, $elven_camps,
#! -- $killed_by_azkotep, $killed_by_ystara, $grak_challenged,
#! -- $zur_challenged
#! -- $killed_by_azkotep, $killed_by_ystara, $grak_defeated,
#! -- $zur_defeated
[event]
name=prestart
@ -321,8 +321,8 @@
{VARIABLE sneak_up 0}
{VARIABLE killed_by_azkotep 0}
{VARIABLE killed_by_ystara 0}
{VARIABLE grak_challenged 0}
{VARIABLE zur_challenged 0}
{VARIABLE grak_defeated 0}
{VARIABLE zur_defeated 0}
{VARIABLE defiant_death 0}
#Time Areas correspond with halos around campfires
@ -684,8 +684,8 @@
#endif
# If opposing champion wasn't attacked by the player yet Garak
# can issue a challenge. Sffects variables : $grak_challenged,
# $zur_challenged
# can issue a challenge. Sffects variables : $grak_defeated,
# $zur_defeated
# Inform the player about the possibility of challenge and
# adjust Garak accordingly. Perform the challenge, set the
# death events where required. Internal variables :
@ -837,7 +837,7 @@
[/message]
[if]
[variable]
name=zur_challenged
name=zur_defeated
equals=0
[/variable]
[then]
@ -867,7 +867,7 @@
[/message]
[if]
[variable]
name=grak_challenged
name=grak_defeated
equals=0
[/variable]
[then]
@ -907,10 +907,10 @@
equals=Grak
[/variable]
[then]
{VARIABLE grak_challenged 1}
{VARIABLE grak_defeated 1}
[/then]
[else]
{VARIABLE zur_challenged 1}
{VARIABLE zur_defeated 1}
[/else]
[/if]
[/event]
@ -955,7 +955,7 @@
# If challenge didn't happen by turn 12 and bad guy dies, Garak
# gets possessed. Sets variable : $ElvishGarak, $defiant_death
# Depends on variables : $grak_challenged, $zur_challenged,
# Depends on variables : $grak_defeated, $zur_defeated,
# $azkotep_casualties[], $ystara_casualties[],
# $killed_by_azkotep, $killed_by_ystara clears variables :
# $azkotep_casualties[], $ystara_casualties[],
@ -991,10 +991,10 @@
{VARIABLE_OP choice_flag add 100}
[/then]
[/if]
{VARIABLE_OP grak_challenged multiply 10}
{VARIABLE_OP choice_flag add $grak_challenged}
{VARIABLE_OP grak_challenged divide 10}
{VARIABLE_OP choice_flag add $zur_challenged}
{VARIABLE_OP grak_defeated multiply 10}
{VARIABLE_OP choice_flag add $grak_defeated}
{VARIABLE_OP grak_defeated divide 10}
{VARIABLE_OP choice_flag add $zur_defeated}
[message]
speaker=Nym
@ -2315,8 +2315,8 @@
[event]
name=victory
{CLEAR_VARIABLE defiant_death}
{CLEAR_VARIABLE zur_challenged}
{CLEAR_VARIABLE grak_challenged}
{CLEAR_VARIABLE zur_defeated}
{CLEAR_VARIABLE grak_defeated}
{CLEAR_VARIABLE ElvishGarak}
{CLEAR_VARIABLE elven_camps}
{CLEAR_VARIABLE azkotep_casualties}