0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up a large number of wmlscope errors created by bigmap.cfg rewrites.

Browse source 
Undefining and renaming library macros confuses the crap out of wmlscope,
causing many spurious messages.

This revision also normalized some line endings in files that has to be
modified anyway.
This commit is contained in:
Eric S. Raymond 2013-03-28 00:46:14 -04:00
parent 45cdd236db
commit 17414644c1
5 changed files with 1549 additions and 1556 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

414
data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg
View file

@ -12,9 +12,7 @@
[/background_layer]
#enddef
#undef NEW_JOURNEY
#define NEW_JOURNEY X Y
#define JOURNEY X Y
[image]
x,y={X},{Y}
file=misc/new-journey.png
@ -33,10 +31,10 @@
#define JOURNEY_02_NEW
{JOURNEY_01_OLD}
{NEW_JOURNEY 240 752}
{NEW_JOURNEY 229 738}
{NEW_JOURNEY 227 721}
{NEW_JOURNEY 225 704}
{JOURNEY 240 752}
{JOURNEY 229 738}
{JOURNEY 227 721}
{JOURNEY 225 704}
{NEW_BATTLE 221 687}
#enddef
@ -51,10 +49,10 @@
#define JOURNEY_03_NEW
{JOURNEY_02_OLD}
{NEW_JOURNEY 219 671}
{NEW_JOURNEY 221 654}
{NEW_JOURNEY 225 638}
{NEW_JOURNEY 216 626}
{JOURNEY 219 671}
{JOURNEY 221 654}
{JOURNEY 225 638}
{JOURNEY 216 626}
{NEW_BATTLE 200 622}
#enddef
@ -69,10 +67,10 @@
#define JOURNEY_04_NEW
{JOURNEY_03_OLD}
{NEW_JOURNEY 214 612}
{NEW_JOURNEY 229 605}
{NEW_JOURNEY 246 599}
{NEW_JOURNEY 262 596}
{JOURNEY 214 612}
{JOURNEY 229 605}
{JOURNEY 246 599}
{JOURNEY 262 596}
{NEW_BATTLE 280 593}
#enddef
@ -87,14 +85,14 @@
#define JOURNEY_05A_NEW
{JOURNEY_04_OLD}
{NEW_JOURNEY 292 585}
{NEW_JOURNEY 306 577}
{NEW_JOURNEY 319 569}
{NEW_JOURNEY 330 559}
{NEW_JOURNEY 334 545}
{NEW_JOURNEY 327 532}
{NEW_JOURNEY 317 520}
{NEW_JOURNEY 306 509}
{JOURNEY 292 585}
{JOURNEY 306 577}
{JOURNEY 319 569}
{JOURNEY 330 559}
{JOURNEY 334 545}
{JOURNEY 327 532}
{JOURNEY 317 520}
{JOURNEY 306 509}
{NEW_BATTLE 295 499}
#enddef
@ -113,18 +111,18 @@
#define JOURNEY_05B_NEW
{JOURNEY_04_OLD}
{NEW_JOURNEY 266 588}
{NEW_JOURNEY 251 587}
{NEW_JOURNEY 236 585}
{NEW_JOURNEY 223 578}
{NEW_JOURNEY 214 566}
{NEW_JOURNEY 209 552}
{NEW_JOURNEY 207 537}
{NEW_JOURNEY 207 520}
{NEW_JOURNEY 208 503}
{NEW_JOURNEY 211 486}
{NEW_JOURNEY 213 469}
{NEW_JOURNEY 195 469}
{JOURNEY 266 588}
{JOURNEY 251 587}
{JOURNEY 236 585}
{JOURNEY 223 578}
{JOURNEY 214 566}
{JOURNEY 209 552}
{JOURNEY 207 537}
{JOURNEY 207 520}
{JOURNEY 208 503}
{JOURNEY 211 486}
{JOURNEY 213 469}
{JOURNEY 195 469}
{NEW_BATTLE 177 468}
#enddef
@ -153,28 +151,28 @@
[/variable]
[then]
{JOURNEY_05A_OLD}
{NEW_JOURNEY 285 485}
{NEW_JOURNEY 280 470}
{NEW_JOURNEY 279 453}
{NEW_JOURNEY 281 436}
{NEW_JOURNEY 288 421}
{NEW_JOURNEY 297 407}
{NEW_JOURNEY 309 394}
{JOURNEY 285 485}
{JOURNEY 280 470}
{JOURNEY 279 453}
{JOURNEY 281 436}
{JOURNEY 288 421}
{JOURNEY 297 407}
{JOURNEY 309 394}
{NEW_BATTLE 321 383}
[/then]
[else]
{JOURNEY_05B_OLD}
{NEW_JOURNEY 189 458}
{NEW_JOURNEY 200 448}
{NEW_JOURNEY 211 437}
{NEW_JOURNEY 220 425}
{NEW_JOURNEY 229 413}
{NEW_JOURNEY 239 401}
{NEW_JOURNEY 249 389}
{NEW_JOURNEY 262 381}
{NEW_JOURNEY 276 376}
{NEW_JOURNEY 291 376}
{NEW_JOURNEY 306 379}
{JOURNEY 189 458}
{JOURNEY 200 448}
{JOURNEY 211 437}
{JOURNEY 220 425}
{JOURNEY 229 413}
{JOURNEY 239 401}
{JOURNEY 249 389}
{JOURNEY 262 381}
{JOURNEY 276 376}
{JOURNEY 291 376}
{JOURNEY 306 379}
{NEW_BATTLE 321 384}
[/else]
[/if]
@ -217,26 +215,26 @@
#define JOURNEY_07_NEW
{JOURNEY_06_OLD}
{NEW_JOURNEY 337 384}
{NEW_JOURNEY 350 391}
{NEW_JOURNEY 359 403}
{NEW_JOURNEY 364 417}
{NEW_JOURNEY 368 432}
{NEW_JOURNEY 371 447}
{NEW_JOURNEY 373 462}
{NEW_JOURNEY 375 478}
{NEW_JOURNEY 377 493}
{NEW_JOURNEY 379 508}
{NEW_JOURNEY 382 523}
{NEW_JOURNEY 385 538}
{NEW_JOURNEY 389 553}
{NEW_JOURNEY 395 567}
{NEW_JOURNEY 402 580}
{NEW_JOURNEY 411 593}
{NEW_JOURNEY 422 603}
{NEW_JOURNEY 435 611}
{NEW_JOURNEY 450 616}
{NEW_JOURNEY 465 619}
{JOURNEY 337 384}
{JOURNEY 350 391}
{JOURNEY 359 403}
{JOURNEY 364 417}
{JOURNEY 368 432}
{JOURNEY 371 447}
{JOURNEY 373 462}
{JOURNEY 375 478}
{JOURNEY 377 493}
{JOURNEY 379 508}
{JOURNEY 382 523}
{JOURNEY 385 538}
{JOURNEY 389 553}
{JOURNEY 395 567}
{JOURNEY 402 580}
{JOURNEY 411 593}
{JOURNEY 422 603}
{JOURNEY 435 611}
{JOURNEY 450 616}
{JOURNEY 465 619}
{NEW_BATTLE 480 620}
#enddef
@ -267,13 +265,13 @@
#define JOURNEY_08_NEW
{JOURNEY_07_OLD}
{NEW_JOURNEY 497 620}
{NEW_JOURNEY 513 617}
{NEW_JOURNEY 528 609}
{NEW_JOURNEY 534 593}
{NEW_JOURNEY 531 577}
{NEW_JOURNEY 528 560}
{NEW_JOURNEY 526 544}
{JOURNEY 497 620}
{JOURNEY 513 617}
{JOURNEY 528 609}
{JOURNEY 534 593}
{JOURNEY 531 577}
{JOURNEY 528 560}
{JOURNEY 526 544}
{NEW_BATTLE 531 528}
#enddef
@ -291,8 +289,8 @@
#define JOURNEY_09_NEW
{JOURNEY_08_OLD}
{NEW_JOURNEY 541 516}
{NEW_JOURNEY 553 507}
{JOURNEY 541 516}
{JOURNEY 553 507}
{NEW_BATTLE 569 496}
#enddef
@ -305,7 +303,7 @@
#define JOURNEY_10_NEW
{JOURNEY_09_OLD}
{NEW_JOURNEY 583 490}
{JOURNEY 583 490}
{NEW_BATTLE 600 480}
#enddef
@ -317,10 +315,10 @@
#define JOURNEY_11_NEW
{JOURNEY_10_OLD}
{NEW_JOURNEY 611 468}
{NEW_JOURNEY 619 457}
{NEW_JOURNEY 622 442}
{NEW_JOURNEY 618 428}
{JOURNEY 611 468}
{JOURNEY 619 457}
{JOURNEY 622 442}
{JOURNEY 618 428}
{NEW_BATTLE 620 414}
#enddef
@ -335,9 +333,9 @@
#define JOURNEY_12_NEW
{JOURNEY_11_OLD}
{NEW_JOURNEY 632 401}
{NEW_JOURNEY 643 387}
{NEW_JOURNEY 654 373}
{JOURNEY 632 401}
{JOURNEY 643 387}
{JOURNEY 654 373}
{NEW_BATTLE 663 357}
#enddef
@ -351,8 +349,8 @@
#define JOURNEY_13_NEW
{JOURNEY_12_OLD}
{NEW_JOURNEY 670 341}
{NEW_JOURNEY 672 323}
{JOURNEY 670 341}
{JOURNEY 672 323}
{NEW_BATTLE 667 306}
#enddef
@ -365,7 +363,7 @@
#define JOURNEY_14_NEW
{JOURNEY_13_OLD}
{NEW_JOURNEY 658 288}
{JOURNEY 658 288}
{NEW_BATTLE 641 278}
#enddef
@ -377,10 +375,10 @@
#define JOURNEY_15_NEW
{JOURNEY_14_OLD}
{NEW_JOURNEY 659 274}
{NEW_JOURNEY 676 278}
{NEW_JOURNEY 697 277}
{NEW_JOURNEY 687 261}
{JOURNEY 659 274}
{JOURNEY 676 278}
{JOURNEY 697 277}
{JOURNEY 687 261}
{NEW_BATTLE 668 251}
#enddef
@ -395,7 +393,7 @@
#define JOURNEY_16_NEW
{JOURNEY_15_OLD}
{NEW_JOURNEY 686 247}
{JOURNEY 686 247}
{NEW_BATTLE 703 242}
#enddef
@ -407,7 +405,7 @@
#define JOURNEY_17_NEW
{JOURNEY_16_OLD}
{NEW_JOURNEY 690 231}
{JOURNEY 690 231}
{NEW_BATTLE 686 216}
#enddef
@ -419,10 +417,10 @@
#define JOURNEY_18_NEW
{JOURNEY_17_OLD}
{NEW_JOURNEY 702 217}
{NEW_JOURNEY 717 224}
{NEW_JOURNEY 733 230}
{NEW_JOURNEY 749 234}
{JOURNEY 702 217}
{JOURNEY 717 224}
{JOURNEY 733 230}
{JOURNEY 749 234}
{NEW_BATTLE 765 230}
#enddef
@ -437,14 +435,14 @@
#define JOURNEY_19A_NEW
{JOURNEY_18_OLD}
{NEW_JOURNEY 778 223}
{NEW_JOURNEY 792 218}
{NEW_JOURNEY 807 214}
{NEW_JOURNEY 822 210}
{NEW_JOURNEY 836 206}
{NEW_JOURNEY 851 201}
{NEW_JOURNEY 865 196}
{NEW_JOURNEY 879 190}
{JOURNEY 778 223}
{JOURNEY 792 218}
{JOURNEY 807 214}
{JOURNEY 822 210}
{JOURNEY 836 206}
{JOURNEY 851 201}
{JOURNEY 865 196}
{JOURNEY 879 190}
{NEW_BATTLE 894 184}
#enddef
@ -463,14 +461,14 @@
#define JOURNEY_19B_NEW
{JOURNEY_18_OLD}
{NEW_JOURNEY 770 245}
{NEW_JOURNEY 772 260}
{NEW_JOURNEY 772 275}
{NEW_JOURNEY 771 290}
{NEW_JOURNEY 772 305}
{NEW_JOURNEY 780 318}
{NEW_JOURNEY 792 327}
{NEW_JOURNEY 806 333}
{JOURNEY 770 245}
{JOURNEY 772 260}
{JOURNEY 772 275}
{JOURNEY 771 290}
{JOURNEY 772 305}
{JOURNEY 780 318}
{JOURNEY 792 327}
{JOURNEY 806 333}
{NEW_BATTLE 820 338}
#enddef
@ -501,46 +499,46 @@
[case]
value=a
{JOURNEY_19A_OLD}
{NEW_JOURNEY 909 183}
{NEW_JOURNEY 920 192}
{NEW_JOURNEY 931 203}
{NEW_JOURNEY 941 215}
{NEW_JOURNEY 950 228}
{NEW_JOURNEY 959 240}
{NEW_JOURNEY 969 252}
{NEW_JOURNEY 979 264}
{NEW_JOURNEY 989 276}
{NEW_JOURNEY 1000 287}
{NEW_JOURNEY 1012 297}
{NEW_JOURNEY 1024 306}
{NEW_JOURNEY 1037 315}
{NEW_JOURNEY 1050 323}
{NEW_JOURNEY 1065 329}
{NEW_JOURNEY 1079 333}
{NEW_JOURNEY 1095 336}
{JOURNEY 909 183}
{JOURNEY 920 192}
{JOURNEY 931 203}
{JOURNEY 941 215}
{JOURNEY 950 228}
{JOURNEY 959 240}
{JOURNEY 969 252}
{JOURNEY 979 264}
{JOURNEY 989 276}
{JOURNEY 1000 287}
{JOURNEY 1012 297}
{JOURNEY 1024 306}
{JOURNEY 1037 315}
{JOURNEY 1050 323}
{JOURNEY 1065 329}
{JOURNEY 1079 333}
{JOURNEY 1095 336}
{NEW_BATTLE 1110 338}
[/case]
[case]
value=b
{JOURNEY_19B_OLD}
{NEW_JOURNEY 836 341}
{NEW_JOURNEY 851 344}
{NEW_JOURNEY 866 348}
{NEW_JOURNEY 881 350}
{NEW_JOURNEY 896 353}
{NEW_JOURNEY 911 355}
{NEW_JOURNEY 927 357}
{NEW_JOURNEY 942 358}
{NEW_JOURNEY 958 359}
{NEW_JOURNEY 973 360}
{NEW_JOURNEY 989 359}
{NEW_JOURNEY 1004 358}
{NEW_JOURNEY 1019 357}
{NEW_JOURNEY 1035 355}
{NEW_JOURNEY 1050 352}
{NEW_JOURNEY 1065 349}
{NEW_JOURNEY 1080 346}
{NEW_JOURNEY 1095 342}
{JOURNEY 836 341}
{JOURNEY 851 344}
{JOURNEY 866 348}
{JOURNEY 881 350}
{JOURNEY 896 353}
{JOURNEY 911 355}
{JOURNEY 927 357}
{JOURNEY 942 358}
{JOURNEY 958 359}
{JOURNEY 973 360}
{JOURNEY 989 359}
{JOURNEY 1004 358}
{JOURNEY 1019 357}
{JOURNEY 1035 355}
{JOURNEY 1050 352}
{JOURNEY 1065 349}
{JOURNEY 1080 346}
{JOURNEY 1095 342}
{NEW_BATTLE 1110 338}
[/case]
[/switch]
@ -599,17 +597,17 @@
#define JOURNEY_21_NEW
{JOURNEY_20_OLD}
{NEW_JOURNEY 1124 333}
{NEW_JOURNEY 1129 319}
{NEW_JOURNEY 1128 304}
{NEW_JOURNEY 1125 289}
{NEW_JOURNEY 1122 274}
{NEW_JOURNEY 1120 259}
{NEW_JOURNEY 1119 244}
{NEW_JOURNEY 1122 229}
{NEW_JOURNEY 1129 216}
{NEW_JOURNEY 1142 208}
{NEW_JOURNEY 1156 204}
{JOURNEY 1124 333}
{JOURNEY 1129 319}
{JOURNEY 1128 304}
{JOURNEY 1125 289}
{JOURNEY 1122 274}
{JOURNEY 1120 259}
{JOURNEY 1119 244}
{JOURNEY 1122 229}
{JOURNEY 1129 216}
{JOURNEY 1142 208}
{JOURNEY 1156 204}
{NEW_REST 1172 204}
#enddef
@ -631,29 +629,29 @@
#define JOURNEY_22_NEW
{JOURNEY_21_OLD}
{NEW_JOURNEY 1172 220}
{NEW_JOURNEY 1172 235}
{NEW_JOURNEY 1172 251}
{NEW_JOURNEY 1171 266}
{NEW_JOURNEY 1170 282}
{NEW_JOURNEY 1168 297}
{NEW_JOURNEY 1166 312}
{NEW_JOURNEY 1162 327}
{NEW_JOURNEY 1158 342}
{NEW_JOURNEY 1152 357}
{NEW_JOURNEY 1144 370}
{NEW_JOURNEY 1135 383}
{NEW_JOURNEY 1124 394}
{NEW_JOURNEY 1112 403}
{NEW_JOURNEY 1098 411}
{NEW_JOURNEY 1085 419}
{NEW_JOURNEY 1071 426}
{NEW_JOURNEY 1058 434}
{NEW_JOURNEY 1044 442}
{NEW_JOURNEY 1032 451}
{NEW_JOURNEY 1020 461}
{NEW_JOURNEY 1009 472}
{NEW_JOURNEY 999 484}
{JOURNEY 1172 220}
{JOURNEY 1172 235}
{JOURNEY 1172 251}
{JOURNEY 1171 266}
{JOURNEY 1170 282}
{JOURNEY 1168 297}
{JOURNEY 1166 312}
{JOURNEY 1162 327}
{JOURNEY 1158 342}
{JOURNEY 1152 357}
{JOURNEY 1144 370}
{JOURNEY 1135 383}
{JOURNEY 1124 394}
{JOURNEY 1112 403}
{JOURNEY 1098 411}
{JOURNEY 1085 419}
{JOURNEY 1071 426}
{JOURNEY 1058 434}
{JOURNEY 1044 442}
{JOURNEY 1032 451}
{JOURNEY 1020 461}
{JOURNEY 1009 472}
{JOURNEY 999 484}
{NEW_BATTLE 990 497}
#enddef
@ -687,15 +685,15 @@
#define JOURNEY_23_NEW
{JOURNEY_22_OLD}
{NEW_JOURNEY 977 506}
{NEW_JOURNEY 962 509}
{NEW_JOURNEY 947 506}
{NEW_JOURNEY 933 499}
{NEW_JOURNEY 919 492}
{NEW_JOURNEY 905 485}
{NEW_JOURNEY 890 481}
{NEW_JOURNEY 874 483}
{NEW_JOURNEY 861 490}
{JOURNEY 977 506}
{JOURNEY 962 509}
{JOURNEY 947 506}
{JOURNEY 933 499}
{JOURNEY 919 492}
{JOURNEY 905 485}
{JOURNEY 890 481}
{JOURNEY 874 483}
{JOURNEY 861 490}
{NEW_BATTLE 850 502}
#enddef
@ -715,17 +713,17 @@
#define JOURNEY_24_NEW
{JOURNEY_23_OLD}
{NEW_JOURNEY 844 515}
{NEW_JOURNEY 844 530}
{NEW_JOURNEY 845 545}
{NEW_JOURNEY 845 560}
{NEW_JOURNEY 841 575}
{NEW_JOURNEY 832 587}
{NEW_JOURNEY 821 597}
{NEW_JOURNEY 809 606}
{NEW_JOURNEY 796 614}
{NEW_JOURNEY 782 620}
{NEW_JOURNEY 768 626}
{JOURNEY 844 515}
{JOURNEY 844 530}
{JOURNEY 845 545}
{JOURNEY 845 560}
{JOURNEY 841 575}
{JOURNEY 832 587}
{JOURNEY 821 597}
{JOURNEY 809 606}
{JOURNEY 796 614}
{JOURNEY 782 620}
{JOURNEY 768 626}
{NEW_BATTLE 754 632}
#enddef

