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

LoW: Wired in a new portrait for HaldricII from kitty.

Browse source 
Fixed some multiplayer scenario setups.

Fixed Kalenz and Landar showing up instead of Galtrid and El'Isomitir
in scenario 03.
This commit is contained in:
Fabian Müller 2010-10-04 23:28:29 +00:00
parent 81f7e04db8
commit ae50ddb4dc
7 changed files with 112 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/campaigns/Legend_of_Wesmere/images/portraits/haldricII.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 196 KiB

34
data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
View file

@ -26,11 +26,12 @@
id=03_Kalian
name= _ "Ka’lian under Attack"
{LOW_PRESTART}
#### Map setup ####
{LOW_MAP Kalian.map}
{campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg}
{LOW_PRESTART}
[event]
name=prestart
@ -47,6 +48,8 @@
[/event]
{LOW_MASK 03_Kalian.mask (-9) (-3)}
#### /Map setup ####
#ifdef DEBUG_MODE
turns=2
@ -76,14 +79,20 @@
[side]
side=1
no_leader=yes
controller=human
user_team_name= _ "Player"
team_name=player
user_team_name= _ "Player"
recruit=Elvish Fighter, Elvish Archer
save_id=Kalenz
fog=yes
share_view=yes
{GOLD 300 200 100}
{GALTRID}
[unit]
{GALTRID}
x=23
y=22
[/unit]
# wmllint: recognize Galtrid
x=23
y=22
@ -101,6 +110,7 @@
#wml_disabled_lint: validate-off
[side]
side=2
share_view=yes
hidden=yes
allow_player=no
no_leader=yes
@ -250,14 +260,20 @@
#ifdef MULTIPLAYER
[side]
side=6
no_leader=yes
controller=human
team_name=player
user_team_name= _ "Player"
recruit=Elvish Fighter, Elvish Archer
save_id=Landar
fog=yes
share_view=yes
{GOLD 300 200 100}
{EL_ISOMITHIR}
[unit]
{EL_ISOMITHIR}
x=19
y=22
[/unit]
# wmllint: recognize El_Isomithir
x=19
y=22
@ -622,6 +638,12 @@
[/filter]
[/store_unit]
[allow_recruit]
side=1
type=Elvish Shaman, Elvish Scout
[/allow_recruit]
{UNIT 1 "Elvish Scout" 21 20 (id=guard) }
# wmllint: recognize guard
@ -897,7 +919,7 @@
{MOVE_UNIT (id=Urudin) 19 13}
[terrain]
terrain = Gg^Dr
terrain = Rp^Dr
x,y=19,13
[/terrain]
{MOVE_UNIT (id=Urudin) 19 13}

7
data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
View file

@ -147,13 +147,14 @@
#ifdef MULTIPLAYER
#wmllint: validate-off
[side]
#Landar's side
side=4
fog=no
shroud=no
no_leader=yes
persistent=yes
save_id=Landar
#{LANDAR}
{PLAYABLE}
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"
@ -163,13 +164,15 @@
#wmllint: validate-on
[side]
#Cleodil's side
side=5
fog=no
shroud=no
no_leader=yes
persistent=yes
save_id=Cleodil
#{CLEODIL}
{PLAYABLE}
#TODO maybe give cleodil less money in that scenario?
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"

7
data/campaigns/Legend_of_Wesmere/scenarios/08_Council_of_hard_choices.cfg
View file

@ -27,6 +27,13 @@
# wmllint: directory spelling Iradia Uripur Legmir
[part]
[image]
x=100
y=100
file="story/characters/highlord.png"
[/image]
background="story/characters/highlord.png"
scale_background=no
story={CAPTION ( _ "Iradia")} + _ "Kalenz, you have won a great victory! Wesmere is safe. But... for what cause have you invited a dwarf to the elvish council? This is most unusual!"

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

