Author: esr
Date: Fri Mar 21 00:17:56 2008
New Revision: 24918
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24918&view=rev
Log:
Address bug #11318. Continuity fixes for story setup.
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg?rev=24918&r1=24917&r2=24918&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg Fri
Mar 21 00:17:56 2008
@@ -90,14 +90,12 @@
[story]
[part]
- story= _ "Rahul I, head of the Northern Alliance, concluded peace
with orcs during the 4th year of his leadership. He ended a 15-year war with
Black-Eye Karun, ruler of the orcs. A peace treaty between the local humans and
the orcs defined which lands were devoted to orcs or humans."
- background=sotbe.png
- [/part]
-
- [part]
- story= _ "So impressed was Rahul with the intelligence, prowess
and leadership of Black-Eye Karun that he invited him to join the Northern
Alliance. After much deliberation Black-Eye Karun decided to accept the offer.
However, on the way to the city of Dwarven Doors - the headquarters of the
Northern Alliance - Karun and his small group of bodyguards were attacked and
slain to the last man. There were no survivors to confirm the incident, but it
soon became believed among the orcs that the Northern Alliance had deliberately
set up this ambush in order to slay their paramount leader break the unity of
the orcs."
- #To be considered for replacing the previous text after the end of
the string freeze
- #story= _ "So impressed was Rahul with the intelligence, prowess
and leadership of Black-Eye Karun that he invited him to join the Northern
Alliance. After much deliberation Black-Eye Karun decided to accept the offer.
However, on the way to the city of Dwarven Doors - the headquarters of the
Northern Alliance - Karun and his small group of bodyguards were attacked and
slain to the last man. There were no survivors to confirm the incident, but it
soon became believed among the orcs that the Northern Alliance had deliberately
set up this ambush in order to break the unity of the orcs by slaying their
paramount leader."
+ story= _ "Rahul I, Lord Protector of the Northern Alliance,
concluded peace with enemy orcs during the 4th year of his leadership. He ended
a 15-year war with Black-Eye Karun, ruler of the enemy orcs. A peace treaty
between the Alliance and the orcs settled their territorial disputes."
+ background=sotbe.png
+ [/part]
+
+ [part]
+ story= _ "So impressed was Rahul with the intelligence, prowess
and leadership of Black-Eye Karun that he invited him to bcome a Lord Companion
of the Northern Alliance. After much deliberation Black-Eye Karun decided to
accept the offer. However, on the way to the city of Dwarven Doors - the
headquarters of the Northern Alliance - Karun and his small group of bodyguards
were attacked and slain to the last man. There were no survivors to confirm the
incident, but it soon became believed among the orcs that the Northern Alliance
had deliberately set up this ambush in order to break the unity of the orcs by
slaying their paramount leader."
background=sotbe.png
[/part]
@@ -107,7 +105,7 @@
[/part]
[part]
- story= _ "In the thirteenth year of Howgarth III - the successor
of Rahul I - tension began to rise between orcish tribes and the northern
humans. Famine led humans to colonize some orcish lands and push orcs into
desolated hill country."
+ story= _ "In the thirteenth year of Howgarth III - the successor
of Rahul I - tension began to rise between orcish tribes and the northern
humans. Famine led humans to colonize some orcish lands and push orcs into
desolated hill country. The few orcish tribes who had remained part of the
Allance, feeling the pressure, either left Alliance territory or revolted and
were destroyed."
background=sotbe.png
[/part]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg?rev=24918&r1=24917&r2=24918&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
Fri Mar 21 00:17:56 2008
@@ -233,6 +233,9 @@
x=20
y=11
[/recall]
+
+ {RENAME_IF_DEAD thelarion_dead Thelarion (_"Telamir")}
+ {RENAME_IF_DEAD darstang_dead Darstang (_"Angthur")}
[/event]
[event]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg?rev=24918&r1=24917&r2=24918&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
Fri Mar 21 00:17:56 2008
@@ -178,6 +178,9 @@
y=2
[/unit]
+ {RENAME_IF_DEAD thelarion_dead Thelarion (_"Pelondras")}
+ {RENAME_IF_DEAD darstang_dead Darstang (_"Trithalsul")}
+
[message]
speaker=Darstang
message= _ "My my, look at this, two abandoned keeps. Probably
built by those orcs in one of their pointless wars against each-other."
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg?rev=24918&r1=24917&r2=24918&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg Fri
Mar 21 00:17:56 2008
@@ -145,6 +145,8 @@
[event]
name=start
+ {RENAME_IF_DEAD thelarion_dead Thelarion (_"Valan")}
+
[role]
type=Orcish Warlord, Orcish Warrior, Saurian Ambusher, Orcish
Grunt, Saurian Skirmisher, Orcish Crossbowman, Orcish Slayer, Orcish Assassin,
Orcish Archer
role=army
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg?rev=24918&r1=24917&r2=24918&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg Fri Mar 21
00:17:56 2008
@@ -357,3 +357,39 @@
y={Y}
[/unit]
#enddef
+
+#define RENAME_IF_DEAD VAR NAME STRING
+ [if]
+ [variable]
+ name={VAR}
+ equals=yes
+ [/variable]
+ [then]
+ {MODIFY_UNIT id={NAME} name {STRING}}
+ [/then]
+ [/if]
+#enddef
+
+[event]
+ name=die
+ [filter]
+ id=Thelarion
+ [/filter]
+ [message]
+ speaker=unit
+ message= _ "The green earth will curse you for this...."
+ [/message]
+ {VARIABLE thelarion_dead yes}
+[/event]
+
+[event]
+ name=die
+ [filter]
+ id=Darstang
+ [/filter]
+ [message]
+ speaker=unit
+ message= _ "Curse you, foul orc!"
+ [/message]
+ {VARIABLE darstang_dead yes}
+[/event]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