871
data/campaigns/Sceptre_of_Fire/utils/bigmap.cfg
View file

@ -1,436 +1,435 @@
#define SOF_BIGMAP
[background_layer]
image=maps/background.jpg
keep_aspect_ratio=no
[/background_layer]
[background_layer]
image=maps/sof.png
scale=no
base_layer=yes
[/background_layer]
#enddef
#undef NEW_JOURNEY
#define NEW_JOURNEY X Y
[image]
x,y={X},{Y}
file=misc/new-journey.png
delay=300
centered=yes
[/image]
#enddef
#define JOURNEY_01_NEW
{NEW_BATTLE 391 581}
#enddef
#define JOURNEY_01_OLD
{OLD_BATTLE 391 581}
#enddef
#define JOURNEY_02_NEW
{JOURNEY_01_OLD}
{NEW_JOURNEY 393 565}
{NEW_BATTLE 400 550}
#enddef
#define JOURNEY_02_OLD
{JOURNEY_01_OLD}
{OLD_JOURNEY 393 565}
{OLD_BATTLE 400 550}
#enddef
#define JOURNEY_02T_NEW
{JOURNEY_02_OLD}
{NEW_JOURNEY 416 535}
{NEW_REST 434 524}
#enddef
#define JOURNEY_02T_OLD
{JOURNEY_02_OLD}
{OLD_JOURNEY 416 535}
{OLD_REST 434 524}
#enddef
#define JOURNEY_03_NEW
{JOURNEY_02T_OLD}
{NEW_JOURNEY 426 510}
{NEW_JOURNEY 421 495}
{NEW_JOURNEY 418 479}
{NEW_JOURNEY 416 463}
{NEW_JOURNEY 415 447}
{NEW_JOURNEY 416 431}
{NEW_JOURNEY 418 414}
{NEW_JOURNEY 421 399}
{NEW_JOURNEY 426 383}
{NEW_JOURNEY 431 368}
{NEW_JOURNEY 437 353}
{NEW_JOURNEY 444 339}
{NEW_JOURNEY 452 326}
{NEW_JOURNEY 462 314}
{NEW_JOURNEY 472 303}
{NEW_JOURNEY 482 292}
{NEW_JOURNEY 493 281}
{NEW_JOURNEY 504 271}
{NEW_JOURNEY 514 260}
{NEW_JOURNEY 525 249}
{NEW_JOURNEY 534 237}
{NEW_JOURNEY 544 225}
{NEW_JOURNEY 552 212}
{NEW_JOURNEY 559 199}
{NEW_JOURNEY 564 185}
{NEW_JOURNEY 565 166}
{NEW_BATTLE 556 146}
#enddef
#define JOURNEY_03_OLD
{JOURNEY_02T_OLD}
{OLD_JOURNEY 426 510}
{OLD_JOURNEY 421 495}
{OLD_JOURNEY 418 479}
{OLD_JOURNEY 416 463}
{OLD_JOURNEY 415 447}
{OLD_JOURNEY 416 431}
{OLD_JOURNEY 418 414}
{OLD_JOURNEY 421 399}
{OLD_JOURNEY 426 383}
{OLD_JOURNEY 431 368}
{OLD_JOURNEY 437 353}
{OLD_JOURNEY 444 339}
{OLD_JOURNEY 452 326}
{OLD_JOURNEY 462 314}
{OLD_JOURNEY 472 303}
{OLD_JOURNEY 482 292}
{OLD_JOURNEY 493 281}
{OLD_JOURNEY 504 271}
{OLD_JOURNEY 514 260}
{OLD_JOURNEY 525 249}
{OLD_JOURNEY 534 237}
{OLD_JOURNEY 544 225}
{OLD_JOURNEY 552 212}
{OLD_JOURNEY 559 199}
{OLD_JOURNEY 564 185}
{OLD_JOURNEY 565 166}
{OLD_BATTLE 556 146}
#enddef
#define JOURNEY_03T_NEW
{JOURNEY_03_OLD}
{NEW_JOURNEY 565 166}
{NEW_JOURNEY 564 185}
{NEW_JOURNEY 559 199}
{NEW_JOURNEY 552 212}
{NEW_JOURNEY 544 225}
{NEW_JOURNEY 534 237}
{NEW_JOURNEY 525 249}
{NEW_JOURNEY 514 260}
{NEW_JOURNEY 504 271}
{NEW_JOURNEY 493 281}
{NEW_JOURNEY 482 292}
{NEW_JOURNEY 472 303}
{NEW_JOURNEY 462 314}
{NEW_JOURNEY 452 326}
{NEW_JOURNEY 444 339}
{NEW_JOURNEY 437 353}
{NEW_JOURNEY 431 368}
{NEW_JOURNEY 426 383}
{NEW_JOURNEY 421 399}
{NEW_JOURNEY 418 414}
{NEW_JOURNEY 416 431}
{NEW_JOURNEY 415 447}
{NEW_JOURNEY 416 463}
{NEW_JOURNEY 418 479}
{NEW_JOURNEY 421 495}
{NEW_JOURNEY 426 510}
{NEW_REST 434 524}
#enddef
#define JOURNEY_03T_OLD
{JOURNEY_03_OLD}
# no need to repeat the previous journey here
#enddef
#define JOURNEY_04_NEW
{JOURNEY_03T_OLD}
{NEW_JOURNEY 451 521}
{NEW_JOURNEY 468 518}
{NEW_JOURNEY 485 516}
{NEW_JOURNEY 501 513}
{NEW_BATTLE 518 508}
#enddef
#define JOURNEY_04_OLD
{JOURNEY_03T_OLD}
{OLD_JOURNEY 451 521}
{OLD_JOURNEY 468 518}
{OLD_JOURNEY 485 516}
{OLD_JOURNEY 501 513}
{OLD_BATTLE 518 508}
#enddef
#define JOURNEY_04T_NEW
{JOURNEY_04_OLD}
{NEW_JOURNEY 516 496}
{NEW_JOURNEY 501 491}
{NEW_JOURNEY 485 490}
{NEW_JOURNEY 469 493}
{NEW_JOURNEY 455 500}
{NEW_JOURNEY 443 511}
{NEW_REST 434 524}
#enddef
#define JOURNEY_04T_OLD
{JOURNEY_04_OLD}
{OLD_JOURNEY 516 496}
{OLD_JOURNEY 501 491}
{OLD_JOURNEY 485 490}
{OLD_JOURNEY 469 493}
{OLD_JOURNEY 455 500}
{OLD_JOURNEY 443 511}
{OLD_REST 434 524}
#enddef
#define JOURNEY_05_NEW
{JOURNEY_04T_OLD}
{NEW_JOURNEY 446 534}
{NEW_JOURNEY 459 540}
{NEW_JOURNEY 474 543}
{NEW_JOURNEY 489 542}
{NEW_JOURNEY 504 539}
{NEW_JOURNEY 519 535}
{NEW_JOURNEY 533 531}
{NEW_JOURNEY 548 526}
{NEW_JOURNEY 562 522}
{NEW_JOURNEY 577 518}
{NEW_JOURNEY 592 516}
{NEW_JOURNEY 607 514}
{NEW_JOURNEY 622 514}
{NEW_JOURNEY 637 516}
{NEW_JOURNEY 651 519}
{NEW_JOURNEY 664 528}
{NEW_BATTLE 670 540}
#enddef
#define JOURNEY_05_OLD
{JOURNEY_04T_OLD}
{OLD_JOURNEY 446 534}
{OLD_JOURNEY 459 540}
{OLD_JOURNEY 474 543}
{OLD_JOURNEY 489 542}
{OLD_JOURNEY 504 539}
{OLD_JOURNEY 519 535}
{OLD_JOURNEY 533 531}
{OLD_JOURNEY 548 526}
{OLD_JOURNEY 562 522}
{OLD_JOURNEY 577 518}
{OLD_JOURNEY 592 516}
{OLD_JOURNEY 607 514}
{OLD_JOURNEY 622 514}
{OLD_JOURNEY 637 516}
{OLD_JOURNEY 651 519}
{OLD_JOURNEY 664 528}
{OLD_BATTLE 670 540}
#enddef
#define JOURNEY_06_NEW
{JOURNEY_05_OLD}
{NEW_BATTLE 670 540}
#enddef
#define JOURNEY_06_OLD
{JOURNEY_05_OLD}
# no need to use the old battle marker here
#enddef
#define JOURNEY_07_NEW
{JOURNEY_06_OLD}
{NEW_JOURNEY 675 555}
{NEW_JOURNEY 680 570}
{NEW_JOURNEY 684 585}
{NEW_JOURNEY 688 600}
{NEW_JOURNEY 691 615}
{NEW_JOURNEY 693 631}
{NEW_JOURNEY 693 646}
{NEW_JOURNEY 691 662}
{NEW_JOURNEY 685 677}
{NEW_JOURNEY 677 690}
{NEW_JOURNEY 666 701}
{NEW_JOURNEY 655 712}
{NEW_JOURNEY 643 723}
{NEW_JOURNEY 632 734}
{NEW_JOURNEY 622 745}
{NEW_JOURNEY 612 757}
{NEW_JOURNEY 603 770}
{NEW_JOURNEY 594 783}
{NEW_BATTLE 587 797}
#enddef
#define JOURNEY_07_OLD
{JOURNEY_06_OLD}
{OLD_JOURNEY 675 555}
{OLD_JOURNEY 680 570}
{OLD_JOURNEY 684 585}
{OLD_JOURNEY 688 600}
{OLD_JOURNEY 691 615}
{OLD_JOURNEY 693 631}
{OLD_JOURNEY 693 646}
{OLD_JOURNEY 691 662}
{OLD_JOURNEY 685 677}
{OLD_JOURNEY 677 690}
{OLD_JOURNEY 666 701}
{OLD_JOURNEY 655 712}
{OLD_JOURNEY 643 723}
{OLD_JOURNEY 632 734}
{OLD_JOURNEY 622 745}
{OLD_JOURNEY 612 757}
{OLD_JOURNEY 603 770}
{OLD_JOURNEY 594 783}
{OLD_BATTLE 587 797}
#enddef
#define JOURNEY_08_NEW
{JOURNEY_07_OLD}
{NEW_JOURNEY 687 533}
{NEW_BATTLE 703 521}
#enddef
#define JOURNEY_08_OLD
{JOURNEY_07_OLD}
{OLD_JOURNEY 687 533}
{OLD_BATTLE 703 521}
#enddef
#define JOURNEY_09_NEW
{JOURNEY_08_OLD}
{NEW_JOURNEY 717 518}
{NEW_JOURNEY 730 526}
{NEW_BATTLE 738 539}
#enddef
#define JOURNEY_09_OLD
{JOURNEY_08_OLD}
{OLD_JOURNEY 717 518}
{OLD_JOURNEY 730 526}
{OLD_BATTLE 738 539}
#enddef
#define BIGMAP_01
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_01_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_02
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_02_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_02T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_02T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_03
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_03_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_03T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_03T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_04
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_04_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_04T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_04T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_05
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_05_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_06
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_06_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_07
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_07_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_08
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_08_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_09
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_09_NEW}
[/part]
[/story]
#enddef
#define SOF_BIGMAP
[background_layer]
image=maps/background.jpg
keep_aspect_ratio=no
[/background_layer]
[background_layer]
image=maps/sof.png
scale=no
base_layer=yes
[/background_layer]
#enddef
#define JOURNEY X Y
[image]
x,y={X},{Y}
file=misc/new-journey.png
delay=300
centered=yes
[/image]
#enddef
#define JOURNEY_01_NEW
{NEW_BATTLE 391 581}
#enddef
#define JOURNEY_01_OLD
{OLD_BATTLE 391 581}
#enddef
#define JOURNEY_02_NEW
{JOURNEY_01_OLD}
{JOURNEY 393 565}
{NEW_BATTLE 400 550}
#enddef
#define JOURNEY_02_OLD
{JOURNEY_01_OLD}
{OLD_JOURNEY 393 565}
{OLD_BATTLE 400 550}
#enddef
#define JOURNEY_02T_NEW
{JOURNEY_02_OLD}
{JOURNEY 416 535}
{NEW_REST 434 524}
#enddef
#define JOURNEY_02T_OLD
{JOURNEY_02_OLD}
{OLD_JOURNEY 416 535}
{OLD_REST 434 524}
#enddef
#define JOURNEY_03_NEW
{JOURNEY_02T_OLD}
{JOURNEY 426 510}
{JOURNEY 421 495}
{JOURNEY 418 479}
{JOURNEY 416 463}
{JOURNEY 415 447}
{JOURNEY 416 431}
{JOURNEY 418 414}
{JOURNEY 421 399}
{JOURNEY 426 383}
{JOURNEY 431 368}
{JOURNEY 437 353}
{JOURNEY 444 339}
{JOURNEY 452 326}
{JOURNEY 462 314}
{JOURNEY 472 303}
{JOURNEY 482 292}
{JOURNEY 493 281}
{JOURNEY 504 271}
{JOURNEY 514 260}
{JOURNEY 525 249}
{JOURNEY 534 237}
{JOURNEY 544 225}
{JOURNEY 552 212}
{JOURNEY 559 199}
{JOURNEY 564 185}
{JOURNEY 565 166}
{NEW_BATTLE 556 146}
#enddef
#define JOURNEY_03_OLD
{JOURNEY_02T_OLD}
{OLD_JOURNEY 426 510}
{OLD_JOURNEY 421 495}
{OLD_JOURNEY 418 479}
{OLD_JOURNEY 416 463}
{OLD_JOURNEY 415 447}
{OLD_JOURNEY 416 431}
{OLD_JOURNEY 418 414}
{OLD_JOURNEY 421 399}
{OLD_JOURNEY 426 383}
{OLD_JOURNEY 431 368}
{OLD_JOURNEY 437 353}
{OLD_JOURNEY 444 339}
{OLD_JOURNEY 452 326}
{OLD_JOURNEY 462 314}
{OLD_JOURNEY 472 303}
{OLD_JOURNEY 482 292}
{OLD_JOURNEY 493 281}
{OLD_JOURNEY 504 271}
{OLD_JOURNEY 514 260}
{OLD_JOURNEY 525 249}
{OLD_JOURNEY 534 237}
{OLD_JOURNEY 544 225}
{OLD_JOURNEY 552 212}
{OLD_JOURNEY 559 199}
{OLD_JOURNEY 564 185}
{OLD_JOURNEY 565 166}
{OLD_BATTLE 556 146}
#enddef
#define JOURNEY_03T_NEW
{JOURNEY_03_OLD}
{JOURNEY 565 166}
{JOURNEY 564 185}
{JOURNEY 559 199}
{JOURNEY 552 212}
{JOURNEY 544 225}
{JOURNEY 534 237}
{JOURNEY 525 249}
{JOURNEY 514 260}
{JOURNEY 504 271}
{JOURNEY 493 281}
{JOURNEY 482 292}
{JOURNEY 472 303}
{JOURNEY 462 314}
{JOURNEY 452 326}
{JOURNEY 444 339}
{JOURNEY 437 353}
{JOURNEY 431 368}
{JOURNEY 426 383}
{JOURNEY 421 399}
{JOURNEY 418 414}
{JOURNEY 416 431}
{JOURNEY 415 447}
{JOURNEY 416 463}
{JOURNEY 418 479}
{JOURNEY 421 495}
{JOURNEY 426 510}
{NEW_REST 434 524}
#enddef
#define JOURNEY_03T_OLD
{JOURNEY_03_OLD}
# no need to repeat the previous journey here
#enddef
#define JOURNEY_04_NEW
{JOURNEY_03T_OLD}
{JOURNEY 451 521}
{JOURNEY 468 518}
{JOURNEY 485 516}
{JOURNEY 501 513}
{NEW_BATTLE 518 508}
#enddef
#define JOURNEY_04_OLD
{JOURNEY_03T_OLD}
{OLD_JOURNEY 451 521}
{OLD_JOURNEY 468 518}
{OLD_JOURNEY 485 516}
{OLD_JOURNEY 501 513}
{OLD_BATTLE 518 508}
#enddef
#define JOURNEY_04T_NEW
{JOURNEY_04_OLD}
{JOURNEY 516 496}
{JOURNEY 501 491}
{JOURNEY 485 490}
{JOURNEY 469 493}
{JOURNEY 455 500}
{JOURNEY 443 511}
{NEW_REST 434 524}
#enddef
#define JOURNEY_04T_OLD
{JOURNEY_04_OLD}
{OLD_JOURNEY 516 496}
{OLD_JOURNEY 501 491}
{OLD_JOURNEY 485 490}
{OLD_JOURNEY 469 493}
{OLD_JOURNEY 455 500}
{OLD_JOURNEY 443 511}
{OLD_REST 434 524}
#enddef
#define JOURNEY_05_NEW
{JOURNEY_04T_OLD}
{JOURNEY 446 534}
{JOURNEY 459 540}
{JOURNEY 474 543}
{JOURNEY 489 542}
{JOURNEY 504 539}
{JOURNEY 519 535}
{JOURNEY 533 531}
{JOURNEY 548 526}
{JOURNEY 562 522}
{JOURNEY 577 518}
{JOURNEY 592 516}
{JOURNEY 607 514}
{JOURNEY 622 514}
{JOURNEY 637 516}
{JOURNEY 651 519}
{JOURNEY 664 528}
{NEW_BATTLE 670 540}
#enddef
#define JOURNEY_05_OLD
{JOURNEY_04T_OLD}
{OLD_JOURNEY 446 534}
{OLD_JOURNEY 459 540}
{OLD_JOURNEY 474 543}
{OLD_JOURNEY 489 542}
{OLD_JOURNEY 504 539}
{OLD_JOURNEY 519 535}
{OLD_JOURNEY 533 531}
{OLD_JOURNEY 548 526}
{OLD_JOURNEY 562 522}
{OLD_JOURNEY 577 518}
{OLD_JOURNEY 592 516}
{OLD_JOURNEY 607 514}
{OLD_JOURNEY 622 514}
{OLD_JOURNEY 637 516}
{OLD_JOURNEY 651 519}
{OLD_JOURNEY 664 528}
{OLD_BATTLE 670 540}
#enddef
#define JOURNEY_06_NEW
{JOURNEY_05_OLD}
{NEW_BATTLE 670 540}
#enddef
#define JOURNEY_06_OLD
{JOURNEY_05_OLD}
# no need to use the old battle marker here
#enddef
#define JOURNEY_07_NEW
{JOURNEY_06_OLD}
{JOURNEY 675 555}
{JOURNEY 680 570}
{JOURNEY 684 585}
{JOURNEY 688 600}
{JOURNEY 691 615}
{JOURNEY 693 631}
{JOURNEY 693 646}
{JOURNEY 691 662}
{JOURNEY 685 677}
{JOURNEY 677 690}
{JOURNEY 666 701}
{JOURNEY 655 712}
{JOURNEY 643 723}
{JOURNEY 632 734}
{JOURNEY 622 745}
{JOURNEY 612 757}
{JOURNEY 603 770}
{JOURNEY 594 783}
{NEW_BATTLE 587 797}
#enddef
#define JOURNEY_07_OLD
{JOURNEY_06_OLD}
{OLD_JOURNEY 675 555}
{OLD_JOURNEY 680 570}
{OLD_JOURNEY 684 585}
{OLD_JOURNEY 688 600}
{OLD_JOURNEY 691 615}
{OLD_JOURNEY 693 631}
{OLD_JOURNEY 693 646}
{OLD_JOURNEY 691 662}
{OLD_JOURNEY 685 677}
{OLD_JOURNEY 677 690}
{OLD_JOURNEY 666 701}
{OLD_JOURNEY 655 712}
{OLD_JOURNEY 643 723}
{OLD_JOURNEY 632 734}
{OLD_JOURNEY 622 745}
{OLD_JOURNEY 612 757}
{OLD_JOURNEY 603 770}
{OLD_JOURNEY 594 783}
{OLD_BATTLE 587 797}
#enddef
#define JOURNEY_08_NEW
{JOURNEY_07_OLD}
{JOURNEY 687 533}
{NEW_BATTLE 703 521}
#enddef
#define JOURNEY_08_OLD
{JOURNEY_07_OLD}
{OLD_JOURNEY 687 533}
{OLD_BATTLE 703 521}
#enddef
#define JOURNEY_09_NEW
{JOURNEY_08_OLD}
{JOURNEY 717 518}
{JOURNEY 730 526}
{NEW_BATTLE 738 539}
#enddef
#define JOURNEY_09_OLD
{JOURNEY_08_OLD}
{OLD_JOURNEY 717 518}
{OLD_JOURNEY 730 526}
{OLD_BATTLE 738 539}
#enddef
#define BIGMAP_01
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_01_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_02
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_02_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_02T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_02T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_03
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_03_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_03T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_03T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_04
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_04_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_04T
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_04T_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_05
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_05_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_06
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_06_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_07
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_07_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_08
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_08_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_09
[story]
[part]
show_title=yes
{SOF_BIGMAP}
{JOURNEY_09_NEW}
[/part]
[/story]
#enddef

