mail[Wesnoth-commits] r33575 - in /trunk/data/campaigns/Eastern_Invasion: scenarios/ utils/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 12, 2009 - 20:32:
Author: esr
Date: Thu Mar 12 20:31:39 2009
New Revision: 33575

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33575&view=rev
Log:
Fix broken journey paths in Eastern Invasion.

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/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/05.Northern_Outpost.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg?rev=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg 
Thu Mar 12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_NORTHERN_OUTPOST}
-        [/part]
+        {TO_NORTHERN_OUTPOST}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg Thu Mar 
12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_TWO_PATHS}
-        [/part]
+        {TO_TWO_PATHS}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg Thu 
Mar 12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_THE_CROSSING}
-        [/part]
+        {TO_THE_CROSSING}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg 
Thu Mar 12 20:31:39 2009
@@ -12,10 +12,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_UNDEAD_CROSSING}
-        [/part]
+        {TO_UNDEAD_CROSSING}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&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 Mar 12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_TRAINING_THE_OGRES}
-        [/part]
+        {TO_TRAINING_THE_OGRES}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg Thu Mar 
12 20:31:39 2009
@@ -16,10 +16,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_XENOPHOBIA}
-        [/part]
+        {TO_XENOPHOBIA}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg Thu Mar 
12 20:31:39 2009
@@ -19,10 +19,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_LAKE_VRUG}
-        [/part]
+        {TO_LAKE_VRUG}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg Thu Mar 
12 20:31:39 2009
@@ -18,8 +18,8 @@
         [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."
             show_title=yes
-            {TO_EVACUATION}
         [/part]
+        {TO_EVACUATION}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&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 Mar 12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_THE_DROWNED_PLAINS}
-        [/part]
+        {TO_THE_DROWNED_PLAINS}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg 
Thu Mar 12 20:31:39 2009
@@ -15,10 +15,7 @@
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
-        [part]
-            show_title=yes
-            {TO_APPROACHING_WELDYN}
-        [/part]
+        {TO_APPROACHING_WELDYN}
     [/story]
 
     [side]

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg Thu 
Mar 12 20:31:39 2009
@@ -14,10 +14,7 @@
 
     # wmllint: local spelling Galdren Ravan
     [story]
-        [part]
-            show_title=yes
-            {TO_THE_COUNCIL}
-        [/part]
+        {TO_THE_COUNCIL}
         [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

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=33575&r1=33574&r2=33575&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg Thu Mar 12 
20:31:39 2009
@@ -290,6 +290,8 @@
 # How these are assembled depends on the value of the variables
 # first_fork and second_fork.
 
+# Early macros can be called within [part], as no conditionals are involved.
+
 #define TO_THE_OUTPOST
     background="eastern-invasion-map.png"
     {JOURNEY1_STAGE1}
@@ -318,126 +320,273 @@
     {JOURNEY3_STAGE2}
 #enddef
 
+# All following macros must be direct children of [story].
+# This can be fixed when conditionals are supported inside [part]
+
 #define TO_NORTHERN_OUTPOST
-    background="eastern-invasion-map.png"
-    {JOURNEY1_COMPLETE}
     [if]
         [variable]
             name=first_fork
             equals=east
         [/variable]
         [then]
-            {JOURNEY3_STAGE3}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY3_STAGE3}
+            [/part]
         [/then]
         [else]
-            {JOURNEY2_STAGE2}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY2_STAGE2}
+            [/part]
         [/else]
     [/if]
 #enddef
 
-#define FROM_NORTHERN_OUTPOST
-    {JOURNEY1_COMPLETE}
+#define TO_TWO_PATHS
     [if]
         [variable]
             name=first_fork
             equals=east
         [/variable]
         [then]
-            {JOURNEY3_COMPLETE}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY3_COMPLETE}
+                {JOURNEY4_STAGE1}
+            [/part]
         [/then]
         [else]
-            {JOURNEY2_COMPLETE}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY2_COMPLETE}
+                {JOURNEY4_STAGE1}
+            [/part]
         [/else]
     [/if]
 #enddef
 
-#define TO_TWO_PATHS
-    background="eastern-invasion-map.png"
-    {FROM_NORTHERN_OUTPOST}
-    {JOURNEY4_STAGE1}
-#enddef
-
 #define TO_UNDEAD_CROSSING
-    background="eastern-invasion-map.png"
-    {FROM_NORTHERN_OUTPOST}
-    {JOURNEY4_COMPLETE}
-    {JOURNEY5_STAGE1}
-#enddef
-
-#define TO_THE_CROSSING
-    background="eastern-invasion-map.png"
-    {FROM_NORTHERN_OUTPOST}
-    {JOURNEY4_COMPLETE}
-    {JOURNEY6_STAGE1}
-#enddef
-
-#define TO_TRAINING_THE_OGRES
-    background="eastern-invasion-map.png"
-    {FROM_NORTHERN_OUTPOST}
-    {JOURNEY4_COMPLETE}
     [if]
         [variable]