@ -69,9 +69,12 @@
#wmllint: validate-off
[side]
#no_leader=yes
no_leader=yes
{PLAYABLE}
fog=no
shroud=no
team_name=player
user_team_name= _ "Player"
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD}
@ -102,7 +105,7 @@
[/unit]
#else
{MULTIPLAYER_GOLD}
recruit={ELVES}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#endif
[/side]
#wmllint: validate-on
@ -288,18 +291,18 @@
[recall]
id=Cleodil
x=18
y=32
y=31
[/recall]
[recall]
id=Olurf
x=11
y=32
x=18
y=29
[/recall]
[recall]
id=Landar
x=25
x=11
y=32
[/recall]
@ -312,6 +315,7 @@
[then]
[unit]
{KALENZ}
type=Elvish Captain
x=25
y=32
[/unit]
@ -329,7 +333,9 @@
[then]
[unit]
{LANDAR}
x=25
side=5
type=Elvish Ranger
x=11
y=32
# wmllint: recognize Landar
[/unit]
@ -344,8 +350,9 @@
[then]
[unit]
{OLURF}
x=11
y=32
side=6
x=18
y=29
# wmllint: recognize Olurf
[/unit]
[/then]
@ -359,8 +366,9 @@
[then]
[unit]
{CLEODIL}
side=7
x=18
y=32
y=31
# wmllint: recognize Cleodil
[/unit]
[/then]
@ -492,28 +500,48 @@
#ifdef MULTIPLAYER
[side]
#Landar's side
side=5
fog=no
shroud=no
{MULTIPLAYER_GOLD}
no_leader=yes
{PLAYABLE}
# {LANDAR}
recruit={ELVES}
team_name=player
user_team_name= _ "Player"
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
#Olurf's side
side=6
fog=no
shroud=no
#TODO give Olurf more gold?
{MULTIPLAYER_GOLD}
team_name=player
user_team_name= _ "Player"
no_leader=yes
# {OLURF}
{PLAYABLE}
controller=human
allow_player=yes
recruit={DWARVES}
[/side]
[side]
#Cleodil's side
side=7
fog=no
shroud=no
{MULTIPLAYER_GOLD}
team_name=player
user_team_name= _ "Player"
no_leader=yes
{PLAYABLE}
controller=human
allow_player=yes
recruit=Elvish Shaman, Wose, Elvish Scout
[/side]
#endif
[event]

28
data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
View file

@ -143,6 +143,7 @@
x=25
y=11
fog=no
shroud=no
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD}
@ -170,7 +171,7 @@
[/unit]
#else
{MULTIPLAYER_GOLD}
recruit={ELVES}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#endif
[/side]
@ -632,18 +633,26 @@
#ifdef MULTIPLAYER
#wmllint: validate-off
[side]
#Landar's side
side=13
team_name=player
user_team_name= _ "Player"
fog=no
shroud=no
{PLAYABLE}
{LANDAR}
{MULTIPLAYER_GOLD}
x=28
y=11
# wmllint: recognize Landar
recruit={ELVES}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
#Olurf's side
side=14
fog=no
shroud=no
{PLAYABLE}
{OLURF}
{MULTIPLAYER_GOLD}
x=36
@ -653,6 +662,21 @@
user_team_name= _ "Player"
recruit={DWARVES}
[/side]
[side]
#Cleodil's side
side=15
fog=no
shroud=no
{PLAYABLE}
{CLEODIL}
{MULTIPLAYER_GOLD}
x=36
y=10
# wmllint: recognize Olurf
team_name=player
user_team_name= _ "Player"
recruit=Elvish Shaman, Wose, Elvish Scout
[/side]
#wmllint: validate-on
#endif

10
data/campaigns/Legend_of_Wesmere/scenarios/15_The_Treaty.cfg
View file

@ -9,7 +9,7 @@
[story]
[part]
# background=story/characters/haldric-ii.png
background=portraits/haldricII.png
scale_background=no
story={CAPTION ( _ "Haldric II")} + _ "Friends, today we have won a great victory, though it lost us good men. Let this be the beginning of a new alliance between our people."
[/part]
@ -29,7 +29,7 @@
story={CAPTION ( _ "Aldar")} + _ "Silence! How dare you talk this way to the King!"
[/part]
[part]
# background=story/characters/haldric-ii.png
background=portraits/haldricII.png
scale_background=no
story={CAPTION ( _ "Haldric II")} + _ "Calm down, Aldar! The elf is right to reproach us. My father did not help when the orcs attacked you. But my father is dead. There are a lot of things my father did that I can not understand; he grew suspicious and strange in his last days. But <i>I</i> am the King of Wesnoth now, not my father! And it is my intention to renew our alliance by signing a new treaty here, with you."
[/part]
@ -50,7 +50,7 @@
[/part]
[part]
# background=story/characters/haldric-ii.png
background=portraits/haldricII.png
scale_background=no
story={CAPTION ( _ "Haldric II")} + _ "How is it that you know about the Ruby of Fire?"
[/part]
@ -60,7 +60,7 @@
story={CAPTION ( _ "Cleodil")} + _ "We have learned, oh King, that the energy suffusing the Ruby can have evil effects on its wielders. It may well be this was the reason your father grew closed in upon himself. For your own sake and that of your kingdom, we advise you to enclose it in a net or filigree of pure gold charged with the magic of light."
[/part]
[part]
# background=story/characters/haldric-ii.png
background=portraits/haldricII.png
scale_background=no
story={CAPTION ( _ "Haldric II")} + _ "Yes... this would explain many things. It shall be as you say, and I am grateful for the warning."
[/part]
@ -70,7 +70,7 @@
story={CAPTION ( _ "Kalenz")} + _ "Now that we have signed the Treaty, let us put it into action. We will take the fight to the orcs before winter falls; we need you to demonstrate against them, drawing them away from the roads north. Can we count on you?"
[/part]
[part]
# background=story/characters/haldric-ii.png
background=portraits/haldricII.png
scale_background=no
story={CAPTION ( _ "Haldric II")} + _ "I am not sure... My late father did not pay too much attention to military matters, and we have already lost very many men..."
[/part]