Author: esr
Date: Fri Mar 21 00:24:20 2008
New Revision: 24919
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24919&view=rev
Log:
Address bug #11318. Continuity fixes for story setup. (Backport to 1.4)
Modified:
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
Modified:
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
---
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
(original)
+++
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
Fri Mar 21 00:24:20 2008
@@ -108,7 +108,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:
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
---
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
(original)
+++
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
Fri Mar 21 00:24:20 2008
@@ -234,6 +234,9 @@
x=20
y=11
[/recall]
+
+ {RENAME_IF_DEAD thelarion_dead Thelarion (_"Telamir")}
+ {RENAME_IF_DEAD darstang_dead Darstang (_"Angthur")}
[/event]
[event]
Modified:
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
---
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
(original)
+++
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
Fri Mar 21 00:24:20 2008
@@ -179,6 +179,9 @@
y=2
[/unit]
+ {RENAME_IF_DEAD thelarion_dead Thelarion (_"Pelondras")}
+ {RENAME_IF_DEAD darstang_dead Darstang (_"Trithalsul")}
+
[message]
description=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:
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
(original)
+++ branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
Fri Mar 21 00:24:20 2008
@@ -146,6 +146,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: branches/1.4/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- branches/1.4/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg (original)
+++ branches/1.4/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg Fri Mar 21
00:24:20 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 description={NAME} user_description {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
