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

DM: Eliminate use of a macro

Browse source 
ELVISH_NPCS_REAPPEAR was used inconsistently, and at odds with current
handling in DELFADOR_DEPARTS_AGAIN & DELFADOR_JOINS_ELVES.
Also improves change level compatability.
This commit is contained in:
sigurdfdragon 2019-06-08 14:18:29 -04:00
parent 30741bad33
commit caf4f75eec
4 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
View file

@ -143,6 +143,7 @@
[event]
name=start
# recall is here instead of [unit] in [side], as she is unpacked in {DELFADOR_JOINS_ELVES}
[recall]
id=Chantal
[/recall]

9
data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
View file

@ -50,13 +50,20 @@
user_team_name= _ "Rebels"
{FLAG_VARIANT long}
{OLD_DELFADOR}
[unit]
{KALENZ}
placement=leader
[/unit]
[unit]
{CHANTAL}
placement=leader
[/unit]
[/side]
# wmllint: validate-on
# wmllint: recognize Kalenz
# wmllint: recognize Chantal
[event]
name=prestart
{ELVISH_NPCS_REAPPEAR}
{MODIFY_UNIT (side=1) facing ne}
[object]
silent=yes

14
data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
View file

@ -36,6 +36,14 @@
user_team_name= _ "Rebels"
{FLAG_VARIANT long}
{OLD_DELFADOR}
[unit]
{KALENZ}
placement=leader
[/unit]
[unit]
{CHANTAL}
placement=leader
[/unit]
[/side]
#wmllint: validate-on
@ -109,12 +117,6 @@
name=start
{MODIFY_UNIT (side=1) facing sw}
[recall]
id=Kalenz
[/recall]
[recall]
id=Chantal
[/recall]
[message]
speaker=Chantal
message= _ "There is no doubt the book is here; I can feel its presence."

21
data/campaigns/Delfadors_Memoirs/utils/sides.cfg
View file

@ -602,23 +602,8 @@
# At the end of Prince of Wesnoth (20), Delfador gets control of side 1 again.
# We reuse the macro from scenario 14.
# At the beginning of Clash at the Manor (21), our favorite Elvish NPCs
# reappear. From this point onward Delfador recruits only elves.
#define ELVISH_NPCS_REAPPEAR
#wmllint: validate-off
[unit]
id=Kalenz
type=Elvish High Lord
placement=leader
[/unit]
[unit]
id=Chantal
type=Elvish Shyde
placement=leader
[/unit]
#wmllint: validate-on
#enddef
# At the beginning of Prince of Wesnoth (20), our favorite Elvish NPCs
# reappear. Kalenz is handled in DELFADOR_DEPARTS_AGAIN in previous scenario.
# Chantal is handled in DELFADOR_JOINS_ELVES. From this point onward Delfador recruits only elves.
# We're done.