1550
data/campaigns/Son_Of_The_Black_Eye/utils/bigmap.cfg
View file

File diff suppressed because it is too large Load diff

268
data/campaigns/The_South_Guard/utils/bigmap.cfg
View file

@ -12,9 +12,7 @@
[/background_layer]
#enddef
#undef NEW_JOURNEY
#define NEW_JOURNEY X Y
#define JOURNEY X Y
[image]
x,y={X},{Y}
file=misc/new-journey.png
@ -24,26 +22,26 @@
#enddef
#define JOURNEY_01_NEW
{NEW_JOURNEY 1015 122}
{NEW_JOURNEY 999 120}
{NEW_JOURNEY 983 116}
{NEW_JOURNEY 968 110}
{NEW_JOURNEY 953 103}
{NEW_JOURNEY 690 97}
{NEW_JOURNEY 689 112}
{NEW_JOURNEY 690 127}
{NEW_JOURNEY 694 143}
{NEW_JOURNEY 699 157}
{NEW_JOURNEY 705 171}
{NEW_JOURNEY 710 186}
{NEW_JOURNEY 713 201}
{NEW_JOURNEY 714 216}
{NEW_JOURNEY 713 232}
{NEW_JOURNEY 711 247}
{NEW_JOURNEY 708 262}
{NEW_JOURNEY 705 277}
{NEW_JOURNEY 703 292}
{NEW_JOURNEY 707 306}
{JOURNEY 1015 122}
{JOURNEY 999 120}
{JOURNEY 983 116}
{JOURNEY 968 110}
{JOURNEY 953 103}
{JOURNEY 690 97}
{JOURNEY 689 112}
{JOURNEY 690 127}
{JOURNEY 694 143}
{JOURNEY 699 157}
{JOURNEY 705 171}
{JOURNEY 710 186}
{JOURNEY 713 201}
{JOURNEY 714 216}
{JOURNEY 713 232}
{JOURNEY 711 247}
{JOURNEY 708 262}
{JOURNEY 705 277}
{JOURNEY 703 292}
{JOURNEY 707 306}
{NEW_BATTLE 716 319}
#enddef
@ -73,9 +71,9 @@
#define JOURNEY_02_NEW
{JOURNEY_01_OLD}
{NEW_JOURNEY 723 335}
{NEW_JOURNEY 723 353}
{NEW_JOURNEY 713 368}
{JOURNEY 723 335}
{JOURNEY 723 353}
{JOURNEY 713 368}
{NEW_BATTLE 697 376}
#enddef
@ -89,16 +87,16 @@
#define JOURNEY_03_NEW
{JOURNEY_02_OLD}
{NEW_JOURNEY 683 380}
{NEW_JOURNEY 668 385}
{NEW_JOURNEY 653 387}
{NEW_JOURNEY 641 378}
{NEW_JOURNEY 627 372}
{NEW_JOURNEY 613 368}
{NEW_JOURNEY 598 364}
{NEW_JOURNEY 583 361}
{NEW_JOURNEY 568 359}
{NEW_JOURNEY 553 357}
{JOURNEY 683 380}
{JOURNEY 668 385}
{JOURNEY 653 387}
{JOURNEY 641 378}
{JOURNEY 627 372}
{JOURNEY 613 368}
{JOURNEY 598 364}
{JOURNEY 583 361}
{JOURNEY 568 359}
{JOURNEY 553 357}
{NEW_BATTLE 538 356}
#enddef
@ -119,16 +117,16 @@
#define JOURNEY_04_NEW
{JOURNEY_03_OLD}
{NEW_JOURNEY 523 356}
{NEW_JOURNEY 508 359}
{NEW_JOURNEY 494 365}
{NEW_JOURNEY 481 372}
{NEW_JOURNEY 469 381}
{NEW_JOURNEY 459 392}
{NEW_JOURNEY 450 405}
{NEW_JOURNEY 444 418}
{NEW_JOURNEY 443 433}
{NEW_JOURNEY 446 448}
{JOURNEY 523 356}
{JOURNEY 508 359}
{JOURNEY 494 365}
{JOURNEY 481 372}
{JOURNEY 469 381}
{JOURNEY 459 392}
{JOURNEY 450 405}
{JOURNEY 444 418}
{JOURNEY 443 433}
{JOURNEY 446 448}
{NEW_BATTLE 454 461}
#enddef
@ -149,25 +147,25 @@
#define JOURNEY_05_NEW
{JOURNEY_04_OLD}
{NEW_JOURNEY 463 473}
{NEW_JOURNEY 472 486}
{NEW_JOURNEY 480 499}
{NEW_JOURNEY 486 513}
{NEW_JOURNEY 491 528}
{NEW_JOURNEY 493 543}
{NEW_JOURNEY 493 559}
{NEW_JOURNEY 491 574}
{NEW_JOURNEY 487 589}
{NEW_JOURNEY 482 603}
{NEW_JOURNEY 475 617}
{NEW_JOURNEY 468 631}
{NEW_JOURNEY 460 644}
{NEW_JOURNEY 452 658}
{NEW_JOURNEY 446 672}
{NEW_JOURNEY 440 686}
{NEW_JOURNEY 436 701}
{NEW_JOURNEY 436 717}
{NEW_JOURNEY 439 732}
{JOURNEY 463 473}
{JOURNEY 472 486}
{JOURNEY 480 499}
{JOURNEY 486 513}
{JOURNEY 491 528}
{JOURNEY 493 543}
{JOURNEY 493 559}
{JOURNEY 491 574}
{JOURNEY 487 589}
{JOURNEY 482 603}
{JOURNEY 475 617}
{JOURNEY 468 631}
{JOURNEY 460 644}
{JOURNEY 452 658}
{JOURNEY 446 672}
{JOURNEY 440 686}
{JOURNEY 436 701}
{JOURNEY 436 717}
{JOURNEY 439 732}
{NEW_BATTLE 446 746}
#enddef
@ -197,18 +195,18 @@
#define JOURNEY_06A_NEW
{JOURNEY_05_OLD}
{NEW_JOURNEY 457 759}
{NEW_JOURNEY 469 771}
{NEW_JOURNEY 484 780}
{NEW_JOURNEY 499 787}
{NEW_JOURNEY 516 790}
{NEW_JOURNEY 519 776}
{NEW_JOURNEY 520 762}
{NEW_JOURNEY 520 746}
{NEW_JOURNEY 519 730}
{NEW_JOURNEY 516 714}
{NEW_JOURNEY 513 697}
{NEW_JOURNEY 517 681}
{JOURNEY 457 759}
{JOURNEY 469 771}
{JOURNEY 484 780}
{JOURNEY 499 787}
{JOURNEY 516 790}
{JOURNEY 519 776}
{JOURNEY 520 762}
{JOURNEY 520 746}
{JOURNEY 519 730}
{JOURNEY 516 714}
{JOURNEY 513 697}
{JOURNEY 517 681}
{NEW_BATTLE 526 668}
#enddef
@ -231,16 +229,16 @@
#define JOURNEY_06B_NEW
{JOURNEY_05_OLD}
{NEW_JOURNEY 457 759}
{NEW_JOURNEY 469 771}
{NEW_JOURNEY 484 780}
{NEW_JOURNEY 499 787}
{NEW_JOURNEY 516 790}
{NEW_JOURNEY 529 780}
{NEW_JOURNEY 535 767}
{NEW_JOURNEY 540 753}
{NEW_JOURNEY 543 738}
{NEW_JOURNEY 544 722}
{JOURNEY 457 759}
{JOURNEY 469 771}
{JOURNEY 484 780}
{JOURNEY 499 787}
{JOURNEY 516 790}
{JOURNEY 529 780}
{JOURNEY 535 767}
{JOURNEY 540 753}
{JOURNEY 543 738}
{JOURNEY 544 722}
{NEW_BATTLE 544 706}
#enddef
@ -271,20 +269,20 @@
#define JOURNEY_07B_NEW
{JOURNEY_06B_OLD}
{NEW_JOURNEY 544 690}
{NEW_JOURNEY 546 674}
{NEW_JOURNEY 549 658}
{NEW_JOURNEY 553 643}
{NEW_JOURNEY 559 628}
{NEW_JOURNEY 567 614}
{NEW_JOURNEY 575 600}
{NEW_JOURNEY 584 587}
{NEW_JOURNEY 594 574}
{NEW_JOURNEY 603 562}
{NEW_JOURNEY 613 549}
{NEW_JOURNEY 622 536}
{NEW_JOURNEY 630 522}
{NEW_JOURNEY 638 508}
{JOURNEY 544 690}
{JOURNEY 546 674}
{JOURNEY 549 658}
{JOURNEY 553 643}
{JOURNEY 559 628}
{JOURNEY 567 614}
{JOURNEY 575 600}
{JOURNEY 584 587}
{JOURNEY 594 574}
{JOURNEY 603 562}
{JOURNEY 613 549}
{JOURNEY 622 536}
{JOURNEY 630 522}
{JOURNEY 638 508}
{NEW_BATTLE 643 493}
#enddef
@ -309,21 +307,21 @@
#define JOURNEY_08A_NEW
{JOURNEY_07A_OLD}
{NEW_JOURNEY 531 790}
{NEW_JOURNEY 546 788}
{NEW_JOURNEY 561 784}
{NEW_JOURNEY 575 778}
{NEW_JOURNEY 585 768}
{NEW_JOURNEY 591 754}
{NEW_JOURNEY 592 739}
{NEW_JOURNEY 591 724}
{NEW_JOURNEY 590 708}
{NEW_JOURNEY 590 693}
{NEW_JOURNEY 590 678}
{NEW_JOURNEY 592 663}
{NEW_JOURNEY 596 649}
{NEW_JOURNEY 602 635}
{NEW_JOURNEY 609 621}
{JOURNEY 531 790}
{JOURNEY 546 788}
{JOURNEY 561 784}
{JOURNEY 575 778}
{JOURNEY 585 768}
{JOURNEY 591 754}
{JOURNEY 592 739}
{JOURNEY 591 724}
{JOURNEY 590 708}
{JOURNEY 590 693}
{JOURNEY 590 678}
{JOURNEY 592 663}
{JOURNEY 596 649}
{JOURNEY 602 635}
{JOURNEY 609 621}
{NEW_BATTLE 618 609}
#enddef
@ -349,12 +347,12 @@
#define JOURNEY_08B_NEW
{JOURNEY_07B_OLD}
{NEW_JOURNEY 647 478}
{NEW_JOURNEY 649 463}
{NEW_JOURNEY 648 448}
{NEW_JOURNEY 646 433}
{NEW_JOURNEY 645 418}
{NEW_JOURNEY 649 403}
{JOURNEY 647 478}
{JOURNEY 649 463}
{JOURNEY 648 448}
{JOURNEY 646 433}
{JOURNEY 645 418}
{JOURNEY 649 403}
{NEW_BATTLE 653 387}
#enddef
@ -371,19 +369,19 @@
#define JOURNEY_09A_NEW
{JOURNEY_08A_OLD}
{NEW_JOURNEY 626 594}
{NEW_JOURNEY 630 578}
{NEW_JOURNEY 632 561}
{NEW_JOURNEY 635 544}
{NEW_JOURNEY 637 527}
{NEW_JOURNEY 640 510}
{NEW_JOURNEY 643 493}
{NEW_JOURNEY 647 478}
{NEW_JOURNEY 649 463}
{NEW_JOURNEY 648 448}
{NEW_JOURNEY 646 433}
{NEW_JOURNEY 645 417}
{NEW_JOURNEY 648 402}
{JOURNEY 626 594}
{JOURNEY 630 578}
{JOURNEY 632 561}
{JOURNEY 635 544}
{JOURNEY 637 527}
{JOURNEY 640 510}
{JOURNEY 643 493}
{JOURNEY 647 478}
{JOURNEY 649 463}
{JOURNEY 648 448}
{JOURNEY 646 433}
{JOURNEY 645 417}
{JOURNEY 648 402}
{NEW_BATTLE 653 387}
#enddef

2
data/tools/wesnoth/wmltools.py
View file

@ -168,7 +168,7 @@ def formaltype(f):
ftype = "terrain_pattern"
elif f.startswith("TERRAIN") or f.endswith("TERRAIN"):
ftype = "terrain_code"
elif f in ("NAME", "NAMESPACE", "VAR", "IMAGESTEM", "ID", "FLAG", "BUILDER") or f.endswith("_NAME") or f.endswith("_ID") or f.endswith("_VAR"):
elif f in ("NAME", "NAMESPACE", "VAR", "IMAGESTEM", "ID", "FLAG", "BUILDER") or f.endswith("_NAME") or f.endswith("_ID") or f.endswith("_VAR") or f.endswith("_OVERLAY"):
ftype = "name"
elif f in ("ID_STRING", "NAME_STRING", "DESCRIPTION", "IPF"):
ftype = "optional_string"