Author: esr
Date: Thu Oct 16 20:14:27 2008
New Revision: 30206
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30206&view=rev
Log:
Journey track for Eastern Invasion is complete. The intro had
to be merged iinto the firtst scenario file so the jorney macro would be
visible.
Removed:
trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg?rev=30206&r1=30205&r2=30206&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg Thu Oct
16 20:14:27 2008
@@ -4,7 +4,42 @@
name= _ "The Outpost"
map_data="{campaigns/Eastern_Invasion/maps/The_Outpost.map}"
turns=16
- {campaigns/Eastern_Invasion/utils/intro.cfg}
+
+ [story]
+ [part]
+ music=revelation.ogg
+ story= _ "It was the thirtieth year of Konrad II's reign, and
there were strange occurrences in the Estmark Hills on the eastern border of
Wesnoth."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "Cattle and beasts of burden were found dead in the
fields, and men went missing from their houses, with no clues but a thin stream
of black blood. At first the settlers suspected raiders from the great desert,
but when they sent scouts east they found nothing but a small mountain range
and miles of swamp."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "The disappearances did not stop, and every day the
terror grew greater. Eventually, the people living in the eastern villages sent
a messenger to the King, asking for help. The messenger rode hard for many days
and nights, and finally reached the city of Weldyn."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "When the King received news of the problem, his advisor
Dacyn had much to say. Apparently, these attacks were connected to similar ones
that occurred earlier on the far southern border, attacks by undead. Dacyn
outlined a plan to combat these intrusions."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "In the days of the king Garard I, two strongpoints had
been built along the near bank of the Weldyn, south of Soradoc, to stop bandits
and Orcish raiders out of the the Estmarks from entering Wesnoth. But in later
years the River Guard posts had been abandoned, as colonists spread into the
Estmarks and the orcs were driven in retreat north of the Great River."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "With unknown enemies pressing Wesnoth from the East,
Konrad II decided to re-build and re-man the River Guard outposts, and use them
to keep the Crown's eye and hand firmly on the settled country to either side
of the lower Weldyn. He sent two of the most promising young officers to them."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "To the northern outpost he sent Owaec, a clan noble. To
the southern outpost, he sent Gweddry, who would be accompanied by Dacyn the
mage. It is with them this story is concerned."
+ background=eastern-invasion-map.png
+ [/part]
+ [part]
+ story= _ "All went well once the King's forces arrived. There were
no attacks for several weeks, and Gweddry's men started to grow incautious.
Then, at dawn one day, Gweddry and his men were roused by the startled cries of
the night watchmen..."
+ {TO_THE_OUTPOST}
+ [/part]
+ [/story]
{DEFAULT_SCHEDULE}
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg?rev=30206&r1=30205&r2=30206&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg Thu Oct
16 20:14:27 2008
@@ -15,7 +15,8 @@
[story]
[part]
story= _ "Gweddry had escaped from the orcish prisons. He found
himself in the Northlands, farther south than before. Orcs were at his back. He
and his men went south, until they reached the Great River."
- # background=story/
+ show_title=yes
+ {TO_EVACUATION}
[/part]
[/story]
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=30206&r1=30205&r2=30206&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 20:14:27 2008
@@ -11,6 +11,13 @@
{DEFAULT_MUSIC_PLAYLIST}
{campaigns/Eastern_Invasion/utils/deaths.cfg}
+
+ [story]
+ [part]
+ show_title=yes
+ {TO_THE_DROWNED_PLAINS}
+ [/part]
+ [/story]
[side]
type=Lieutenant
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg?rev=30206&r1=30205&r2=30206&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
Thu Oct 16 20:14:27 2008
@@ -12,6 +12,13 @@
{campaigns/Eastern_Invasion/utils/deaths.cfg}
+ [story]
+ [part]
+ show_title=yes
+ {TO_APPROACHING_WELDYN}
+ [/part]
+ [/story]
+
[side]
type=Lieutenant
id=Gweddry
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg?rev=30206&r1=30205&r2=30206&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg Thu Oct
16 20:14:27 2008
@@ -13,6 +13,10 @@
{campaigns/Eastern_Invasion/utils/deaths.cfg}
[story]
+ [part]
+ show_title=yes
+ {TO_THE_COUNCIL}
+ [/part]
[part]
story= _ "Before we begin our council, I must tell you all the
history of this lich we face. He was at first a mage of light, like me, and his
fall began during the reign of Haldric VII..."
background=portraits/dacyn.png
Removed: trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg?rev=30205&view=auto
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg (removed)
@@ -1,36 +1,0 @@
-#textdomain wesnoth-ei
-[story]
- [part]
- music=revelation.ogg
- story= _ "It was the thirtieth year of Konrad II's reign, and there
were strange occurrences in the Estmark Hills on the eastern border of Wesnoth."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "Cattle and beasts of burden were found dead in the fields,
and men went missing from their houses, with no clues but a thin stream of
black blood. At first the settlers suspected raiders from the great desert, but
when they sent scouts east they found nothing but a small mountain range and
miles of swamp."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "The disappearances did not stop, and every day the terror
grew greater. Eventually, the people living in the eastern villages sent a
messenger to the King, asking for help. The messenger rode hard for many days
and nights, and finally reached the city of Weldyn."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "When the King received news of the problem, his advisor
Dacyn had much to say. Apparently, these attacks were connected to similar ones
that occurred earlier on the far southern border, attacks by undead. Dacyn
outlined a plan to combat these intrusions."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "In the days of the king Garard I, two strongpoints had been
built along the near bank of the Weldyn, south of Soradoc, to stop bandits and
Orcish raiders out of the the Estmarks from entering Wesnoth. But in later
years the River Guard posts had been abandoned, as colonists spread into the
Estmarks and the orcs were driven in retreat north of the Great River."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "With unknown enemies pressing Wesnoth from the East, Konrad
II decided to re-build and re-man the River Guard outposts, and use them to
keep the Crown's eye and hand firmly on the settled country to either side of
the lower Weldyn. He sent two of the most promising young officers to them."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "To the northern outpost he sent Owaec, a clan noble. To the
southern outpost, he sent Gweddry, who would be accompanied by Dacyn the mage.
It is with them this story is concerned."
- background=eastern-invasion-map.png
- [/part]
- [part]
- story= _ "All went well once the King's forces arrived. There were no
attacks for several weeks, and Gweddry's men started to grow incautious. Then,
at dawn one day, Gweddry and his men were roused by the startled cries of the
night watchmen..."
- {TO_THE_OUTPOST}
- [/part]
-[/story]
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=30206&r1=30205&r2=30206&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg Thu Oct 16 20:14:27
2008
@@ -169,7 +169,7 @@
{NEW_BATTLE 507 132}
#enddef
-#define JOURNEY7_COMPLETE
+#define JOURNEY7_STAGE_3
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@@ -177,6 +177,110 @@
{OLD_JOURNEY 582 152}
{OLD_JOURNEY 543 137}
{OLD_BATTLE 507 132}
+ {NEW_JOURNEY 472 111}
+ {NEW_JOURNEY 465 144}
+ {NEW_JOURNEY 453 181}
+ {NEW_JOURNEY 477 216}
+ {NEW_JOURNEY 495 237}
+ {NEW_JOURNEY 520 280}
+ {NEW_JOURNEY 562 308}
+ {NEW_JOURNEY 601 331}
+ {NEW_BATTLE 633 352}
+#enddef
+
+#define JOURNEY7_STAGE_4
+ {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}
+ {OLD_JOURNEY 472 111}
+ {OLD_JOURNEY 465 144}
+ {OLD_JOURNEY 453 181}
+ {OLD_JOURNEY 477 216}
+ {OLD_JOURNEY 495 237}
+ {OLD_JOURNEY 520 280}
+ {OLD_JOURNEY 562 308}
+ {OLD_JOURNEY 601 331}
+ {OLD_BATTLE 633 352}
+ {NEW_JOURNEY 643 376}
+ {NEW_BATTLE 648 404}
+#enddef
+
+#define JOURNEY7_STAGE_5
+ {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}
+ {OLD_JOURNEY 472 111}
+ {OLD_JOURNEY 465 144}
+ {OLD_JOURNEY 453 181}
+ {OLD_JOURNEY 477 216}
+ {OLD_JOURNEY 495 237}
+ {OLD_JOURNEY 520 280}
+ {OLD_JOURNEY 562 308}
+ {OLD_JOURNEY 601 331}
+ {OLD_BATTLE 633 352}
+ {OLD_JOURNEY 643 376}
+ {OLD_BATTLE 648 404}
+ {NEW_JOURNEY 645 437}
+ {NEW_JOURNEY 625 479}
+ {NEW_BATTLE 610 511}
+#enddef
+
+#define JOURNEY7_STAGE_6
+ {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}
+ {OLD_JOURNEY 472 111}
+ {OLD_JOURNEY 465 144}
+ {OLD_JOURNEY 453 181}
+ {OLD_JOURNEY 477 216}
+ {OLD_JOURNEY 495 237}
+ {OLD_JOURNEY 520 280}
+ {OLD_JOURNEY 562 308}
+ {OLD_JOURNEY 601 331}
+ {OLD_BATTLE 633 352}
+ {OLD_JOURNEY 643 376}
+ {OLD_BATTLE 648 404}
+ {OLD_JOURNEY 645 437}
+ {OLD_JOURNEY 625 479}
+ {OLD_BATTLE 610 511}
+ {NEW_REST 600 537}
+#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}
+ {OLD_JOURNEY 472 111}
+ {OLD_JOURNEY 465 144}
+ {OLD_JOURNEY 453 181}
+ {OLD_JOURNEY 477 216}
+ {OLD_JOURNEY 495 237}
+ {OLD_JOURNEY 520 280}
+ {OLD_JOURNEY 562 308}
+ {OLD_JOURNEY 601 331}
+ {OLD_BATTLE 633 352}
+ {OLD_JOURNEY 643 376}
+ {OLD_BATTLE 648 404}
+ {OLD_JOURNEY 645 437}
+ {OLD_JOURNEY 625 479}
+ {OLD_BATTLE 610 511}
+ {OLD_REST 600 537}
#enddef
# trackplacer: tracks end
@@ -308,3 +412,27 @@
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_2}
#enddef
+
+#define TO_EVACUATION
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_3}
+#enddef
+
+#define TO_THE_DROWNED_PLAINS
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_4}
+#enddef
+
+#define TO_APPROACHING_WELDYN
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_5}
+#enddef
+
+#define TO_THE_COUNCIL
+ background="eastern-invasion-map.png"
+ {FROM_TRAINING_THE_OGRES}
+ {JOURNEY7_STAGE_6}
+#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
