Removed Cleodil from the scenario setup.

Removed all code that was related to the no longer needed shaman line storage.

This fixes parts of bug #19236.

Removed the mp hack.
This commit is contained in:
Fabian Müller 2012-01-06 22:33:08 +00:00
parent 016c463af3
commit 9bebbec085

View file

@ -1,18 +1,8 @@
#textdomain wesnoth-low
#ifdef MULTIPLAYER
[multiplayer]
#ifdef HARD
name= _ "2p MC — LoW, Hard Mode, Chapter five"
description= _ "<i>The Legend of Wesmere</i>\nMultiplayer Campaign\nChapter five\n Hard difficulty"
#endif
#ifdef EASY
name= _ "2p MC — LoW, Easy Mode, Chapter five"
description= _ "<i>The Legend of Wesmere</i>\nMultiplayer Campaign\nChapter five\n Easy difficulty"
#endif
#ifdef NORMAL
name= _ "2p MC — LoW, Normal Mode, Chapter five"
description= _ "<i>The Legend of Wesmere</i>\nMultiplayer Campaign\nChapter five\n Normal difficulty"
#endif
random_start_time=no
allow_new_game=yes
#else
@ -37,7 +27,7 @@
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{EXTRA_SCENARIO_MUSIC suspense.ogg}
{DEFAULT_SCHEDULE}
{DEFAULT_SCHEDULE_DUSK}
# {LOW_PRESTART}
@ -99,7 +89,6 @@ Chapter Five"
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# TODO no minimum gold here?
x=3
y=18
#ifndef MULTIPLAYER
@ -114,13 +103,6 @@ Chapter Five"
#else
{MULTIPLAYER_GOLD}
#endif
#TODO why do we recall cleodil if she is not taking part in the scenario?
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
# wmllint: recognize Cleodil
placement=leader
[/unit]
[/side]
[event]
name=prestart
@ -128,15 +110,6 @@ Chapter Five"
[kill]
race=dwarf
[/kill]
# all shamans have left with Cleodil
#TODO this is most likely no longer needed regarding the new recruit/recall list features
#[store_unit]
# kill=yes
# variable=faeries
# [filter]
# type={SHAMANS}
# [/filter]
#[/store_unit]
#TODO see if this recalls units wich are not recallable
{RECALL_LOYALS}
@ -275,14 +248,6 @@ Chapter Five"
{NEXT u}
{CLEAR_VARIABLE steal_wearer}
# unstore the shaman-line units to rejoin Kalenz
# x,y is on recall,recall since they have been stored in prestart
{FOREACH faeries faery}
[unstore_unit]
variable=faeries[$faery]
[/unstore_unit]
{NEXT faery}
{CLEAR_VARIABLE faeries}
[/event]
##### Scenario objectives #####
@ -401,7 +366,7 @@ Chapter Five"
[/message]
[message]
#TODO The nearest saurian
#formula=TODO get it from crap
#formula=TODO get it from crab
side=2,3
[not]
canrecruit=yes