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

Merge branch 'master' of git://github.com/wesnoth/wesnoth-old into tmp

Browse source
This commit is contained in:
Bär Halberkamp 2013-08-24 20:50:57 +02:00
commit 13f167c22b
1414 changed files with 151452 additions and 138423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitignore vendored
View file

@ -4,8 +4,6 @@
revision.h
*.swp
.DS_Store
wesnoth
wesnothd
make_translation
merge_translations
Makefile
@ -45,20 +43,16 @@ Lib
*.exe
*.dll
*.txt
wesnothd*
build
test*
!src/test*
wesnoth*
campaignd*
cutter*
exploder*
!data/tools/wesnoth
/wesnothd*
/test*
/wesnoth*
/campaignd*
/cutter*
/exploder*
/build/
locales
.kdev_include_paths
.kdev4
!po/wesnoth*
!po/wesnoth*/wesnoth*.pot
#cmake/Linux/CodeBlocks:
Project.cbp
Project.layout

2
Doxyfile
View file

@ -31,7 +31,7 @@ PROJECT_NAME = "The Battle for Wesnoth"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = 1.11.0+dev
PROJECT_NUMBER = 1.11.6+dev
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

21
SConstruct
View file

@ -82,7 +82,6 @@ opts.AddVariables(
('version_suffix', 'suffix that will be added to default values of prefsdir, program_suffix and datadirname', ""),
BoolVariable('raw_sockets', 'Set to use raw receiving sockets in the multiplayer network layer rather than the SDL_net facilities', False),
BoolVariable('forum_user_handler', 'Enable forum user handler in wesnothd', False),
BoolVariable('use_network_ana', 'Use the new network api', False),
('server_gid', 'group id of the user who runs wesnothd', ""),
('server_uid', 'user id of the user who runs wesnothd', ""),
BoolVariable('strict', 'Set to strict compilation', False),
@ -284,18 +283,15 @@ if env["prereqs"]:
conf.CheckLib("m")
conf.CheckFunc("round")
def CheckANA(conf, do_check):
if not do_check:
return True
def CheckAsio(conf):
if env["PLATFORM"] == 'win32':
conf.env.Append(LIBS = ["libws2_32"])
return conf.CheckBoost("system") and \
conf.CheckBoost("thread")
def CheckAsio(conf):
return conf.CheckLib("pthread") and \
conf.CheckBoost("system") and \
conf.CheckBoost("asio", header_only = True)
have_libpthread = True
else:
have_libpthread = conf.CheckLib("pthread")
return have_libpthread and \
conf.CheckBoost("system") and \
conf.CheckBoost("asio", header_only = True)
if env['host'] in ['x86_64-nacl', 'i686-nacl']:
# libppapi_cpp has a reverse dependency on the following function
@ -326,8 +322,7 @@ if env["prereqs"]:
conf.CheckBoostIostreamsBZip2() and \
conf.CheckBoost("smart_ptr", header_only = True) and \
conf.CheckSDL(require_version = '1.2.7') and \
conf.CheckSDL('SDL_net') and \
CheckANA(conf, env["use_network_ana"]) or Warning("Base prerequisites are not met.")
conf.CheckSDL('SDL_net') or Warning("Base prerequisites are not met.")
env = conf.Finish()
client_env = env.Clone()

29
changelog
View file

@ -1,4 +1,20 @@
Version 1.11.5+dev:
Version 1.11.6+dev:
* Add-ons client:
* Report errors caused by faulty local .pbl files properly instead of presenting
them as network errors.
* Language and i18n:
* Updated translations: German, Lithuanian
* Lua API:
* Added scroll_to_leader field (read/write) to wesnoth.sides table elements.
* WML engine:
* [store_side] now stores the scroll_to_leader attribute from sides.
* Miscellaneous and bug fixes:
* Added -256 and -512 color shifts to FADE_TO_BLACK and FADE_TO_BLACK_HOLD
macros to account for ToD color shifts greater than -31, guaranteeing complete
darkness.
* Unit WML frames with image modifications now shown correctly for hits/death.
Version 1.11.6:
* Add-ons client:
* The Description popup displays the selected add-on's dependencies now,
using color-keyed statuses.
@ -17,10 +33,14 @@ Version 1.11.5+dev:
* Campaigns:
* An Orcish Incursion:
* New world map.
* Descent Into Darkness:
* New world map.
* Legend of Wesmere:
* convert to "wmllint: who" magic comments
* The South Guard:
* Fixed double "lich found" event in Choice in the Fog
* Language and i18n:
* Updated translations: Galician, Japanese, Russian, Scottish Gaelic
* Updated translations: Galician, Japanese, Lithuanian, Russian, Scottish Gaelic
* Lua API:
* Added: function wesnoth.find_cost_map().
* Units:
@ -31,6 +51,7 @@ Version 1.11.5+dev:
* If [recall] cannot find a unit to recall, the message is logged at the
"info" severity level in the "wml" domain (instead of the "error" level in
the "engine" domain). This means the message will be suppressed by default.
* Allowed [modify_side] to modify the scroll_to_leader key
* Miscellaneous and bug fixes
* Creating a unit via debug mode now clears fog/shroud around the unit.
* [move_unit_fake] now accepts an optional force_scroll= attribute (def. to
@ -39,6 +60,10 @@ Version 1.11.5+dev:
* [move_unit] accepts an optional force_scroll= attribute like
[move_unit_fake] above, defaults to using the [move_unit_fake] default.
* Added: Feature in pathfind.xpp to build a cost map.
* wmllint: turn on globbing on Windows, create "who" and "unwho" magic
comments, bugfixes
* wmllint-1.4: add an enhanced and bugfixed version of wmllint 1.4 for
porting old add-ons
Version 1.11.5:
* Add-ons client:

BIN
data/campaigns/An_Orcish_Incursion/images/l10n/lt/an-orcish-incursion-map--overlay.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
data/campaigns/An_Orcish_Incursion/images/maps/aoi.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
data/campaigns/An_Orcish_Incursion/images/maps/l10n/gl/aoi--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 103 KiB

BIN
data/campaigns/An_Orcish_Incursion/images/maps/l10n/lt/aoi--overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
data/campaigns/Dead_Water/images/l10n/gl/dead-water-map--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 51 KiB

2
data/campaigns/Descent_Into_Darkness/_main.cfg
View file

@ -62,9 +62,9 @@
path=data/campaigns/Descent_Into_Darkness
[/binary_path]
{campaigns/Descent_Into_Darkness/utils/bigmap.cfg}
{campaigns/Descent_Into_Darkness/utils/deaths.cfg}
{campaigns/Descent_Into_Darkness/utils/macros.cfg}
{campaigns/Descent_Into_Darkness/utils/journey.cfg}
{campaigns/Descent_Into_Darkness/scenarios}
#endif

BIN
data/campaigns/Descent_Into_Darkness/images/maps/did.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
data/campaigns/Descent_Into_Darkness/images/maps/l10n/lt/did--overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 KiB

BIN
data/campaigns/Descent_Into_Darkness/images/misc/descent-into-darkness.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 MiB

BIN
data/campaigns/Descent_Into_Darkness/images/misc/l10n/gl/descent-into-darkness--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 130 KiB

BIN
data/campaigns/Descent_Into_Darkness/images/misc/l10n/lt/descent-into-darkness--overlay.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 115 KiB

24
data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file

@ -19,24 +19,20 @@
#po: like Latin "oppidum", use it for Parthyn.
[part]
story=_ "Malin Keshar was born ten years after the death of Haldric IV. He grew up in the northern border town of Parthyn, the second child and eldest son of the baron of the city. Every summer when the mountain passes became clear, orcs came down from the north to prove themselves in battle. Every year Parthyn’s guards repelled the raids, though some of the townsfolk were always lost. Malin’s father led raiding parties to disrupt the orc encampments and send the orcs back to the north."
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
[part]
story=_ "When Malin was 10, a mage who passed through the town sensed strong magical abilities in the boy. His parents, seeing a chance for him to live away from the constant battles with the orcs, arranged for him to be sent to the mage community on the Isle of Alduin. There he studied for eight years, while back at home the orc raids increased in their frequency and ferocity. Before Malin could finish his training, however, he was expelled."
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
[part]
# good to have an arrow that arcs across the screen here
story=_ "Malin returned to Parthyn just as summer began only to encounter more misfortune. Even as he arrived, an early, unexpected orc raid was being conducted against Parthyn. Malin watched as his father took an arrow in the chest and fell lifeless to the ground."
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
[part]
story=_ "Shaken by the loss of their commander, the human defense began to falter. As the orcs roared in anticipation of victory, skeleton warriors poured out of the woods to the orcs’ rear. The soldiers watched in amazement as the skeletons cut down orc after orc and then melted back into the forest."
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
# wmllint: local spelling misdoubt
[part]
@ -47,20 +43,16 @@
# x,y=284,204
# [/image]
story=_ "Shortly a man dressed in the robes of a necromancer emerged from the trees. <i>“Allow me to introduce myself. I am Darken Volk. While I know your kingdom does not love my kind, I think it vital that we put aside our differences for the moment. The orc menace grows in the North, and I misdoubt any of the border towns can stand without some assistance. For now, I ask only to rest in your town for a few days.”</i>"
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
[part]
story=_ "Drogan, the captain of the guard, replied, <i>“Surely you know that the penalty for necromancy is death. For your aid we will promise you rest and safety. Upon your departure, however, you are banished from these lands, not to return on pain of death. We thank you for your help, but need no alliances with those who deal only in dark magic.”</i>"
background=story/parthyn.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_SAVING_PARTHYN}
{DID_BIGMAP}
[/part]
[/story]
{BIGMAP_01}
[side]
side=1
controller=human

9
data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file

@ -21,20 +21,17 @@
[story]
[part]
story=_ "Fighting tears and rage, Malin follows the back-trail of the orcish band. He curses the elder mages for sending him from the Isle of Alduin half-prepared, only to be thrust into conflict. He curses Drogan for lacking the courage to see what must be done. Most fiercely, he curses the orcs for ravaging his family and home through their ceaseless attacks."
background=story/parthyn.jpg
scale_background=no
{DID_BIGMAP}
[/part]
[part]
story=_ "Three days’ travel outside Parthyn, Malin meets Darken Volk, the same necromancer who had saved Parthyn and taught Malin to raise the dead not long ago. The necromancer takes pity on Malin in his friendless state, and asks Malin to travel with him. As the weeks pass, he teaches Malin more dark magic."
background=story/travel.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_PEACEFUL_VALLEY}
[/part]
[/story]
{BIGMAP_02}
[side]
side=1
controller=human

