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

LoW: Enhanced the loading of the persistent side recall list information.

Browse source
This commit is contained in:
Fabian Müller 2010-08-31 15:37:41 +00:00
parent 9732cdc698
commit 711ee59392
4 changed files with 66 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Legend_of_Wesmere/masks/07_Elves_last_stand.mask
View file

@ -18,7 +18,7 @@ _f , _f , _f , Ce , Ce , Ce
_f , _f , _f , Ce , _f , Ce , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , Ce , Ke , Ce , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , Ce , _f , Ce , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , Gg^Dr , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f
_f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f
_f , _f , _f , _f , _f , _f , Ce , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f , _f

36
data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
View file

@ -3,8 +3,6 @@
#TODO give the player a reward for saving El'Isomithir
#TODO Add the ogre cage idea.
#TODO give a reward for saving some of the Kalian gold.
#TODO make Cleodil say something
#TODO remove the village that was destroyed in scenario 3.
#TODO add the water sound effects.
{./07_Elves_last_stand_utils.cfg}
@ -75,7 +73,8 @@
y=10
team_name=player
user_team_name= _ "Player"
recruit={ELVES}, Elvish Captain, Elvish Hero, Elvish Sorceress, Elvish Marksman, Elvish Ranger, Elvish Druid
recruit={ELVES}
#, Elvish Captain, Elvish Hero, Elvish Sorceress, Elvish Marksman, Elvish Ranger, Elvish Druid
#ifndef MULTIPLAYER
[unit]
{LANDAR}
@ -89,12 +88,13 @@
placement=leader
[/unit]
[/side]
#TODO give a hint to the player about the changed recruit list
#TODO enable the extended recruit list and give a hint to the player about it
[event]
name=prestart
[allow_recruit]
side=1
type={ELVES}, Elvish Captain, Elvish Hero, Elvish Sorceress, Elvish Marksman, Elvish Ranger, Elvish Druid
type={ELVES}
#, Elvish Captain, Elvish Hero, Elvish Sorceress, Elvish Marksman, Elvish Ranger, Elvish Druid
[/allow_recruit]
[/event]
@ -509,7 +509,7 @@
[message]
speaker=narrator
image=wesnoth-icon.png
message= _ "You are from now on able to recruit Dwarves."
message= _ "Now that Olurf and his tribe joined you, you are able to recruit Dwarves."
[/message]
#else
# [message]
@ -660,6 +660,30 @@
id=Kalenz
message= _ "And we have what’s left of the elvish treasury with us!"
[/message]
[message]
id=Landar
#TODO ESR
message= _ "Let's see if ever the payment will give us any credit on the council."
[/message]
[message]
id=Cleodil
#TODO ESR
message= _ "The council will never act upon your will for being founded."
[/message]
[message]
speaker=narrator
image=wesnoth-icon.png
side_for=1
#TODO ESR
message= _ "Kalenz" + _ " has dropped his gold into the elvish treasury. You will start the next scenario with a preset amount."
[/message]
[message]
speaker=narrator
image=wesnoth-icon.png
side_for=9
#TODO ESR
message= _ "Landar" + _ " has dropped his gold into the elvish treasury. You will start the next scenario with a preset amount."
[/message]
[/event]
###DEATH EVENTS###

48
data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
View file

@ -36,7 +36,7 @@
#endif
[part]
delay=4000
title= _ "Chapter two\nPart one\nThe book"
title= _ "Chapter two, Part one:The book"
show_title=yes
[/part]
[part]
@ -171,11 +171,11 @@
{CLEAR_VARIABLE party_store}
#enddef
{VARIABLE_FROM_GLOBAL LoW kalenz party_store 1}
{GET_PERSISTENT_RECALLS_FROM3 1 5 6 kalenz party_store}
{UNSTORE_PARTY 1}
{VARIABLE_FROM_GLOBAL LoW landar party_store 1}
{GET_PERSISTENT_RECALLS_FROM3 5 1 6 landar party_store}
{UNSTORE_PARTY 5}
{VARIABLE_FROM_GLOBAL LoW olurf party_store 1}
{GET_PERSISTENT_RECALLS_FROM3 6 1 5 olurf party_store}
{UNSTORE_PARTY 6}
#undef UNSTORE_PARTY
@ -307,17 +307,13 @@
[/unit]
[/then]
[/if]
[if]
[not]
[have_unit]
id=Landar
[/have_unit]
[/not]
[then]
[unit]
{LANDAR}
x=25
@ -327,7 +323,6 @@
[/unit]
[/then]
[/if]
[if]
[not]
[have_unit]
@ -344,7 +339,6 @@
[/unit]
[/then]
[/if]
[if]
[not]
[have_unit]
@ -450,7 +444,6 @@
message= _ "You speak my thought, Cleodil. Close in behind me; I'll guard you from harm myself. Look to your weapons as we cross, all! And be wary."
[/message]
#TODO change for multiplayer
[message]
side_for=1
speaker=narrator
@ -461,6 +454,7 @@
message= _ "Before Kalenz left the Ka'lian he had ordered $left_behind_kalenz to stay and guard it."
#endif
[/message]
{CLEAR_VARIABLE left_behind_kalenz}
#ifdef MULTIPLAYER
[message]
side_for=5
@ -468,11 +462,8 @@
image=wesnoth-icon.png
message= _ "Before Landar left the Ka'lian he had ordered $left_behind_landar to stay and guard it."
[/message]
{CLEAR_VARIABLE left_behind_landar}
#endif
{CLEAR_VARIABLE left_behind}
[/else]
[/if]
#endif
@ -537,26 +528,13 @@
[/side]
#endif
# [event]
# name=moveto
# [filter]
# x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,35-37
# y= 1-2, 3, 3, 4, 4, 5, 5, 6
# [and]
# id=Kalenz#
##
#
# [/objectives]
# [/event]
[event]
name=moveto
[filter]
x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,35-37
y= 1-2, 3, 3, 4, 4, 5, 5, 6
[and]
id=Kalenz
[event]
name=moveto
[filter]
x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,35-37
y= 1-2, 3, 3, 4, 4, 5, 5, 6
[and]
id=Kalenz
#ifdef MULTIPLAYER
[or]
id=Landar

22
data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
View file

@ -287,3 +287,25 @@ Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman#enddef
#define TROLL_SETUP
{FLAG_VARIANT undead}
#enddef
#define GET_PERSISTENT_RECALLS_FROM2 SIDE1 SIDE2 GLOBAL_VAR LOCAL_VAR
#Loads the recall list variable from all sides.
{VARIABLE_FROM_GLOBAL LoW {GLOBAL_VAR} {LOCAL_VAR} {SIDE1}}
[if]
{VARIABLE_CONDITIONAL {LOCAL_VAR} equals ($empty)}
[then]
{VARIABLE_FROM_GLOBAL LoW {GLOBAL_VAR} {LOCAL_VAR} {SIDE2}}
[/then]
[/if]
#enddef
#define GET_PERSISTENT_RECALLS_FROM3 SIDE1 SIDE2 SIDE3 GLOBAL_VAR LOCAL_VAR
#Loads the recall list variable from all sides.
{GET_PERSISTENT_RECALLS_FROM2 {SIDE1} {SIDE2} {GLOBAL_VAR} {LOCAL_VAR} }
[if]
{VARIABLE_CONDITIONAL {LOCAL_VAR} equals ($empty)}
[then]
{VARIABLE_FROM_GLOBAL LoW {GLOBAL_VAR} {LOCAL_VAR} {SIDE3}}
[/then]
[/if]
#enddef