Author: esr
Date: Thu Oct 16 01:03:27 2008
New Revision: 30191
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30191&view=rev
Log:
trackplacer: update some documentation and rename a test file.
Added:
trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg (props changed)
- copied unchanged from r30190,
trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg
Removed:
trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg
Modified:
trunk/data/tools/trackplacer
Removed: trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg?rev=30190&view=auto
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/_final.cfg (removed)
@@ -1,178 +1,0 @@
-# wmllint: no translatables
-
-# trackplacer: tracks begin
-# Hand-hack 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
-
-#define JOURNEY1_STAGE_2
- {OLD_BATTLE 759 508}
- {NEW_JOURNEY 788 509}
- {NEW_BATTLE 821 517}
-#enddef
-
-#define JOURNEY1_COMPLETE
- {OLD_BATTLE 759 508}
- {OLD_JOURNEY 788 509}
- {OLD_BATTLE 821 517}
-#enddef
-
-#define JOURNEY2_STAGE_1
- {NEW_JOURNEY 844 507}
- {NEW_JOURNEY 847 487}
- {NEW_BATTLE 847 469}
-#enddef
-
-#define JOURNEY2_STAGE_2
- {OLD_JOURNEY 844 507}
- {OLD_JOURNEY 847 487}
- {OLD_BATTLE 847 469}
- {NEW_JOURNEY 798 466}
- {NEW_JOURNEY 772 471}
- {NEW_BATTLE 729 460}
-#enddef
-
-#define JOURNEY2_COMPLETE
- {OLD_JOURNEY 844 507}
- {OLD_JOURNEY 847 487}
- {OLD_BATTLE 847 469}
- {OLD_JOURNEY 798 466}
- {OLD_JOURNEY 772 471}
- {OLD_BATTLE 729 460}
-#enddef
-
-#define JOURNEY3_STAGE_1
- {NEW_JOURNEY 846 525}
- {NEW_JOURNEY 879 545}
- {NEW_JOURNEY 908 562}
- {NEW_BATTLE 938 583}
-#enddef
-
-#define JOURNEY3_STAGE_2
- {OLD_JOURNEY 846 525}
- {OLD_JOURNEY 879 545}
- {OLD_JOURNEY 908 562}
- {OLD_BATTLE 938 583}
- {NEW_JOURNEY 951 538}
- {NEW_JOURNEY 984 568}
- {NEW_JOURNEY 959 598}
- {NEW_BATTLE 988 611}
-#enddef
-
-#define JOURNEY3_STAGE_3
- {OLD_JOURNEY 846 525}
- {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 932 503}
- {NEW_JOURNEY 876 475}
- {NEW_JOURNEY 831 467}
- {NEW_JOURNEY 781 469}
- {NEW_BATTLE 729 460}
-#enddef
-
-#define JOURNEY3_COMPLETE
- {OLD_JOURNEY 846 525}
- {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 932 503}
- {OLD_JOURNEY 876 475}
- {OLD_JOURNEY 831 467}
- {OLD_JOURNEY 781 469}
- {OLD_BATTLE 729 460}
-#enddef
-
-#define JOURNEY4_STAGE_1
- {NEW_JOURNEY 709 449}
- {NEW_BATTLE 709 412}
-#enddef
-
-#define JOURNEY4_COMPLETE
- {OLD_JOURNEY 709 449}
- {OLD_BATTLE 709 412}
-#enddef
-
-# trackplacer: tracks end
-
-# This is where we stitch together the variant journey tracks.
-# How these are assembled depends on the value of the variables
-# first_fork and second_fork.
-
-#define TO_THE_OUTPOST
- background="eastern-invasion-map.png"
- {JOURNEY1_STAGE_1}
-#enddef
-
-#define TO_AN_UNEXPECTED_APPEARANCE
- background="eastern-invasion-map.png"
- {JOURNEY1_STAGE_2}
-#enddef
-
-#define TO_AN_ELVEN_ALLIANCE
- background="eastern-invasion-map.png"
- {JOURNEY1_COMPLETE}
- {JOURNEY2_STAGE_1}
-#enddef
-
-#define TO_THE_UNDEAD_BORDER_PATROL
- background="eastern-invasion-map.png"
- {JOURNEY1_COMPLETE}
- {JOURNEY3_STAGE_1}
-#enddef
-
-#define TO_MAL_RAVANALS_CAPITOL
- background="eastern-invasion-map.png"
- {JOURNEY1_COMPLETE}
- {JOURNEY3_STAGE_2}
-#enddef
-
-#define TO_NORTHERN_OUTPOST
- background="eastern-invasion-map.png"
- {JOURNEY1_COMPLETE}
- [switch]
- variable=first_fork
- [case]
- value=west
- {JOURNEY2_STAGE_2}
- [/case]
- [case]
- value=east
- {JOURNEY3_STAGE_3}
- [/case]
- [/switch]
-#enddef
-
-#define FROM_NORTHERN_OUTPOST
- {JOURNEY1_COMPLETE}
- [switch]
- variable=first_fork
- [case]
- value=west
- {JOURNEY2_COMPLETE}
- [/case]
- [case]
- value=east
- {JOURNEY3_COMPLETE}
- [/case]
- [/switch]
-#enddef
-
-#define TO_TWO_PATHS
- background="eastern-invasion-map.png"
- {FROM_NORTHERN_OUTPOST}
- {JOURNEY4_STAGE_1}
-#enddef
Propchange: trunk/data/campaigns/Eastern_Invasion/utils/journey.cfg
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/data/tools/trackplacer
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/trackplacer?rev=30191&r1=30190&r2=30191&view=diff
==============================================================================
--- trunk/data/tools/trackplacer (original)
+++ trunk/data/tools/trackplacer Thu Oct 16 01:03:27 2008
@@ -10,12 +10,23 @@
the main screen, click the Help button.
Can be started with a map image, in which case we are editing a new journey.
-Can be started with a .cfg file. All parts of .cfg files other than the
-NEW_* macros placing tracking icons are ignored, except that a comment
-of the form "# trackplacer: map=fubar.png" is interpreted as a declaration
-that this track has the base map fubar.png (or similarly for any other
-fiilrename after the = sign). The NEW_* macros are interpreted snd their
-features appended to the track in the order they are given in the file.
+Can be started with a .cfg file, in which case iit will look for
+track information enclosed in special comments that look like this:
+
+ # trackplacer: tracks begin
+ # trackplacer: tracks end
+
+trackplacer will not alter anything it finds outside these comments,
+and will always enclose everything it writes in them.
+
+Special comments may appear in your journey.cfg, looking like this:
+
+ # trackplacer: <property>=<value>
+
+These set properties that trackplacer may use. At present there is
+only one such property: map, which records the name of the mapfile on
+which your track is laid. Do not remove this comment, trackplacer
+needs it.
A journey is an object containing a map file name and a (possibly empty)
track. This program exists to visually edit journeys represented in .cfg
@@ -404,6 +415,13 @@
tooltips.set_tip(button, "See a help message describing the controls.")
button.show()
+ # A tracks button
+ button = gtk.Button("Tracks")
+ buttonbox.pack_end(button, expand=False, fill=False, padding=10)
+ button.connect_object("clicked", self.tracks_handler, self.window)
+ tooltips.set_tip(button, "Select tracks to be displayed.")
+ button.show()
+
# A properties button
button = gtk.Button("Properties")
buttonbox.pack_end(button, expand=False, fill=False, padding=10)
@@ -702,6 +720,10 @@
w.set_markup(gui_help)
w.run()
w.destroy()
+
+ def tracks_handler(self, w):
+ "Modify the visible set of tracks."
+ pass
def properties_handler(self, w):
"Display a dialog for editing track properties."
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
