Author: esr
Date: Thu Oct 16 19:11:54 2008
New Revision: 30203
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30203&view=rev
Log:
In Eastern Invasion, extend the journey track to Lake Vrug.
Do a bit of story-text polishing and add a reference to the Horse Plains.
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg Thu
Oct 16 19:11:54 2008
@@ -14,6 +14,7 @@
[story]
[part]
+ show_title=yes
{TO_NORTHERN_OUTPOST}
[/part]
[/story]
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg Thu Oct 16
19:11:54 2008
@@ -13,6 +13,7 @@
[story]
[part]
+ show_title=yes
{TO_TWO_PATHS}
[/part]
[/story]
@@ -118,11 +119,11 @@
[/message]
[message]
speaker=Mal-Arnai
- message= _ "Well, orc, we can either continue this fight, or we
can crush these intruders and battle later. Your call."
+ message= _ "Well, orc, we can either continue this fight, or we
can crush the humans and battle later. How shall it be?"
[/message]
[message]
speaker=Wak-Rano
- message= _ "Hmm... I know. We will make a pact to destroy these
men, and continue our fight later. (Perhaps he will die, for then I will win
our battle without fighting.)"
+ message= _ "Hmm... I know. We will make a pact to destroy these
men, and continue our fight later. (Perhaps he will die, and I will win our
battle without fighting.)"
[/message]
[message]
speaker=Mal-Arnai
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg Thu
Oct 16 19:11:54 2008
@@ -20,6 +20,13 @@
canrecruit=yes
controller=human
[/side]
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_THE_CROSSING}
+ [/part]
+ [/story]
[side]
type=Revenant
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg Thu
Oct 16 19:11:54 2008
@@ -23,6 +23,13 @@
[/side]
{STARTING_VILLAGES 1 7}
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_UNDEAD_CROSSING}
+ [/part]
+ [/story]
[side]
type=Necromancer
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
Thu Oct 16 19:11:54 2008
@@ -14,6 +14,13 @@
victory_when_enemies_defeated=no
{campaigns/Eastern_Invasion/utils/deaths.cfg}
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_TRAINING_THE_OGRES}
+ [/part]
+ [/story]
[side]
type=Lieutenant
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg Thu Oct
16 19:11:54 2008
@@ -11,6 +11,13 @@
{DEFAULT_MUSIC_PLAYLIST}
{campaigns/Eastern_Invasion/utils/deaths.cfg}
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_XENOPHOBIA}
+ [/part]
+ [/story]
[side]
type=Lieutenant
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg Thu Oct 16
19:11:54 2008
@@ -17,6 +17,13 @@
{DEFAULT_MUSIC_PLAYLIST}
{campaigns/Eastern_Invasion/utils/deaths.cfg}
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_LAKE_VRUG}
+ [/part]
+ [/story]
[side]
type=Lieutenant
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
Thu Oct 16 19:11:54 2008
@@ -369,7 +369,7 @@
[/recall]
[message]
speaker=Owaec
- message= _ "Now, we have reached the fair homeland of my people.
They may be able to help us in - "
+ message= _ "Now, we have reached the Horse Plains, the fair
homeland of my people. They may be able to help us in - "
[/message]
[message]
speaker=Owaec
@@ -415,7 +415,7 @@
[message]
caption= _ "Dacyn"
image=portraits/dacyn.png
- message= _ "Aha! I see what they have done. They have raised him
as an undead dragon. But he does not appear to be weak to my arcane flame...
this is strange magic indeed."
+ message= _ "Aha! I see what they have done. They have raised him
as an undead dragon. But he does not appear to be weak to my arcane senses...
this is strange magic indeed."
[/message]
[/event]
[/scenario]
Modified: trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg?rev=30203&r1=30202&r2=30203&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg Thu Oct 16 19:11:54
2008
@@ -1,11 +1,11 @@
# wmllint: no translatables
# trackplacer: tracks begin
-# Hand-hack strictly at your own risk.
+#
+# Hand-hack this section strictly at your own risk.
#
# trackplacer:
map=data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
#
-
#define JOURNEY1_STAGE_1
{NEW_BATTLE 759 508}
#enddef
@@ -67,8 +67,6 @@
{OLD_JOURNEY 879 545}
{OLD_JOURNEY 908 562}
{OLD_BATTLE 938 583}
- {OLD_JOURNEY 951 538}
- {OLD_JOURNEY 984 568}
{OLD_JOURNEY 959 598}
{OLD_BATTLE 988 611}
{NEW_JOURNEY 984 568}
@@ -85,10 +83,10 @@
{OLD_JOURNEY 879 545}
{OLD_JOURNEY 908 562}
{OLD_BATTLE 938 583}
- {OLD_JOURNEY 951 538}
- {OLD_JOURNEY 984 568}
{OLD_JOURNEY 959 598}
{OLD_BATTLE 988 611}
+ {OLD_JOURNEY 984 568}
+ {OLD_JOURNEY 951 538}
{OLD_JOURNEY 932 503}
{OLD_JOURNEY 876 475}
{OLD_JOURNEY 831 467}
@@ -98,12 +96,87 @@
#define JOURNEY4_STAGE_1
{NEW_JOURNEY 709 449}
- {NEW_BATTLE 709 412}
+ {NEW_BATTLE 689 424}
#enddef
#define JOURNEY4_COMPLETE
{OLD_JOURNEY 709 449}
- {OLD_BATTLE 709 412}
+ {OLD_BATTLE 689 424}
+#enddef
+
+#define JOURNEY5_STAGE_1
+ {NEW_JOURNEY 666 401}
+ {NEW_JOURNEY 629 383}
+ {NEW_BATTLE 602 368}
+#enddef
+
+#define JOURNEY5_STAGE_2
+ {OLD_JOURNEY 666 401}
+ {OLD_JOURNEY 629 383}
+ {OLD_BATTLE 602 368}
+ {NEW_JOURNEY 581 327}
+ {NEW_JOURNEY 570 288}
+ {NEW_BATTLE 552 244}
+#enddef
+
+#define JOURNEY5_COMPLETE
+ {OLD_JOURNEY 666 401}
+ {OLD_JOURNEY 629 383}
+ {OLD_BATTLE 602 368}
+ {OLD_JOURNEY 581 327}
+ {OLD_JOURNEY 570 288}
+ {OLD_BATTLE 552 244}
+#enddef
+
+#define JOURNEY6_STAGE_1
+ {NEW_JOURNEY 707 411}
+ {NEW_BATTLE 709 381}
+#enddef
+
+#define JOURNEY6_STAGE_2
+ {OLD_JOURNEY 707 411}
+ {OLD_BATTLE 709 381}
+ {NEW_JOURNEY 670 349}
+ {NEW_JOURNEY 631 326}
+ {NEW_JOURNEY 600 303}
+ {NEW_JOURNEY 561 268}
+ {NEW_BATTLE 552 244}
+#enddef
+
+#define JOURNEY6_COMPLETE
+ {OLD_JOURNEY 707 411}
+ {OLD_BATTLE 709 381}
+ {OLD_JOURNEY 670 349}
+ {OLD_JOURNEY 631 326}
+ {OLD_JOURNEY 600 303}
+ {OLD_JOURNEY 561 268}
+ {OLD_BATTLE 552 244}
+#enddef
+
+#define JOURNEY7_STAGE_1
+ {NEW_JOURNEY 583 250}
+ {NEW_JOURNEY 617 237}
+ {NEW_BATTLE 636 214}
+#enddef
+
+#define JOURNEY7_STAGE_2
+ {OLD_JOURNEY 583 250}
+ {OLD_JOURNEY 617 237}
+ {OLD_BATTLE 636 214}
+ {NEW_JOURNEY 620 168}
+ {NEW_JOURNEY 582 152}
+ {NEW_JOURNEY 543 137}
+ {NEW_BATTLE 507 132}
+#enddef
+
+#define JOURNEY7_COMPLETE
+ {OLD_JOURNEY 583 250}
+ {OLD_JOURNEY 617 237}
+ {OLD_BATTLE 636 214}
+ {OLD_JOURNEY 620 168}
+ {OLD_JOURNEY 582 152}
+ {OLD_JOURNEY 543 137}
+ {OLD_BATTLE 507 132}
#enddef
# trackplacer: tracks end
@@ -176,3 +249,62 @@
{FROM_NORTHERN_OUTPOST}
{JOURNEY4_STAGE_1}
#enddef
+
+#define TO_UNDEAD_CROSSING
+ background="eastern-invasion-map.png"
+ {FROM_NORTHERN_OUTPOST}
+ {JOURNEY4_COMPLETE}
+ {JOURNEY5_STAGE_1}
+#enddef
+
+#define TO_THE_CROSSING
+ background="eastern-invasion-map.png"
+ {FROM_NORTHERN_OUTPOST}
+ {JOURNEY4_COMPLETE}
+ {JOURNEY6_STAGE_1}
+#enddef
+
+#define TO_TRAINING_THE_OGRES
+ background="eastern-invasion-map.png"
+ {FROM_NORTHERN_OUTPOST}
+ {JOURNEY4_COMPLETE}
+ [switch]
+ variable=second_fork
+ [case]
+ value=west
+ {JOURNEY5_STAGE_2}
+ [/case]
+ [case]
+ value=north
+ {JOURNEY6_STAGE_2}
+ [/case]
+ [/switch]
+#enddef
+
+#define FROM_TRAINING_THE_OGRES
+ {FROM_NORTHERN_OUTPOST}
+ {JOURNEY4_COMPLETE}
+ [switch]
+ variable=second_fork
+ [case]
+ value=west
+ {JOURNEY5_COMPLETE}
+ [/case]
+ [case]
+ value=east
+ {JOURNEY6_COMPLETE}
+ [/case]
+ [/switch]
+#enddef
+
+#define TO_XENOPHOBIA
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_1}
+#enddef
+
+#define TO_LAKE_VRUG
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_2}
+#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