6
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file

@ -19,12 +19,10 @@
background=story/travel.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_A_HAUNTING_IN_WINTER}
[/part]
[/story]
{BIGMAP_03}
[time_area]
x=12-24,12-21,12-20,14-18,16-18
y=19-21,18,17,16,15

6
data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
View file

@ -30,12 +30,10 @@
background=story/travel.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_BEGINNING_OF_THE_REVENGE}
[/part]
[/story]
{BIGMAP_04}
[side]
side=1
controller=human

6
data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file

@ -34,12 +34,10 @@
background=story/travel.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_ORC_WAR}
[/part]
[/story]
{BIGMAP_05}
{SET_LABEL 8 12 (_"River Longlier")}
[side]

6
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -24,12 +24,10 @@
background=story/parthyn.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_RETURN_TO_PARTHYN}
[/part]
[/story]
{BIGMAP_06}
[side]
side=1
controller=human

6
data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
View file

@ -122,12 +122,10 @@
background=story/book.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_A_SMALL_FAVOR}
[/part]
[/story]
{BIGMAP_07}
[side]
side=1
controller=human

6
data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View file

@ -29,12 +29,10 @@
background=story/travel.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_ALONE_AT_LAST}
[/part]
[/story]
{BIGMAP_10}
[side]
side=1
controller=human

6
data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
View file

@ -34,12 +34,10 @@
background=story/end.jpg
scale_background=no
[/part]
[part]
show_title=yes
{TO_DESCENT_INTO_DARKNESS}
[/part]
[/story]
{BIGMAP_11}
{UNDERGROUND}
[side]

2
data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
View file

@ -22,6 +22,8 @@
[/part]
[/story]
{BIGMAP_12}
{UNDERGROUND}
[side]

441
data/campaigns/Descent_Into_Darkness/utils/bigmap.cfg Normal file
View file

@ -0,0 +1,441 @@
#textdomain wesnoth-did
#define DID_BIGMAP
[background_layer]
image=maps/background.jpg
keep_aspect_ratio=no
[/background_layer]
[background_layer]
image=maps/did.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 866 693}
#enddef
#define JOURNEY_01_OLD
{OLD_BATTLE 866 693}
#enddef
#define JOURNEY_02_NEW
{JOURNEY_01_OLD}
{NEW_JOURNEY 890 702}
{NEW_JOURNEY 915 709}
{NEW_JOURNEY 940 715}
{NEW_JOURNEY 966 720}
{NEW_JOURNEY 991 723}
{NEW_JOURNEY 1017 725}
{NEW_JOURNEY 1043 723}
{NEW_JOURNEY 1069 719}
{NEW_JOURNEY 1093 711}
{NEW_JOURNEY 1116 699}
{NEW_JOURNEY 1135 682}
{NEW_BATTLE 1150 661}
#enddef
#define JOURNEY_02_OLD
{JOURNEY_01_OLD}
{OLD_JOURNEY 890 702}
{OLD_JOURNEY 915 709}
{OLD_JOURNEY 940 715}
{OLD_JOURNEY 966 720}
{OLD_JOURNEY 991 723}
{OLD_JOURNEY 1017 725}
{OLD_JOURNEY 1043 723}
{OLD_JOURNEY 1069 719}
{OLD_JOURNEY 1093 711}
{OLD_JOURNEY 1116 699}
{OLD_JOURNEY 1135 682}
{OLD_BATTLE 1150 661}
#enddef
#define JOURNEY_03_NEW
{JOURNEY_02_OLD}
{NEW_JOURNEY 1127 649}
{NEW_JOURNEY 1105 635}
{NEW_JOURNEY 1091 614}
{NEW_BATTLE 1093 588}
#enddef
#define JOURNEY_03_OLD
{JOURNEY_02_OLD}
{OLD_JOURNEY 1127 649}
{OLD_JOURNEY 1105 635}
{OLD_JOURNEY 1091 614}
{OLD_BATTLE 1093 588}
#enddef
#define JOURNEY_04_NEW
{JOURNEY_03_OLD}
{NEW_JOURNEY 1101 564}
{NEW_JOURNEY 1116 544}
{NEW_JOURNEY 1136 528}
{NEW_JOURNEY 1142 505}
{NEW_JOURNEY 1134 481}
{NEW_BATTLE 1124 458}
#enddef
#define JOURNEY_04_OLD
{JOURNEY_03_OLD}
{OLD_JOURNEY 1101 564}
{OLD_JOURNEY 1116 544}
{OLD_JOURNEY 1136 528}
{OLD_JOURNEY 1142 505}
{OLD_JOURNEY 1134 481}
{OLD_BATTLE 1124 458}
#enddef
#define JOURNEY_05_NEW
{JOURNEY_04_OLD}
{NEW_JOURNEY 1101 445}
{NEW_JOURNEY 1079 432}
{NEW_JOURNEY 1057 418}
{NEW_JOURNEY 1036 402}
{NEW_JOURNEY 1016 386}
{NEW_JOURNEY 998 368}
{NEW_JOURNEY 982 347}
{NEW_JOURNEY 969 325}
{NEW_JOURNEY 963 300}
{NEW_JOURNEY 967 274}
{NEW_JOURNEY 982 254}
{NEW_JOURNEY 1005 241}
{NEW_JOURNEY 1030 236}
{NEW_JOURNEY 1056 239}
{NEW_JOURNEY 1080 248}
{NEW_BATTLE 1101 264}
#enddef
#define JOURNEY_05_OLD
{JOURNEY_04_OLD}
{OLD_JOURNEY 1101 445}
{OLD_JOURNEY 1079 432}
{OLD_JOURNEY 1057 418}
{OLD_JOURNEY 1036 402}
{OLD_JOURNEY 1016 386}
{OLD_JOURNEY 998 368}
{OLD_JOURNEY 982 347}
{OLD_JOURNEY 969 325}
{OLD_JOURNEY 963 300}
{OLD_JOURNEY 967 274}
{OLD_JOURNEY 982 254}
{OLD_JOURNEY 1005 241}
{OLD_JOURNEY 1030 236}
{OLD_JOURNEY 1056 239}
{OLD_JOURNEY 1080 248}
{OLD_BATTLE 1101 264}
#enddef
#define JOURNEY_06_NEW
{JOURNEY_05_OLD}
{NEW_JOURNEY 1088 288}
{NEW_JOURNEY 1077 312}
{NEW_JOURNEY 1068 338}
{NEW_JOURNEY 1062 364}
{NEW_JOURNEY 1060 391}
{NEW_JOURNEY 1057 418}
{NEW_JOURNEY 1048 442}
{NEW_JOURNEY 1039 469}
{NEW_JOURNEY 1027 497}
{NEW_JOURNEY 1013 521}
{NEW_JOURNEY 998 544}
{NEW_JOURNEY 985 567}
{NEW_JOURNEY 988 596}
{NEW_JOURNEY 1006 619}
{NEW_JOURNEY 1027 641}
{NEW_JOURNEY 1036 668}
{NEW_JOURNEY 1026 700}
{NEW_JOURNEY 1017 725}
{NEW_JOURNEY 991 723}
{NEW_JOURNEY 966 720}
{NEW_JOURNEY 940 715}
{NEW_JOURNEY 915 709}
{NEW_JOURNEY 890 702}
{NEW_BATTLE 866 693}
#enddef
#define JOURNEY_06_OLD
{JOURNEY_05_OLD}
{OLD_JOURNEY 1088 288}
{OLD_JOURNEY 1077 312}
{OLD_JOURNEY 1068 338}
{OLD_JOURNEY 1062 364}
{OLD_JOURNEY 1060 391}
{OLD_JOURNEY 1057 418}
{OLD_JOURNEY 1048 442}
{OLD_JOURNEY 1039 469}
{OLD_JOURNEY 1027 497}
{OLD_JOURNEY 1013 521}
{OLD_JOURNEY 998 544}
{OLD_JOURNEY 985 567}
{OLD_JOURNEY 988 596}
{OLD_JOURNEY 1006 619}
{OLD_JOURNEY 1027 641}
{OLD_JOURNEY 1036 668}
{OLD_JOURNEY 1026 700}
{OLD_JOURNEY 1017 725}
{OLD_JOURNEY 991 723}
{OLD_JOURNEY 966 720}
{OLD_JOURNEY 940 715}
{OLD_JOURNEY 915 709}
{OLD_JOURNEY 890 702}
{OLD_BATTLE 866 693}
#enddef
#define JOURNEY_07_NEW
{JOURNEY_06_OLD}
{NEW_JOURNEY 868 666}
{NEW_JOURNEY 860 640}
{NEW_JOURNEY 845 617}
{NEW_JOURNEY 826 598}
{NEW_JOURNEY 803 583}
{NEW_JOURNEY 778 573}
{NEW_JOURNEY 751 571}
{NEW_JOURNEY 725 580}
{NEW_JOURNEY 704 594}
{NEW_JOURNEY 683 608}
{NEW_JOURNEY 662 623}
{NEW_JOURNEY 642 638}
{NEW_JOURNEY 621 654}
{NEW_JOURNEY 601 669}
{NEW_JOURNEY 581 685}
{NEW_JOURNEY 561 700}
{NEW_JOURNEY 540 714}
{NEW_JOURNEY 518 727}
{NEW_JOURNEY 495 738}
{NEW_JOURNEY 471 746}
{NEW_JOURNEY 446 751}
{NEW_JOURNEY 421 753}
{NEW_JOURNEY 395 752}
{NEW_JOURNEY 370 749}
{NEW_JOURNEY 345 745}
{NEW_JOURNEY 320 738}
{NEW_BATTLE 296 731}
#enddef
#define JOURNEY_07_OLD
{JOURNEY_06_OLD}
{OLD_JOURNEY 868 666}
{OLD_JOURNEY 860 640}
{OLD_JOURNEY 845 617}
{OLD_JOURNEY 826 598}
{OLD_JOURNEY 803 583}
{OLD_JOURNEY 778 573}
{OLD_JOURNEY 751 571}
{OLD_JOURNEY 725 580}
{OLD_JOURNEY 704 594}
{OLD_JOURNEY 683 608}
{OLD_JOURNEY 662 623}
{OLD_JOURNEY 642 638}
{OLD_JOURNEY 621 654}
{OLD_JOURNEY 601 669}
{OLD_JOURNEY 581 685}
{OLD_JOURNEY 561 700}
{OLD_JOURNEY 540 714}
{OLD_JOURNEY 518 727}
{OLD_JOURNEY 495 738}
{OLD_JOURNEY 471 746}
{OLD_JOURNEY 446 751}
{OLD_JOURNEY 421 753}
{OLD_JOURNEY 395 752}
{OLD_JOURNEY 370 749}
{OLD_JOURNEY 345 745}
{OLD_JOURNEY 320 738}
{OLD_BATTLE 296 731}
#enddef
# Scenarios 8 and 9 have no story screens
#define JOURNEY_10_NEW
{JOURNEY_07_OLD}
{NEW_JOURNEY 273 716}
{NEW_JOURNEY 266 689}
{NEW_JOURNEY 270 662}
{NEW_BATTLE 279 635}
#enddef
#define JOURNEY_10_OLD
{JOURNEY_07_OLD}
{OLD_JOURNEY 273 716}
{OLD_JOURNEY 266 689}
{OLD_JOURNEY 270 662}
{OLD_BATTLE 279 635}
#enddef
#define JOURNEY_11_NEW
{JOURNEY_10_OLD}
{NEW_JOURNEY 250 630}
{NEW_JOURNEY 224 616}
{NEW_JOURNEY 198 602}
{NEW_JOURNEY 168 599}
{NEW_JOURNEY 139 602}
{NEW_JOURNEY 152 578}
{NEW_JOURNEY 175 562}
{NEW_JOURNEY 201 552}
{NEW_JOURNEY 225 537}
{NEW_JOURNEY 238 513}
{NEW_JOURNEY 246 489}
{NEW_JOURNEY 257 466}
{NEW_JOURNEY 272 446}
{NEW_JOURNEY 290 428}
{NEW_JOURNEY 310 412}
{NEW_JOURNEY 331 398}
{NEW_JOURNEY 353 385}
{NEW_JOURNEY 376 374}
{NEW_JOURNEY 399 364}
{NEW_JOURNEY 423 355}
{NEW_JOURNEY 446 346}
{NEW_JOURNEY 470 337}
{NEW_JOURNEY 494 328}
{NEW_JOURNEY 517 318}
{NEW_JOURNEY 539 306}
{NEW_BATTLE 556 287}
#enddef
#define JOURNEY_11_OLD
{JOURNEY_10_OLD}
{OLD_JOURNEY 250 630}
{OLD_JOURNEY 224 616}
{OLD_JOURNEY 198 602}
{OLD_JOURNEY 168 599}
{OLD_JOURNEY 139 602}
{OLD_JOURNEY 152 578}
{OLD_JOURNEY 175 562}
{OLD_JOURNEY 201 552}
{OLD_JOURNEY 225 537}
{OLD_JOURNEY 238 513}
{OLD_JOURNEY 246 489}
{OLD_JOURNEY 257 466}
{OLD_JOURNEY 272 446}
{OLD_JOURNEY 290 428}
{OLD_JOURNEY 310 412}
{OLD_JOURNEY 331 398}
{OLD_JOURNEY 353 385}
{OLD_JOURNEY 376 374}
{OLD_JOURNEY 399 364}
{OLD_JOURNEY 423 355}
{OLD_JOURNEY 446 346}
{OLD_JOURNEY 470 337}
{OLD_JOURNEY 494 328}
{OLD_JOURNEY 517 318}
{OLD_JOURNEY 539 306}
{OLD_BATTLE 556 287}
#enddef
#define JOURNEY_12_NEW
{JOURNEY_11_OLD}
{NEW_BATTLE 566 264}
#enddef
#define BIGMAP_01
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_01_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_02
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_02_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_03
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_03_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_04
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_04_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_05
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_05_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_06
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_06_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_07
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_07_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_10
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_10_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_11
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_11_NEW}
[/part]
[/story]
#enddef
#define BIGMAP_12
[story]
[part]
show_title=yes
{DID_BIGMAP}
{JOURNEY_12_NEW}
[/part]
[/story]
#enddef