-            name=second_fork
-            equals=west
+            name=first_fork
+            equals=east
         [/variable]
         [then]
-            {JOURNEY5_STAGE2}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY3_COMPLETE}
+                {JOURNEY4_COMPLETE}
+                {JOURNEY5_STAGE1}
+            [/part]
         [/then]
         [else]
-            {JOURNEY6_STAGE2}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY2_COMPLETE}
+                {JOURNEY4_COMPLETE}
+                {JOURNEY5_STAGE1}
+            [/part]
         [/else]
     [/if]
 #enddef
 
-#define FROM_TRAINING_THE_OGRES
-    {FROM_NORTHERN_OUTPOST}
-    {JOURNEY4_COMPLETE}
+#define TO_THE_CROSSING
     [if]
         [variable]
-            name=second_fork
-            equals=west
+            name=first_fork
+            equals=east
         [/variable]
         [then]
-            {JOURNEY5_COMPLETE}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY3_COMPLETE}
+                {JOURNEY4_COMPLETE}
+                {JOURNEY6_STAGE1}
+            [/part]
         [/then]
         [else]
-            {JOURNEY6_COMPLETE}
+            [part]
+               background="eastern-invasion-map.png"
+                show_title=yes
+                {JOURNEY1_COMPLETE}
+                {JOURNEY2_COMPLETE}
+                {JOURNEY4_COMPLETE}
+                {JOURNEY6_STAGE1}
+            [/part]
         [/else]
     [/if]
 #enddef
 
+#define TO_TRAINING_THE_OGRES
+    [if]
+        [variable]
+            name=first_fork
+            equals=east
+        [/variable]
+        [then]
+            [if]
+                [variable]
+                    name=second_fork
+                    equals=west
+                [/variable]
+                [then]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY3_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY5_STAGE2}
+                    [/part]
+                [/then]
+                [else]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY3_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY6_STAGE2}
+                   [/part]
+                [/else]
+            [/if]
+        [/then]
+        [else]
+            [if]
+                [variable]
+                    name=second_fork
+                    equals=west
+                [/variable]
+                [then]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY2_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY5_STAGE2}
+                    [/part]
+                [/then]
+                [else]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY2_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY6_STAGE2}
+                    [/part]
+                [/else]
+            [/if]
+        [/else]
+    [/if]
+#enddef
+
+#define FROM_TRAINING_THE_OGRES AFTER
+    [if]
+        [variable]
+            name=first_fork
+            equals=east
+        [/variable]
+        [then]
+            [if]
+                [variable]
+                    name=second_fork
+                    equals=west
+                [/variable]
+                [then]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY3_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY5_COMPLETE}
+                        {AFTER}
+                    [/part]
+                [/then]
+                [else]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY3_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY6_COMPLETE}
+                        {AFTER}
+                   [/part]
+                [/else]
+            [/if]
+        [/then]
+        [else]
+            [if]
+                [variable]
+                    name=second_fork
+                    equals=west
+                [/variable]
+                [then]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY2_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY5_COMPLETE}
+                        {AFTER}
+                    [/part]
+                [/then]
+                [else]
+                    [part]
+                        background="eastern-invasion-map.png"
+                        show_title=yes
+                        {JOURNEY1_COMPLETE}
+                        {JOURNEY2_COMPLETE}
+                        {JOURNEY4_COMPLETE}
+                        {JOURNEY6_COMPLETE}
+                        {AFTER}
+                    [/part]
+                [/else]
+            [/if]
+        [/else]
+    [/if]
+#enddef
+
 #define TO_XENOPHOBIA
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE1}
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE1}}
 #enddef
 
 #define TO_LAKE_VRUG
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE2}
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE2}}
 #enddef
 
 #define TO_EVACUATION
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE3}
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE3}}
 #enddef
 
 #define TO_THE_DROWNED_PLAINS
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE4}
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE4}}
 #enddef
 
 #define TO_APPROACHING_WELDYN
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE5}
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE5}}
 #enddef
 
 #define TO_THE_COUNCIL
-    background="eastern-invasion-map.png"
-    {FROM_TRAINING_THE_OGRES}
-    {JOURNEY7_STAGE6}
-#enddef
+    {FROM_TRAINING_THE_OGRES {JOURNEY7_STAGE6}}
+#enddef




Related Messages


Powered by MHonArc, Updated Thu Mar 12 22:40:31 2009