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

Moved the new caption and footnote macros...

Browse source 
...from scenario-utils.cfg to carryover-utils.cfg for now and
converted a few remaining objective descriptions embedded in note= to
proper [objective] tags with captions and/or footnotes.
This commit is contained in:
Lari Nieminen 2010-08-07 17:44:21 +00:00
parent b8f642874c
commit 9762f47e5e
4 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
View file

@ -91,7 +91,12 @@
description= _ "Destroy all the undead"
condition=win
[/objective]
note= _ "Early finish bonus only if you also kill Marg-Tonz. (You can destroy the undead first.)"
[objective]
{BONUS_OBJECTIVE_CAPTION}
description= _ "Also kill Marg-Tonz"+{EARLY_FINISH_BONUS_FOOTNOTE}+{OBJECTIVE_FOOTNOTE "(you can destroy the undead first)"}
condition=win
[/objective]
[gold_carryover]
carryover_percentage=40
[/gold_carryover]

7
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -355,6 +355,11 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
description= _ "Kill any of the orc leaders"
condition=win
[/objective]
[objective]
{BONUS_OBJECTIVE_CAPTION}
description= _ "Keep Velon alive"+{EARLY_FINISH_BONUS_FOOTNOTE}
condition=win
[/objective]
[objective]
description= _ "Death of Kalenz"
condition=lose
@ -371,8 +376,6 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
[gold_carryover]
carryover_percentage=40
[/gold_carryover]
note= _ "Early finish bonus: keep Velon alive"
[/objectives]
[/event]

20
data/core/macros/carryover-utils.cfg
View file

@ -32,18 +32,30 @@ _"No gold carried over to the next scenario."#enddef
_"
20% of finishing gold carried over to the next scenario."#enddef
#define OBJECTIVE_FOOTNOTE TEXT
"<span foreground='white'><small> " + {TEXT} + "</small></span>"
#enddef
#define ALTERNATIVE_OBJECTIVE_CAPTION
caption= _ "Alternative objective:"
#enddef
#define BONUS_OBJECTIVE_CAPTION
caption= _ "Bonus objective:"
#enddef
#define ALTERNATIVE_OBJECTIVE OBJECTIVE_TEXT
[objective]
description="<span color='white'>" + _ "Alternative objective:" + "</span>
<span color='green'>" + {OBJECTIVE_TEXT} + "</span> "
{ALTERNATIVE_OBJECTIVE_CAPTION}
description={OBJECTIVE_TEXT}
condition=win
[/objective]
#enddef
#define ALTERNATIVE_OBJECTIVE_BONUS OBJECTIVE_TEXT
[objective]
description="<span color='white'>" + _ "Alternative objective:" + "</span>
<span color='green'>" + {OBJECTIVE_TEXT} + "</span> " + {EARLY_FINISH_BONUS_CAPTION}
{ALTERNATIVE_OBJECTIVE_CAPTION}
description={OBJECTIVE_TEXT}+{EARLY_FINISH_BONUS_FOOTNOTE}
condition=win
[/objective]
#enddef

12
data/core/macros/scenario-utils.cfg
View file

@ -34,18 +34,6 @@ x,y=1-999,1-999 #enddef
[/objectives]
#enddef
#define OBJECTIVE_FOOTNOTE TEXT
"<span foreground='white'><small> " + {TEXT} + "</small></span>"
#enddef
#define ALTERNATIVE_OBJECTIVE_CAPTION
caption= _ "Alternative objective:"
#enddef
#define BONUS_OBJECTIVE_CAPTION
caption= _ "Bonus objective:"
#enddef
#define VICTORY_CONDITION DESCRIPTION
# Used in conjunction with SET_OBJECTIVES this sets a victory condition
# (marked green).