658
data/campaigns/Descent_Into_Darkness/utils/journey.cfg
View file

@ -1,658 +0,0 @@
#textdomain wesnoth-did
# trackplacer: tracks begin
#
# Hand-hack this section strictly at your own risk.
#
# trackplacer: map=data/campaigns/Descent_Into_Darkness/images/misc/descent-into-darkness.png
#
#define JOURNEY_STAGE1
{NEW_BATTLE 800 425}
#enddef
#define JOURNEY_STAGE1_END
{NEW_BATTLE 800 425}
#enddef
#define JOURNEY_STAGE2
{OLD_BATTLE 800 425}
{NEW_JOURNEY 819 409}
{NEW_JOURNEY 823 377}
{NEW_JOURNEY 826 344}
{NEW_BATTLE 822 312}
#enddef
#define JOURNEY_STAGE2_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{NEW_BATTLE 822 312}
#enddef
#define JOURNEY_STAGE3
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{NEW_JOURNEY 792 339}
{NEW_JOURNEY 750 355}
{NEW_JOURNEY 702 349}
{NEW_JOURNEY 643 332}
{NEW_JOURNEY 591 315}
{NEW_JOURNEY 552 287}
{NEW_BATTLE 538 267}
#enddef
#define JOURNEY_STAGE3_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{NEW_BATTLE 538 267}
#enddef
#define JOURNEY_STAGE4
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{NEW_JOURNEY 556 251}
{NEW_JOURNEY 580 248}
{NEW_JOURNEY 610 240}
{NEW_JOURNEY 639 220}
{NEW_BATTLE 657 203}
#enddef
#define JOURNEY_STAGE4_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{NEW_BATTLE 657 203}
#enddef
#define JOURNEY_STAGE5
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{NEW_JOURNEY 652 180}
{NEW_JOURNEY 638 162}
{NEW_JOURNEY 636 137}
{NEW_JOURNEY 661 119}
{NEW_JOURNEY 696 113}
{NEW_JOURNEY 730 131}
{NEW_JOURNEY 753 166}
{NEW_JOURNEY 777 190}
{NEW_BATTLE 814 185}
#enddef
#define JOURNEY_STAGE5_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{NEW_BATTLE 814 185}
#enddef
#define JOURNEY_STAGE6
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{NEW_JOURNEY 827 206}
{NEW_JOURNEY 863 209}
{NEW_JOURNEY 882 238}
{NEW_JOURNEY 893 264}
{NEW_JOURNEY 893 311}
{NEW_JOURNEY 875 341}
{NEW_JOURNEY 867 372}
{NEW_JOURNEY 867 408}
{NEW_JOURNEY 867 442}
{NEW_JOURNEY 839 440}
{NEW_BATTLE 805 444}
#enddef
#define JOURNEY_STAGE6_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{NEW_BATTLE 805 444}
#enddef
#define JOURNEY_STAGE7
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{NEW_JOURNEY 766 462}
{NEW_JOURNEY 721 469}
{NEW_JOURNEY 683 463}
{NEW_JOURNEY 647 459}
{NEW_JOURNEY 615 455}
{NEW_JOURNEY 581 452}
{NEW_JOURNEY 548 447}
{NEW_BATTLE 521 441}
#enddef
#define JOURNEY_STAGE7_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{NEW_BATTLE 521 441}
#enddef
#define JOURNEY_STAGE8
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{OLD_BATTLE 521 441}
{NEW_JOURNEY 509 410}
{NEW_BATTLE 500 375}
#enddef
#define JOURNEY_STAGE8_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{OLD_BATTLE 521 441}
{OLD_JOURNEY 509 410}
{NEW_BATTLE 500 375}
#enddef
#define JOURNEY_STAGE9
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{OLD_BATTLE 521 441}
{OLD_JOURNEY 509 410}
{OLD_BATTLE 500 375}
{NEW_JOURNEY 485 355}
{NEW_JOURNEY 478 315}
{NEW_JOURNEY 471 288}
{NEW_BATTLE 458 263}
#enddef
#define JOURNEY_STAGE9_END
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{OLD_BATTLE 521 441}
{OLD_JOURNEY 509 410}
{OLD_BATTLE 500 375}
{OLD_JOURNEY 485 355}
{OLD_JOURNEY 478 315}
{OLD_JOURNEY 471 288}
{NEW_BATTLE 458 263}
#enddef
#define JOURNEY_COMPLETE
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
{OLD_JOURNEY 826 344}
{OLD_BATTLE 822 312}
{OLD_JOURNEY 792 339}
{OLD_JOURNEY 750 355}
{OLD_JOURNEY 702 349}
{OLD_JOURNEY 643 332}
{OLD_JOURNEY 591 315}
{OLD_JOURNEY 552 287}
{OLD_BATTLE 538 267}
{OLD_JOURNEY 556 251}
{OLD_JOURNEY 580 248}
{OLD_JOURNEY 610 240}
{OLD_JOURNEY 639 220}
{OLD_BATTLE 657 203}
{OLD_JOURNEY 652 180}
{OLD_JOURNEY 638 162}
{OLD_JOURNEY 636 137}
{OLD_JOURNEY 661 119}
{OLD_JOURNEY 696 113}
{OLD_JOURNEY 730 131}
{OLD_JOURNEY 753 166}
{OLD_JOURNEY 777 190}
{OLD_BATTLE 814 185}
{OLD_JOURNEY 827 206}
{OLD_JOURNEY 863 209}
{OLD_JOURNEY 882 238}
{OLD_JOURNEY 893 264}
{OLD_JOURNEY 893 311}
{OLD_JOURNEY 875 341}
{OLD_JOURNEY 867 372}
{OLD_JOURNEY 867 408}
{OLD_JOURNEY 867 442}
{OLD_JOURNEY 839 440}
{OLD_BATTLE 805 444}
{OLD_JOURNEY 766 462}
{OLD_JOURNEY 721 469}
{OLD_JOURNEY 683 463}
{OLD_JOURNEY 647 459}
{OLD_JOURNEY 615 455}
{OLD_JOURNEY 581 452}
{OLD_JOURNEY 548 447}
{OLD_BATTLE 521 441}
{OLD_JOURNEY 509 410}
{OLD_BATTLE 500 375}
{OLD_JOURNEY 485 355}
{OLD_JOURNEY 478 315}
{OLD_JOURNEY 471 288}
{OLD_BATTLE 458 263}
#enddef
# trackplacer: tracks end
#define TO_SAVING_PARTHYN
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE1}
#enddef
#define TO_PEACEFUL_VALLEY
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE2}
#enddef
#define TO_A_HAUNTING_IN_WINTER
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE3}
#enddef
#define TO_BEGINNING_OF_THE_REVENGE
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE4}
#enddef
#define TO_ORC_WAR
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE5}
#enddef
#define TO_RETURN_TO_PARTHYN
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE6}
#enddef
#define TO_A_SMALL_FAVOR
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE7}
#enddef
#define TO_ALONE_AT_LAST
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE8}
#enddef
#define TO_DESCENT_INTO_DARKNESS
background="misc/descent-into-darkness.png"
{JOURNEY_STAGE9}
#enddef
# trackplacer: epilog begins
#undef JOURNEY_STAGE1_END
#undef JOURNEY_STAGE2_END
#undef JOURNEY_STAGE3_END
#undef JOURNEY_STAGE4_END
#undef JOURNEY_STAGE5_END
#undef JOURNEY_STAGE6_END
#undef JOURNEY_STAGE7_END
#undef JOURNEY_STAGE8_END
#undef JOURNEY_STAGE9_END
#undef JOURNEY_COMPLETE
# trackplacer: epilog ends

