Change the DOT*/CROSS*/FLAG* macros to {NEW,OLD}_{JOURNEY_BATTLE_REST}.
Convert coordinates in DOT and CROSS to the centered version. This commit makes no behavioral change at all -- it is pure mechanism, no policy -- but will make it easier to restyle the tracking markers. Also deprecates the old macros, and teaches wmllint to do the up-conversion.
This commit is contained in:
Eric S. Raymond
parent
b7946cb3fb
commit
e5245aefb8
55 changed files with 8543 additions and 8433 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@
|
|||
[part]
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 1001 250}
|
||||
{DOT 968 221}
|
||||
{DOT 925 216}
|
||||
{DOT 894 188}
|
||||
{DOT 841 177}
|
||||
{NEW_JOURNEY 1006 255}
|
||||
{NEW_JOURNEY 973 226}
|
||||
{NEW_JOURNEY 930 221}
|
||||
{NEW_JOURNEY 899 193}
|
||||
{NEW_JOURNEY 846 182}
|
||||
{CROSS 789 149}
|
||||
show_title=yes
|
||||
[/part]
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
[part]
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 789 149}
|
||||
{DOT 705 148}
|
||||
{DOT 616 192}
|
||||
{DOT 512 205}
|
||||
{DOT 452 225}
|
||||
{NEW_JOURNEY 794 154}
|
||||
{NEW_JOURNEY 710 153}
|
||||
{NEW_JOURNEY 621 197}
|
||||
{NEW_JOURNEY 517 210}
|
||||
{NEW_JOURNEY 457 230}
|
||||
{CROSS 393 258}
|
||||
show_title=yes
|
||||
[/part]
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
story= _ "Kalenz and his forces raced to relieve the siege of the Elvish Treasury..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 393 258}
|
||||
{DOT 314 265}
|
||||
{NEW_JOURNEY 398 263}
|
||||
{NEW_JOURNEY 319 270}
|
||||
{CROSS 280 240}
|
||||
[/part]
|
||||
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
story= _ "Elvish scouts found the trail of the Saurian war party without difficulty. The way back to the saurians' treasury was clear..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 280 240}
|
||||
{DOT 273 196}
|
||||
{DOT 262 174}
|
||||
{DOT 262 154}
|
||||
{DOT 262 144}
|
||||
{DOT 262 136}
|
||||
{NEW_JOURNEY 285 245}
|
||||
{NEW_JOURNEY 278 201}
|
||||
{NEW_JOURNEY 267 179}
|
||||
{NEW_JOURNEY 267 159}
|
||||
{NEW_JOURNEY 267 149}
|
||||
{NEW_JOURNEY 267 141}
|
||||
{CROSS 262 128}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
story= _ "To evade the saurians blocking the eastern approaches to Wesmere, Kalenz and his war-band moved north to enter Wesmere Forest from at different direction ..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 262 128}
|
||||
{DOT 317 144}
|
||||
{DOT 338 157}
|
||||
{DOT 345 163}
|
||||
{DOT 353 168}
|
||||
{DOT 362 171}
|
||||
{NEW_JOURNEY 267 133}
|
||||
{NEW_JOURNEY 322 149}
|
||||
{NEW_JOURNEY 343 162}
|
||||
{NEW_JOURNEY 350 168}
|
||||
{NEW_JOURNEY 358 173}
|
||||
{NEW_JOURNEY 367 176}
|
||||
{CROSS 370 176}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
[part]
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 370 176}
|
||||
{DOT 360 179}
|
||||
{DOT 363 190}
|
||||
{DOT 359 210}
|
||||
{DOT 353 229}
|
||||
{NEW_JOURNEY 375 181}
|
||||
{NEW_JOURNEY 365 184}
|
||||
{NEW_JOURNEY 368 195}
|
||||
{NEW_JOURNEY 364 215}
|
||||
{NEW_JOURNEY 358 234}
|
||||
{CROSS 352 242}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
[part]
|
||||
background="maps/wesnoth.png"
|
||||
show_title=yes
|
||||
{DOT 399 219}
|
||||
{DOT 411 222}
|
||||
{DOT 439 199}
|
||||
{DOT 453 195}
|
||||
{DOT 478 188}
|
||||
{DOT 520 165}
|
||||
{DOT 531 138}
|
||||
{NEW_JOURNEY 404 224}
|
||||
{NEW_JOURNEY 416 227}
|
||||
{NEW_JOURNEY 444 204}
|
||||
{NEW_JOURNEY 458 200}
|
||||
{NEW_JOURNEY 483 193}
|
||||
{NEW_JOURNEY 525 170}
|
||||
{NEW_JOURNEY 536 143}
|
||||
{CROSS 567 130}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
background="maps/wesnoth.png"
|
||||
show_title=yes
|
||||
{DOT 570 110 }
|
||||
{DOT 575 105}
|
||||
{NEW_JOURNEY 580 110}
|
||||
{CROSS 577 84}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
background="maps/wesnoth.png"
|
||||
show_title=yes
|
||||
delay=4000
|
||||
{DOT 513 19}
|
||||
{NEW_JOURNEY 518 24}
|
||||
{CROSS 592 21}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
story= _ "With the human-elf alliance revived, our heroes hurried to the battlefield..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 446 12}
|
||||
{DOT 512 46}
|
||||
{DOT 612 152}
|
||||
{DOT 566 301}
|
||||
{DOT 590 346}
|
||||
{NEW_JOURNEY 451 17}
|
||||
{NEW_JOURNEY 517 51}
|
||||
{NEW_JOURNEY 617 157}
|
||||
{NEW_JOURNEY 571 306}
|
||||
{NEW_JOURNEY 595 351}
|
||||
{CROSS 614 453}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
show_title=yes
|
||||
{DOT 829 314}
|
||||
{DOT 877 226}
|
||||
{NEW_JOURNEY 834 319}
|
||||
{NEW_JOURNEY 882 231}
|
||||
{CROSS 926 177}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@
|
|||
story= _ "But Kalenz failed to persuade the dwarves. The dwarves left, and at Landar's insistence the elves marched on the empire of the Saurians..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 909 202}
|
||||
{DOT 697 237}
|
||||
{DOT 550 244}
|
||||
{DOT 398 228}
|
||||
{DOT 289 197}
|
||||
{DOT 270 173}
|
||||
{NEW_JOURNEY 914 207}
|
||||
{NEW_JOURNEY 702 242}
|
||||
{NEW_JOURNEY 555 249}
|
||||
{NEW_JOURNEY 403 233}
|
||||
{NEW_JOURNEY 294 202}
|
||||
{NEW_JOURNEY 275 178}
|
||||
{CROSS 262 128}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
story= _ "With the once mighty Saurian empire destroyed, saurians had been reduced to scattered bands lurking in waste places. But the Elves still had problems of their own..."
|
||||
delay=4000
|
||||
background="maps/wesnoth.png"
|
||||
{DOT 262 128}
|
||||
{DOT 282 156}
|
||||
{DOT 261 178}
|
||||
{DOT 278 202}
|
||||
{DOT 294 222}
|
||||
{DOT 308 252}
|
||||
{NEW_JOURNEY 267 133}
|
||||
{NEW_JOURNEY 287 161}
|
||||
{NEW_JOURNEY 266 183}
|
||||
{NEW_JOURNEY 283 207}
|
||||
{NEW_JOURNEY 299 227}
|
||||
{NEW_JOURNEY 313 257}
|
||||
{CROSS 318 276}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
[part]
|
||||
background="maps/wesnoth.png"
|
||||
show_title=yes
|
||||
{DOT 829 314}
|
||||
{DOT 877 226}
|
||||
{NEW_JOURNEY 834 319}
|
||||
{NEW_JOURNEY 882 231}
|
||||
{CROSS 926 177}
|
||||
[/part]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{CROSS_CENTERED 252 252}
|
||||
{NEW_BATTLE 252 252}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 252 252}
|
||||
{CROSS_CENTERED 242 267}
|
||||
{NEW_JOURNEY 252 252}
|
||||
{NEW_BATTLE 242 267}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 242 267}
|
||||
{CROSS_CENTERED 229 248}
|
||||
{NEW_JOURNEY 242 267}
|
||||
{NEW_BATTLE 229 248}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@
|
|||
music="knolls.ogg"
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 229 248}
|
||||
{DOT_CENTERED 232 270}
|
||||
{DOT_CENTERED 224 290}
|
||||
{CROSS_CENTERED 209 300}
|
||||
{NEW_JOURNEY 229 248}
|
||||
{NEW_JOURNEY 232 270}
|
||||
{NEW_JOURNEY 224 290}
|
||||
{NEW_BATTLE 209 300}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 209 300}
|
||||
{DOT_CENTERED 231 297}
|
||||
{DOT_CENTERED 245 316}
|
||||
{DOT_CENTERED 250 338}
|
||||
{CROSS_CENTERED 273 346}
|
||||
{NEW_JOURNEY 209 300}
|
||||
{NEW_JOURNEY 231 297}
|
||||
{NEW_JOURNEY 245 316}
|
||||
{NEW_JOURNEY 250 338}
|
||||
{NEW_BATTLE 273 346}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 279 360}
|
||||
{DOT_CENTERED 283 380}
|
||||
{CROSS_CENTERED 288 400}
|
||||
{NEW_JOURNEY 279 360}
|
||||
{NEW_JOURNEY 283 380}
|
||||
{NEW_BATTLE 288 400}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@
|
|||
[part]
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 282 435}
|
||||
{DOT_CENTERED 260 439}
|
||||
{DOT_CENTERED 238 431}
|
||||
{CROSS_CENTERED 223 412}
|
||||
{NEW_JOURNEY 282 435}
|
||||
{NEW_JOURNEY 260 439}
|
||||
{NEW_JOURNEY 238 431}
|
||||
{NEW_BATTLE 223 412}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
music="battle.ogg"
|
||||
show_title=yes
|
||||
background="maps/wesnoth-liberty.png"
|
||||
{DOT_CENTERED 215 407}
|
||||
{CROSS_CENTERED 206 386}
|
||||
{NEW_JOURNEY 215 407}
|
||||
{NEW_BATTLE 206 386}
|
||||
[/part]
|
||||
[/story]
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 238 136}
|
||||
{NEW_JOURNEY 243 141}
|
||||
{CROSS 241 131}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 241 131}
|
||||
{DOT 257 122}
|
||||
{NEW_JOURNEY 246 136}
|
||||
{NEW_JOURNEY 262 127}
|
||||
{CROSS 271 109}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 271 109}
|
||||
{DOT 269 91}
|
||||
{DOT 263 76}
|
||||
{DOT 256 58}
|
||||
{DOT 236 49}
|
||||
{NEW_JOURNEY 276 114}
|
||||
{NEW_JOURNEY 274 96}
|
||||
{NEW_JOURNEY 268 81}
|
||||
{NEW_JOURNEY 261 63}
|
||||
{NEW_JOURNEY 241 54}
|
||||
{CROSS 218 43}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 218 43}
|
||||
{DOT 236 49}
|
||||
{DOT 256 58}
|
||||
{DOT 263 76}
|
||||
{DOT 269 91}
|
||||
{NEW_JOURNEY 223 48}
|
||||
{NEW_JOURNEY 241 54}
|
||||
{NEW_JOURNEY 261 63}
|
||||
{NEW_JOURNEY 268 81}
|
||||
{NEW_JOURNEY 274 96}
|
||||
{CROSS 271 109}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 271 109}
|
||||
{DOT 281 110}
|
||||
{DOT 292 111}
|
||||
{DOT 302 113}
|
||||
{NEW_JOURNEY 276 114}
|
||||
{NEW_JOURNEY 286 115}
|
||||
{NEW_JOURNEY 297 116}
|
||||
{NEW_JOURNEY 307 118}
|
||||
{CROSS 312 116}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 312 116}
|
||||
{DOT 292 111}
|
||||
{NEW_JOURNEY 317 121}
|
||||
{NEW_JOURNEY 297 116}
|
||||
{CROSS 271 109}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -100,10 +100,10 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 271 109}
|
||||
{DOT 273 120}
|
||||
{DOT 284 130}
|
||||
{DOT 296 142}
|
||||
{NEW_JOURNEY 276 114}
|
||||
{NEW_JOURNEY 278 125}
|
||||
{NEW_JOURNEY 289 135}
|
||||
{NEW_JOURNEY 301 147}
|
||||
{CROSS 309 153}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 309 153}
|
||||
{NEW_JOURNEY 314 158}
|
||||
{CROSS 322 157}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 322 157}
|
||||
{DOT 322 170}
|
||||
{DOT 327 185}
|
||||
{NEW_JOURNEY 327 162}
|
||||
{NEW_JOURNEY 327 175}
|
||||
{NEW_JOURNEY 332 190}
|
||||
{CROSS 325 199}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 322 157}
|
||||
{NEW_JOURNEY 327 162}
|
||||
{CROSS 335 141}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -144,9 +144,9 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 335 141}
|
||||
{DOT 350 123}
|
||||
{DOT 338 110}
|
||||
{NEW_JOURNEY 340 146}
|
||||
{NEW_JOURNEY 355 128}
|
||||
{NEW_JOURNEY 343 115}
|
||||
{CROSS 323 108}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -43,15 +43,15 @@
|
|||
[part]
|
||||
background=maps/wesnoth.png
|
||||
show_title=yes
|
||||
{DOT 325 199}
|
||||
{DOT 323 224}
|
||||
{DOT 321 245}
|
||||
{DOT 311 263}
|
||||
{DOT 316 273}
|
||||
{DOT 299 296}
|
||||
{DOT 290 315}
|
||||
{DOT 312 328}
|
||||
{DOT 338 339}
|
||||
{NEW_JOURNEY 330 204}
|
||||
{NEW_JOURNEY 328 229}
|
||||
{NEW_JOURNEY 326 250}
|
||||
{NEW_JOURNEY 316 268}
|
||||
{NEW_JOURNEY 321 278}
|
||||
{NEW_JOURNEY 304 301}
|
||||
{NEW_JOURNEY 295 320}
|
||||
{NEW_JOURNEY 317 333}
|
||||
{NEW_JOURNEY 343 344}
|
||||
{CROSS 358 337}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -131,13 +131,13 @@
|
|||
[part]
|
||||
background=sotbe1.png
|
||||
show_title=yes
|
||||
{DOT 580 433}
|
||||
{DOT 570 409}
|
||||
{DOT 560 385}
|
||||
{DOT 550 361}
|
||||
{DOT 545 340}
|
||||
{DOT 532 326}
|
||||
{DOT 518 310}
|
||||
{NEW_JOURNEY 585 438}
|
||||
{NEW_JOURNEY 575 414}
|
||||
{NEW_JOURNEY 565 390}
|
||||
{NEW_JOURNEY 555 366}
|
||||
{NEW_JOURNEY 550 345}
|
||||
{NEW_JOURNEY 537 331}
|
||||
{NEW_JOURNEY 523 315}
|
||||
{CROSS 496 294}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -105,13 +105,13 @@
|
|||
[part]
|
||||
background=sotbe1.png
|
||||
show_title=yes
|
||||
{DOT 496 294}
|
||||
{DOT 488 258}
|
||||
{DOT 478 226}
|
||||
{DOT 468 204}
|
||||
{DOT 448 187}
|
||||
{DOT 426 197}
|
||||
{DOT 399 208}
|
||||
{NEW_JOURNEY 501 299}
|
||||
{NEW_JOURNEY 493 263}
|
||||
{NEW_JOURNEY 483 231}
|
||||
{NEW_JOURNEY 473 209}
|
||||
{NEW_JOURNEY 453 192}
|
||||
{NEW_JOURNEY 431 202}
|
||||
{NEW_JOURNEY 404 213}
|
||||
{CROSS 374 221}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -234,11 +234,11 @@
|
|||
[part]
|
||||
background=sotbe1.png
|
||||
show_title=yes
|
||||
{DOT 374 221}
|
||||
{DOT 340 228}
|
||||
{DOT 304 215}
|
||||
{DOT 271 209}
|
||||
{DOT 241 212}
|
||||
{NEW_JOURNEY 379 226}
|
||||
{NEW_JOURNEY 345 233}
|
||||
{NEW_JOURNEY 309 220}
|
||||
{NEW_JOURNEY 276 214}
|
||||
{NEW_JOURNEY 246 217}
|
||||
{CROSS 212 213}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -217,11 +217,11 @@
|
|||
[part]
|
||||
background=sotbe2.png
|
||||
show_title=yes
|
||||
{DOT 219 54}
|
||||
{DOT 216 76}
|
||||
{DOT 216 93}
|
||||
{DOT 215 110}
|
||||
{DOT 214 133}
|
||||
{NEW_JOURNEY 224 59}
|
||||
{NEW_JOURNEY 221 81}
|
||||
{NEW_JOURNEY 221 98}
|
||||
{NEW_JOURNEY 220 115}
|
||||
{NEW_JOURNEY 219 138}
|
||||
{CROSS 217 156}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -144,14 +144,14 @@
|
|||
[part]
|
||||
background=sotbe2.png
|
||||
show_title=yes
|
||||
{DOT 217 156}
|
||||
{DOT 220 183}
|
||||
{DOT 232 207}
|
||||
{DOT 242 222}
|
||||
{DOT 243 250}
|
||||
{DOT 235 272}
|
||||
{DOT 227 292}
|
||||
{DOT 215 314}
|
||||
{NEW_JOURNEY 222 161}
|
||||
{NEW_JOURNEY 225 188}
|
||||
{NEW_JOURNEY 237 212}
|
||||
{NEW_JOURNEY 247 227}
|
||||
{NEW_JOURNEY 248 255}
|
||||
{NEW_JOURNEY 240 277}
|
||||
{NEW_JOURNEY 232 297}
|
||||
{NEW_JOURNEY 220 319}
|
||||
{CROSS 204 333}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -121,13 +121,13 @@
|
|||
[part]
|
||||
background=sotbe2.png
|
||||
show_title=yes
|
||||
{DOT 204 333}
|
||||
{DOT 227 320}
|
||||
{DOT 244 307}
|
||||
{DOT 267 293}
|
||||
{DOT 289 285}
|
||||
{DOT 309 284}
|
||||
{DOT 335 291}
|
||||
{NEW_JOURNEY 209 338}
|
||||
{NEW_JOURNEY 232 325}
|
||||
{NEW_JOURNEY 249 312}
|
||||
{NEW_JOURNEY 272 298}
|
||||
{NEW_JOURNEY 294 290}
|
||||
{NEW_JOURNEY 314 289}
|
||||
{NEW_JOURNEY 340 296}
|
||||
{CROSS 356 293}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -128,13 +128,13 @@
|
|||
[part]
|
||||
background=sotbe3.png
|
||||
show_title=yes
|
||||
{DOT 127 165}
|
||||
{DOT 150 167}
|
||||
{DOT 172 168}
|
||||
{DOT 194 166}
|
||||
{DOT 216 161}
|
||||
{DOT 237 153}
|
||||
{DOT 253 145}
|
||||
{NEW_JOURNEY 132 170}
|
||||
{NEW_JOURNEY 155 172}
|
||||
{NEW_JOURNEY 177 173}
|
||||
{NEW_JOURNEY 199 171}
|
||||
{NEW_JOURNEY 221 166}
|
||||
{NEW_JOURNEY 242 158}
|
||||
{NEW_JOURNEY 258 150}
|
||||
{CROSS 277 143}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -82,10 +82,10 @@
|
|||
[part]
|
||||
background=sotbe3.png
|
||||
show_title=yes
|
||||
{DOT 385 190}
|
||||
{DOT 410 194}
|
||||
{DOT 429 188}
|
||||
{DOT 452 180}
|
||||
{NEW_JOURNEY 390 195}
|
||||
{NEW_JOURNEY 415 199}
|
||||
{NEW_JOURNEY 434 193}
|
||||
{NEW_JOURNEY 457 185}
|
||||
{CROSS 463 171}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -120,16 +120,16 @@
|
|||
[part]
|
||||
background=sotbe3.png
|
||||
show_title=yes
|
||||
{DOT 463 171}
|
||||
{DOT 469 193}
|
||||
{DOT 467 217}
|
||||
{DOT 458 241}
|
||||
{DOT 438 270}
|
||||
{DOT 407 297}
|
||||
{DOT 372 309}
|
||||
{DOT 344 314}
|
||||
{DOT 319 324}
|
||||
{DOT 318 350}
|
||||
{NEW_JOURNEY 468 176}
|
||||
{NEW_JOURNEY 474 198}
|
||||
{NEW_JOURNEY 472 222}
|
||||
{NEW_JOURNEY 463 246}
|
||||
{NEW_JOURNEY 443 275}
|
||||
{NEW_JOURNEY 412 302}
|
||||
{NEW_JOURNEY 377 314}
|
||||
{NEW_JOURNEY 349 319}
|
||||
{NEW_JOURNEY 324 329}
|
||||
{NEW_JOURNEY 323 355}
|
||||
{CROSS 318 378}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -146,13 +146,13 @@
|
|||
[part]
|
||||
background=sotbe3.png
|
||||
show_title=yes
|
||||
{DOT 323 393}
|
||||
{DOT 334 409}
|
||||
{DOT 357 415}
|
||||
{DOT 380 408}
|
||||
{DOT 403 398}
|
||||
{DOT 429 392}
|
||||
{DOT 455 396}
|
||||
{NEW_JOURNEY 328 398}
|
||||
{NEW_JOURNEY 339 414}
|
||||
{NEW_JOURNEY 362 420}
|
||||
{NEW_JOURNEY 385 413}
|
||||
{NEW_JOURNEY 408 403}
|
||||
{NEW_JOURNEY 434 397}
|
||||
{NEW_JOURNEY 460 401}
|
||||
{CROSS 474 410}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -136,18 +136,18 @@
|
|||
[part]
|
||||
background=sotbe.png
|
||||
show_title=yes
|
||||
{DOT 432 444}
|
||||
{DOT 423 425}
|
||||
{DOT 437 408}
|
||||
{DOT 446 387}
|
||||
{DOT 417 374}
|
||||
{DOT 392 355}
|
||||
{DOT 385 317}
|
||||
{DOT 367 290}
|
||||
{DOT 358 266}
|
||||
{DOT 361 239}
|
||||
{DOT 385 229}
|
||||
{DOT 410 230}
|
||||
{NEW_JOURNEY 437 449}
|
||||
{NEW_JOURNEY 428 430}
|
||||
{NEW_JOURNEY 442 413}
|
||||
{NEW_JOURNEY 451 392}
|
||||
{NEW_JOURNEY 422 379}
|
||||
{NEW_JOURNEY 397 360}
|
||||
{NEW_JOURNEY 390 322}
|
||||
{NEW_JOURNEY 372 295}
|
||||
{NEW_JOURNEY 363 271}
|
||||
{NEW_JOURNEY 366 244}
|
||||
{NEW_JOURNEY 390 234}
|
||||
{NEW_JOURNEY 415 235}
|
||||
{CROSS 428 218}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@
|
|||
[part]
|
||||
background=sotbe.png
|
||||
show_title=yes
|
||||
{DOT 428 218}
|
||||
{DOT 447 212}
|
||||
{NEW_JOURNEY 433 223}
|
||||
{NEW_JOURNEY 452 217}
|
||||
{CROSS 460 200}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -170,13 +170,13 @@
|
|||
[part]
|
||||
background=sotbe.png
|
||||
show_title=yes
|
||||
{DOT 460 200}
|
||||
{DOT 440 220}
|
||||
{DOT 416 238}
|
||||
{DOT 392 258}
|
||||
{DOT 370 279}
|
||||
{DOT 344 302}
|
||||
{DOT 322 323}
|
||||
{NEW_JOURNEY 465 205}
|
||||
{NEW_JOURNEY 445 225}
|
||||
{NEW_JOURNEY 421 243}
|
||||
{NEW_JOURNEY 397 263}
|
||||
{NEW_JOURNEY 375 284}
|
||||
{NEW_JOURNEY 349 307}
|
||||
{NEW_JOURNEY 327 328}
|
||||
{CROSS 302 343}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -148,11 +148,11 @@
|
|||
[part]
|
||||
background=sotbe.png
|
||||
show_title=yes
|
||||
{DOT 302 343}
|
||||
{DOT 278 360}
|
||||
{DOT 251 372}
|
||||
{DOT 236 395}
|
||||
{DOT 230 421}
|
||||
{NEW_JOURNEY 307 348}
|
||||
{NEW_JOURNEY 283 365}
|
||||
{NEW_JOURNEY 256 377}
|
||||
{NEW_JOURNEY 241 400}
|
||||
{NEW_JOURNEY 235 426}
|
||||
{CROSS 218 440}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -130,16 +130,16 @@
|
|||
[part]
|
||||
background=sotbe3.png
|
||||
show_title=yes
|
||||
{DOT 47 386}
|
||||
{DOT 92 358}
|
||||
{DOT 145 336}
|
||||
{DOT 205 332}
|
||||
{DOT 262 328}
|
||||
{DOT 316 325}
|
||||
{DOT 317 378}
|
||||
{DOT 350 410}
|
||||
{DOT 392 418}
|
||||
{DOT 439 423}
|
||||
{NEW_JOURNEY 52 391}
|
||||
{NEW_JOURNEY 97 363}
|
||||
{NEW_JOURNEY 150 341}
|
||||
{NEW_JOURNEY 210 337}
|
||||
{NEW_JOURNEY 267 333}
|
||||
{NEW_JOURNEY 321 330}
|
||||
{NEW_JOURNEY 322 383}
|
||||
{NEW_JOURNEY 355 415}
|
||||
{NEW_JOURNEY 397 423}
|
||||
{NEW_JOURNEY 444 428}
|
||||
{CROSS 473 419}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -39,13 +39,13 @@
|
|||
[part]
|
||||
background=story/bigmap.jpg
|
||||
show_title=yes
|
||||
{DOT 222 17}
|
||||
{DOT 223 34}
|
||||
{DOT 224 51}
|
||||
{DOT 226 68}
|
||||
{DOT 225 85}
|
||||
{DOT 214 99}
|
||||
{DOT 200 109}
|
||||
{NEW_JOURNEY 227 22}
|
||||
{NEW_JOURNEY 228 39}
|
||||
{NEW_JOURNEY 229 56}
|
||||
{NEW_JOURNEY 231 73}
|
||||
{NEW_JOURNEY 230 90}
|
||||
{NEW_JOURNEY 219 104}
|
||||
{NEW_JOURNEY 205 114}
|
||||
{CROSS 187 117}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
@ -70,12 +70,12 @@
|
|||
[part]
|
||||
background=story/bigmap.jpg
|
||||
show_title=yes
|
||||
{DOT 187 117}
|
||||
{DOT 172 128}
|
||||
{DOT 157 139}
|
||||
{DOT 142 150}
|
||||
{DOT 127 159}
|
||||
{DOT 112 168}
|
||||
{NEW_JOURNEY 192 122}
|
||||
{NEW_JOURNEY 177 133}
|
||||
{NEW_JOURNEY 162 144}
|
||||
{NEW_JOURNEY 147 155}
|
||||
{NEW_JOURNEY 132 164}
|
||||
{NEW_JOURNEY 117 173}
|
||||
{CROSS 99 183}
|
||||
[/part]
|
||||
[/story]
|
||||
|
|
|
|||
|
|
@ -13,3 +13,92 @@
|
|||
[/deprecated_message]
|
||||
#enddef
|
||||
#wmllint: markcheck on
|
||||
|
||||
#
|
||||
# Deprecate these in favor of the {NEW,OLD}_{JOURNEY,BATTLE,REST} maxros.
|
||||
# That way we can restyle the markers without breaking content.
|
||||
# wmllint does the up-conversion automatically
|
||||
#
|
||||
|
||||
#define DOT X Y
|
||||
# Mark the specified map hex with a dot.
|
||||
{DEPRECATE DOT 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot.png
|
||||
delay=500
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS X Y
|
||||
# Mark the specified map hex with a cross.
|
||||
{DEPRECATE CROSS 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross.png
|
||||
delay=500
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define DOT_CENTERED X Y
|
||||
# A centered version of {DOT X Y} for easier application
|
||||
{DEPRECATE DOT_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS_CENTERED X Y
|
||||
# A centered version of {CROSS X Y} for easier application
|
||||
{DEPRECATE CROSS_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define DOT_WHITE_CENTERED X Y
|
||||
# A centered white dot representing the movement in the past scenarios
|
||||
{DEPRECATE DOT_WHITE_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot-white.png
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS_WHITE_CENTERED X Y
|
||||
# A centered white cross representing the past battles
|
||||
{DEPRECATE CROSS_WHITE_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross-white.png
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define FLAG_WHITE_CENTERED X Y
|
||||
# A centered white flag representing the past non-combat scenarios
|
||||
{DEPRECATE FLAG_WHITE_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/flag-white.png
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define FLAG_RED_CENTERED X Y
|
||||
# A centered red flag representing the non-combat scenarios
|
||||
{DEPRECATE FLAG_RED_CENTERED 1.5.5}
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/flag-red.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
|
|
|||
|
|
@ -49,26 +49,8 @@
|
|||
[/clear_variable]
|
||||
#enddef
|
||||
|
||||
#define DOT X Y
|
||||
# Mark the specified map hex with a dot.
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot.png
|
||||
delay=500
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS X Y
|
||||
# Mark the specified map hex with a cross.
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross.png
|
||||
delay=500
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define DOT_CENTERED X Y
|
||||
# A centered version of {DOT X Y} for easier application
|
||||
#define NEW_JOURNEY X Y
|
||||
# Make a new journey mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot.png
|
||||
|
|
@ -77,45 +59,42 @@
|
|||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS_CENTERED X Y
|
||||
# A centered version of {CROSS X Y} for easier application
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define DOT_WHITE_CENTERED X Y
|
||||
# A centered white dot representing the movement in the past scenarios
|
||||
#define OLD_JOURNEY X Y
|
||||
# Make an old journey mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/dot-white.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define CROSS_WHITE_CENTERED X Y
|
||||
# A centered white cross representing the past battles
|
||||
|
||||
#define NEW_BATTLE X Y
|
||||
# Make a new battle mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
|
||||
#define OLD_BATTLE X Y
|
||||
# Make an old battle mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/cross-white.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define FLAG_WHITE_CENTERED X Y
|
||||
# A centered white flag representing the past non-combat scenarios
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/flag-white.png
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
#define FLAG_RED_CENTERED X Y
|
||||
# A centered red flag representing the non-combat scenarios
|
||||
#define NEW_REST X Y
|
||||
# Make a new rest mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/flag-red.png
|
||||
|
|
@ -124,6 +103,18 @@
|
|||
[/image]
|
||||
#enddef
|
||||
|
||||
|
||||
#define OLD_REST X Y
|
||||
# Make an old rest mark on a tracking map
|
||||
[image]
|
||||
x,y={X},{Y}
|
||||
file=misc/flag-white.png
|
||||
delay=500
|
||||
centered=yes
|
||||
[/image]
|
||||
#enddef
|
||||
|
||||
|
||||
#define PLACE_IMAGE IMAGE X Y
|
||||
# Place an image at a specified location on the map.
|
||||
[item]
|
||||
|
|
|
|||
|
|
@ -795,6 +795,36 @@ def hack_syntax(filename, lines):
|
|||
frame_commented = lines[i].strip().startswith("#")
|
||||
elif in_death and "[/frame]" in lines[i]:
|
||||
frame_end = i
|
||||
# Hack tracking-map macros from 1.4 and earlier. The idea is to lose
|
||||
# all assumptions about colors in the names
|
||||
for i in range(len(lines)):
|
||||
if "no-syntax-rewrite" in lines[i]:
|
||||
break
|
||||
if lines[i].startswith("#"):
|
||||
pass
|
||||
elif "{DOT_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("DOT_CENTERED", "NEW_JOURNEY")
|
||||
elif "{DOT_WHITE_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("DOT_WHITE_CENTERED", "OLD_JOURNEY")
|
||||
elif "{CROSS_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("CROSS_CENTERED", "NEW_BATTLE")
|
||||
elif "{CROSS_WHITE_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("CROSS_WHITE_CENTERED", "OLD_BATTLE")
|
||||
elif "{FLAG_RED_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("FLAG_RED_CENTERED", "NEW_REST")
|
||||
elif "{FLAG_WHITE_CENTERED" in lines[i]:
|
||||
lines[i] = lines[i].replace("FLAG_WHITE_CENTERED", "OLD_REST")
|
||||
elif "{DOT " in lines[i]:
|
||||
m = re.search("{(DOT|CROSS) ([0-9]+) ([0-9]+)}", lines[i])
|
||||
if m:
|
||||
n = m.group(1)
|
||||
if n == "DOT":
|
||||
n = "NEW_JOURNEY"
|
||||
if n == "CROSS":
|
||||
n = "NEW_BATTLE"
|
||||
x = int(m.group(2)) + 5
|
||||
y = int(m.group(3)) + 5
|
||||
lines[i] = lines[i][:m.start(0)] +("{%s %d %d}" % (n, x, y)) + lines[i][m.end(0):]
|
||||
# More syntax transformations would go here.
|
||||
return lines
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue