[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Be...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Be... |
|
Date: |
Sun, 20 Mar 2005 18:56:47 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/03/20 23:56:47
Modified files:
data/scenarios/The_Rise_of_Wesnoth: A_Beach.cfg
A_Final_Spring.cfg
A_Harrowing_Escape.cfg
A_New_Land.cfg
A_Summer_of_Storms.cfg
Clearwater_Port.cfg
Cursed_Isle.cfg
Fallen_Lich_Point.cfg
Peoples_in_Decline.cfg
Return_of_the_Fleet.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg Sewer.cfg
Temple_of_the_Deep.cfg
The_Dragon.cfg The_Fall.cfg
The_Midlands.cfg
The_Oldwood.cfg
The_River_Road.cfg
The_Vanguard.cfg
Troll_Hole.cfg
Log message:
Use the new objectives, and try to make them consistant
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.25 Mon Feb 21
08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg Sun Mar 20
23:56:47 2005
@@ -16,14 +16,6 @@
bonus=yes
music=wesnoth-6.ogg
-
- objectives= _ "
-Victory:
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -124,6 +116,25 @@
description=Minister Edmond
[/recall]
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.40
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.41
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.40 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg Sun Mar
20 23:56:47 2005
@@ -14,17 +14,8 @@
next_scenario=Peoples_in_Decline
bonus=yes
-
+
music=wesnoth-7.ogg
-
- objectives= _ "
-Victory:
address@hidden the Orcs
-Defeat:
-#Death of Prince Haldric or
-#Death of King Addroran IX or
-#Death of Lady Jessica or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -258,6 +249,30 @@
[/missile_frame]
[/effect]
[/object]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of King Addroran IX"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.29
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg Sun Mar
20 23:56:47 2005
@@ -15,13 +15,6 @@
next_scenario=The_River_Road
music=wesnoth-7.ogg
-
- objectives= _ "
-Victory:
address@hidden Both Enemies
-Defeat:
-#Death of Prince Haldric or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -121,6 +114,22 @@
[recall]
description=Lady Outlaw
[/recall]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.25 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg Sun Mar 20
23:56:47 2005
@@ -104,6 +104,14 @@
x=1
y=39
[/hide_unit]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Avoid engagement for as long as
possible"
+ condition=win
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.22
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.23
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.22
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg Sun Mar
20 23:56:47 2005
@@ -17,14 +17,6 @@
music=wesnoth-1.ogg
- objectives= _ "
-Victory:
address@hidden the Wesfolk Leader
-Defeat:
-#Death of Prince Haldric or
-#Death of King Eldaric IV or
-#Turns run out"
-
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -80,6 +72,26 @@
{STARTING_VILLAGES 2 6}
{HERO (Warrior King) (King Eldaric IV) 1 28 15}
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat the Wesfolk Leader"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of King Eldaric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.40
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.41
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.40 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg Sun Mar
20 23:56:47 2005
@@ -15,20 +15,8 @@
next_scenario=Fallen_Lich_Point
victory_when_enemies_defeated=no
bonus=no
-
- music=wesnoth-6.ogg
- objectives= _ "
-Victory:
address@hidden: Flee on the First Ship or
address@hidden: Flee on the Second Ship or
address@hidden: Flee on the Third Ship or
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Death of Lieutenant Aethyr or
-#Miss the Last Ship"
+ music=wesnoth-6.ogg
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -240,6 +228,42 @@
{UNIT (Peasant) (Angry Farmer) 2 26 18}
{UNIT (Peasant) (Angry Farmer) 2 28 19}
{UNIT (Peasant) (Angry Farmer) 2 29 22}
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Cowardly: Flee on the First
Ship"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Normal: Flee on the Second Ship"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Heroic: Flee on the Third Ship"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Heroic: Defeat all Enemies"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lieutenant Aethyr"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Miss the Last Ship"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.27 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Sun Mar 20
23:56:47 2005
@@ -15,16 +15,8 @@
next_scenario=Elf_Lords
victory_when_enemies_defeated=no
bonus=yes
-
+
music=wesnoth-3.ogg
-
- objectives= _ "
-Victory:
address@hidden the Undead
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -321,6 +313,26 @@
#ifdef EASY
{OBJ_POTION_HOLY 28 26 (holy_water2)}
#endif
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.32
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.33
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.32
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg Sun Mar
20 23:56:47 2005
@@ -14,18 +14,8 @@
next_scenario=Sewer
victory_when_enemies_defeated=no
-
- music=wesnoth-4.ogg
- objectives= _ "
-Victory:
address@hidden the Lich's to get his Book and
address@hidden Southbay's Sewer or
address@hidden Above and Kill All Enemy Leaders (Bonus)
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
+ music=wesnoth-4.ogg
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -218,6 +208,34 @@
x=33
y=24
[/hide_unit]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Kill the Lich's to get his book
and"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Haldric enters Southbay's sewer"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Heroic: As above and kill All
enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.31
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg Sun Mar
20 23:56:47 2005
@@ -16,17 +16,8 @@
next_scenario=Rough_Landing
bonus=yes
-
+
music=wesnoth-2.ogg
-
- objectives= _ "
-Victory:
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Death of Lord Typhon or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -176,6 +167,29 @@
{PLACE_IMAGE (galleon.png) 10 9}
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lord Typhon"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
# [event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.35
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.36
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.35
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Sun Mar
20 23:56:47 2005
@@ -14,17 +14,8 @@
next_scenario=The_Plan
bonus=yes
-
+
music=wesnoth-2.ogg
-
- objectives= _ "
-Victory:
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Death of Lt. Aethyr or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -200,6 +191,30 @@
x=1-40
y=1-40
[/remove_shroud]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lt. Aethyr"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.26 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Sun Mar
20 23:56:47 2005
@@ -17,18 +17,6 @@
music=wesnoth-7.ogg
- objectives= _ "
-Victory:
address@hidden Aethyr Sacrifices Himself to Lich-Lord Jevyan and
address@hidden Lich-Lord Jevyan and
address@hidden All Enemy Leaders Except for One
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Death of Lt. Aethyr by Somebody Other Than Jevyan or
-#Fail to Leave one Enemy Leader Behind or
-#Turns run out"
-
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -282,6 +270,42 @@
name=num_orcs_alive
value=4
[/set_variable]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Lt. Aethyr sacrifices himself
to Lich-Lord Jevyan and"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Destroy Lich-Lord Jevyan and"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Defeat all enemy leaders except
for one"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lt. Aethyr by somebody
other than Jevyan"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Fail to leave one enemy leader
behind"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.28 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Sun Mar
20 23:56:47 2005
@@ -14,17 +14,8 @@
next_scenario=A_New_Land
bonus=yes
-
+
music=wesnoth-1.ogg
-
- objectives= _ "
-Victory:
address@hidden the Nagas
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Death of Lord Typhon or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -153,7 +144,30 @@
[/recall]
{PLACE_IMAGE (galleon.png) 10 27}
-
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lord Typhon"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.31 Sun Mar 20
09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg Sun Mar 20
23:56:47 2005
@@ -13,15 +13,6 @@
music=wesnoth-2.ogg
- objectives= _ "
-Victory:
address@hidden the Sewer
address@hidden All Enemy Leaders to Get the Bonus
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
-
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -139,6 +130,30 @@
{GUARD_UNIT (Giant Scorpion) (Scorpion) 3 3 7}
#endif
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Prince Haldric exits the sewer"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Heroic: As above and defeat all
enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.35
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.36
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.35
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg Sun Mar
20 23:56:47 2005
@@ -9,16 +9,8 @@
next_scenario=Return_to_Oldwood
victory_when_enemies_defeated=no
-
- music=frantic.ogg
- objectives= _ "
-Victory:
address@hidden the Lich-Lord and
address@hidden the Fire Ruby
-Defeat:
-#Death of Prince Haldric or
-#Turns run out"
+ music=frantic.ogg
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -123,6 +115,27 @@
[recall]
description=Minister Edmond
[/recall]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat the Lich-Lord and"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Retrieve the Fire Ruby"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
[/event]
# [event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.27 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg Sun Mar 20
23:56:47 2005
@@ -15,17 +15,8 @@
next_scenario=Elf_Lords
victory_when_enemies_defeated=no
bonus=yes
-
+
music=wesnoth-5.ogg
-
- objectives= _ "
-Victory:
address@hidden the Dragon or
address@hidden: Slay the Dragon and defeat all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -218,6 +209,30 @@
name=dragon_dead
value=0
[/set_variable]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Slay the Dragon"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Heroic: Slay the Dragon and
defeat all enemies"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.24 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg Sun Mar 20
23:56:47 2005
@@ -16,15 +16,6 @@
music=wesnoth-5.ogg
- objectives= _ "
-Victory:
address@hidden the Wesfolk Leader
-Defeat:
-#Death of Prince Haldric or
-#Death of King Eldaric IV or
-#Orcs Kill the Wesfolk Leader or
-#Turns run out"
-
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -155,6 +146,30 @@
{NORTH_GUARD 10 6}
{NORTH_GUARD 12 6}
{NORTH_GUARD 12 10}
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat the Wesfolk Leader"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of King Eldaric IV"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Orcs kill the Wesfolk Leader"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.30 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg Sun Mar 20
23:56:47 2005
@@ -16,15 +16,8 @@
next_scenario=The_Oldwood
bonus=yes
-
+
music=wesnoth-2.ogg
-
- objectives= _ "
-Victory:
address@hidden All Enemies
-Defeat:
-#Death of Prince Haldric or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -160,6 +153,22 @@
[recall]
description=Burin the Lost
[/recall]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.35
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.36
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.35 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg Sun Mar 20
23:56:47 2005
@@ -17,14 +17,6 @@
music=underground.ogg
- objectives= _ "
-Victory:
address@hidden Both Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Elilmaldur-Rithrandil or
-#Turns run out"
-
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -202,6 +194,27 @@
{GUARD_UNIT (Elder Wose) (Muldondindal) 4 10 18}
{GUARD_UNIT (Elder Wose) (Landunwonbam) 4 16 13}
#endif
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Elilmaldur-Rithrandil"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
+
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.28 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg Sun Mar
20 23:56:47 2005
@@ -16,15 +16,8 @@
next_scenario=The_Oldwood
bonus=yes
-
+
music=wesnoth-8.ogg
-
- objectives= _ "
-Victory:
address@hidden All Enemies
-Defeat:
-#Death of Prince Haldric or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -161,6 +154,22 @@
[recall]
description=Burin the Lost
[/recall]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.32
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.33
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.32 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Sun Mar 20
23:56:47 2005
@@ -14,16 +14,8 @@
next_scenario=Return_of_the_Fleet
bonus=yes
-
+
music=wesnoth-3.ogg
-
- objectives= _ "
-Victory:
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lt. Aethyr or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -197,6 +189,26 @@
[/unit]
{CLEAR_VARIABLE haldric_store}
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lt. Aethyr"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.24 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg Sun Mar 20
23:56:47 2005
@@ -11,14 +11,6 @@
bonus=yes
music=underground.ogg
-
- objectives= _ "
-Victory:
address@hidden all Enemies
-Defeat:
-#Death of Prince Haldric or
-#Death of Lady Jessica or
-#Turns run out"
{scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg}
{scenarios/The_Rise_of_Wesnoth/trow-macros.cfg}
@@ -267,6 +259,26 @@
x=15
y=16
[/recall]
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Defeat all enemy leaders"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Prince Haldric"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Lady Jessica"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Turns run out"
+ condition=lose
+ [/objective]
+ [/objectives]
[/event]
[event]
- [Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Be...,
James Spencer <=