BIN
data/campaigns/Eastern_Invasion/images/l10n/gl/eastern-invasion-map--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 129 KiB

BIN
data/campaigns/Heir_To_The_Throne/images/maps/l10n/gl/httt--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 312 KiB

BIN
data/campaigns/Heir_To_The_Throne/images/maps/l10n/lt/httt--overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 KiB

BIN
data/campaigns/Heir_To_The_Throne/images/portraits/asheviere-defeated.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 KiB

After

Width:  |  Height:  |  Size: 206 KiB

BIN
data/campaigns/Heir_To_The_Throne/images/portraits/asheviere-mad.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 197 KiB

After

Width:  |  Height:  |  Size: 189 KiB

BIN
data/campaigns/Legend_of_Wesmere/images/l10n/gl/legend-of-wesmere-map--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 42 KiB

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
View file

@ -87,8 +87,8 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
side=1
fog=no
shroud=no
# wmllint: who {KALENZ} is Kalenz
{KALENZ}
# wmllint: recognize Kalenz
save_id=Kalenz
controller=human
team_name=player
@ -99,8 +99,8 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
y=15
#ifndef MULTIPLAYER
[unit]
# wmllint: who {LANDAR} is Landar
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
x=18
y=15

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
View file

@ -50,7 +50,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
controller=human
fog=no
extra_recruit=Elvish Fighter, Elvish Archer
@ -58,7 +57,6 @@
{PLAYER_GOLD}
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
x=20
y=4
@ -69,6 +67,7 @@
[/side]
[event]
name=prestart
# wmllint: who RECALL_LOYALS is Anduilas, Landulias
{RECALL_LOYALS}
[/event]
### /Kalenz's code ###
@ -80,7 +79,7 @@
#enddef
[side]
# wmllint: recognize Olurf
# wmllint: who {OLURF} is Olurf
{OLURF}
side=2
allow_player=no
@ -467,7 +466,6 @@
{LANDAR}
{MULTIPLAYER_GOLD}
fog=no
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
[/side]
#endif

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
View file

@ -325,7 +325,6 @@
x=19
y=22
[/unit]
# wmllint: recognize Eradion
x=19
y=22
[/side]
@ -716,7 +715,6 @@
y=11
[/unit]
# wmllint: recognize Landar
[unit]
{LANDAR}
#ifndef MULTIPLAYER

8
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
View file

@ -62,7 +62,6 @@ Chapter Two"
team_name=Player
user_team_name= _ "Player"
recruit=""
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD_04}
[unit]
@ -70,7 +69,6 @@ Chapter Two"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=16
y=29
# wmllint: recognize Landar
[/unit]
#else
{MULTIPLAYER_GOLD_04}
@ -143,7 +141,6 @@ Chapter Two"
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
@ -160,7 +157,6 @@ Chapter Two"
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"
# wmllint: recognize Cleodil
extra_recruit=Elvish Shaman, Elvish Scout, Wose
[/side]
@ -264,8 +260,8 @@ Chapter Two"
[/then]
[/if]
# wmllint: who RECALL_LOYALS is Huraldur
{RECALL_LOYALS}
# wmllint: recognize Huraldur
#{CHECK_LANDAR}
#ifdef MULTIPLAYER
@ -348,7 +344,7 @@ Chapter Two"
{INCIDENTAL_MUSIC love_theme.ogg}
[unit]
# wmllint: recognize Cleodil
# wmllint: who {CLEODIL} is Cleodil
{CLEODIL}
#ifdef MULTIPLAYER
side=5

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
View file

@ -77,7 +77,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=3
y=19
@ -89,14 +88,12 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=4
y=11
# wmllint: recognize Landar
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=1
y=15
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -194,7 +191,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{LANDAR}
# wmllint: recognize Landar
x=4
y=11
[/side]
@ -241,6 +237,7 @@
[/gold_carryover]
[/objectives]
# wmllint: who RECALL_LOYALS is Arkildur, Tameril-Isimeril, Laril
{RECALL_LOYALS}
[/event]
@ -431,7 +428,6 @@
[then]
[if]
[have_unit]
#wmllint: recognize Huraldur
id=Huraldur
[/have_unit]
[then]

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
View file

@ -60,7 +60,6 @@
{KALENZ}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=no
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
@ -69,7 +68,6 @@
#placement=leader
x=22
y=39
# wmllint: recognize Landar
[/unit]
[unit]
{CLEODIL}
@ -77,7 +75,6 @@
x=14
y=39
#placement=leader
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -92,7 +89,6 @@
#### Olurf's code ####
[side]
{OLURF}
# wmllint: recognize Olurf
side=2
allow_player=no
controller=ai
@ -214,7 +210,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{LANDAR}
# wmllint: recognize Landar
[/side]
[side]
side=7
@ -223,7 +218,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Shaman, Wose, Elvish Scout
{CLEODIL}
# wmllint: recognize Landar
[/side]
#endif

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
View file

@ -64,7 +64,6 @@
#### Kalenz ###
[side]
# wmllint: recognize Kalenz
{KALENZ}
type=Elvish Captain
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -75,14 +74,12 @@
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
# wmllint: recognize Landar
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=42
y=10
[/unit]
[unit]
# wmllint: recognize Cleodil
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=41
@ -603,7 +600,6 @@
[unit]
side=8
{OLURF}
#wmllint: recognize Olurf
x=$olurf_entry.x
y=$olurf_entry.y
[/unit]

7
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
View file

@ -72,7 +72,6 @@ Chapter Three"
shroud=no
team_name=player
user_team_name= _ "Player"
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#ifndef MULTIPLAYER
{PLAYER_GOLD}
@ -80,7 +79,6 @@ Chapter Three"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
x=14
y=31
[/unit]
@ -89,14 +87,12 @@ Chapter Three"
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Stalwart
x=18
y=29
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Wose, Elvish Scout
x=18
y=31
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -332,7 +328,6 @@ Chapter Three"
type=Elvish Ranger
x=14
y=31
# wmllint: recognize Landar
[/unit]
[/then]
[/if]
@ -348,7 +343,6 @@ Chapter Three"
side=6
x=18
y=29
# wmllint: recognize Olurf
[/unit]
[/then]
[/if]
@ -364,7 +358,6 @@ Chapter Three"
side=7
x=18
y=31
# wmllint: recognize Cleodil
[/unit]
[/then]
[/if]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
View file

@ -62,13 +62,11 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=yes
#ifndef MULTIPLAYER
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=23
y=32
@ -78,14 +76,12 @@
x=13
y=31
#extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsmen, Dwarvish Scout
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Wose, Elvish Scout
x=18
y=32
# wmllint: recognize Cleodil
[/unit]
#endif
[/side]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
View file

@ -57,28 +57,24 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=yes
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=25
y=27
[/unit]
[unit]
{OLURF}
# wmllint: recognize Olurf
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Thunderer, Dwarvish Guardsman
x=29
y=28
[/unit]
[unit]
{CLEODIL}
# wmllint: recognize Cleodil
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=15
y=27

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
View file

@ -38,7 +38,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
fog=yes
share_view=yes
x=12
@ -47,17 +46,14 @@
#ifndef MULTIPLAYER
[unit]
{LANDAR}
# wmllint: recognize Landar
placement=leader
[/unit]
[unit]
{CLEODIL}
# wmllint: recognize Cleodil
placement=leader
[/unit]
[unit]
{OLURF}
# wmllint: recognize Olurf
placement=leader
[/unit]
#endif

11
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
View file

@ -171,21 +171,18 @@ Chapter Four"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
x=25
y=13
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
# wmllint: recognize Cleodil
x=27
y=12
[/unit]
[unit]
{OLURF}
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Guardsman
# wmllint: recognize Olurf
x=36
y=10
[/unit]
@ -371,10 +368,6 @@ Chapter Four"
[event]
name=side 1 turn 1
# wmllint: recognize Arkildur
# wmllint: recognize Tameril-Isimeril
# wmllint: recognize Laril
# wmllint: recognize Anduilas
#ifdef MULTIPLAYER
{GET_PERSISTENT_RECALLS_FROM4 1 5 6 7 LoW_Chapter_Three kalenz}
@ -704,7 +697,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=28
y=11
# wmllint: recognize Landar
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
@ -717,7 +709,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=36
y=10
# wmllint: recognize Olurf
team_name=player
user_team_name= _ "Player"
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Guardsman, Dwarvish Thunderer
@ -732,7 +723,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=36
y=10
# wmllint: recognize Olurf
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Shaman, Wose, Elvish Scout
@ -955,7 +945,6 @@ Chapter Four"
#[/modify_ai]
[/event]
#wmllint: recognize Cleodil
[event]
name=victory
[message]

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
View file

@ -68,7 +68,6 @@
#wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
village_gold=0
#This sets the income to 0
{INCOME -2 -2 -2}
@ -76,7 +75,6 @@
{LANDAR}
canrecruit=yes
placement=leader
# wmllint: recognize Landar
[/unit]
[/side]
#wmllint: validate-on

8
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
View file

@ -54,7 +54,6 @@
[side]
{KALENZ}
#wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -68,21 +67,18 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#TODO place on his keep
placement=leader
# wmllint: recognize Landar
[/unit]
[unit]
{OLURF}
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout
#TODO place on his keep
placement=leader
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#TODO place on her keep
placement=leader
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -220,7 +216,6 @@
{LANDAR}
{MULTIPLAYER_GOLD}
fog=yes
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
@ -231,13 +226,11 @@
{OLURF}
{MULTIPLAYER_GOLD}
fog=yes
# wmllint: recognize Olurf
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout
[/side]
[side]
side=8
{CLEODIL}
# wmllint: recognize Cleodil
save_id=Cleodil
x=20
y=4
@ -410,6 +403,7 @@
[/message]
[/event]
# wmllint: unwho "{OLURF}"
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
View file

@ -83,7 +83,6 @@ Chapter Five"
[side]
{KALENZ}
# wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -94,7 +93,6 @@ Chapter Five"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
#TODO place on his keep
placement=leader
[/unit]
@ -113,7 +111,6 @@ Chapter Five"
#TODO see if this recalls units wich are not recallable
{RECALL_LOYALS}
# wmllint: recognize Anduilas
[/event]
[side]
@ -324,7 +321,6 @@ Chapter Five"
[then]
[role]
role=Anduilas
# wmllint: recognize Anduilas
id=Anduilas
[/role]
[/then]

1
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
View file

@ -68,7 +68,6 @@
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#wmllint: recognize Cleodil
placement=leader
[/unit]
[/side]

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
View file

@ -46,7 +46,6 @@
[side]
{KALENZ}
{PLAYABLE}
# wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
controller=human
@ -60,7 +59,6 @@
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#TODO place on her keep
placement=leader
#wmllint: recognize Cleodil
[/unit]
#endif
[/side]
@ -150,7 +148,6 @@
[side]
{URADREDIA}
#wmllint: recognize Uradredia
persistent=yes
save_id=Uradredia
side=2

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
View file

@ -39,7 +39,6 @@
[side]
{KALENZ}
{PLAYABLE}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{GOLD 200 180 160}
#ifndef MULTIPLAYER
@ -47,7 +46,6 @@
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#wmllint: recognize Cleodil
placement=leader
[/unit]
#endif
@ -67,7 +65,6 @@
#ifdef MULTIPLAYER
{PLAYABLE}
#endif
# wmllint: recognize Landar
canrecruit=yes
#ifdef EASY
recruit=Elvish Archer, Elvish Fighter, Elvish Hero
@ -209,6 +206,7 @@
[/endlevel]
[/event]
# wmllint: unwho ALL
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER

BIN
data/campaigns/Liberty/images/maps/l10n/gl/liberty-map--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 132 KiB

2
data/campaigns/Liberty/utils/utils.cfg
View file

@ -177,7 +177,7 @@
[message]
speaker=narrator
image=wesnoth-icon.png
message=_ "They returned to their village to find it destroyed, with those who fought left dead and the few survivors born away to unguessable fates. It was a bitter doom, but as Asheviere’s grip tightened they would live to see worse."
message=_ "They returned to their village to find it destroyed, with those who fought left dead and the few survivors borne away to unguessable fates. It was a bitter doom, but as Asheviere’s grip tightened they would live to see worse."
[/message]
[/event]
#enddef

BIN
data/campaigns/Sceptre_of_Fire/images/maps/l10n/gl/sof--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 157 KiB

BIN
data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/gl/sotbe--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 276 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/east.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-blackmore.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 999 B

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-clearwater.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-jevyan.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-southbay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-stormvale.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-thegreenisle.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/trow-logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 57 KiB

BIN
data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/west.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
data/campaigns/The_South_Guard/images/maps/l10n/gl/tsg--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 188 KiB

BIN
data/campaigns/The_South_Guard/images/maps/l10n/lt/tsg--overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 140 KiB

BIN
data/core/images/icons/key_silver.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
data/core/images/icons/ring_gold.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
data/core/images/maps/l10n/gl/titlescreen--overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 312 KiB

BIN
data/core/images/maps/l10n/lt/titlescreen--overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 KiB

BIN
data/core/images/maps/l10n/lt/wesnoth--overlay.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 114 KiB

BIN
data/core/images/misc/l10n/gl/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
data/core/images/portraits/undead/transparent/ancient-lich.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 230 KiB

BIN
data/core/images/unit_env/schedule/tod-clouds-dawn.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 251 KiB

BIN
data/core/images/unit_env/schedule/tod-clouds-day.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 379 KiB

BIN
data/core/images/unit_env/schedule/tod-clouds-dusk.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 199 KiB

BIN
data/core/images/unit_env/schedule/tod-clouds-golden.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 KiB

After

Width:  |  Height:  |  Size: 182 KiB

BIN
data/core/images/unit_env/schedule/tod-clouds-night.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 317 KiB

After

Width:  |  Height:  |  Size: 296 KiB

BIN
data/core/images/unit_env/schedule/tod-template.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
data/core/images/units/monsters/scorpion/scorpion.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

7
data/core/macros/interface-utils.cfg
View file

@ -325,6 +325,8 @@
{FADE_STEP -160 5}
{FADE_STEP -192 5}
{FADE_STEP -224 5}
{FADE_STEP -256 5}
{FADE_STEP -512 5}
#enddef
#define FADE_TO_BLACK_HOLD TIME
@ -336,11 +338,14 @@
{FADE_STEP -128 5}
{FADE_STEP -160 5}
{FADE_STEP -192 5}
{FADE_STEP -224 {TIME}}
{FADE_STEP -224 5}
{FADE_STEP -256 5}
{FADE_STEP -512 {TIME}}
#enddef
#define FADE_IN
# Brings the screen back from a {FADE_TO_BLACK}
{FADE_STEP -256 5}
{FADE_STEP -224 5}
{FADE_STEP -192 5}
{FADE_STEP -160 5}

2
data/core/units/elves/Outrider.cfg
View file

@ -82,7 +82,7 @@ The speed of these soldiers allows the elves to strike when and where they choos
image="units/elves-wood/outrider/outrider.png:[100,250,100]"
[/frame]
[frame]
image="units/elves-wood/outrider/outrider-moving.png:100"
image="units/elves-wood/outrider/outrider.png:100"
[/frame]
[/attack_anim]
[attack_anim]

1
data/lua/wml-tags.lua
View file

@ -1012,6 +1012,7 @@ function wml_actions.store_side(cfg)
user_team_name = t.user_team_name,
color = t.color,
gold = t.gold,
scroll_to_leader = t.scroll_to_leader,
side = side_number
}
wesnoth.set_variable(string.format("%s[%u]", variable, index), container)

64
data/tools/rmtrans/rmtrans.py
View file

@ -3,39 +3,39 @@
from gimpfu import *
def rmtrans(img,tdrawable):
pdb.gimp_image_undo_group_start(img)
if pdb.gimp_selection_is_empty(img):
pdb.gimp_selection_all(img)
selection = pdb.gimp_selection_save(img)
pdb.gimp_selection_none(img)
alpha,temp,temp,temp = pdb.plug_in_decompose(img,tdrawable,"Alpha",1) # get alpha channel
alpha = pdb.gimp_image_get_active_layer(alpha) # turn it into a layer
pdb.gimp_edit_copy(alpha)
pdb.gimp_floating_sel_to_layer(pdb.gimp_edit_paste(tdrawable,TRUE))
alpha = pdb.gimp_image_get_active_layer(img) # move alpha layer into image (copy-paste)
pdb.gimp_context_set_antialias(False)
pdb.gimp_context_set_sample_threshold(0.0) # configuration for color selection
for i in xrange(10):
pdb.gimp_image_select_color(img,CHANNEL_OP_REPLACE,alpha,(i,i,i)) # select alpha values <= 10
pdb.gimp_image_select_item(img,CHANNEL_OP_INTERSECT,selection) # bound it to the previously selected area (before plugin execution)
if not(pdb.gimp_selection_is_empty(img)):
pdb.gimp_edit_clear(tdrawable) # and clear it
print(alpha)
pdb.gimp_image_remove_layer(img,alpha)
pdb.gimp_selection_none(img)
pdb.gimp_image_undo_group_end(img)
pdb.gimp_image_undo_group_start(img)
if pdb.gimp_selection_is_empty(img):
pdb.gimp_selection_all(img)
selection = pdb.gimp_selection_save(img)
pdb.gimp_selection_none(img)
alpha,temp,temp,temp = pdb.plug_in_decompose(img,tdrawable,"Alpha",1) # get alpha channel
alpha = pdb.gimp_image_get_active_layer(alpha) # turn it into a layer
pdb.gimp_edit_copy(alpha)
pdb.gimp_floating_sel_to_layer(pdb.gimp_edit_paste(tdrawable,TRUE))
alpha = pdb.gimp_image_get_active_layer(img) # move alpha layer into image (copy-paste)
pdb.gimp_context_set_antialias(False)
pdb.gimp_context_set_sample_threshold(0.0) # configuration for color selection
for i in xrange(10):
pdb.gimp_image_select_color(img,CHANNEL_OP_REPLACE,alpha,(i,i,i)) # select alpha values <= 10
pdb.gimp_image_select_item(img,CHANNEL_OP_INTERSECT,selection) # bound it to the previously selected area (before plugin execution)
if not(pdb.gimp_selection_is_empty(img)):
pdb.gimp_edit_clear(tdrawable) # and clear it
print(alpha)
pdb.gimp_image_remove_layer(img,alpha)
pdb.gimp_selection_none(img)
pdb.gimp_image_undo_group_end(img)
register(
"python_fu_rmtrans",
"Remove all pixels under a given alpha threshold.",
"Remove all pixels under a given alpha threshold.",
"Samuel Kim",
"Samuel Kim",
"2012",
"<Image>/Colors/Remove almost-transparent pixels",
"*",
[],
[],
rmtrans)
"python_fu_rmtrans",
"Remove all pixels under a given alpha threshold.",
"Remove all pixels under a given alpha threshold.",
"Samuel Kim",
"Samuel Kim",
"2012",
"<Image>/Colors/Remove almost-transparent pixels",
"*",
[],
[],
rmtrans)
main()

4
data/tools/terrain2wiki.py
View file

