Author: esr
Date: Mon Oct 13 20:45:06 2008
New Revision: 30136
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30136&view=rev
Log:
Liberty now uses a track file and trackplacer-generated macros.
Added:
trunk/data/campaigns/Liberty/utils/journey.cfg
trunk/data/campaigns/Liberty/utils/journey.trk
Modified:
trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
Modified: trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg Mon Oct 13 20:45:06
2008
@@ -39,7 +39,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_BATTLE 252 252}
+ {JOURNEY_STAGE_1}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg Mon Oct 13
20:45:06 2008
@@ -14,8 +14,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 252 252}
- {NEW_BATTLE 242 267}
+ {JOURNEY_STAGE_2}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg Mon Oct 13
20:45:06 2008
@@ -15,8 +15,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 242 267}
- {NEW_BATTLE 229 248}
+ {JOURNEY_STAGE_3}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg Mon Oct 13
20:45:06 2008
@@ -24,10 +24,7 @@
music="knolls.ogg"
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 229 248}
- {NEW_JOURNEY 232 270}
- {NEW_JOURNEY 224 290}
- {NEW_BATTLE 209 300}
+ {JOURNEY_STAGE_4}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg Mon Oct 13
20:45:06 2008
@@ -15,11 +15,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 209 300}
- {NEW_JOURNEY 231 297}
- {NEW_JOURNEY 245 316}
- {NEW_JOURNEY 250 338}
- {NEW_BATTLE 273 346}
+ {JOURNEY_STAGE_5}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg Mon Oct 13
20:45:06 2008
@@ -13,9 +13,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 279 360}
- {NEW_JOURNEY 283 380}
- {NEW_BATTLE 288 400}
+ {JOURNEY_STAGE_6}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg Mon Oct 13
20:45:06 2008
@@ -26,10 +26,7 @@
[part]
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 282 435}
- {NEW_JOURNEY 260 439}
- {NEW_JOURNEY 238 431}
- {NEW_BATTLE 223 412}
+ {JOURNEY_STAGE_8}
[/part]
[/story]
Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=30136&r1=30135&r2=30136&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Mon Oct 13 20:45:06 2008
@@ -35,8 +35,7 @@
music="battle.ogg"
show_title=yes
background="maps/wesnoth-liberty.png"
- {NEW_JOURNEY 215 407}
- {NEW_BATTLE 206 386}
+ {JOURNEY_STAGE_8}
[/part]
[/story]
Added: trunk/data/campaigns/Liberty/utils/journey.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/utils/journey.cfg?rev=30136&view=auto
==============================================================================
--- trunk/data/campaigns/Liberty/utils/journey.cfg (added)
+++ trunk/data/campaigns/Liberty/utils/journey.cfg Mon Oct 13 20:45:06 2008
@@ -1,0 +1,136 @@
+# Automatically generated by trackplacer on Mon Oct 13 14:38:45 2008.
+# Don't hand-hack -- edit the associated track file
+# and then regenerate this instead.
+
+#define JOURNEY_STAGE_1
+ {NEW_BATTLE 252 252}
+#enddef
+
+#define JOURNEY_STAGE_2
+ {OLD_BATTLE 252 252}
+ {NEW_JOURNEY 247 248}
+ {NEW_BATTLE 242 267}
+#enddef
+
+#define JOURNEY_STAGE_3
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {NEW_JOURNEY 235 252}
+ {NEW_BATTLE 229 248}
+#enddef
+
+#define JOURNEY_STAGE_4
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {NEW_JOURNEY 232 270}
+ {NEW_JOURNEY 224 290}
+ {NEW_BATTLE 209 300}
+#enddef
+
+#define JOURNEY_STAGE_5
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {OLD_JOURNEY 232 270}
+ {OLD_JOURNEY 224 290}
+ {OLD_BATTLE 209 300}
+ {NEW_JOURNEY 231 297}
+ {NEW_JOURNEY 245 316}
+ {NEW_JOURNEY 250 338}
+ {NEW_BATTLE 273 346}
+#enddef
+
+#define JOURNEY_STAGE_6
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {OLD_JOURNEY 232 270}
+ {OLD_JOURNEY 224 290}
+ {OLD_BATTLE 209 300}
+ {OLD_JOURNEY 231 297}
+ {OLD_JOURNEY 245 316}
+ {OLD_JOURNEY 250 338}
+ {OLD_BATTLE 273 346}
+ {NEW_JOURNEY 279 360}
+ {NEW_JOURNEY 283 380}
+ {NEW_BATTLE 288 400}
+#enddef
+
+#define JOURNEY_STAGE_7
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {OLD_JOURNEY 232 270}
+ {OLD_JOURNEY 224 290}
+ {OLD_BATTLE 209 300}
+ {OLD_JOURNEY 231 297}
+ {OLD_JOURNEY 245 316}
+ {OLD_JOURNEY 250 338}
+ {OLD_BATTLE 273 346}
+ {OLD_JOURNEY 279 360}
+ {OLD_JOURNEY 283 380}
+ {OLD_BATTLE 288 400}
+ {NEW_JOURNEY 282 435}
+ {NEW_JOURNEY 260 439}
+ {NEW_JOURNEY 238 431}
+ {NEW_BATTLE 223 412}
+#enddef
+
+#define JOURNEY_STAGE_8
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {OLD_JOURNEY 232 270}
+ {OLD_JOURNEY 224 290}
+ {OLD_BATTLE 209 300}
+ {OLD_JOURNEY 231 297}
+ {OLD_JOURNEY 245 316}
+ {OLD_JOURNEY 250 338}
+ {OLD_BATTLE 273 346}
+ {OLD_JOURNEY 279 360}
+ {OLD_JOURNEY 283 380}
+ {OLD_BATTLE 288 400}
+ {OLD_JOURNEY 282 435}
+ {OLD_JOURNEY 260 439}
+ {OLD_JOURNEY 238 431}
+ {OLD_BATTLE 223 412}
+ {NEW_JOURNEY 215 407}
+ {NEW_BATTLE 206 386}
+#enddef
+
+#define JOURNEY_COMPLETE
+ {OLD_BATTLE 252 252}
+ {OLD_JOURNEY 247 248}
+ {OLD_BATTLE 242 267}
+ {OLD_JOURNEY 235 252}
+ {OLD_BATTLE 229 248}
+ {OLD_JOURNEY 232 270}
+ {OLD_JOURNEY 224 290}
+ {OLD_BATTLE 209 300}
+ {OLD_JOURNEY 231 297}
+ {OLD_JOURNEY 245 316}
+ {OLD_JOURNEY 250 338}
+ {OLD_BATTLE 273 346}
+ {OLD_JOURNEY 279 360}
+ {OLD_JOURNEY 283 380}
+ {OLD_BATTLE 288 400}
+ {OLD_JOURNEY 282 435}
+ {OLD_JOURNEY 260 439}
+ {OLD_JOURNEY 238 431}
+ {OLD_BATTLE 223 412}
+ {OLD_JOURNEY 215 407}
+ {OLD_BATTLE 206 386}
+#enddef
+
Added: trunk/data/campaigns/Liberty/utils/journey.trk
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/utils/journey.trk?rev=30136&view=auto
==============================================================================
--- trunk/data/campaigns/Liberty/utils/journey.trk (added)
+++ trunk/data/campaigns/Liberty/utils/journey.trk Mon Oct 13 20:45:06 2008
@@ -1,0 +1,22 @@
+MAP data/campaigns/Liberty/images/maps/wesnoth-liberty.png
+BATTLE 252 252
+JOURNEY 247 248
+BATTLE 242 267
+JOURNEY 235 252
+BATTLE 229 248
+JOURNEY 232 270
+JOURNEY 224 290
+BATTLE 209 300
+JOURNEY 231 297
+JOURNEY 245 316
+JOURNEY 250 338
+BATTLE 273 346
+JOURNEY 279 360
+JOURNEY 283 380
+BATTLE 288 400
+JOURNEY 282 435
+JOURNEY 260 439
+JOURNEY 238 431
+BATTLE 223 412
+JOURNEY 215 407
+BATTLE 206 386
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