@ -34,7 +34,7 @@ def parse_terrain(data):
editor_group=water
[/terrain_type]
Ouput is a text in wiki format.
Output is a text in wiki format.
"""
# Remove all comments.
@ -57,7 +57,7 @@ def parse_terrain(data):
# directly. (They're only there to make aliasing work.)
if i[0].startswith(" "):
continue
# Create a dictionnary of key and values
# Create a dictionary of key and values
content = dict([v.strip().split("=") for v in i])
# Hidden things shouldn't be displayed
if 'hidden' in content:

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

@ -192,7 +192,7 @@ class Addon(object):
# Fast forward
pass
elif status == "*":
# Freshly inited repository
# Freshly initiated repository
pass
elif status == "=":
# Up to date?

10
data/tools/wesnoth/wescamp.py
View file

@ -122,7 +122,7 @@ if __name__ == "__main__":
init_script = os.path.join(build_system.get_dir(), "init-build-sys.sh")
# Grab master build system's version
# Uglyness
# Ugliness
out, err, res = build_system._execute(["git", "show", "--pretty=oneline", "--summary"])
build_system_version = out.split()[0]
if len(build_system_version) != 40:
@ -136,7 +136,7 @@ if __name__ == "__main__":
logging.info("Build system for add-on {0} is up-to-date".format(addon_name))
return True
# Uglyness
# Ugliness
out, err, res = addon_obj._execute([init_script, "--{0}".format(git_version), addon_name, "."], check_error=False)
if len(err):
logging.warn("init-build-sys.sh in add-on {0}:\n{1}".format(addon_name, err))
@ -170,7 +170,7 @@ if __name__ == "__main__":
if not os.path.exists(os.path.join(addon_obj.get_dir(), "Makefile")):
logging.warn("Cannot pot-update: build system does not exist for add-on {0}.".format(addon_name))
return False
# Uglyness, again
# Ugliness, again
out, err, res = addon_obj._execute(["make"])
if len(err):
logging.warn("pot-update in addon {0}:\n{1}".format(addon_name, err))
@ -225,7 +225,7 @@ if __name__ == "__main__":
server The url of the addon server eg
add-ons.wesnoth.org:15005.
translatable_only If True only returns translatable addons.
returns A dictonary with the addon as key and the translatable
returns A dictionary with the addon as key and the translatable
status as value.
"""
@ -371,7 +371,7 @@ if __name__ == "__main__":
help = "Server to connect to [localhost]")
argumentparser.add_argument("-p", "--port",
help = "Port on the server to connect to. If omitted will try to selet a port based on --branch. ['']")
help = "Port on the server to connect to. If omitted will try to select a port based on --branch. ['']")
argumentparser.add_argument("-t", "--temp-dir", help = "Directory to store the "
+ "tempory data, if omitted a tempdir is created and destroyed after "

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

@ -267,7 +267,7 @@ class DataSub(Data):
bytes = ""
for r in result:
if r != None:
# For networking, we need actual bytesteam here, not unicode.
# For networking, we need actual bytestream here, not unicode.
if type(r) is unicode: r = r.encode("utf8")
bytes += str(r)

4
data/tools/wesnoth/wmliterator.py
View file

@ -96,12 +96,12 @@ class WmlIterator(object):
empty and the filename is specified, lines will be read from the file.
Note: if changes are made to lines while iterating, this may produce
unexpected results. In such case, seek() to the linenumber of a
unexpected results. In such case, seek() to the line number of a
scope behind where changes were made.
Important Attributes:
lines - this is an internal list of all the physical lines
scopes - this is an internal list of all open scopes (as iterators)
note: when retreiving an iterator from this list, always
note: when retrieving an iterator from this list, always
use a copy to perform seek() or next(), and not the original
element - the wml tag, key, or macro name for this logical line
(in complex cases, this may be a tuple of elements...

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

@ -377,7 +377,7 @@ class Parser:
# file.
elif macro[0] == ".":
dirpath = self.current_path + macro[1:]
# Otherwise, try to interprete the macro as a filename in the data dir.
# Otherwise, try to interpret the macro as a filename in the data dir.
elif self.data_dir != None:
dirpath = self.data_dir + "/" + macro
else:

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

@ -60,13 +60,10 @@ def parse_attribute(line):
leader = line[:where]
after = line[where+1:]
after = after.lstrip()
if "#" in after:
where = after.find("#")
where -= 1
while after[where] in (" ", "\t"):
where -= 1
value = after[:where+1]
comment = after[where+1:]
if re.search("\s#", after):
where = len(re.split("\s+#", after)[0])
value = after[:where]
comment = after[where:]
else:
value = after.rstrip()
comment = ""
@ -718,7 +715,7 @@ class CrossRef:
#
# String translations from po files. The advantage of this code is that it
# does not require the gettext binary message catalogs to have been compiled.
# The disavantage is that it eats lots of core!
# The disavantadge is that it eats lots of core!
#

2
data/tools/wmlflip
View file

@ -73,7 +73,7 @@ class ParseArgs:
self.lead = self.lead[:-1]
return c
elif c == '{':
self.parse_call()
self.parse_call()
def parse_call(self):
"We see a start of call."
if self.verbose:

2
data/tools/wmlindent
View file

@ -203,7 +203,7 @@ def reindent(name, infp, outfp):
# Compute the dostrip state likewise.
# We look for unbalanced string quotes.
if dostrip:
eligible = transformed.split("#")[0]
eligible = re.split("\s#", transformed)[0]
else:
eligible = transformed
if dostrip and "<<" in eligible and not ">>" in eligible.split("<<", 1)[1]:

100
data/tools/wmllint
View file

@ -9,9 +9,8 @@
# markup to newer ones should live here. This includes resource path changes
# and renames, also map format conversions.
#
# Note: Lift logic for pre-1.4 versions has been removed; if you need
# it, check out a copy of wmllint from the 1.4 stable branch and use
# that to lift before running this one. I did this for a policy
# Note: Lift logic for pre-1.4 versions has been removed; if you need it,
# use wmllint-1.4 to lift before running this one. I did this for a policy
# reason; I wanted to kill off the --oldversion switch. It will *not*
# be restored; in future, changes to WML syntax *must* be forward
# compatible in such a way that tags from old versions can be
@ -69,6 +68,30 @@
# also be useful if you have wrapped unit-creation or recall markup in macros
# and wmllint cannot recognize it.
#
# For macros used in multiple scenarios to field characters, you can tell
# wmllint to recognize them with another magic comment:
# wmllint: who <macro> is <character(s)>
# <Macro> should be a text string sufficient to distinguish the macro from
# any other; <character(s)> would be the ids of the recalled (or created)
# characters, comma-separated if there were more than one. (Enclosing <macro>
# in quotes is possible, if a space is needed at the end; for example, if a
# campaign had a "{GARARD_I $x $y}" macro and also a "GARARD_II" macro,
# "who '{GARARD_I '" would distinguish I from II.)
#
# If more characters attach to a macro in later scenarios, they can be appended
# with additional "who" magic comments (though this requires scenarios to
# be numbered or otherwise sorted to work properly, as wmllint traverses files
# in alphabetical order). If there is a character that drops out, preceding that
# person's entry with a double-minus will cause that character to be removed,
# e.g., "-- Garak".
#
# At the end of the campaign, *make sure* you use:
# wmllint: unwho ALL
# This will clear the list of "who" magic comments and tell wmllint to stop
# checking for them in later files and directories. If a specific macro is
# not used in subsequent scenarios, put "unwho <macro>" in its last scenario,
# where <macro> should be the string you originally used for "wmllint: who".
#
# Similarly, it is possible to explicitly declare a unit's usage class
# with a magic comment that looks like this:
# wmllint: usage of <unit> is <class>
@ -649,6 +672,9 @@ notepairs = [
("{WEAPON_SPECIAL_STUN}", "{SPECIAL_NOTES_STUN}"),
]
# This dictionary will pair macros with the characters they recall or create,
# but must be populated by the magic comment, "#wmllint: who ... is ...".
whopairs = {}
# These are accumulated by sanity_check() and examined by consistency_check()
unit_types = []
@ -904,8 +930,17 @@ def local_sanity_check(filename, nav, key, prefix, value, comment):
# Bad [recruit] attribute
if parent in ("[allow_recruit]", "[disallow_recruit]") and key == "recruit":
print errlead + "recruit= should be type="
# Check [binary_path] and [textdomain] paths
if parent == '[textdomain]' and key == 'path' and not '/translations' in value:
print errlead + 'no reference to "/translations" directory in textdomain path'
if parent == '[binary_path]' and key == 'path':
if '/external' in value or '/public' in value:
print errlead + '"/external" or "/public" image directories should no longer be used'
# Accumulate data to check for missing next scenarios
if parent == '[scenario] or parent == None':
if parent == '[campaign]':
if key == "first_scenario" and value != "null":
nextrefs.append((filename, nav.lineno, value))
if parent == '[scenario]' or parent == None:
if key == "next_scenario" and value != "null":
nextrefs.append((filename, nav.lineno, value))
if key == 'id':
@ -1303,6 +1338,40 @@ def global_sanity_check(filename, lines):
markcheck = False
if "wmllint: markcheck on" in lines[i]:
markcheck = True
if 'wmllint: who ' in lines[i]:
try:
fields = lines[i].split("wmllint: who ", 1)[1].split(" is ", 1)
if len(fields) == 2:
mac = string_strip(fields[0].strip())
if whopairs.has_key(mac):
whopairs[mac] = whopairs[mac] + ", " + fields[1].strip()
else:
whopairs.update({mac: fields[1].strip()})
except IndexError:
pass
elif 'wmllint: unwho ' in lines[i]:
unmac = lines[i].split("wmllint: unwho ", 1)[1].strip()
if string_strip(unmac).upper() == 'ALL':
whopairs.clear()
else:
try:
del whopairs[string_strip(unmac)]
except KeyError:
print >>sys.stderr, '%s, line %s: magic comment "unwho %s" does not match any current keys: %s' \
% (filename, i+1, unmac, str(whopairs.keys())[1:-1])
if lines[i].lstrip().startswith('{'):
# Recognize macro pairings from "wmllint: who" magic
# comments.
for mac in whopairs.keys():
if mac in lines[i]:
for who in whopairs[mac].split(","):
if who.strip().startswith("--"):
try:
present.remove(who.replace('--', '', 1).strip())
except:
ValueError
else:
present.append(who.strip())
m = re.search("# *wmllint: recognize +(.*)", lines[i])
if m:
present.append(string_strip(m.group(1)).strip())
@ -2266,6 +2335,7 @@ def help():
sys.stderr.write("""\
Usage: wmllint [options] [dir]
Convert Battle of Wesnoth WML from older versions to newer ones.
Also validates WML to check for errors.
Takes any number of directories as arguments. Each directory is converted.
If no directories are specified, acts on the current directory.
Options may be any of these:
@ -2275,17 +2345,24 @@ Usage: wmllint [options] [dir]
-v -v names each file before it's processed.
-v -v -v shows verbose parse details.
-c, --clean Clean up -bak files.
-D, --diff Display diffs between converted and unconverted files.
-D, --diff Display diffs between converted and unconverted
files.
-r, --revert Revert the conversion from the -bak files.
-s, --stripcr Convert DOS-style CR/LF to Unix-style LF.
-p, --progress Names each file before processing (like -v -v).
-f, --future Enable experimental WML conversions.
-K, --known Suppress check for unknown unit types, recruits,
races, scenarios, etc.
-S, --nospellcheck Suppress spellchecking
-Z, --stringfreeze Suppress warnings about newlines in messages
-Z, --stringfreeze Suppress repair attempts of newlines in messages
For more about wmllint, including how to prevent unwanted conversions and false
positive warnings with magic comments, read the introduction in the wmllint
file itself. See also: http://wiki.wesnoth.org/Maintenance_tools.
""")
if __name__ == '__main__':
try:
(options, arguments) = getopt.getopt(sys.argv[1:], "cdDfhnprsvSZ", [
(options, arguments) = getopt.getopt(sys.argv[1:], "cdDfhnprsvKSZ", [
"clean",
"diffs",
"dryrun",
@ -2295,10 +2372,13 @@ if __name__ == '__main__':
"revert",
"stripcr",
"verbose",
"known",
"nospellcheck",
"stringfreeze",
])
except getopt.GetoptError:
help()
sys.stderr.write('\nAn option you have entered is invalid. Review options and try again.')
sys.exit(1)
clean = False
diffs = False
@ -2310,6 +2390,7 @@ if __name__ == '__main__':
verbose = 0
dospellcheck = True
progress = False
inconsistency = False
for (switch, val) in options:
if switch in ('-h', '--help'):
help()
@ -2335,6 +2416,8 @@ if __name__ == '__main__':
verbose += 1
elif switch in ('-S', '--nospellcheck'):
dospellcheck = False
elif switch in ('-K', '--known'):
inconsistency = True
if clean and revert:
sys.stderr.write("wmllint: can't do clean and revert together.\n")
sys.exit(1)
@ -2560,7 +2643,8 @@ In your case, your system interprets your arguments as:
raise exc_type, exc_value, exc_traceback
if not clean and not diffs and not revert:
# Consistency-check everything we got from the file scans
consistency_check()
if not inconsistency:
consistency_check()
# Attempt a spell-check
if dospellcheck:
try:

24
data/tools/wmllint-1.4
View file

@ -46,7 +46,7 @@
#
# You can also prevent description insertions with "wmllint: no-icon".
#
# You can force otherwise undeclared characters to be recogized with
# You can force otherwise undeclared characters to be recognized with
# a magic comment containing the string "wmllint: recognize".
# The rest of the line is stripped and treated as the name of a character
# who should be recognized in descriptions. This will be useful,
@ -307,7 +307,7 @@ filemoves = {
"trunk" : (),
}
# Turn all the filemove string substition pairs into nearly equivalent
# Turn all the filemove string substitution pairs into nearly equivalent
# regexp-substitution pairs, forbidding the match from being preceded
# by a dash. This prevents, e.g., "miss.ogg" false-matching on "big-miss.ogg".
for (key, value) in filemoves.items():
@ -602,7 +602,7 @@ def parse_attribute(str):
# value, trailing whitespace and comment.
return (leader.strip(), leader+"=", string_strip(value), comment)
# This needs to match the list of usagge types in ai_python.cpp
# This needs to match the list of usage types in ai_python.cpp
usage_types = ("scout", "fighter", "mixed fighter", "archer", "healer")
# These are accumulated by sanity_check() and examined by sanity_postcheck()
@ -621,7 +621,7 @@ def sanity_check(filename, lines):
modified = False
unit_id = ""
# Sanity-check abilities and traits against notes macros.
# Note: This check is disabled on units deived via [base_unit].
# Note: This check is disabled on units derived via [base_unit].
# Also, build dictionaries of unit movement types and races
in_unit = False
in_attack_filter = False
@ -731,7 +731,7 @@ def sanity_check(filename, lines):
except TypeError:
pass
# Sanity-check recruit and recruitment_pattern.
# This code has a limitation; if there arre multiple instances of
# This code has a limitation; if there are multiple instances of
# recruit and recruitment_pattern (as can happen if these lists
# vary by EASY/NORMAL/HARD level) this code will only record the
# last of each for later consistency checking.
@ -1994,14 +1994,20 @@ def allcfgfiles(dir):
def help():
sys.stderr.write("""\
Usage: wmllint [options] [dir]
Convert Battle of Wesnoth WML from older versions to newer ones.
Included because wmllint has dropped support for pre-1.4 Wesnoth WML.
Use it to convert 1.0 and 1.2 material to "1.4", then use regular wmllint
to port it to a modern Battle of Wesnoth version. Can also be used to
validate 1.4 add-ons against remnants of archaic WML.
Takes any number of directories as arguments. Each directory is converted.
If no directories are specified, acts on the current directory.
Options may be any of these:
-h, --help Emit this help message and quit.
-d, --dryrun List changes but don't perform them.
-n, --nolift Don't perform version-lifting
-n, --nolift Don't perform version-lifting.
-o, --oldversion Specify version to begin with.
Note: wmllint-1.4 already defaults to "older",
which covers everything before 1.3.1.
-v, --verbose -v lists changes.
-v -v names each file before it's processed.
-v -v -v shows verbose parse details.
@ -2009,7 +2015,11 @@ Usage: wmllint [options] [dir]
-D, --diff Display diffs between converted and unconverted files.
-r, --revert Revert the conversion from the -bak files.
-s, --stripcr Convert DOS-style CR/LF to Unix-style LF.
Note: does not work on Windows, due to Python
defaulting to universal newlines support there.
--future Enable experimental WML conversions.
More about wmllint can be found in the introduction in the file itself, and
at http://wiki.wesnoth.org/Maintenance_tools.
""")
if __name__ == '__main__':

14
data/tools/wmlmove
View file

@ -192,13 +192,13 @@ overwrite()
if delete:
print "# Image deletions:"
for (name, defloc) in srcrefs.fileref.items():
for namespace in map(directory_namespace, srclist):
if namespace_member(name, namespace) and cref.refcount(name) == 0:
if revert:
print vcundelete(name)
else:
print vcdelete(name)
break
for namespace in map(directory_namespace, srclist):
if namespace_member(name, namespace) and cref.refcount(name) == 0:
if revert:
print vcundelete(name)
else:
print vcdelete(name)
break
print ""
print "# .cfg deletions"
for filename in srclist:

2
data/tools/wmlvalidator
View file

@ -17,7 +17,7 @@ def print_indent(string, depth, char=' '):
class Validator:
"""
The class that takes a wmlgrammer object to validate wml trees with
The class that takes a wmlgrammar object to validate wml trees with
"""
def __init__(self, schema, verbosity=0):
self.schema = wmlgrammar.Grammar(schema)

6
doc/doxygen/footer.html
View file

@ -10,9 +10,9 @@
</td>
<td align="right">
<small><a href="http://gna.org/projects/wesnoth/">Gna!</a> |</small>
<small><a href="http://forum.wesnoth.org/">Forum</a> |</small>
<small><a href="http://www.wesnoth.org/wiki">Wiki</a> |</small>
<small><a href="http://cia.vc/stats/project/wesnoth">CIA</a> |</small>
<small><a href="https://github.com/wesnoth/">GitHub</a> |</small>
<small><a href="http://forums.wesnoth.org/">Forums</a> |</small>
<small><a href="http://wiki.wesnoth.org/">Wiki</a> |</small>
<small><a href="http://devdocs.wesnoth.org">devdocs</a> </small>
</td>
</tr>

34
doc/man/gl/wesnoth.6
View file

@ -35,14 +35,14 @@ mundo fantástico.
Derrota a todos os líderes inimigos escollendo sabiamente as tropas e
xestionando coidadosamente os recursos de ouro e vilas. Todas as unidades
teñen as fortalezas e debilidades. Para gañar, desprega as túas forzas de
xeito que aproveiten completamente o seu potencial, e impide que os inimigos
fagan o mesmo. A medida que as unidades consigan experiencia, adquirirán
novas habilidades e volveranse máis fortes. Xoga na lingua que queiras e pon
a proba as túas habilidades contra a intelixencia artificial, ou únete á
enorme comunidade internacional de xogadores que se reúne na internet. Crea
unidades, escenarios ou campañas personalizadas, e compárteo todo co resto
da comunidade.
teñen fortalezas e debilidades de seu. Para gañar, desprega as túas forzas
de xeito que aproveiten completamente o seu potencial, e impide que os
inimigos fagan o mesmo. A medida que as unidades consigan experiencia,
adquirirán novas habilidades e volveranse máis fortes. Xoga na lingua que
queiras e pon a proba as túas habilidades contra a intelixencia artificial,
ou únete á enorme comunidade internacional de xogadores que se reúne en
internet. Crea unidades, escenarios ou campañas personalizadas, e compárteo
todo co resto da comunidade.
.
.SH OPCIÓNS
.
@ -86,19 +86,19 @@ Inicia directamente o editor de mapas integrado. Se se indica un
\fIficheiro\fP, fai o mesmo que \fB\-l \-\-load\fP.
.TP
\fB\-\-fps\fP
Amosa nunha esquina da pantalla o número de fotogramas por segundo ao que se
está executando o xogo.
Mostra nunha esquina da pantalla o número de fotogramas por segundo ao que
se está executando o xogo.
.TP
\fB\-f, \-\-fullscreen\fP
Executa o xogo a pantalla completa.
.TP
\fB\-\-gunzip\fP\fI\ ficheiro_de_entrada.gz\fP
Descomprime un ficheiro que debería estar en formato “gzip” e gárdao sen o
Descomprime un ficheiro que debería estar en formato GZIP e gárdao sen o
sufixo «.gz». Borrarase o \fIficheiro_de_entrada.gz\fP.
.TP
\fB\-\-gzip\fP\fI\ ficheiro_de_entrada\fP
Comprime un ficheiro en formato “gzip”, gárdao coma
\fIficheiro_de_entrada\fP.gz e borra o \fIficheiro_de_entrada\fP.
Comprime un ficheiro en formato GZIP, gárdao coma \fIficheiro_de_entrada\fP.gz
e borra o \fIficheiro_de_entrada\fP.
.TP
\fB\-h, \-\-help\fP
Devolve un resumo das opcións da liña de ordes.
@ -146,7 +146,7 @@ Devolve o directorio de datos do xogo.
.TP
\fB\-p, \-\-preprocess <ficheiro ou cartafol de orixe> <directorio de destino>\fP
Preprocesa o ficheiro ou cartafol indicado. O ficheiro ou ficheiros
escribiranse no directorio de destino indicado: un ficheiro “.cfg” simple e
escribiranse no directorio de destino indicado: un ficheiro «.cfg» simple e
outro procesado. Se se indica un cartafol, preprocesaranse todos os seus
contidos baseándose nas regras coñecidas para o preprocesador. Os macros
comúns do directorio «data/core/macros» preprocesaranse antes que os
@ -228,9 +228,9 @@ predeterminada (\fBDefault\fP). A era elíxese mediante un identificador. As
eras descríbense no ficheiro \fBdata/multiplayer/eras.cfg\fP.
.TP
\fB\-\-exit\-at\-end\fP
Sae do xogo unha vez se remate o escenario, sen amosar un diálogo de vitoria
ou derrota que requira que o usuario prema «Aceptar». Isto tamén se emprega
para probas de rendemento automatizadas mediante guións.
Sae do xogo unha vez se remate o escenario, sen mostrar un diálogo de
vitoria ou derrota que requira que o usuario prema «Aceptar». Isto tamén se
emprega para probas de rendemento automatizadas mediante scripts.
.TP
\fB\-\-ignore\-map\-settings\fP
Non usar a configuración do mapa, senón os valores predeterminados.

10
doc/man/gl/wesnothd.6
View file

@ -18,11 +18,11 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH WESNOTHD 6 2013 wesnothd "Daemon de rede para partidas con varios xogadores de A batalla polo Noroeste"
.TH WESNOTHD 6 2013 wesnothd "Servizo de rede para partidas con varios xogadores de A batalla polo Noroeste"
.
.SH NOME
.
wesnothd — Daemon de rede para partidas con varios xogadores de A batalla
wesnothd — Servizo de rede para partidas con varios xogadores de A batalla
polo \fBNoroeste\fP.
.
.SH SINOPSE
@ -47,7 +47,7 @@ a sintaxe máis adiante na sección de \fBCONFIGURACIÓN DO SERVIDOR\fP. Pódese
recargar a configuración enviando SIGHUP ao proceso do servidor.
.TP
\fB\-d, \-\-daemon\fP
Executa wesnothd coma un daemon.
Executa wesnothd coma un servizo.
.TP
\fB\-h, \-\-help\fP
Indica as funcións das opcións de liña de ordes.
@ -96,7 +96,7 @@ Activa o rexistro da depuración.
\fBallow_remote_shutdown\fP
Se se lle dá o valor \fBno\fP («non», valor predeterminado), as solicitudes de
apagado e reinicio ignoraranse salvo que procedan do fifo. Co valor \fByes\fP
(«si») permitirase o apagado remoto por medio dunha “/query” realizada por
(«si») permitirase o apagado remoto por medio dunha «/query» realizada por
un administrador.
.TP
\fBban_save_file\fP
@ -120,7 +120,7 @@ valores predeterminados son:
.TP
\fBfifo_path\fP
A ruta ao fifo polo que se poden enviar ordes ao servidor —equivalente ao
“/query …” desde o xogo—. Se non se especifica outra cousa, toma a ruta
«/query …» desde o xogo—. Se non se especifica outra cousa, toma a ruta
indicada como valor predeterminado durante a compilación (en principio
\fB/var/run/socket/wesnothd/socket\fP).
.TP

Some files were not shown because too many files have changed in this diff Show more