Merge branch 'master' of https://github.com/wesnoth/wesnoth-old
This commit is contained in:
ln-zookeeper
commit
2570d7345b
105 changed files with 3268 additions and 1549 deletions
|
|
@ -26,6 +26,10 @@ Rebalancing of the campaign continues and is mostly done for Scenarios 1 (End of
|
|||
Since 1.9.0, Wesnoth obeys the XDG Basedir Specification, meaning that on X11-based systems, such as most linux distros, the userdata and the preferences have been split between $HOME/.local/share/wesnoth/<version> and $HOME/.config/wesnoth. The old command line options --config-dir and --config-path remained in place, referring to the userdata though. New options, --userdata-dir, --userdata-path, --userconfig-dir and --userconfig-path now replace these old ones.
|
||||
[/section]
|
||||
|
||||
[section="Changes to mainline campaigns"]
|
||||
This version includes a ton of smaller changes to mainline campaigns, such as updated graphics for units in Son of the Black Eye and Delfador's Memoirs, new world maps for Dead Water, The Rise of Wesnoth and Liberty, updated scenario maps for scenarios 1 through 7 of Eastern Invasion, and various minor improvements to Heir to the Throne.
|
||||
[/section]
|
||||
|
||||
|
||||
==========
|
||||
KNOWN BUGS
|
||||
|
|
|
|||
11
changelog
11
changelog
|
|
@ -15,10 +15,12 @@ Version 1.11.7+dev:
|
|||
* Campaigns:
|
||||
* Dead Water:
|
||||
* New world map.
|
||||
* Delfador's Memoirs:
|
||||
* Updated sprite and animations for the Wose Shaman.
|
||||
* Eastern Invasion:
|
||||
* Made Dacyn use teal TC and Mal-Ravanal blue TC, to make them fit the
|
||||
portraits more.
|
||||
* Updated maps for scenario 1-5.
|
||||
* Updated maps for scenario 1-7.
|
||||
* Heir To The Throne:
|
||||
* Increased Li'sar's lvl3 hitpoints from 52 to 62.
|
||||
* Implemented the portrait variations for Delfador and Asheviere.
|
||||
|
|
@ -46,12 +48,13 @@ Version 1.11.7+dev:
|
|||
eliminate dependence on luck during the first turn
|
||||
* S17: add a warning that the AI will receive reinforcements
|
||||
* S18: no linger mode at the end of the last scenario
|
||||
* Minor updates to messages (grammar and prose) and objectives
|
||||
* Minor updates to messages (grammar and prose) and objectives.
|
||||
* Updated sprites and animations for the Orcish Shamans.
|
||||
* Graphics:
|
||||
* New and updated animations for the Loyalist Horseman.
|
||||
* Language and i18n:
|
||||
* Updated translations: Chinese (Traditional), Dutch, Galician, Japanese,
|
||||
Latin
|
||||
* Updated translations: Catalan, Chinese (Traditional), Dutch, Galician,
|
||||
Japanese, Latin
|
||||
* Lua API:
|
||||
* Added flag, flag_icon, and village_support fields to wesnoth.sides table
|
||||
elements.
|
||||
|
|
|
|||
|
|
@ -64,14 +64,22 @@
|
|||
[/filter_attack]
|
||||
missile_start_time=-250
|
||||
[missile_frame]
|
||||
offset=1.0
|
||||
duration=250
|
||||
image=projectiles/entangle.png
|
||||
image_diagonal=projectiles/entangle.png
|
||||
[/missile_frame]
|
||||
start_time=-300
|
||||
# [frame]
|
||||
# image=units/wose-shaman.png:150,units/wose-shaman-attack-[1~2].png:150,units/wose-shaman.png:150
|
||||
# halo=halo/wose-ranged-halo[1~4].png:150
|
||||
# [/frame]
|
||||
attack_sound_start_time=-100
|
||||
|
||||
[attack_sound_frame]
|
||||
sound=entangle.wav
|
||||
[/attack_sound_frame]
|
||||
{SOUND:SLOW}
|
||||
|
||||
[frame]
|
||||
image="units/wose-shaman.png"
|
||||
halo="halo/elven/nature-halo[1~8].png:75"
|
||||
[/frame]
|
||||
[/attack_anim]
|
||||
[/unit_type]
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Gs , Gs , Hh , Mm , Mm , Mm , Mm , Hh , Hh , Gs , Gs , Gs , Gs , Gs , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Mm , Hh , Hh , Hh , Mm , Mm , Hh , Re , Re , Re , Re
|
||||
Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Gg , Gs , Hh , Mm , Mm , Mm , Mm , Hh , Hh , Gs , Gs , Gs , Gg , Gs , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Mm , Hh , Hh , Hh , Mm , Mm , Hh , Re , Co , Re , Re
|
||||
Mm , Mm , Mm , Mm , Hh , Gs , Gs , Gs , Gg , Gg^Vh , Gs , Hh , Hh , Hh , Hh , Hh , Gg , Gg , Gs^Fds , Gs^Fds , Gg , Gg , Gg^Vh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Hh^Fds , Hh^Fms , Hh^Fds , Hh , Hh , Hh , Hh , Gs , Hh , Mm , Mm , Hh , Co , 4 Ko , Co , Re
|
||||
Mm , Mm , Mm , Mm , Gs , Hh , Gg , Gg , Gg , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gg , Gs , Gs^Fds , Gs , Gs , Gs , Hh , Hh , Hh , Hh , Hh , Hh , Hh^Fms , Gs^Fds , Gs^Fms , Gs , Gs , Gs , Gs , Gs , Gs , Hh , Mm , Hh , Hh , Co , Co , Co , Re
|
||||
Mm , Mm , Hh , Hh , Gs , Gs , Gs , Gs , Gs , Gs , Hh^Fms , Hh , Gs , Gs , Gs^Fms , Gs , Gs , Gg^Vh , Co , Co , Co , Gg , Gg , Gs , Gs^Fds , Gs , Hh , Hh , Gs , Gs , Gs , Gs^Fms , Gs , Gs^Fds , Gs , Gs^Fms , Gs^Fds , Gs , Hh , Mm , Mm , Hh , Hh , Re , Re , Re
|
||||
Hh , Hh , Gs , Gs , Gg , Gg , Gg , Gs^Fds , Gg , Hh^Fds , Gs^Fds , Gs , Gs^Fms , Gs^Fds , Gs , Gg , Gg , Gg , Co , 3 Ko , Co , Gs , Gs , Gs^Fds , Gs , Gs , Gs , Gs , Hh , Gs , Gs , Gs^Fds , Gs , Gg , Gg , Hh , Hh , Gs , Hh , Hh , Mm , Mm , Mm , Hh , Hh , Hh
|
||||
Hh , Hh , Gs , Gg , Gg , Gg , Gs^Fms , Gg , Gs^Fds , Gs^Fms , Gs^Fms , Gs^Fds , Gs^Fms , Gs , Gs , Gs^Fms , Gs^Fds , Gs , Gs , Co , Gs , Gs , Gs , Gs^Fds , Gs , Gs , Hh , Gs , Gg , Gs , Gg^Vh , Gs , Hh , Gg , Gg , Gs , Gs , Hh , Gs , Hh , Hh , Hh , Hh , Mm , Mm , Mm
|
||||
Hh , Hh , Gs , Gg , Gg^Vh , Gs , Gg , Gg , Gs^Fms , Gs^Fds , Gs^Fms , Gs^Fds , Gs , Gs , Gs^Fms , Gs , Gs , Gs , Gg , Gs , Gg , Gg , Gg , Gs , Gg , Hh , Hh , Hh , Gg , Gg , Gg , Gg , Gg , Gg , Gg^Vh , Gs , Hh , Hh , Hh , Gs , Gs , Gs , Gs , Hh , Hh , Hh
|
||||
Gs , Gs , Gs , Gg , Gs , Gg , Gg , Gg , Gs , Gs^Fds , Gs , Gs , Gs^Fds , Gs , Gs , Gs , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs , Gs , Gs , Gs , Gs , Gs , Gg , Gg , Gg , Gg , Gs , Gs , Gg , Gg , Gg , Gs , Hh , Gs , Gg , Gs
|
||||
Gs , Gs , Gs , Gg , Gs , Gs , Gs , Gs , Gs^Fms , Gs , Gs , Gs^Fds , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gg , Gs , Gs , Gs , Gg , Gs , Gs , Ds , Ds , Ds , Ds , Gs , Gs , Gs , Gg , Gs , Gg , Gs , Hh , Gs , Gg , Gg , Gg , Gg^Vh , Gg , Gg , Gs
|
||||
Ds , Ds , Gs , Gs , Ds , Ds , Ds , Gs , Gs , Gs , Gs , Gs , Ds , Ds , Ds , Ds , Ds , Ds , Gs , Gs , Ds , Ds , Ds , Ds , Ds , Ds , Ww , Ww , Ww , Ww , Ds , Ds , Ds , Ds , Ds , Ds , Gs , Gs , Gs , Gs , Gs , Gg , Gs , Gs , Hh , Hh
|
||||
Gs , Gs , Ds , Ds , Ds , Ds , Ww , Ds , Ds , Ds , Ds , Ds , Ww , Ww , Ww , Ww , Ww , Ww , Ds , Ds , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ds , Ds , Ds , Ds , Ds , Gs , Gs , Hh , Gs , Gs
|
||||
Ds , Ds , Ww , Ds , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ds , Gs , Ds , Gs , Gs , Gs
|
||||
Ww , Ww , Ww , Ww , Ww , Ww , Wo , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ds , Ds , Ds , Ds , Ds
|
||||
Ww , Ww , Wo , Wo , Wo , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Ds , Ds , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ds , Gs , Gg , Ds , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Wo , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Wo , Wo , Ww , Ww
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ds , Gg , Gg^Vh , Gg , Ds , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ds , Ds , Gs , Gs , Ds , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Ww , Ww , Ww , Ww , Ww , Ww , Ww , Wo , Ww , Wo , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ds , Ww , Ds , Ds , Ds , Ww , Ds , Ds , Ds , Ds , Ds , Ww , Ww , Ww , Ww , Wo , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Ds , Ds , Ds , Ds , Ds , Ds , Ds , Ds , Ds , Ds , Ds , Ww , Ds , Ww , Ds , Ds , Ds , Ds , Ds , Ww , Ds , Ds , Gs , Ds , Gs , Ds , Rd , Ds , Gs , Gs , Gg , Gs , Ds , Ds , Ds , Ds , Ds , Ww , Ds , Ww , Ww , Wo , Wo , Wo , Wo , Wo
|
||||
Gg , Gs , Gg , Gs , Gg , Gs , Gg , Gs , Gs , Gs , Gs , Ds , Ds , Ds , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gs , Gg , Gg , Gs , Gg , Rd , Rd , Rd , Gg , Gg^Efm , Gg , Gs , Gs , Gs , Gg , Ds , Gs , Ds , Ds , Ww , Ww , Wo , Wo , Wo
|
||||
Gg , Gs , Gg^Efm , Gg^Efm , Gg^Efm , Gg , Gs , Gg^Vh , Gg , Gs , Gg , Gg , Gg , Gs , Gg , Gg , Gg , Gg , Gg , Hh , Gs , Gg , Gg , Gs , Gg , Gg^Vh , Gg , Gg , Ce , Rd , Rd , Gg , Gg , Gg^Efm , Gg , Gg , Gg , Gs , Gg^Vh , Gs , Ds , Ww , Ds , Ww , Wo , Wo
|
||||
Gg , Gg , Gg , Gg , Gg , Gg^Efm , Gg^Efm , Gg , Hh^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gs , Gs , Gg^Efm , Gg , Hh , Gg , Gs , Hh^Fds , Hh , Hh , Gg , Gg , Gg , Rd , Ce , 1 Ke , Ce , Rd , Gg , Gg^Efm , Gg , Hh , Gg , Gg , Gg , Gg , Gs , Gs , Ds , Ds , Ww , Ds , Ds
|
||||
Gg , Gg , Gs , Hh , Hh , Gg , Gg , Hh^Fds , Hh^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs , Gg , Gg^Efm , Gg , Gs^Fds , Hh , Gg , Hh^Fds , Hh , Hh , Gg , Gg , Rd , Ce , Gg , Ce , Rd , Gg , Gg , Hh , Hh , Gg , Hh , Gg^Efm , Gg , Gg , Gg , Gs , Gs , Ds , Ds , Ds
|
||||
Hh , Hh , Gs , Gg , Hh , Hh , Gg , Hh^Fds , Gg , Gs^Fds , Gs^Fds , Gs^Fds , Gs , Gs , Gs , Gg , Gg , Gg , Gg , Gs^Fds , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs , Gg , Rd , Gg , Gs , Gs , Hh , Gg , Hh^Fds , Gg , Gg , Gs^Fds , Gs^Fds , Gs^Fds , Gs , Gs , Gg , Gg
|
||||
Gg , Gs , Gg , Gs , Gs , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Hh , Gg , Gs , Hh , Gs , Gs , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gs^Fds , Hh , Gs , Gs , Gs , Rd , Gg , Hh , Gs , Gs , Gg , Gg , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg
|
||||
Gg , Gg , Hh , Hh , Gs , Gs , Gg , Gg^Efm , Gs^Fds , Gg , Gg , Hh , Gg , Gs , Gs , Gs , Gs , Gg , Gs^Fds , Gs^Fds , Gg , Gs^Fds , Gs^Fds , Gg , Gg , Gg , Gg , Gg , Hh , Rd , Gg , Gg^Efm , Hh , Gg , Gs , Gs , Gs , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg
|
||||
Gg , Gg , Hh , Gs , Gs , Gg^Vh , Gg^Efm , Gg^Efm , Gs^Fds , Gs^Fds , Gs^Fds , Hh^Fds , Gg , Hh , Gg , Gg^Vh , Gg , Gg , Hh , Gs^Fds , Gg , Gg , Gg^Vh , Gg , Ce , Gg , Ce , Gg , Gg , Rd , Gg , Gg , Hh , Hh , Gg , Gg , Gg , Hh^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg
|
||||
Gg , Gg , Hh , Gg , Gg , Gg , Gg , Gg , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg , Gg^Efm , Gg , Gg^Efm , Gg , Gg , Hh^Fds , Gs^Fds , Gg , Gg , Gg , Ce , 2 Ke , Ce , Gg , Gg , Rd , Gg , Hh , Gg , Hh , Gg , Gg^Efm , Gg^Efm , Gg , Hh^Fds , Gg , Hh^Fds , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Hh , Hh^Fds , Hh^Fds , Hh^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg , Gg , Gg , Hh , Gg , Gg^Efm , Hh , Gg , Gg , Gg , Ce , Gg , Gg , Gg , Rd , Rd , Gg , Gg , Gg , Gg , Gg^Efm , Gg^Efm , Gg , Gg , Hh , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Hh , Hh , Hh^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg , Gg^Efm , Gg , Gg , Hh , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Rd , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Hh , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gd, Gd, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Mm, Hh, Mm, Mm, Mm, Mm, Hh, Re, Gg, Gs, Re
|
||||
Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gg, Gs, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gg, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Mm, Hh, Hh, Hh, Mm, Mm, Hh, Re, Co, Gg, Re
|
||||
Mm, Mm, Mm, Mm, Hh, Gs, Gs, Gs, Gg, Gg^Vhh, Gs, Hh, Hh, Hh, Hh, Hh, Gg, Gg, Gs^Fds, Gll^Fds, Gg, Gg, Gg^Vh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Hh^Fds, Hh^Fms, Hh^Fds, Hh, Hh, Hh, Hh, Gs, Hh, Mm, Mm, Hh, Co, 4 Ko, Co, Gs
|
||||
Mm, Mm, Mm, Mm, Gd, Hh, Gg, Gg, Gg, Gd, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gg, Gll, Gll^Fds, Gs, Gs, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh^Fms, Gll^Fds, Gll^Fms, Gs, Gs, Gd, Gs, Gs, Gd, Hh, Mm, Hh, Hh, Co, Co, Co, Gd
|
||||
Mm, Mm, Hh, Hh, Gd, Gs^Es, Gd, Gs, Gs, Gs, Hh^Fms, Hh, Gll, Gll, Gll^Fms, Gs, Gs, Gg^Vo, Co, Co, Co, Gg, Gg, Gs, Gs^Fds, Gs, Hh, Hh, Gs, Gs, Gll, Gll^Fms, Gll, Gll^Fds, Gs, Gs^Fms, Gs^Fds, Gd, Hh, Hh, Gs, Hh, Hh, Hh, Hh, Hh
|
||||
Hh, Hh, Gs, Gs, Gd, Gd, Gg, Gs^Fds, Gg, Hh^Fds, Gll^Fds, Gll^Em, Gll^Fms, Gll^Fds, Gs, Gg, Gg, Gg, Co, 3 Ko, Co, Gs, Gs, Gll^Fds, Gll, Gs, Gs, Gs, Hh, Gs^Es, Gs, Gll^Fds, Gll, Gll, Gg, Hh, Hh, Gs, Hh, Gg, Gs, Hh, Hh, Hh, Mm, Mm
|
||||
Hh, Hh, Gs, Gg, Gg, Gg, Gll^Fms, Gll, Gll^Fds, Gll^Fms, Gll^Fms, Gll^Fds, Gll^Fms, Gll, Gs, Gs^Fms, Gs^Fds, Gs, Gs, Co, Gs, Gs, Gs^Es, Gll^Fds, Gs, Gs, Hh, Gs, Gg, Gs, Gg^Vh, Gs, Hh, Gg, Gg, Gs, Gs, Hh, Gs, Gg, Hh, Hh, Hh, Mm, Mm, Mm
|
||||
Hh, Hh, Gs, Gg, Gg^Vl, Gs, Gll, Gll, Gll^Fms, Gll^Fds, Gll^Fms, Gs^Fds, Gs, Gs, Gs^Fms, Gs, Gs, Gs, Gg, Gs, Gg, Gg, Gg, Gs, Gg, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Vo, Gs, Hh, Hh, Hh, Gs, Gs, Gs, Gs, Hh, Hh, Hh
|
||||
Gs, Gs, Gs, Gg, Gs, Gg, Gg, Gll, Gll, Gll^Fds, Gll, Gll, Gll^Fds, Gs, Gs, Gd, Gd, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs, Gs, Gs, Gd, Gd, Gd, Gg, Gg, Gg, Gg, Gs, Gs, Gg, Gg, Gg, Gs, Hh, Gs, Gg, Gs
|
||||
Gs, Gs, Gd, Gg^Es, Gs, Gs, Gd, Gll, Gs^Fms, Gs, Gs, Gs^Fds, Gs, Gs, Gs, Gs, Gs, Gd, Gd, Gd, Gs, Gs^Es, Gs, Gg, Gs, Gs, Ds, Ds, Ds, Ds, Gs, Gd, Gs, Gg, Gs, Gg, Gs, Hh, Gd, Gd^Es, Gg, Gg, Gg^Vo, Gg, Gg, Gs
|
||||
Ds, Ds, Gs, Gs, Ds, Ds, Ds, Gs, Gs, Gs, Gs, Gs, Ds, Ds, Ds, Ds, Ds, Ds, Gs, Gs, Ds, Ds, Ds, Ds, Ds, Ds, Ww, Ww, Ww, Ww, Ds, Ds, Ds, Ds, Ds, Ds, Gs, Gs, Gs, Gd, Gs, Gg, Gs, Gs, Hh, Hh
|
||||
Gs, Gs, Ds, Ds^Esd, Ds, Ds^Esd, Wwf, Ds, Ds, Ds, Ds, Ds, Ww, Ww, Ww, Ww, Ww, Ww, Ds, Ds, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Ds, Ds, Ds^Esd, Ds, Ds, Gd, Gd, Hh, Gd, Gs
|
||||
Ds, Ds, Wwf, Ds, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ds, Gs, Ds, Gs, Gs, Gs
|
||||
Ww, Wwf, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Ds, Ds, Ds, Ds
|
||||
Ww, Ww, Wo, Wo, Wo, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wwf, Wwf, Ds, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Wwf, Ww, Ww, Ww, Ww
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ds, Gs, Gg, Ds, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Wo, Ww, Ww
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ds, Gs, Gg^Vh, Rp, Ds, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ds, Ds, Gd, Rp, Ds, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ds, Wo, Wo^Bw\, Ww, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
|
||||
Wo, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
|
||||
Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ds, Ww, Ds, Ds, Ds, Ww, Ds, Ds, Ds, Ds, Ds, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo
|
||||
Ds, Ds, Ds, Ds, Ds, Ds, Ds, Ds, Ds, Ds, Ds, Ww, Ds, Ww, Ds, Ds, Ds, Ds, Ds, Ww, Ds, Ds, Gs, Ds, Gs, Ds^Esd, Re, Ds, Gd, Gs, Gs, Gs, Ds, Ds, Ds, Ds, Ds, Ww, Ds, Ww, Ww, Wo, Wo, Wo, Wo, Wo
|
||||
Gg, Gs, Gg, Gs, Gg, Gs, Gg, Gs, Gs, Gs, Gs, Ds, Ds, Ds, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gg, Gd, Gs, Gs, Rd, Re, Re, Gs, Gs^Efm, Gs^Eff, Gd, Gd, Gs, Gg^Gvs, Ds, Gs, Ds, Ds, Ww, Ww, Wo, Wo, Wo
|
||||
Gg, Gd^Es, Gg^Efm, Gg^Efm, Gg^Gvs, Gg^Gvs, Gs^Gvs, Gg^Vh, Gg, Gs, Gll, Gg, Gg, Gs, Gg, Gg, Gg, Gg, Gg, Hh, Gd, Gg, Gg, Gd^Es, Gg, Gs^Vh, Gg, Gs, Ce, Re, Rd, Gs^Eff, Gg^Eff, Gs^Efm, Gg, Gg^Gvs, Gg^Gvs, Gs^Gvs, Gd^Vl, Gd, Ds, Ww, Ds, Ww, Wo, Wo
|
||||
Gg, Gg, Gg, Gg, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg, Hh^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll, Gs, Gs, Gg^Efm, Gg, Hh, Gg, Gd, Hh^Fds, Hh, Hh, Gg, Gg, Gg, Rd, Ce, 1 Ke, Ce, Rb, Gg, Gg^Efm, Gs, Hh, Gg^Gvs, Gg, Gg, Gg, Gs, Gs, Ds, Ds, Ww, Ds, Ds
|
||||
Gg, Gg, Gs, Hh, Hh, Gg, Gg, Hh^Fds, Hh^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gs, Gg, Gg^Efm, Gll, Gll^Fds, Hh, Gg, Hh^Fds, Hh, Hh, Gg, Gg, Re, Ce, Gg, Ce, Re, Gg, Gg, Hh, Hh, Gg, Hh, Gg^Efm, Gll, Gll, Gll, Gs, Gs, Ds, Ds, Ds
|
||||
Hh, Hh, Gs, Gg, Hh, Hh, Gg, Hh^Fds, Gg, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Em, Gs, Gd, Gg, Gg, Gg, Gll, Gll^Fds, Gll, Gg, Gll, Gg, Gg, Gg, Gg, Gg, Gs, Gg, Rb, Gg, Gs, Gs, Hh, Gg, Hh^Fds, Gg, Gll, Gll^Fds, Gll^Fds, Gll^Fds, Gll, Gs, Gg, Gg
|
||||
Gg, Gs, Gg, Gs, Gd^Es, Gg, Gg, Gg, Gg, Gg, Gg, Gll, Hh, Gg, Gd, Hh, Gd, Gs, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gg, Gs^Fds, Hh, Gs, Gs^Es, Gs, Re, Gg, Hh, Gs, Gs, Gg, Gll, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gs^Fds, Gll^Fds, Gll, Gg
|
||||
Gg, Gg, Hh, Hh, Gs, Gs, Gg, Gg^Efm, Gll^Fds, Gll^Em, Gll, Hh, Gg, Gs, Gs, Gs, Gd, Gll, Gll^Fds, Gll^Fds, Gll, Gll^Fds, Gll^Fds, Gll, Gg, Gs, Gg, Gg, Hh, Rd, Gg, Gg^Efm, Hh, Gg, Gs, Gs, Gs, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gs^Fds, Gll^Fds, Gll^Fds, Gll, Gll
|
||||
Gg, Gg, Hh, Gs, Gs, Gg^Vl, Gg^Efm, Gg^Efm, Gll^Fds, Gll^Fds, Gs^Fds, Hh^Fds, Gll, Hh, Gg, Gg^Vh, Gg, Gll, Hh, Gll^Fds, Gll, Gll, Gll^Vhh, Gll, Ce, Gg, Ce, Gg, Gg, Re, Gg, Gg, Hh, Hh, Gs, Gs, Gg, Hh^Fds, Gll^Fds, Gs^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll, Gg
|
||||
Gg, Gg, Hh, Gg, Gg, Gg, Gg, Gll, Gll^Fds, Gs^Fds, Gs^Fds, Gll^Fds, Gll, Gg, Gll^Efm, Gg, Gg^Efm, Gg, Gg, Hh^Fds, Gll^Fds, Gll, Gg, Gg, Ce, 2 Ke, Ce, Gg, Gg, Rb, Gg, Hh, Gg, Hh, Gs, Gs^Efm, Gg^Efm, Gll, Hh^Fds, Gll, Hh^Fds, Gll^Em, Gll, Gll, Gg, Gg
|
||||
Gg, Gg, Gg, Hh, Hh^Fds, Hh^Fds, Hh^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll, Gg, Gg, Gg, Hh, Gg, Gg^Efm, Hh, Gg, Gg, Gg, Ce, Gg, Gg, Gs, Rd, Re, Gg, Gs, Gd, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Hh, Gg, Gg, Gg, Gg, Gd, Gg
|
||||
Gg, Gg, Gg, Hh, Hh, Hh^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gg, Gg^Efm, Gg, Gg, Hh, Gg, Gg, Gs, Gs, Gs, Gs, Gg, Gs, Gs, Gs, Gg, Re, Gs, Gs, Gs, Gg, Gg, Gg, Gg, Gg, Hh, Gg, Gg, Gs, Gs^Es, Gd, Gg
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 2.1 MiB |
File diff suppressed because it is too large
Load diff
|
|
@ -48,18 +48,34 @@
|
|||
[/filter_attack]
|
||||
|
||||
missile_start_time=-200
|
||||
start_time=-200
|
||||
start_time=-350
|
||||
halo1_start_time=-350
|
||||
halo2_start_time=-200
|
||||
sound_start_time=0
|
||||
|
||||
[missile_frame]
|
||||
halo="halo/elven/druid-healing[8~1].png:50"
|
||||
halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
|
||||
offset=1.0~0.0
|
||||
[/missile_frame]
|
||||
|
||||
[frame]
|
||||
image="units/novice-orcish-shaman.png:400"
|
||||
image="units/novice-orcish-shaman.png:550"
|
||||
[/frame]
|
||||
|
||||
[halo1_frame]
|
||||
halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
|
||||
offset=1.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo1_frame]
|
||||
|
||||
[halo2_frame]
|
||||
halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
|
||||
offset=0.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo2_frame]
|
||||
|
||||
[sound_frame]
|
||||
sound=magicmissile.wav
|
||||
[/sound_frame]
|
||||
|
|
|
|||
|
|
@ -48,18 +48,34 @@
|
|||
[/filter_attack]
|
||||
|
||||
missile_start_time=-200
|
||||
start_time=-200
|
||||
start_time=-350
|
||||
halo1_start_time=-350
|
||||
halo2_start_time=-200
|
||||
sound_start_time=0
|
||||
|
||||
[missile_frame]
|
||||
halo="halo/elven/druid-healing[8~1].png:50"
|
||||
halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
|
||||
offset=1.0~0.0
|
||||
[/missile_frame]
|
||||
|
||||
[frame]
|
||||
image="units/elder-orcish-shaman.png:400"
|
||||
image="units/novice-orcish-shaman.png:550"
|
||||
[/frame]
|
||||
|
||||
[halo1_frame]
|
||||
halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
|
||||
offset=1.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo1_frame]
|
||||
|
||||
[halo2_frame]
|
||||
halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
|
||||
offset=0.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo2_frame]
|
||||
|
||||
[sound_frame]
|
||||
sound=magicmissile.wav
|
||||
[/sound_frame]
|
||||
|
|
|
|||
|
|
@ -48,18 +48,34 @@
|
|||
[/filter_attack]
|
||||
|
||||
missile_start_time=-200
|
||||
start_time=-200
|
||||
start_time=-350
|
||||
halo1_start_time=-350
|
||||
halo2_start_time=-200
|
||||
sound_start_time=0
|
||||
|
||||
[missile_frame]
|
||||
halo="halo/elven/druid-healing[8~1].png:50"
|
||||
halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
|
||||
offset=1.0~0.0
|
||||
[/missile_frame]
|
||||
|
||||
[frame]
|
||||
image="units/orcish-shaman.png:400"
|
||||
image="units/novice-orcish-shaman.png:550"
|
||||
[/frame]
|
||||
|
||||
[halo1_frame]
|
||||
halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
|
||||
offset=1.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo1_frame]
|
||||
|
||||
[halo2_frame]
|
||||
halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
|
||||
offset=0.0
|
||||
auto_vflip=no
|
||||
auto_hflip=no
|
||||
[/halo2_frame]
|
||||
|
||||
[sound_frame]
|
||||
sound=magicmissile.wav
|
||||
[/sound_frame]
|
||||
|
|
|
|||
|
|
@ -207,9 +207,9 @@
|
|||
red,green,blue=255,255,192
|
||||
description= _ "40% of finishing gold carried over to the next scenario." + "
|
||||
<span foreground='white'><big>"+
|
||||
#textdomain wesnoth
|
||||
_"Notes:"+"</big></span>"
|
||||
#textdomain wesnoth-trow
|
||||
#textdomain wesnoth
|
||||
_"Notes:"+"</big></span>"
|
||||
#textdomain wesnoth-trow
|
||||
[/note]
|
||||
[note]
|
||||
description= _ "Enemies will not initiate an attack if there is a risk of them dying."
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@
|
|||
{core/editor/music.cfg}
|
||||
{core/editor/terrain-groups.cfg}
|
||||
{core/editor/time-of-day.cfg}
|
||||
{core/editor/tool-hints.cfg}
|
||||
{core/editor/items.cfg}
|
||||
|
||||
#endif
|
||||
|
||||
[titlescreen_music]
|
||||
|
|
|
|||
|
|
@ -15,6 +15,12 @@
|
|||
name= _ "Altar"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ankh-necklace
|
||||
image=items/ankh-necklace.png
|
||||
name= _ "Ankh Necklace"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=anvil
|
||||
image=items/anvil.png
|
||||
|
|
@ -22,15 +28,21 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=cage
|
||||
image=items/cage.png
|
||||
name= _ "Cage"
|
||||
id=archery-target
|
||||
image=items/archery-target-right.png
|
||||
name= _ "Archery Target"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=box
|
||||
image=items/box.png
|
||||
name= _ "Box"
|
||||
id=armor-golden
|
||||
image=items/armor-golden.png
|
||||
name= _ "Golden Armor"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=armor
|
||||
image=items/armor.png
|
||||
name= _ "Armor"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
|
|
@ -39,6 +51,30 @@
|
|||
name= _ "Axe"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ball-blue
|
||||
image=items/ball-blue.png
|
||||
name= _ "Blue Ball"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ball-green
|
||||
image=items/ball-green.png
|
||||
name= _ "Green Ball"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ball-magenta
|
||||
image=items/ball-magenta.png
|
||||
name= _ "Magenta Ball"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=barrel
|
||||
image=items/barrel.png
|
||||
name= _ "Barrel"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=bomb
|
||||
image=items/bomb.png
|
||||
|
|
@ -52,15 +88,39 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=bow
|
||||
image=items/bow.png
|
||||
name= _ "Bow"
|
||||
id=bonestack
|
||||
image=items/bonestack.png
|
||||
name= _ "Bonestack"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=bow-elven
|
||||
image=items/bow-elven.png
|
||||
name= _ "Elven Bow"
|
||||
id=book1
|
||||
image=items/book1.png
|
||||
name= _ "Book"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=book2
|
||||
image=items/book2.png
|
||||
name= _ "Book"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=book3
|
||||
image=items/book3.png
|
||||
name= _ "Book"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=book4
|
||||
image=items/book4.png
|
||||
name= _ "Book"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=book5
|
||||
image=items/book5.png
|
||||
name= _ "Book"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
|
|
@ -70,27 +130,57 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=archery-target
|
||||
image=items/archery-target-right.png
|
||||
name= _ "Archery Target"
|
||||
id=bow-elven
|
||||
image=items/bow-elven.png
|
||||
name= _ "Elven Bow"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=armor
|
||||
image=items/armor.png
|
||||
name= _ "Armor"
|
||||
id=bow
|
||||
image=items/bow.png
|
||||
name= _ "Bow"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=key
|
||||
image=items/key.png
|
||||
name= _ "Key"
|
||||
id=box
|
||||
image=items/box.png
|
||||
name= _ "Box"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=sword
|
||||
image=items/sword.png
|
||||
name= _ "Sword"
|
||||
id=brazier
|
||||
image=items/brazier.png
|
||||
name= _ "Brazier"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=buckler
|
||||
image=items/buckler.png
|
||||
name= _ "Buckler"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=burial
|
||||
image=items/burial.png
|
||||
name= _ "Burial"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=cage
|
||||
image=items/cage.png
|
||||
name= _ "Cage"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=chest-plain-closed
|
||||
image=items/chest-plain-closed.png
|
||||
name= _ "Closed Plain Chest"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=chest-plain-open
|
||||
image=items/chest-plain-open.png
|
||||
name= _ "Open Plain Chest"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
|
|
@ -100,9 +190,249 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=buckler
|
||||
image=items/buckler.png
|
||||
name= _ "Buckler"
|
||||
id=cloak-green
|
||||
image=items/cloak-green.png
|
||||
name= _ "Green Cloak"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=coffin-closed
|
||||
image=items/coffin-closed.png
|
||||
name= _ "Closed Coffin"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=dragonstatue
|
||||
image=items/dragonstatue.png
|
||||
name= _ "Dragon Statue"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flame-sword
|
||||
image=items/flame-sword.png
|
||||
name= _ "Flaming Sword"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flower1
|
||||
image=items/flower1.png
|
||||
name= _ "Flower"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flower2
|
||||
image=items/flower2.png
|
||||
name= _ "Flower"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flower3
|
||||
image=items/flower3.png
|
||||
name= _ "Flower"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flower4
|
||||
image=items/flower4.png
|
||||
name= _ "Flower"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gohere
|
||||
image=items/gohere.png
|
||||
name= _ "Go Here Overlay"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gold-coins-large
|
||||
image=items/gold-coins-large.png
|
||||
name= _ "Large Pile of Gold Coins"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gold-coins-medium
|
||||
image=items/gold-coins-medium.png
|
||||
name= _ "Pile of Gold Coins"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gold-coins-small
|
||||
image=items/gold-coins-small.png
|
||||
name= _ "Small Pile of Gold Coins"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=grain-sheaf
|
||||
image=items/grain-sheaf.png
|
||||
name= _ "Grain Sheaf"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=hammer-runic
|
||||
image=items/hammer-runic.png
|
||||
name= _ "Runic Hammer"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=holly-water
|
||||
image=items/holy-water.png
|
||||
name= _ "Holy Water"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=key
|
||||
image=items/key.png
|
||||
name= _ "Key"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=leather-pack
|
||||
image=items/leather-pack.png
|
||||
name= _ "Leather Pack"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=orcish-flag
|
||||
image=items/orcish-flag.png
|
||||
name= _ "Orcish Flag"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ornate1
|
||||
image=items/ornate1.png
|
||||
name= _ "Ornate"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ornate2
|
||||
image=items/ornate2.png
|
||||
name= _ "Ornate"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-blue
|
||||
image=items/potion-blue.png
|
||||
name= _ "Blue Potion"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-green
|
||||
image=items/potion-green.png
|
||||
name= _ "Green Potion"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-gray
|
||||
image=items/potion-grey.png
|
||||
name= _ "Gray Potion"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-poison
|
||||
image=items/potion-poison.png
|
||||
name= _ "Poison"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-red
|
||||
image=items/potion-red.png
|
||||
name= _ "Red Potion"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=potion-yellow
|
||||
image=items/potion-yellow.png
|
||||
name= _ "Yellow Potion"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ring-brown
|
||||
image=items/ring-brown.png
|
||||
name= _ "Brown Ring"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ring-gold
|
||||
image=items/ring-gold.png
|
||||
name= _ "Golden Ring"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ring-red
|
||||
image=items/ring-red.png
|
||||
name= _ "Red Ring"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ring-silver
|
||||
image=items/ring-silver.png
|
||||
name= _ "Silver Ring"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=ring-white
|
||||
image=items/ring-white.png
|
||||
name= _ "White Ring"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=scarecrow
|
||||
image=items/scarecrow.png
|
||||
name= _ "Scarecrow"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=sceptre-of-fire
|
||||
image=items/sceptre-of-fire.png
|
||||
name= _ "Sceptre of Fire"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=spear-fancy
|
||||
image=items/spear-fancy.png
|
||||
name= _ "Fancy Spear"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=staff-magic
|
||||
image=items/staff-magic.png
|
||||
name= _ "Magic Staff"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=staff
|
||||
image=items/staff.png
|
||||
name= _ "Staff"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=stone-tablet
|
||||
image=items/stone-tablet.png
|
||||
name= _ "Stone Tablet"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=storm-trident
|
||||
image=items/storm-trident.png
|
||||
name= _ "Storm Trident"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=straw-bale1
|
||||
image=items/straw-bale1.png
|
||||
name= _ "Bale of Straw"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=straw-bale2
|
||||
image=items/straw-bale2.png
|
||||
name= _ "Bale of Straw"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=sword
|
||||
image=items/sword.png
|
||||
name= _ "Sword"
|
||||
[/item]
|
||||
[/item_group]
|
||||
|
||||
|
|
@ -111,6 +441,255 @@
|
|||
name= _ "Scenery"
|
||||
icon=icons/items/item_scenery
|
||||
|
||||
[item]
|
||||
id=castle-ruins
|
||||
image=scenery/castle-ruins.png
|
||||
name= _ "Castle Ruins"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=circle-magic-glow
|
||||
image=scenery/circle-magic-glow.png
|
||||
name= _ "Glowing Magic Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=circle-magic
|
||||
image=scenery/circle-magic.png
|
||||
name= _ "Magic Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=dwarven-doors-closed
|
||||
image=scenery/dwarven-doors-closed.png
|
||||
name= _ "Closed Dwarven Doors"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=fire
|
||||
halo=scenery/fire[1~8].png:100
|
||||
image=scenery/fire1.png
|
||||
name= _ "Campfire"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=flames
|
||||
halo=scenery/flames[01~15].png
|
||||
image=scenery/flames01.png
|
||||
name= _ "Flames"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gate-rusty-se
|
||||
image=scenery/gate-rusty-se.png
|
||||
name= _ "Rusty Gate South East"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=gate-rusty-sw
|
||||
image=scenery/gate-rusty-sw.png
|
||||
name= _ "Rusty Gate South West"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=icepack1
|
||||
image=scenery/icepack-1.png
|
||||
name= _ "Ice Pack"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=leanto
|
||||
image=scenery/leanto.png
|
||||
name= _ "Lectern"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=lighthouse
|
||||
name= _ "Lighthouse"
|
||||
image=scenery/lighthouse.png
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=mausoleum
|
||||
halo=scenery/mausoleum[01~22].png
|
||||
image=scenery/mausoleum01.png
|
||||
name= _ "Mausoleum"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=mine-abandoned
|
||||
image=scenery/mine-abandoned.png
|
||||
name= _ "Abandoned Mine"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=monolith1
|
||||
image=scenery/monolith1.png
|
||||
name= _ "Monolith"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=monolith2
|
||||
image=scenery/monolith2.png
|
||||
name= _ "Monolith"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=monolith3
|
||||
image=scenery/monolith3.png
|
||||
name= _ "Monolith"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=monolith4
|
||||
image=scenery/monolith4.png
|
||||
name= _ "Monolith"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=nest-empty
|
||||
image=scenery/nest-empty.png
|
||||
name= _ "Empty Nest"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=nest-full
|
||||
image=scenery/nest-full.png
|
||||
name= _ "Full Nest"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=oak-leaning
|
||||
image=scenery/oak-leaning.png
|
||||
name= _ "Leaning Oak"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=pine1
|
||||
image=scenery/pine1.png
|
||||
name= _ "Pine Tree"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=pine2
|
||||
image=scenery/pine2.png
|
||||
name= _ "Pine Tree"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rock-cairn
|
||||
image=scenery/rock-cairn.png
|
||||
name= _ "Rock Cairn"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rock1
|
||||
image=scenery/rock1.png
|
||||
name= _ "Rock"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rock2
|
||||
image=scenery/rock2.png
|
||||
name= _ "Rock"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rock3
|
||||
image=scenery/rock3.png
|
||||
name= _ "Rock"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rock4
|
||||
image=scenery/rock4.png
|
||||
name= _ "Rock"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rubble
|
||||
image=scenery/rubble.png
|
||||
name= _ "Rubble"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune1
|
||||
image=scenery/rune1.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune2
|
||||
image=scenery/rune2.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune3
|
||||
image=scenery/rune3.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune4
|
||||
image=scenery/rune4.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune5
|
||||
image=scenery/rune5.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune6
|
||||
image=scenery/rune6.png
|
||||
name= _ "Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune1-glow
|
||||
image=scenery/rune1-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune2-glow
|
||||
image=scenery/rune2-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune3-glow
|
||||
image=scenery/rune3-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune4-glow
|
||||
image=scenery/rune4-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune5-glow
|
||||
image=scenery/rune5-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=rune6-glow
|
||||
image=scenery/rune6-glow.png
|
||||
name= _ "Glowing Rune"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=shipwreck
|
||||
image=scenery/shipwreck-1.png
|
||||
name= _ "Shipwreck"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=signpost
|
||||
name= _ "Signpost"
|
||||
|
|
@ -118,9 +697,123 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=whirlpool
|
||||
name= _ "Whirlpool"
|
||||
image=scenery/whirlpool.png
|
||||
id=slab1
|
||||
name= _ "Slab"
|
||||
image=scenery/slab1.png
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=snowbits
|
||||
name= _ "Piles of Snow"
|
||||
image=scenery/snowbits.png
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-center
|
||||
image=scenery/summoning-center.png
|
||||
name= _ "Summoning Center"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle1
|
||||
image=scenery/summoning-circle1.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle2
|
||||
image=scenery/summoning-circle2.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle3
|
||||
image=scenery/summoning-circle3.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle4
|
||||
image=scenery/summoning-circle4.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle5
|
||||
image=scenery/summoning-circle5.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=summoning-circle6
|
||||
image=scenery/summoning-circle6.png
|
||||
name= _ "Summoning Circle"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=temple1
|
||||
image=scenery/temple1.png
|
||||
name= _ "Temple"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=tent-fancy-red
|
||||
image=scenery/tent-fancy-red.png
|
||||
name= _ "Fancy Red Tent"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=tent-ruin-1
|
||||
image=scenery/tent-ruin-1.png
|
||||
name= _ "Ruined Tent"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=tent-shop-weapons
|
||||
name= _ "Weapons Shop Tent"
|
||||
image=scenery/tent-shop-weapons.png
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=trapdoor-closed
|
||||
image=scenery/trapdoor-closed.png
|
||||
name= _ "Closed Trapdoor"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=trapdoor-open
|
||||
image=scenery/trapdoor-open.png
|
||||
name= _ "Open Trapdoor"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=trash
|
||||
image=scenery/trash.png
|
||||
name= _ "Trash Pile"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=village-human-burned1
|
||||
image=scenery/village-human-burned1.png
|
||||
name= _ "Burned Human Village"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=village-human-burned2
|
||||
image=scenery/village-human-burned2.png
|
||||
name= _ "Burned Human Village"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=village-human-burned3
|
||||
image=scenery/village-human-burned3.png
|
||||
name= _ "Burned Human Village"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=village-human-burned4
|
||||
image=scenery/village-human-burned4.png
|
||||
name= _ "Burned Human Village"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
|
|
@ -130,8 +823,21 @@
|
|||
[/item]
|
||||
|
||||
[item]
|
||||
id=lighthouse
|
||||
name= _ "Lighthouse"
|
||||
image=scenery/lighthouse.png
|
||||
id=whirlpool
|
||||
name= _ "Whirlpool"
|
||||
image=scenery/whirlpool.png
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=windmill
|
||||
image=scenery/windmill-01.png
|
||||
halo=scenery/windmill-[01~14].png:150
|
||||
name= _ "Windmill"
|
||||
[/item]
|
||||
|
||||
[item]
|
||||
id=wreck
|
||||
image=scenery/wreck.png
|
||||
name= _ "Shipwreck"
|
||||
[/item]
|
||||
[/item_group]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
#textdomain wesnoth-editor
|
||||
# Editor time-of-day (lighting settings) presets
|
||||
# Editor time-of-day schedule definitions
|
||||
|
||||
[editor_times]
|
||||
name= _ "None"
|
||||
id=empty
|
||||
[/editor_times]
|
||||
|
||||
[editor_times]
|
||||
name= _ "Test"
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
#textdomain wesnoth-editor
|
||||
# Editor tool information / help
|
||||
|
||||
[editor_tool_hint]
|
||||
# wmllint: local spelling left/right Ctrl+click
|
||||
id="editor-tool-paint"
|
||||
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
|
||||
[/editor_tool_hint]
|
||||
|
||||
[editor_tool_hint]
|
||||
# wmllint: local spelling fore-/background
|
||||
id="editor-tool-fill"
|
||||
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
|
||||
[/editor_tool_hint]
|
||||
|
||||
[editor_tool_hint]
|
||||
# wmllint: local spelling deselects
|
||||
id="editor-tool-select"
|
||||
text= _ "Left mouse button selects, right deselects. Hold Shift for magic-wand selection of tiles with same terrain."
|
||||
[/editor_tool_hint]
|
||||
|
||||
[editor_tool_hint]
|
||||
# wmllint: local spelling alt+number
|
||||
id="editor-tool-starting-position"
|
||||
text= _ "Left mouse button displays player selection, right clears. Number keys scroll to the starting position, alt+number sets respective starting position under cursor, delete clears."
|
||||
[/editor_tool_hint]
|
||||
|
||||
[editor_tool_hint]
|
||||
id="editor-paste"
|
||||
text= _ "Click to paste, zoom out for more accuracy when pasting large areas. Use the edit menu to transform the clipboard (rotate, mirror)."
|
||||
[/editor_tool_hint]
|
||||
BIN
data/core/images/terrain/misc/detritus/detritusA-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusA-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusA-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusA-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusA-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusA-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusA-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusA-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusA-5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusA-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-10.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-10.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-11.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-11.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-12.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-12.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-13.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-13.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-14.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-14.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-15.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-15.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-16.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-6.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-7.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-8.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-8.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusB-9.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusB-9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-6.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
BIN
data/core/images/terrain/misc/detritus/detritusC-7.png
Normal file
BIN
data/core/images/terrain/misc/detritus/detritusC-7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/misc/detritus/liter.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.8 KiB |
BIN
data/core/images/terrain/misc/detritus/liter2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6 KiB |
BIN
data/core/images/terrain/misc/detritus/liter3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/liter4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.7 KiB |
BIN
data/core/images/terrain/misc/detritus/liter5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/misc/detritus/liter6.png
Normal file
BIN
data/core/images/terrain/misc/detritus/liter6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6 KiB |
BIN
data/core/images/terrain/misc/detritus/trashA-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashA-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/trashA-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashA-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
BIN
data/core/images/terrain/misc/detritus/trashA-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashA-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
BIN
data/core/images/terrain/misc/detritus/trashA-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashA-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/trashA-5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashA-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-10.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-10.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.6 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-5.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-6.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-7.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-8.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-8.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.4 KiB |
BIN
data/core/images/terrain/misc/detritus/trashB-9.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashB-9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
data/core/images/terrain/misc/detritus/trashC-1.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashC-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
BIN
data/core/images/terrain/misc/detritus/trashC-2.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashC-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
BIN
data/core/images/terrain/misc/detritus/trashC-3.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashC-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
BIN
data/core/images/terrain/misc/detritus/trashC-4.png
Normal file
BIN
data/core/images/terrain/misc/detritus/trashC-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
|
|
@ -821,4 +821,318 @@
|
|||
# Default terrain
|
||||
{TERRAIN_BASE * void/void}
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Tshy
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=33
|
||||
[image]
|
||||
name=misc/detritus/trashA-@V.png
|
||||
variations="1;2;3;4;5"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Tbny
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=33
|
||||
[image]
|
||||
name=misc/detritus/detritusA-@V.png
|
||||
variations="1;2;3;4;5"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Tbny,*^Tshy
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=100
|
||||
[image]
|
||||
name=misc/detritus/liter@V.png
|
||||
variations=";2;3;4;5;6"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
##################### two neighbours ########################
|
||||
|
||||
#define TRI_TRASH_B TERRAIN FLAG PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
2 , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , 2
|
||||
, 1
|
||||
* , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , 2
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , *
|
||||
, 1
|
||||
2 , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-200
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
||||
{TRI_TRASH_B (*^Tshy) (trash_medium) (70) ("1;2;3;4;5;6;7;8;9;10") (misc/detritus/trashB)}
|
||||
{TRI_TRASH_B (*^Tbny) (detritus_medium) (70) ("1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16") (misc/detritus/detritusB)}
|
||||
|
||||
############################## Major ##########################
|
||||
|
||||
#define TRI_TRASH_C TERRAIN FLAG FLAG2 PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
3 , 3
|
||||
, 1
|
||||
3 , 3
|
||||
, 2"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
3 , 2
|
||||
, 1
|
||||
2 , 3
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
2 , 3
|
||||
, 1
|
||||
3 , 2
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-199
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
||||
{TRI_TRASH_C (*^Tshy) (trash_big) (trash_medium) (30) ("1;2;3;4") (misc/detritus/trashC)}
|
||||
{TRI_TRASH_C (*^Tbny) (detritus_big) (detritus_medium) (50) ("1;2;3;4;5;6;7") (misc/detritus/detritusC)}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#wmlindent: stop ignoring
|
||||
|
|
|
|||
|
|
@ -8,6 +8,28 @@
|
|||
|
||||
# NOTE: this list is sorted to group things comprehensibly in the editor
|
||||
|
||||
#
|
||||
# ## Trash and battlefield litter ##
|
||||
#
|
||||
|
||||
[terrain_type]
|
||||
symbol_image=misc/detritus/trashC-1
|
||||
id=tri_trash
|
||||
name= _ "Trash"
|
||||
string=^Tshy
|
||||
aliasof=_bas
|
||||
editor_group=embellishments
|
||||
[/terrain_type]
|
||||
|
||||
[terrain_type]
|
||||
symbol_image=misc/detritus/detritusC-1
|
||||
id=tri_bones
|
||||
name= _ "Remains"
|
||||
string=^Tbny
|
||||
aliasof=_bas
|
||||
editor_group=embellishments
|
||||
[/terrain_type]
|
||||
|
||||
#
|
||||
# ## Water ##
|
||||
#
|
||||
|
|
@ -838,7 +860,7 @@ Most units receive 20 to 40% defense in sand."
|
|||
editor_name= _ "Lit Mushroom Grove"
|
||||
string=^Ufi
|
||||
default_base=Uu
|
||||
aliasof=^Uft
|
||||
aliasof=Uft
|
||||
light=25
|
||||
editor_group=cave
|
||||
[/terrain_type]
|
||||
|
|
@ -2008,7 +2030,7 @@ For those who go by land or sea, a bridge is the best of both worlds — for gam
|
|||
name= _ "Bridge"
|
||||
editor_name= _ "Cave Chasm Bridge"
|
||||
string=^Bs|
|
||||
aliasof=U,_bas
|
||||
aliasof=Ut,_bas
|
||||
default_base=Qxu
|
||||
editor_group=bridge, cave
|
||||
[/terrain_type]
|
||||
|
|
@ -2020,7 +2042,7 @@ For those who go by land or sea, a bridge is the best of both worlds — for gam
|
|||
editor_name= _ "Cave Chasm Bridge"
|
||||
unit_height_adjust=22
|
||||
string=^Bs/
|
||||
aliasof=U,_bas
|
||||
aliasof=Ut,_bas
|
||||
default_base=Qxu
|
||||
editor_group=bridge, cave
|
||||
hide_help=yes
|
||||
|
|
@ -2033,7 +2055,7 @@ For those who go by land or sea, a bridge is the best of both worlds — for gam
|
|||
editor_name= _ "Cave Chasm Bridge"
|
||||
unit_height_adjust=22
|
||||
string=^Bs\
|
||||
aliasof=U,_bas
|
||||
aliasof=Ut,_bas
|
||||
default_base=Qxu
|
||||
editor_group=bridge, cave
|
||||
hide_help=yes
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/batal.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/hadaf.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/jawal.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/jundi.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/muharib.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/qanas.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/rami.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
image="projectiles/missile-n.png"
|
||||
image_diagonal="projectiles/missile-ne.png"
|
||||
[/missile_frame]
|
||||
|
||||
|
||||
[frame]
|
||||
image="units/khalifate/saree.png:300"
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@
|
|||
horizontal_alignment = "left"
|
||||
[label]
|
||||
definition = "default"
|
||||
label = _ "Experience Modifier:"
|
||||
label = _ "Experience modifier:"
|
||||
[/label]
|
||||
[/column]
|
||||
[column]
|
||||
|
|
@ -273,7 +273,7 @@
|
|||
[toggle_button]
|
||||
id = "victory_when_enemies_defeated"
|
||||
definition = "default"
|
||||
label= _ "victory_when_enemies_defeated"
|
||||
label= _ "Declare victory once all enemies are defeated"
|
||||
[/toggle_button]
|
||||
|
||||
[/column]
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
[toggle_button]
|
||||
id = "random_start_time"
|
||||
definition = "default"
|
||||
label= _ "Random Starting Time"
|
||||
label= _ "Random starting time"
|
||||
[/toggle_button]
|
||||
|
||||
[/column]
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
|
||||
[label]
|
||||
definition = "default"
|
||||
label = _ "Team Identifier:"
|
||||
label = _ "Team identifier:"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
|
||||
[label]
|
||||
definition = "default"
|
||||
label = _ "Team Name:"
|
||||
label = _ "Team name:"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
#textdomain wesnoth
|
||||
|
||||
[tip]
|
||||
text= _ "Use the map editor's <i>Areas</i> menu to define regions later addressed by event or ai coding."
|
||||
source= _ "<i>― The Wesnoth Design Guide</i>"
|
||||
[/tip]
|
||||
[tip]
|
||||
text= _ "Create a <i>New Scenario</i> in the editor's <i>File</i> menu to make use of advanced features."
|
||||
source= _ "<i>― The Wesnoth Design Guide</i>"
|
||||
[/tip]
|
||||
[tip]
|
||||
text= _ "Scenarios saved from the editor in their default folder can be selected in the mp create screen's <i>User Scenarios</i> section."
|
||||
source= _ "<i>― The Wesnoth Design Guide</i>"
|
||||
[/tip]
|
||||
[tip]
|
||||
text= _ "Don’t neglect to earn your leader experience! You need to keep him safe, but if you coddle him too much he may be too weak to survive future battles."
|
||||
source= _ "<i>― Great Mage Delfador, 516YW</i>"
|
||||
|
|
|
|||
773
data/schema.cfg
773
data/schema.cfg
|
|
@ -271,394 +271,391 @@
|
|||
# map="optional string"
|
||||
# no_flag="optional string"
|
||||
# probability="
|
||||
#[/terrain_graphics]
|
||||
[textdomain]
|
||||
name="required string"
|
||||
path="optional path" # required for UMC, implicit for mainline
|
||||
[/textdomain]
|
||||
[theme]
|
||||
_partialresolution="repeated partialresolution"
|
||||
_resolution="repeated resolution"
|
||||
#[/terrain_graphics]
|
||||
[textdomain]
|
||||
name="required string"
|
||||
path="optional path" # required for UMC, implicit for mainline
|
||||
[/textdomain]
|
||||
[theme]
|
||||
_partialresolution="repeated partialresolution"
|
||||
_resolution="repeated resolution"
|
||||
|
||||
name="required string"
|
||||
[/theme]
|
||||
[topic]
|
||||
generator="optional string" #TODO: maybe a special kind of identifier
|
||||
id="required string" #TODO: see above
|
||||
text="optional tstring"
|
||||
title="required tstring"
|
||||
[/topic]
|
||||
[toplevel]
|
||||
sections="required string" #TODO: should be list of identifiers
|
||||
topics="required string" #TODO: see above
|
||||
[/toplevel]
|
||||
[units]
|
||||
_movetype="repeated movetype"
|
||||
_race="repeated race"
|
||||
_trait="repeated trait"
|
||||
_unit_type="repeated unit_type"
|
||||
[/units]
|
||||
alignments="enum chaotic,neutral,lawful"
|
||||
[unit_type]
|
||||
_abilities="optional abilities"
|
||||
_advancement="repeated advancement"
|
||||
_animation="repeated animation"
|
||||
#.*_anim
|
||||
#[element]
|
||||
# freq="repeated"
|
||||
# match="re ^[a-z_]+_anim$"
|
||||
# name="animation"
|
||||
#[/element]
|
||||
_attack="repeated attack"
|
||||
_death="repeated animation"
|
||||
_defend="repeated animation"
|
||||
_defense="optional defense"
|
||||
_female="optional female"
|
||||
_male="optional male"
|
||||
_movement_costs="optional movement_costs"
|
||||
_portrait="repeated portrait"
|
||||
_resistance="optional resistance"
|
||||
_trait="repeated trait"
|
||||
_variation="repeated variation"
|
||||
name="required string"
|
||||
[/theme]
|
||||
[topic]
|
||||
generator="optional string" #TODO: maybe a special kind of identifier
|
||||
id="required string" #TODO: see above
|
||||
text="optional tstring"
|
||||
title="required tstring"
|
||||
[/topic]
|
||||
[toplevel]
|
||||
sections="required string" #TODO: should be list of identifiers
|
||||
topics="required string" #TODO: see above
|
||||
[/toplevel]
|
||||
[units]
|
||||
_movetype="repeated movetype"
|
||||
_race="repeated race"
|
||||
_trait="repeated trait"
|
||||
_unit_type="repeated unit_type"
|
||||
[/units]
|
||||
alignments="enum chaotic,neutral,lawful"
|
||||
[unit_type]
|
||||
_abilities="optional abilities"
|
||||
_advancement="repeated advancement"
|
||||
_animation="repeated animation"
|
||||
#.*_anim
|
||||
#[element]
|
||||
# freq="repeated"
|
||||
# match="re ^[a-z_]+_anim$"
|
||||
# name="animation"
|
||||
#[/element]
|
||||
_attack="repeated attack"
|
||||
_death="repeated animation"
|
||||
_defend="repeated animation"
|
||||
_defense="optional defense"
|
||||
_female="optional female"
|
||||
_male="optional male"
|
||||
_movement_costs="optional movement_costs"
|
||||
_portrait="repeated portrait"
|
||||
_resistance="optional resistance"
|
||||
_trait="repeated trait"
|
||||
_variation="repeated variation"
|
||||
|
||||
#TODO: make [base_unit] do its job
|
||||
advances_to="optional identifierlist" #should be required
|
||||
alignment="optional alignments" # required
|
||||
cost="optional integer" # required
|
||||
description="optional tstring"
|
||||
die_sound="optional pathlist"
|
||||
do_not_list="optional boolean"
|
||||
ellipse="optional path"
|
||||
experience="optional integer" # required
|
||||
flag_rgb="optional string" # list of integers
|
||||
gender="optional string" # enum male,female
|
||||
halo="optional string" # should be animlist: list of imagepaths with animation length
|
||||
hide_help="optional boolean"
|
||||
hitpoints="optional integer" # required
|
||||
id="required identifier"
|
||||
ignore_race_traits="optional boolean"
|
||||
image="optional path" # required
|
||||
level="optional integer" # required
|
||||
movement="optional integer" # required
|
||||
movement_type="optional identifier" # required
|
||||
name="optional tstring" # required
|
||||
profile="optional path"
|
||||
race="optional identifier" # required
|
||||
undead_variation="optional identifier"
|
||||
usage="optional identifier" # required
|
||||
zoc="optional boolean"
|
||||
[/unit_type]
|
||||
[variation:unit_type]
|
||||
id="forbidden identifier"
|
||||
inherit="optional boolean"
|
||||
variation_name="required identifier"
|
||||
[/variation:unit_type]
|
||||
[/schema]
|
||||
#TODO: make [base_unit] do its job
|
||||
advances_to="optional identifierlist" #should be required
|
||||
alignment="optional alignments" # required
|
||||
cost="optional integer" # required
|
||||
description="optional tstring"
|
||||
die_sound="optional pathlist"
|
||||
do_not_list="optional boolean"
|
||||
ellipse="optional path"
|
||||
experience="optional integer" # required
|
||||
flag_rgb="optional string" # list of integers
|
||||
gender="optional string" # enum male,female
|
||||
halo="optional string" # should be animlist: list of imagepaths with animation length
|
||||
hide_help="optional boolean"
|
||||
hitpoints="optional integer" # required
|
||||
id="required identifier"
|
||||
ignore_race_traits="optional boolean"
|
||||
image="optional path" # required
|
||||
level="optional integer" # required
|
||||
movement="optional integer" # required
|
||||
movement_type="optional identifier" # required
|
||||
name="optional tstring" # required
|
||||
profile="optional path"
|
||||
race="optional identifier" # required
|
||||
undead_variation="optional identifier"
|
||||
usage="optional identifier" # required
|
||||
zoc="optional boolean"
|
||||
[/unit_type]
|
||||
[variation:unit_type]
|
||||
id="forbidden identifier"
|
||||
inherit="optional boolean"
|
||||
variation_name="required identifier"
|
||||
[/variation:unit_type]
|
||||
[/schema]
|
||||
|
||||
## Things that still need to be converted, in a similar format.
|
||||
## Note that this is derived from the old wmlgrammar, which was incomplete
|
||||
#
|
||||
## Attempt to keep everything alphabetically ordered
|
||||
#[abilities]
|
||||
# [ 'heals', 'hides', 'illuminates', 'leadership', 'regenerate', { 'resistance' : 'resistance-ability' }, 'skirmisher', 'teleport', { re.compile('\w+') : 'ability-dummy' }, ]
|
||||
# []
|
||||
#[/abilities]
|
||||
#[ability-dummy]
|
||||
# [], #TODO: the filters and adjacent_description
|
||||
# [ 'affect_allies', 'affect_enemies', 'affect_self', 'cumulative', 'description', 'description_inactive', 'female_name', 'female_name_inactive', 'id', 'name', 'name_inactive', ]
|
||||
#[/ability-dummy]
|
||||
#[add]
|
||||
# 'resolution'
|
||||
# []
|
||||
#[/add]
|
||||
#[advancement]
|
||||
# [ 'effect', ]
|
||||
# [ 'description', 'id', 'image', 'max_times', 'require_amla', 'strict_amla', ]
|
||||
#[/advancement]
|
||||
#[animation]
|
||||
# #TODO: add filter, filter_second
|
||||
# [ 'filter_attack', 'filter_second_attack', # Filters
|
||||
# { 'else' : 'else-animation' }, 'frame',
|
||||
#{ re.compile('\w+_frame') : 'frame' },
|
||||
#{ 'if' : 'if-animation' }, ], # The contents
|
||||
# [ 'apply_to', 'direction', 'frequency', 'hits', 'swing', 'terrain', 'value', # Filters
|
||||
# re.compile('(\w+_)?alpha'), re.compile('(\w+_)?blend_with'), re.compile('(\w+_)?blend_ratio'), re.compile('(\w+_)?halo'), re.compile('(\w+_)?halo_mod'), re.compile('(\w+_)?halo_x'), re.compile('(\w+_)?halo_y'), re.compile('(\w+_)?image_mod'), re.compile('(\w+_)?layer'), re.compile('(\w+_)?offset'), re.compile('(\w+_)?start_time'), re.compile('(\w+_)?submerge'), re.compile('(\w+_)?x'), re.compile('(\w+_)?y'), ] # Frame data, got them from the wiki, I'm assuming these are all valid
|
||||
#[/animation]
|
||||
#[attack]
|
||||
# [ 'specials', ]
|
||||
# [ 'attack_weight', 'damage', 'defense_weight', 'description', 'icon', 'movement_used', 'name', 'number', 'range', 'type', ]
|
||||
#[/attack]
|
||||
#[attacks]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/attacks]
|
||||
#[berserk]
|
||||
# TagPlus('special-dummy', ([], [ 'value', ]) ),
|
||||
#[/berserk]
|
||||
#[chance_to_hit]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/chance_to_hit]
|
||||
#[change]
|
||||
# []
|
||||
# [ 'font_size', 'id', 'image', 'items', 'rect', 'ref', ] #TODO: unfinished
|
||||
#[/change]
|
||||
#[color_palette]
|
||||
# []
|
||||
# [ 'ellipse_red', 'flag_green', 'magenta', ]
|
||||
#[/color_palette]
|
||||
#[color_range]
|
||||
# []
|
||||
# [ 'id', 'name', 'rgb', ]
|
||||
#[/color_range]
|
||||
#[damage]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/damage]
|
||||
#[death]
|
||||
# 'animation',
|
||||
#[/death]
|
||||
#[defend]
|
||||
# 'animation',
|
||||
#[/defend]
|
||||
#[defense]
|
||||
# 'movement_costs',
|
||||
#[/defense]
|
||||
#[drains]
|
||||
# 'special-dummy',
|
||||
#[/drains]
|
||||
#[editor_tool_hint]
|
||||
# 'gold-theme',
|
||||
#[/editor_tool_hint]
|
||||
#[effect]
|
||||
# [ 'defense', 'movement_costs', 'resistance', ], #TODO: point tags to where they should go (specials, contents of filter_attack,
|
||||
#{ set_specials : specials }, abilities)
|
||||
# [ 'apply_to', 'times', 'unit_type', re.compile("\w+"), ]
|
||||
#[/effect]
|
||||
#[else-animation]
|
||||
# 'animation',
|
||||
#[/else-animation]
|
||||
#[filter_attack]
|
||||
# []
|
||||
# [ 'name', 'range', 'special', 'type', ]
|
||||
#[/filter_attack]
|
||||
#[filter_second_attack]
|
||||
# 'filter_attack',
|
||||
#[/filter_second_attack]
|
||||
#[filter_weapon]
|
||||
# 'filter_attack',
|
||||
#[/filter_weapon]
|
||||
#[firststrike]
|
||||
# 'special-dummy',
|
||||
#[/firststrike]
|
||||
#[frame]
|
||||
# []
|
||||
# [ 'alpha', 'begin', 'blend_color', 'blend_ratio', 'duration', 'end', 'halo', 'halo_mod', 'halo_x', 'halo_y', 'image', 'image_diagonal', 'image_mod', 'layer', 'offset', 'sound', 'submerge', 'text', 'text_color', 'x', 'y', ]
|
||||
#[/frame]
|
||||
#[gold-theme]
|
||||
# []
|
||||
# [ 'font_rgb', 'font_size', 'id', 'prefix', 'prefix_literal', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/gold-theme]
|
||||
#[heals]
|
||||
# TagPlus('ability-dummy', ([], [ 'poison', 'value', ]) ),
|
||||
#[/heals]
|
||||
#[hides]
|
||||
# TagPlus('ability-dummy', ([], [ 'alert', ]) ),
|
||||
#[/hides]
|
||||
#[if-animation]
|
||||
# 'animation',
|
||||
#[/if-animation]
|
||||
#[income]
|
||||
# 'gold-theme',
|
||||
#[/income]
|
||||
#[illuminates]
|
||||
# TagPlus('ability-dummy', ([], [ 'max_value', 'value', ]) ),
|
||||
#[/illuminates]
|
||||
#[image]
|
||||
# []
|
||||
# [ 'base', 'center', 'layer', 'name', ]
|
||||
#[/image]
|
||||
#[label-theme]
|
||||
# []
|
||||
# [ 'font_rgb', 'font_size', 'icon', 'id', 'image', 'text', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/label-theme]
|
||||
#[leadership]
|
||||
# TagPlus('ability-dummy', ([], [ 'value', ]) ),
|
||||
#[/leadership]
|
||||
#[main_map]
|
||||
# []
|
||||
# 'panel'
|
||||
#[/main_map]
|
||||
#[main_map_border]
|
||||
# []
|
||||
# [ 'background_image', 'border_image_bottom_even', 'border_image_bottom_odd', 'border_image_left', 'border_image_right', 'border_image_top_even', 'border_image_top_odd', 'border_size', 'corner_image_bottom_left', 'corner_image_bottom_right_even', 'corner_image_bottom_right_odd', 'corner_image_top_left','corner_image_top_right_even', 'corner_image_top_right_odd', 'tile_image', ]
|
||||
#[/main_map_border]
|
||||
#[menu]
|
||||
# []
|
||||
# [ 'auto_tooltip', 'id', 'image', 'is_context_menu', 'items', 'title', 'title2', 'tooltip', 'type', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/menu]
|
||||
#[mini_map]
|
||||
# []
|
||||
# 'panel'
|
||||
#[/mini_map]
|
||||
#[movement_costs]
|
||||
# []
|
||||
# [ re.compile('\w+'), ]
|
||||
#[/movement_costs]
|
||||
#[num_units]
|
||||
# 'gold-theme',
|
||||
#[/num_units]
|
||||
#[observers]
|
||||
# 'gold-theme',
|
||||
#[/observers]
|
||||
#[panel]
|
||||
# []
|
||||
# [ 'id', 'image', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/panel]
|
||||
#[plague]
|
||||
# TagPlus('special-dummy', ( [], [ 'type', ] ) ),
|
||||
#[/plague]
|
||||
#[poison]
|
||||
# 'special-dummy',
|
||||
#[/poison]
|
||||
#[position]
|
||||
# 'gold-theme',
|
||||
#[/position]
|
||||
#[regenerate]
|
||||
# TagPlus('ability-dummy', ([], [ 'poison', 'value', ]) ),
|
||||
#[/regenerate]
|
||||
#[remove]
|
||||
# []
|
||||
# [ 'id', ]
|
||||
#[/remove]
|
||||
#[replay]
|
||||
# 'partialresolution'
|
||||
# []
|
||||
#[/replay]
|
||||
#[report_clock]
|
||||
# 'gold-theme',
|
||||
#[/report_clock]
|
||||
#[report_countdown]
|
||||
# 'gold-theme',
|
||||
#[/report_countdown]
|
||||
#[resistance-ability]
|
||||
# TagPlus('ability-dummy', ([], [ 'active_on', 'add', 'apply_to', 'max_value', 'multiply', 'value', ]) ),
|
||||
#[/resistance-ability]
|
||||
#[resistance]
|
||||
# []
|
||||
# [ re.compile('\w+'), ]
|
||||
#[/resistance]
|
||||
#[screen]
|
||||
# []
|
||||
# [ 'id', 'rect' ]
|
||||
#[/screen]
|
||||
#[server]
|
||||
# []
|
||||
# [ 'address', 'name', ]
|
||||
#[/server]
|
||||
#[side_playing]
|
||||
# []
|
||||
# [ 'id', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/side_playing]
|
||||
#[skirmisher]
|
||||
# 'ability-dummy',
|
||||
#[/skirmisher]
|
||||
#[slow]
|
||||
# 'special-dummy',
|
||||
#[/slow]
|
||||
#[special-dummy]
|
||||
# [] #TODO: filters
|
||||
# [ 'active_on', 'apply_to', 'description', 'description_inactive', 'id', 'name', 'name_inactive', ]
|
||||
#[/special-dummy]
|
||||
#[specials]
|
||||
# [ 'attacks', 'berserk', 'chance_to_hit', 'damage', 'drains', 'firststrike', 'plague', 'poison', 'slow', 'petrifies', 'swarm', { re.compile('\w+') : 'special-dummy' }, ]
|
||||
##TODO: add the rest of them
|
||||
# []
|
||||
#[/specials]
|
||||
#[status]
|
||||
# [ 'editor_tool_hint', { 'gold' : 'gold-theme' }, 'income', 'num_units', 'observers', 'panel', 'position', 'report_clock', 'report_countdown', 'side_playing',
|
||||
#{ 'terrain' : 'terrain-theme' }, 'time_of_day', 'turn', 'unit_abilities', 'unit_advancement_options', 'unit_alignment', 'unit_amla', 'unit_hp', 'unit_image', 'unit_level', 'unit_moves', 'unit_name', 'unit_race', 'unit_side', 'unit_status', 'unit_traits',
|
||||
#{ 'unit_type' : 'unit_type-theme' } , 'unit_weapons', 'unit_xp', 'upkeep', 'villages', ]
|
||||
# []
|
||||
#[/status]
|
||||
#[petrifies]
|
||||
# 'special-dummy',
|
||||
#[/petrifies]
|
||||
#[swarm]
|
||||
# TagPlus('special-dummy', ([], ['swarm_attacks_min', 'swarm_attacks_max',]) ),
|
||||
#[/swarm]
|
||||
#[teleport]
|
||||
# 'ability-dummy',
|
||||
#[/teleport]
|
||||
#[terrain_type]
|
||||
# []
|
||||
# [ 'aliasof', 'default_base', 'def_alias', 'description', 'editor_group', 'editor_image', 'gives_income', 'heals', 'hidden', 'id', 'light', 'mvt_alias', 'name', 'recruit_from', 'recruit_onto', 'string', 'submerge', 'symbol_image', 'unit_height_adjust', ]
|
||||
#[/terrain_type]
|
||||
#[terrain-theme]
|
||||
# 'gold-theme',
|
||||
#[/terrain-theme]
|
||||
#[tile]
|
||||
# [ 'image', ]
|
||||
# [ 'no_flag', 'pos', 'set_flag', 'type', 'x', 'y', ]
|
||||
#[/tile]
|
||||
#[time_of_day]
|
||||
# 'side_playing',
|
||||
#[/time_of_day]
|
||||
#[trait]
|
||||
# [ 'effect', ]
|
||||
# [ 'availability', 'description', 'female_name', 'id', 'male_name', 'name', ]
|
||||
#[/trait]
|
||||
#[turn]
|
||||
# 'gold-theme',
|
||||
#[/turn]
|
||||
#[unit_abilities]
|
||||
# 'gold-theme',
|
||||
#[/unit_abilities]
|
||||
#[unit_advancement_options]
|
||||
# 'gold-theme',
|
||||
#[/unit_advancement_options]
|
||||
#[unit_alignment]
|
||||
# 'gold-theme',
|
||||
#[/unit_alignment]
|
||||
#[unit_amla]
|
||||
# 'gold-theme',
|
||||
#[/unit_amla]
|
||||
#[unit_hp]
|
||||
# 'gold-theme',
|
||||
#[/unit_hp]
|
||||
#[unit_image]
|
||||
# 'gold-theme',
|
||||
#[/unit_image]
|
||||
#[unit_level]
|
||||
# 'gold-theme',
|
||||
#[/unit_level]
|
||||
#[unit_moves]
|
||||
# 'gold-theme',
|
||||
#[/unit_moves]
|
||||
#[unit_name]
|
||||
# 'gold-theme',
|
||||
#[/unit_name]
|
||||
#[unit_race]
|
||||
# 'gold-theme',
|
||||
#[/unit_race]
|
||||
#[unit_side]
|
||||
# 'gold-theme',
|
||||
#[/unit_side]
|
||||
#[unit_status]
|
||||
# 'gold-theme',
|
||||
#[/unit_status]
|
||||
#[unit_traits]
|
||||
# 'gold-theme',
|
||||
#[/unit_traits]
|
||||
#[unit_type-theme]
|
||||
# 'gold-theme',
|
||||
#[/unit_type-theme]
|
||||
#[unit_weapons]
|
||||
# 'gold-theme',
|
||||
#[/unit_weapons]
|
||||
#[unit_xp]
|
||||
# 'gold-theme',
|
||||
#[/unit_xp]
|
||||
#[villages]
|
||||
# 'gold-theme',
|
||||
#[/villages]
|
||||
#[upkeep]
|
||||
# 'gold-theme',
|
||||
#[/upkeep]
|
||||
## Things that still need to be converted, in a similar format.
|
||||
## Note that this is derived from the old wmlgrammar, which was incomplete
|
||||
#
|
||||
## Attempt to keep everything alphabetically ordered
|
||||
#[abilities]
|
||||
# [ 'heals', 'hides', 'illuminates', 'leadership', 'regenerate', { 'resistance' : 'resistance-ability' }, 'skirmisher', 'teleport', { re.compile('\w+') : 'ability-dummy' }, ]
|
||||
# []
|
||||
#[/abilities]
|
||||
#[ability-dummy]
|
||||
# [], #TODO: the filters and adjacent_description
|
||||
# [ 'affect_allies', 'affect_enemies', 'affect_self', 'cumulative', 'description', 'description_inactive', 'female_name', 'female_name_inactive', 'id', 'name', 'name_inactive', ]
|
||||
#[/ability-dummy]
|
||||
#[add]
|
||||
# 'resolution'
|
||||
# []
|
||||
#[/add]
|
||||
#[advancement]
|
||||
# [ 'effect', ]
|
||||
# [ 'description', 'id', 'image', 'max_times', 'require_amla', 'strict_amla', ]
|
||||
#[/advancement]
|
||||
#[animation]
|
||||
# #TODO: add filter, filter_second
|
||||
# [ 'filter_attack', 'filter_second_attack', # Filters
|
||||
# { 'else' : 'else-animation' }, 'frame',
|
||||
#{ re.compile('\w+_frame') : 'frame' },
|
||||
#{ 'if' : 'if-animation' }, ], # The contents
|
||||
# [ 'apply_to', 'direction', 'frequency', 'hits', 'swing', 'terrain', 'value', # Filters
|
||||
# re.compile('(\w+_)?alpha'), re.compile('(\w+_)?blend_with'), re.compile('(\w+_)?blend_ratio'), re.compile('(\w+_)?halo'), re.compile('(\w+_)?halo_mod'), re.compile('(\w+_)?halo_x'), re.compile('(\w+_)?halo_y'), re.compile('(\w+_)?image_mod'), re.compile('(\w+_)?layer'), re.compile('(\w+_)?offset'), re.compile('(\w+_)?start_time'), re.compile('(\w+_)?submerge'), re.compile('(\w+_)?x'), re.compile('(\w+_)?y'), ] # Frame data, got them from the wiki, I'm assuming these are all valid
|
||||
#[/animation]
|
||||
#[attack]
|
||||
# [ 'specials', ]
|
||||
# [ 'attack_weight', 'damage', 'defense_weight', 'description', 'icon', 'movement_used', 'name', 'number', 'range', 'type', ]
|
||||
#[/attack]
|
||||
#[attacks]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/attacks]
|
||||
#[berserk]
|
||||
# TagPlus('special-dummy', ([], [ 'value', ]) ),
|
||||
#[/berserk]
|
||||
#[chance_to_hit]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/chance_to_hit]
|
||||
#[change]
|
||||
# []
|
||||
# [ 'font_size', 'id', 'image', 'items', 'rect', 'ref', ] #TODO: unfinished
|
||||
#[/change]
|
||||
#[color_palette]
|
||||
# []
|
||||
# [ 'ellipse_red', 'flag_green', 'magenta', ]
|
||||
#[/color_palette]
|
||||
#[color_range]
|
||||
# []
|
||||
# [ 'id', 'name', 'rgb', ]
|
||||
#[/color_range]
|
||||
#[damage]
|
||||
# TagPlus('special-dummy', ([], [ 'add', 'backstab', 'cumulative', 'multiply', 'value', ]) ),
|
||||
#[/damage]
|
||||
#[death]
|
||||
# 'animation',
|
||||
#[/death]
|
||||
#[defend]
|
||||
# 'animation',
|
||||
#[/defend]
|
||||
#[defense]
|
||||
# 'movement_costs',
|
||||
#[/defense]
|
||||
#[drains]
|
||||
# 'special-dummy',
|
||||
#[/drains]
|
||||
#[effect]
|
||||
# [ 'defense', 'movement_costs', 'resistance', ], #TODO: point tags to where they should go (specials, contents of filter_attack,
|
||||
#{ set_specials : specials }, abilities)
|
||||
# [ 'apply_to', 'times', 'unit_type', re.compile("\w+"), ]
|
||||
#[/effect]
|
||||
#[else-animation]
|
||||
# 'animation',
|
||||
#[/else-animation]
|
||||
#[filter_attack]
|
||||
# []
|
||||
# [ 'name', 'range', 'special', 'type', ]
|
||||
#[/filter_attack]
|
||||
#[filter_second_attack]
|
||||
# 'filter_attack',
|
||||
#[/filter_second_attack]
|
||||
#[filter_weapon]
|
||||
# 'filter_attack',
|
||||
#[/filter_weapon]
|
||||
#[firststrike]
|
||||
# 'special-dummy',
|
||||
#[/firststrike]
|
||||
#[frame]
|
||||
# []
|
||||
# [ 'alpha', 'begin', 'blend_color', 'blend_ratio', 'duration', 'end', 'halo', 'halo_mod', 'halo_x', 'halo_y', 'image', 'image_diagonal', 'image_mod', 'layer', 'offset', 'sound', 'submerge', 'text', 'text_color', 'x', 'y', ]
|
||||
#[/frame]
|
||||
#[gold-theme]
|
||||
# []
|
||||
# [ 'font_rgb', 'font_size', 'id', 'prefix', 'prefix_literal', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/gold-theme]
|
||||
#[heals]
|
||||
# TagPlus('ability-dummy', ([], [ 'poison', 'value', ]) ),
|
||||
#[/heals]
|
||||
#[hides]
|
||||
# TagPlus('ability-dummy', ([], [ 'alert', ]) ),
|
||||
#[/hides]
|
||||
#[if-animation]
|
||||
# 'animation',
|
||||
#[/if-animation]
|
||||
#[income]
|
||||
# 'gold-theme',
|
||||
#[/income]
|
||||
#[illuminates]
|
||||
# TagPlus('ability-dummy', ([], [ 'max_value', 'value', ]) ),
|
||||
#[/illuminates]
|
||||
#[image]
|
||||
# []
|
||||
# [ 'base', 'center', 'layer', 'name', ]
|
||||
#[/image]
|
||||
#[label-theme]
|
||||
# []
|
||||
# [ 'font_rgb', 'font_size', 'icon', 'id', 'image', 'text', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/label-theme]
|
||||
#[leadership]
|
||||
# TagPlus('ability-dummy', ([], [ 'value', ]) ),
|
||||
#[/leadership]
|
||||
#[main_map]
|
||||
# []
|
||||
# 'panel'
|
||||
#[/main_map]
|
||||
#[main_map_border]
|
||||
# []
|
||||
# [ 'background_image', 'border_image_bottom_even', 'border_image_bottom_odd', 'border_image_left', 'border_image_right', 'border_image_top_even', 'border_image_top_odd', 'border_size', 'corner_image_bottom_left', 'corner_image_bottom_right_even', 'corner_image_bottom_right_odd', 'corner_image_top_left','corner_image_top_right_even', 'corner_image_top_right_odd', 'tile_image', ]
|
||||
#[/main_map_border]
|
||||
#[menu]
|
||||
# []
|
||||
# [ 'auto_tooltip', 'id', 'image', 'is_context_menu', 'items', 'title', 'title2', 'tooltip', 'type', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/menu]
|
||||
#[mini_map]
|
||||
# []
|
||||
# 'panel'
|
||||
#[/mini_map]
|
||||
#[movement_costs]
|
||||
# []
|
||||
# [ re.compile('\w+'), ]
|
||||
#[/movement_costs]
|
||||
#[num_units]
|
||||
# 'gold-theme',
|
||||
#[/num_units]
|
||||
#[observers]
|
||||
# 'gold-theme',
|
||||
#[/observers]
|
||||
#[panel]
|
||||
# []
|
||||
# [ 'id', 'image', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/panel]
|
||||
#[plague]
|
||||
# TagPlus('special-dummy', ( [], [ 'type', ] ) ),
|
||||
#[/plague]
|
||||
#[poison]
|
||||
# 'special-dummy',
|
||||
#[/poison]
|
||||
#[position]
|
||||
# 'gold-theme',
|
||||
#[/position]
|
||||
#[regenerate]
|
||||
# TagPlus('ability-dummy', ([], [ 'poison', 'value', ]) ),
|
||||
#[/regenerate]
|
||||
#[remove]
|
||||
# []
|
||||
# [ 'id', ]
|
||||
#[/remove]
|
||||
#[replay]
|
||||
# 'partialresolution'
|
||||
# []
|
||||
#[/replay]
|
||||
#[report_clock]
|
||||
# 'gold-theme',
|
||||
#[/report_clock]
|
||||
#[report_countdown]
|
||||
# 'gold-theme',
|
||||
#[/report_countdown]
|
||||
#[resistance-ability]
|
||||
# TagPlus('ability-dummy', ([], [ 'active_on', 'add', 'apply_to', 'max_value', 'multiply', 'value', ]) ),
|
||||
#[/resistance-ability]
|
||||
#[resistance]
|
||||
# []
|
||||
# [ re.compile('\w+'), ]
|
||||
#[/resistance]
|
||||
#[screen]
|
||||
# []
|
||||
# [ 'id', 'rect' ]
|
||||
#[/screen]
|
||||
#[server]
|
||||
# []
|
||||
# [ 'address', 'name', ]
|
||||
#[/server]
|
||||
#[side_playing]
|
||||
# []
|
||||
# [ 'id', 'rect', 'ref', 'xanchor', 'yanchor', ]
|
||||
#[/side_playing]
|
||||
#[skirmisher]
|
||||
# 'ability-dummy',
|
||||
#[/skirmisher]
|
||||
#[slow]
|
||||
# 'special-dummy',
|
||||
#[/slow]
|
||||
#[special-dummy]
|
||||
# [] #TODO: filters
|
||||
# [ 'active_on', 'apply_to', 'description', 'description_inactive', 'id', 'name', 'name_inactive', ]
|
||||
#[/special-dummy]
|
||||
#[specials]
|
||||
# [ 'attacks', 'berserk', 'chance_to_hit', 'damage', 'drains', 'firststrike', 'plague', 'poison', 'slow', 'petrifies', 'swarm', { re.compile('\w+') : 'special-dummy' }, ]
|
||||
##TODO: add the rest of them
|
||||
# []
|
||||
#[/specials]
|
||||
#[status]
|
||||
# [ { 'gold' : 'gold-theme' }, 'income', 'num_units', 'observers', 'panel', 'position', 'report_clock', 'report_countdown', 'side_playing',
|
||||
#{ 'terrain' : 'terrain-theme' }, 'time_of_day', 'turn', 'unit_abilities', 'unit_advancement_options', 'unit_alignment', 'unit_amla', 'unit_hp', 'unit_image', 'unit_level', 'unit_moves', 'unit_name', 'unit_race', 'unit_side', 'unit_status', 'unit_traits',
|
||||
#{ 'unit_type' : 'unit_type-theme' } , 'unit_weapons', 'unit_xp', 'upkeep', 'villages', ]
|
||||
# []
|
||||
#[/status]
|
||||
#[petrifies]
|
||||
# 'special-dummy',
|
||||
#[/petrifies]
|
||||
#[swarm]
|
||||
# TagPlus('special-dummy', ([], ['swarm_attacks_min', 'swarm_attacks_max',]) ),
|
||||
#[/swarm]
|
||||
#[teleport]
|
||||
# 'ability-dummy',
|
||||
#[/teleport]
|
||||
#[terrain_type]
|
||||
# []
|
||||
# [ 'aliasof', 'default_base', 'def_alias', 'description', 'editor_group', 'editor_image', 'gives_income', 'heals', 'hidden', 'id', 'light', 'mvt_alias', 'name', 'recruit_from', 'recruit_onto', 'string', 'submerge', 'symbol_image', 'unit_height_adjust', ]
|
||||
#[/terrain_type]
|
||||
#[terrain-theme]
|
||||
# 'gold-theme',
|
||||
#[/terrain-theme]
|
||||
#[tile]
|
||||
# [ 'image', ]
|
||||
# [ 'no_flag', 'pos', 'set_flag', 'type', 'x', 'y', ]
|
||||
#[/tile]
|
||||
#[time_of_day]
|
||||
# 'side_playing',
|
||||
#[/time_of_day]
|
||||
#[trait]
|
||||
# [ 'effect', ]
|
||||
# [ 'availability', 'description', 'female_name', 'id', 'male_name', 'name', ]
|
||||
#[/trait]
|
||||
#[turn]
|
||||
# 'gold-theme',
|
||||
#[/turn]
|
||||
#[unit_abilities]
|
||||
# 'gold-theme',
|
||||
#[/unit_abilities]
|
||||
#[unit_advancement_options]
|
||||
# 'gold-theme',
|
||||
#[/unit_advancement_options]
|
||||
#[unit_alignment]
|
||||
# 'gold-theme',
|
||||
#[/unit_alignment]
|
||||
#[unit_amla]
|
||||
# 'gold-theme',
|
||||
#[/unit_amla]
|
||||
#[unit_hp]
|
||||
# 'gold-theme',
|
||||
#[/unit_hp]
|
||||
#[unit_image]
|
||||
# 'gold-theme',
|
||||
#[/unit_image]
|
||||
#[unit_level]
|
||||
# 'gold-theme',
|
||||
#[/unit_level]
|
||||
#[unit_moves]
|
||||
# 'gold-theme',
|
||||
#[/unit_moves]
|
||||
#[unit_name]
|
||||
# 'gold-theme',
|
||||
#[/unit_name]
|
||||
#[unit_race]
|
||||
# 'gold-theme',
|
||||
#[/unit_race]
|
||||
#[unit_side]
|
||||
# 'gold-theme',
|
||||
#[/unit_side]
|
||||
#[unit_status]
|
||||
# 'gold-theme',
|
||||
#[/unit_status]
|
||||
#[unit_traits]
|
||||
# 'gold-theme',
|
||||
#[/unit_traits]
|
||||
#[unit_type-theme]
|
||||
# 'gold-theme',
|
||||
#[/unit_type-theme]
|
||||
#[unit_weapons]
|
||||
# 'gold-theme',
|
||||
#[/unit_weapons]
|
||||
#[unit_xp]
|
||||
# 'gold-theme',
|
||||
#[/unit_xp]
|
||||
#[villages]
|
||||
# 'gold-theme',
|
||||
#[/villages]
|
||||
#[upkeep]
|
||||
# 'gold-theme',
|
||||
#[/upkeep]
|
||||
|
|
|
|||
|
|
@ -644,7 +644,6 @@
|
|||
rect="=+4,+1,+3,+3"
|
||||
[/change]
|
||||
|
||||
|
||||
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
|
||||
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
|
||||
|
||||
|
|
@ -806,12 +805,11 @@
|
|||
# rect="=+4,+1,+3,+3"
|
||||
# [/change]
|
||||
|
||||
|
||||
# use smaller fonts to display things correctly when using a vertical resolution smaller than 600px
|
||||
[change]
|
||||
id=unit-description
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
# rect="=+9,=+3,=-2,+16"
|
||||
# rect="=+9,=+3,=-2,+16"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-type
|
||||
|
|
@ -821,31 +819,31 @@
|
|||
# # placing the unit level right of the alignment
|
||||
# # doing it the other way around leads to a strange problem sometimes having the alingment not being displayed
|
||||
# # this does not happen with this order
|
||||
[change]
|
||||
id=unit-level
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=+72,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-alignment
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=-72,=,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-traits
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-abilities
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-moves
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-level
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=+72,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-alignment
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=-72,=,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-traits
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-abilities
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-moves
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=,+0,=,+11"
|
||||
[/change]
|
||||
# [remove]
|
||||
# id=unit-defense
|
||||
# [/remove]
|
||||
|
|
@ -854,9 +852,9 @@
|
|||
# [/remove]
|
||||
[change]
|
||||
id=unit-weapons
|
||||
# ref=unit-moves
|
||||
# ref=unit-moves
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
# rect="=+0,+0,=,504"
|
||||
# rect="=+0,+0,=,504"
|
||||
[/change]
|
||||
[/partialresolution]
|
||||
[/theme]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
[menu]
|
||||
id=menu-editor-paste-context
|
||||
is_context_menu=true
|
||||
items=editor-unit-toggle-loyal,editor-change-unitid,renameunit,describeunit,editor-deleteunit,editor-toggle-renameable,editor-toggle-canrecruit,editor-cut,editor-copy,editor-paste,editor-tool-select,editor-select-all,editor-select-inverse,editor-select-none,editor-clipboard-rotate-cw,editor-clipboard-rotate-ccw,editor-clipboard-flip-horizontal,editor-clipboard-flip-vertical,editor-selection-name,editor-selection-fill,editor-selection-rotate,editor-selection-flip, editor-selection-generate,editor-selection-randomize
|
||||
items=editor-unit-toggle-loyal,editor-change-unitid,editor-unit-recruit,renameunit,describeunit,editor-deleteunit,editor-toggle-renameable,editor-toggle-canrecruit,editor-cut,editor-copy,editor-paste,editor-tool-select,editor-select-all,editor-select-inverse,editor-select-none,editor-clipboard-rotate-cw,editor-clipboard-rotate-ccw,editor-clipboard-flip-horizontal,editor-clipboard-flip-vertical,editor-selection-name,editor-selection-fill,editor-selection-rotate,editor-selection-flip, editor-selection-generate,editor-selection-randomize
|
||||
[/menu]
|
||||
|
||||
####### Menu Bar
|
||||
|
|
@ -736,7 +736,6 @@
|
|||
yanchor=fixed
|
||||
[/slider]
|
||||
|
||||
|
||||
# [panel]
|
||||
# id=terrain-info-panel
|
||||
# ref=top-panel
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
("value")
|
||||
("invalidate_on_gamestate_change" "value" "name" "engine"))
|
||||
(nil
|
||||
("default" "po4a_langs" "advanced_preference" "language" "game_config" "schema" "part" "mask" "era" "change" "remove" "panel" "theme" "test_key2" "test_key" "test_lead_space" "umc" "lobby_music" "generic_multiplayer" "multiplayer" "remove_item" "set_menu_item" "multiplayer_side" "locale" "fonts" "tip" "gui" "wml_schema" "window" "button_definition" "drawing_definition" "horizontal_scrollbar_definition" "image_definition" "horizontal_listbox_definition" "listbox_definition" "matrix_definition" "minimap_definition" "multi_page_definition" "panel_definition" "progress_bar_definition" "scroll_label_definition" "scrollbar_panel_definition" "slider_definition" "spacer_definition" "stacked_widget_definition" "text_box_definition" "text" "rectangle" "toggle_button_definition" "toggle_panel_definition" "tree_view_definition" "vertical_scrollbar_definition" "window_definition" "about" "help" "hotkey" "color_palette" "color_range" "stage" "sheath_weapon_anim" "post_movement_anim" "movement_anim" "pre_movement_anim" "missile_frame" "magic_missile_trail_3_frame" "magic_missile_trail_2_frame" "magic_missile_trail_1_frame" "magic_missile_frame" "standing_anim" "filter" "store_side" "fire_event" "object" "sound" "else" "music" "gold" "set_variables" "topic" "section" "titlescreen_music" "brush" "item_group" "editor_music" "editor_times" "editor_tool_hint" "allow_undo" "print" "label" "remove_unit_overlay" "allow_recruit" "disallow_recruit" "movetype" "effect" "image" "leadership" "abilities" "modifications" "message" "time" "item" "store_locations" "terrain" "story" "attack_anim" "attack" "teleport_fill_frame" "frame" "teleport_sparkle_3_frame" "teleport_sparkle_2_frame" "if" "editor_group" "terrain_type" "color_adjust" "scroll" "delay" "unstore_unit" "set_recruit" "kill" "not" "store_unit" "redraw" "capture_village" "heal_unit" "lua" "units" "objective" "recall" "clear_variable" "while" "set_variable" "unit_type" "binary_path" "campaign" "textdomain" "background_layer" "scenario" "aspect" "event" "test" "ai" "terrain_graphics" "unit")
|
||||
("default" "po4a_langs" "advanced_preference" "language" "game_config" "schema" "part" "mask" "era" "change" "remove" "panel" "theme" "test_key2" "test_key" "test_lead_space" "umc" "lobby_music" "generic_multiplayer" "multiplayer" "remove_item" "set_menu_item" "multiplayer_side" "locale" "fonts" "tip" "gui" "wml_schema" "window" "button_definition" "drawing_definition" "horizontal_scrollbar_definition" "image_definition" "horizontal_listbox_definition" "listbox_definition" "matrix_definition" "minimap_definition" "multi_page_definition" "panel_definition" "progress_bar_definition" "scroll_label_definition" "scrollbar_panel_definition" "slider_definition" "spacer_definition" "stacked_widget_definition" "text_box_definition" "text" "rectangle" "toggle_button_definition" "toggle_panel_definition" "tree_view_definition" "vertical_scrollbar_definition" "window_definition" "about" "help" "hotkey" "color_palette" "color_range" "stage" "sheath_weapon_anim" "post_movement_anim" "movement_anim" "pre_movement_anim" "missile_frame" "magic_missile_trail_3_frame" "magic_missile_trail_2_frame" "magic_missile_trail_1_frame" "magic_missile_frame" "standing_anim" "filter" "store_side" "fire_event" "object" "sound" "else" "music" "gold" "set_variables" "topic" "section" "titlescreen_music" "brush" "item_group" "editor_music" "editor_times" "allow_undo" "print" "label" "remove_unit_overlay" "allow_recruit" "disallow_recruit" "movetype" "effect" "image" "leadership" "abilities" "modifications" "message" "time" "item" "store_locations" "terrain" "story" "attack_anim" "attack" "teleport_fill_frame" "frame" "teleport_sparkle_3_frame" "teleport_sparkle_2_frame" "if" "editor_group" "terrain_type" "color_adjust" "scroll" "delay" "unstore_unit" "set_recruit" "kill" "not" "store_unit" "redraw" "capture_village" "heal_unit" "lua" "units" "objective" "recall" "clear_variable" "while" "set_variable" "unit_type" "binary_path" "campaign" "textdomain" "background_layer" "scenario" "aspect" "event" "test" "ai" "terrain_graphics" "unit")
|
||||
("lan_server" "versions_accepted" "motd" "cut" "ctrl" "cmd" "version" "future_string_7" "future_string_6" "future_string_5" "future_string_4" "future_string_3" "future_string_2" "future_string_1" "shadow_start_time" "sling_stone_start_time" "missile_halo_y" "missile_halo_x" "missile_offset" "water_start_time" "flare_start_time" "magic_missile_flare_start_time" "magic_missile_trail_3_start_time" "magic_missile_trail_2_start_time" "magic_missile_trail_1_start_time" "magic_missile_start_time" "halo_auto_vflip" "missile_start_time" "sound_start_time" "carryover_percentage" "carryover_add" "ellipse" "overlays" "blue" "red" "green" "flag_rgb" "female_names" "male_names" "caption" "border_size" "current_time" "attack_sound_start_time" "villages_per_scout" "income" "random_traits" "cost" "require_amla" "description" "do_not_list" "hide_help" "show_title" "flag_icon" "flag" "y" "placement" "gender" "color" "extra_recruit" "faction" "income_lock" "gold_lock" "team_lock" "persistence" "village_gold" "turns" "turn_at" "current_tod" "die_sound" "usage" "advances_to" "alignment" "level" "experience" "movement" "movement_type" "hitpoints" "image" "race" "teleport_fill_start_time" "teleport_ring_start_time" "teleport_sparkle_3_start_time" "teleport_sparkle_2_start_time" "teleport_sparkle_1_start_time" "start_time" "profile" "persistent" "save_id" "map_data" "background" "recruit" "unrenamable" "canrecruit" "name" "id" "type" "user_team_name" "team_name" "controller" "side"))
|
||||
("po4a_paths" nil nil)
|
||||
("po4a_langs"
|
||||
|
|
@ -1088,8 +1088,6 @@
|
|||
("core" "icon" "name" "id"))
|
||||
("editor_times" nil
|
||||
("id" "name"))
|
||||
("editor_tool_hint" nil
|
||||
("text" "id"))
|
||||
("clear_menu_item" nil
|
||||
("id"))
|
||||
("unhide_unit"
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ syn keyword wesmlStdTag contained case chat choose clear_global_variable clear_m
|
|||
syn keyword wesmlStdTag contained clear_variable colour_adjust command damage deaths
|
||||
syn keyword wesmlStdTag contained defend defends defense delay deprecated_message
|
||||
syn keyword wesmlStdTag contained destination disallow_end_turn disallow_extra_recruit disallow_recruit do
|
||||
syn keyword wesmlStdTag contained editor_group editor_music editor_times editor_tool_hint effect
|
||||
syn keyword wesmlStdTag contained editor_group editor_music editor_times effect
|
||||
syn keyword wesmlStdTag contained else endlevel end_turn era event
|
||||
syn keyword wesmlStdTag contained expenses filter filter filter_attack filter_attack
|
||||
syn keyword wesmlStdTag contained filter_condition filter_location filter_second filter_second filter_second_attack
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@ class Parser:
|
|||
self.no_preprocess = no_preprocess
|
||||
self.preprocessed = None
|
||||
self.verbose = False
|
||||
self.skip_newlines = False
|
||||
|
||||
self.last_wml_line = "?"
|
||||
self.parser_line = 0
|
||||
|
|
@ -313,6 +314,9 @@ class Parser:
|
|||
self.temp_key_nodes[self.commas].value.append(
|
||||
self.temp_string_node)
|
||||
|
||||
if line[quote + 1:] == "\n":
|
||||
self.skip_newlines = False
|
||||
|
||||
self.in_string = False
|
||||
self.parse_line_without_commands(line[quote + 1:])
|
||||
else:
|
||||
|
|
@ -354,7 +358,11 @@ class Parser:
|
|||
segment = segment[1:].lstrip(" ")
|
||||
if not segment: continue
|
||||
|
||||
self.handle_value(segment, i == 0)
|
||||
if i > 0 and segment == "\n":
|
||||
self.skip_newlines = True
|
||||
elif segment != "\n":
|
||||
self.skip_newlines = False
|
||||
self.handle_value(segment)
|
||||
|
||||
def handle_tag(self, line):
|
||||
end = line.find("]")
|
||||
|
|
@ -389,7 +397,7 @@ class Parser:
|
|||
if remainder:
|
||||
self.parse_outside_strings(remainder)
|
||||
|
||||
def handle_value(self, segment, is_first):
|
||||
def handle_value(self, segment):
|
||||
|
||||
def add_text(segment):
|
||||
n = len(self.temp_key_nodes)
|
||||
|
|
@ -411,7 +419,7 @@ class Parser:
|
|||
if segment:
|
||||
add_text(segment)
|
||||
self.temp_key_nodes = []
|
||||
elif is_first:
|
||||
elif not self.skip_newlines:
|
||||
self.temp_key_nodes = []
|
||||
else:
|
||||
add_text(segment)
|
||||
|
|
@ -682,6 +690,18 @@ code = <<
|
|||
[/test]
|
||||
""", "quoted2")
|
||||
|
||||
test(
|
||||
"""
|
||||
foo="bar"+
|
||||
|
||||
|
||||
|
||||
"baz"
|
||||
""",
|
||||
"""
|
||||
foo='bar' .. 'baz'
|
||||
""", "multi line string")
|
||||
|
||||
test2(
|
||||
"""
|
||||
[test]
|
||||
|
|
|
|||
|
|
@ -8,10 +8,12 @@ Version 1.11.7+dev:
|
|||
* Campaigns:
|
||||
* Dead Water:
|
||||
* New world map.
|
||||
* Delfador's Memoirs:
|
||||
* Updated sprite and animations for the Wose Shaman.
|
||||
* Eastern Invasion:
|
||||
* Made Dacyn use teal TC and Mal-Ravanal blue TC, to make them fit the
|
||||
portraits more.
|
||||
* Updated maps for scenario 1-5.
|
||||
* Updated maps for scenario 1-7.
|
||||
* Heir To The Throne:
|
||||
* Increased Li'sar's lvl3 hitpoints from 52 to 62.
|
||||
* Implemented the portrait variations for Delfador and Asheviere.
|
||||
|
|
@ -29,13 +31,14 @@ Version 1.11.7+dev:
|
|||
* Son of the Black Eye:
|
||||
* Rebalancing of the campaign continues and is mostly done for Scenarios 1
|
||||
(End of Peace) through 8 (Silent Forest).
|
||||
* Updated sprites and animations for the Orcish Shamans.
|
||||
|
||||
* Graphics:
|
||||
* New and updated animations for the Loyalist Horseman.
|
||||
|
||||
* Language and i18n:
|
||||
* Updated translations: Chinese (Traditional), Dutch, Galician, Japanese,
|
||||
Latin.
|
||||
* Updated translations: Catalan, Chinese (Traditional), Dutch, Galician,
|
||||
Japanese, Latin.
|
||||
|
||||
* Multiplayer:
|
||||
* Unit names and genders are now synced in MP games.
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -55,11 +55,12 @@ void mouse_action_unit::move(editor_display& disp, const map_location& hex)
|
|||
rect.h = disp.hex_size();
|
||||
rect.w = disp.hex_size();
|
||||
std::stringstream str;
|
||||
str << N_("ID: ") << unit_it->id() << "\n"
|
||||
<< N_("Name: ") << unit_it->name() << "\n"
|
||||
<< N_("Type: ") << unit_it->type_name() << "\n"
|
||||
<< N_("Level: ") << unit_it->level() << "\n"
|
||||
<< N_("Cost: ") << unit_it->cost();
|
||||
str << N_("Identifier: ") << unit_it->id() << "\n"
|
||||
<< N_("Name: ") << unit_it->name() << "\n"
|
||||
<< N_("Type: ") << unit_it->type_name() << "\n"
|
||||
<< N_("Level: ") << unit_it->level() << "\n"
|
||||
<< N_("Cost: ") << unit_it->cost() << "\n"
|
||||
<< N_("Recruit: ") << utils::join(unit_it->recruits()) << "\n";
|
||||
tooltips::clear_tooltips();
|
||||
tooltips::add_tooltip(rect, str.str());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -297,6 +297,7 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
|
|||
case HOTKEY_EDITOR_UNIT_TOGGLE_CANRECRUIT:
|
||||
case HOTKEY_EDITOR_UNIT_TOGGLE_RENAMEABLE:
|
||||
case HOTKEY_EDITOR_UNIT_TOGGLE_LOYAL:
|
||||
case HOTKEY_EDITOR_UNIT_RECRUIT_ASSIGN:
|
||||
{
|
||||
map_location loc = gui_->mouseover_hex();
|
||||
const unit_map& units = context_manager_->get_map_context().get_units();
|
||||
|
|
@ -726,6 +727,15 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
|
|||
change_unit_id();
|
||||
return true;
|
||||
|
||||
case HOTKEY_EDITOR_UNIT_RECRUIT_ASSIGN:
|
||||
{
|
||||
map_location loc = gui_->mouseover_hex();
|
||||
const unit_map::unit_iterator un = context_manager_->get_map_context().get_units().find(loc);
|
||||
const std::set<std::string>& recruit_set = toolkit_->get_palette_manager()->unit_palette_->get_selected_bg_items();
|
||||
std::vector<std::string> recruits(recruit_set.begin(), recruit_set.end());
|
||||
un->set_recruits(recruits);
|
||||
}
|
||||
return true;
|
||||
case HOTKEY_EDITOR_UNIT_TOGGLE_RENAMEABLE:
|
||||
{
|
||||
map_location loc = gui_->mouseover_hex();
|
||||
|
|
|
|||
|
|
@ -17,15 +17,12 @@
|
|||
#include "builder.hpp"
|
||||
#include "reports.hpp"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
namespace editor {
|
||||
|
||||
editor_display::editor_display(unit_map* units, CVideo& video, const editor_map* map,
|
||||
const std::vector<team>* t, const config& theme_cfg, const config& level)
|
||||
: display(units, video, map, t, theme_cfg, level)
|
||||
, brush_locations_()
|
||||
, toolbar_hint_()
|
||||
, palette_report_()
|
||||
{
|
||||
clear_screen();
|
||||
|
|
@ -120,9 +117,6 @@ void editor_display::draw_sidebar()
|
|||
refresh_report("villages");
|
||||
refresh_report("num_units");
|
||||
}
|
||||
|
||||
text = toolbar_hint_;
|
||||
refresh_report("editor_tool_hint", &element);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ public:
|
|||
void remove_brush_loc(const map_location& hex);
|
||||
const editor_map& map() const { return static_cast<const editor_map&>(get_map()); }
|
||||
void rebuild_terrain(const map_location &loc);
|
||||
void set_toolbar_hint(const std::string& value) { toolbar_hint_ = value; }
|
||||
|
||||
void set_palette_report(const config& palette_report) {palette_report_ = palette_report;};
|
||||
|
||||
|
|
@ -51,7 +50,6 @@ protected:
|
|||
void draw_sidebar();
|
||||
|
||||
std::set<map_location> brush_locations_;
|
||||
std::string toolbar_hint_;
|
||||
|
||||
private:
|
||||
config palette_report_;
|
||||
|
|
|
|||
|
|
@ -266,20 +266,17 @@ void map_context::load_scenario(const config& game_config)
|
|||
int i = 1;
|
||||
BOOST_FOREACH(config &side, scenario.child_range("side"))
|
||||
{
|
||||
//TODO clean up.
|
||||
//state_.build_team(side, "", teams_, level, *this
|
||||
// , units_, false);
|
||||
team t;
|
||||
side["side"] = i++;
|
||||
side["no_leader"] = "yes";
|
||||
side["side"] = i;
|
||||
t.build(side, map_);
|
||||
|
||||
teams_.push_back(t);
|
||||
BOOST_FOREACH(const config &a_unit, side.child_range("unit")) {
|
||||
|
||||
BOOST_FOREACH(config &a_unit, side.child_range("unit")) {
|
||||
map_location loc(a_unit, NULL);
|
||||
units_.add(loc,
|
||||
unit(a_unit, true, &state_) );
|
||||
a_unit["side"] = i;
|
||||
units_.add(loc, unit(a_unit, true, &state_) );
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -455,6 +452,9 @@ config map_context::to_config()
|
|||
u["type"] = i->type_id();
|
||||
u["canrecruit"] = i->can_recruit();
|
||||
u["unrenamable"] = i->unrenamable();
|
||||
u["id"] = i->id();
|
||||
u["name"] = i->name();
|
||||
u["extra_recruit"] = utils::join(i->recruits());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -307,6 +307,24 @@ template size_t editor_palette<t_translation::t_terrain>::num_items();
|
|||
template size_t editor_palette<unit_type>::num_items();
|
||||
template size_t editor_palette<overlay>::num_items();
|
||||
|
||||
template<class Item>
|
||||
bool editor_palette<Item>::is_selected_fg_item(const std::string& id)
|
||||
{
|
||||
return selected_fg_item_ == id;
|
||||
}
|
||||
template bool editor_palette<t_translation::t_terrain>::is_selected_fg_item(const std::string& id);
|
||||
template bool editor_palette<unit_type>::is_selected_fg_item(const std::string& id);
|
||||
template bool editor_palette<overlay>::is_selected_fg_item(const std::string& id);
|
||||
|
||||
template<class Item>
|
||||
bool editor_palette<Item>::is_selected_bg_item(const std::string& id)
|
||||
{
|
||||
return selected_bg_item_ == id;
|
||||
}
|
||||
template bool editor_palette<t_translation::t_terrain>::is_selected_bg_item(const std::string& id);
|
||||
template bool editor_palette<unit_type>::is_selected_bg_item(const std::string& id);
|
||||
template bool editor_palette<overlay>::is_selected_bg_item(const std::string& id);
|
||||
|
||||
template<class Item>
|
||||
void editor_palette<Item>::draw_contents()
|
||||
{
|
||||
|
|
@ -379,12 +397,23 @@ void editor_palette<Item>::draw_contents()
|
|||
tile.set_item_image(item_image);
|
||||
tile.set_item_id(item_id);
|
||||
|
||||
if (get_id((*item).second) == selected_bg_item_
|
||||
&& get_id((*item).second) == selected_fg_item_) {
|
||||
// if (get_id((*item).second) == selected_bg_item_
|
||||
// && get_id((*item).second) == selected_fg_item_) {
|
||||
// tile.set_pressed(gui::tristate_button::BOTH);
|
||||
// } else if (get_id((*item).second) == selected_bg_item_) {
|
||||
// tile.set_pressed(gui::tristate_button::RIGHT);
|
||||
// } else if (get_id((*item).second) == selected_fg_item_) {
|
||||
// tile.set_pressed(gui::tristate_button::LEFT);
|
||||
// } else {
|
||||
// tile.set_pressed(gui::tristate_button::NONE);
|
||||
// }
|
||||
|
||||
if (is_selected_bg_item(get_id(item->second))
|
||||
&& is_selected_fg_item(get_id(item->second))) {
|
||||
tile.set_pressed(gui::tristate_button::BOTH);
|
||||
} else if (get_id((*item).second) == selected_bg_item_) {
|
||||
} else if (is_selected_bg_item(get_id(item->second))) {
|
||||
tile.set_pressed(gui::tristate_button::RIGHT);
|
||||
} else if (get_id((*item).second) == selected_fg_item_) {
|
||||
} else if (is_selected_fg_item(get_id(item->second))) {
|
||||
tile.set_pressed(gui::tristate_button::LEFT);
|
||||
} else {
|
||||
tile.set_pressed(gui::tristate_button::NONE);
|
||||
|
|
|
|||
|
|
@ -124,6 +124,9 @@ private:
|
|||
|
||||
virtual const std::string& active_group_id() {return active_group_;};
|
||||
|
||||
virtual bool is_selected_fg_item(const std::string& id);
|
||||
virtual bool is_selected_bg_item(const std::string& id);
|
||||
|
||||
/** Return the number of items in the palette. */
|
||||
size_t num_items();
|
||||
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ void tristate_button::mouse_up(SDL_MouseButtonEvent const &event) {
|
|||
if (state_ == TOUCHED_BOTH_RIGHT) {
|
||||
state_ = PRESSED_ACTIVE_BOTH;
|
||||
palette_->select_fg_item(item_id_);
|
||||
palette_->select_bg_item(item_id_);
|
||||
// palette_->select_bg_item(item_id_);
|
||||
// palette_->draw(true);
|
||||
pressed_ = true;
|
||||
}
|
||||
|
|
@ -381,18 +381,21 @@ void tristate_button::mouse_up(SDL_MouseButtonEvent const &event) {
|
|||
|
||||
if (event.button == SDL_BUTTON_RIGHT) {
|
||||
|
||||
pressed_ = true;
|
||||
palette_->select_bg_item(item_id_);
|
||||
|
||||
if (state_ == TOUCHED_RIGHT) {
|
||||
state_ = PRESSED_ACTIVE_RIGHT;
|
||||
palette_->select_bg_item(item_id_);
|
||||
// palette_->select_bg_item(item_id_);
|
||||
// palette_->draw(true);
|
||||
pressed_ = true;
|
||||
// pressed_ = true;
|
||||
}
|
||||
if (state_ == TOUCHED_BOTH_LEFT) {
|
||||
state_ = PRESSED_ACTIVE_BOTH;
|
||||
palette_->select_fg_item(item_id_);
|
||||
palette_->select_bg_item(item_id_);
|
||||
// palette_->select_fg_item(item_id_);
|
||||
// palette_->select_bg_item(item_id_);
|
||||
// palette_->draw(true);
|
||||
pressed_ = true;
|
||||
// pressed_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,7 +109,8 @@ void unit_palette::draw_item(const unit_type& u, surface& image, std::stringstre
|
|||
unit_palette::unit_palette(editor_display &gui, const config& cfg,
|
||||
mouse_action** active_mouse_action)
|
||||
//TODO avoid magic numbers
|
||||
: editor_palette<unit_type>(gui, cfg, 36, 4, active_mouse_action)
|
||||
: editor_palette<unit_type>(gui, cfg, 36, 4, active_mouse_action),
|
||||
selected_bg_items_()
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -118,6 +119,19 @@ const std::string& unit_palette::get_id(const unit_type& u)
|
|||
return u.id();
|
||||
}
|
||||
|
||||
bool unit_palette::is_selected_bg_item(const std::string& id)
|
||||
{
|
||||
return selected_bg_items_.count(id) != 0;
|
||||
}
|
||||
|
||||
void unit_palette::select_bg_item(const std::string& item_id) {
|
||||
|
||||
if (selected_bg_items_.count(item_id) != 0)
|
||||
selected_bg_items_.erase(item_id);
|
||||
else selected_bg_items_.insert(item_id);
|
||||
|
||||
set_dirty();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,13 +37,20 @@ public:
|
|||
|
||||
virtual std::string get_help_string();
|
||||
|
||||
const std::set<std::string>& get_selected_bg_items() { return selected_bg_items_; }
|
||||
|
||||
private:
|
||||
virtual const std::string& get_id(const unit_type& terrain);
|
||||
|
||||
virtual void draw_item(const unit_type& terrain, surface& image, std::stringstream& tooltip_text);
|
||||
|
||||
virtual bool is_selected_bg_item(const std::string& id);
|
||||
|
||||
virtual void select_bg_item(const std::string& item_id);
|
||||
// virtual void update_report();
|
||||
|
||||
std::set<std::string> selected_bg_items_;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,13 +33,12 @@ editor_toolkit::editor_toolkit(editor_display& gui, const CKey& key,
|
|||
, palette_manager_()
|
||||
, mouse_action_(NULL)
|
||||
, mouse_actions_()
|
||||
, mouse_action_hints_()
|
||||
, brush_(NULL)
|
||||
, brushes_()
|
||||
{
|
||||
init_brushes(game_config);
|
||||
init_sidebar(game_config);
|
||||
init_mouse_actions(game_config, c_manager);
|
||||
init_mouse_actions(c_manager);
|
||||
}
|
||||
|
||||
editor_toolkit::~editor_toolkit()
|
||||
|
|
@ -69,7 +68,7 @@ void editor_toolkit::init_sidebar(const config& game_config)
|
|||
palette_manager_.reset(new palette_manager(gui_, game_config, &mouse_action_));
|
||||
}
|
||||
|
||||
void editor_toolkit::init_mouse_actions(const config& game_config, context_manager& cmanager)
|
||||
void editor_toolkit::init_mouse_actions(context_manager& cmanager)
|
||||
{
|
||||
mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_TOOL_PAINT,
|
||||
new mouse_action_paint(&brush_, key_, *palette_manager_->terrain_palette_.get())));
|
||||
|
|
@ -99,13 +98,6 @@ void editor_toolkit::init_mouse_actions(const config& game_config, context_manag
|
|||
}
|
||||
}
|
||||
}
|
||||
BOOST_FOREACH(const config &c, game_config.child_range("editor_tool_hint")) {
|
||||
mouse_action_map::iterator i =
|
||||
mouse_actions_.find(hotkey::get_id(c["id"]));
|
||||
if (i != mouse_actions_.end()) {
|
||||
mouse_action_hints_.insert(std::make_pair(i->first, c["text"]));
|
||||
}
|
||||
}
|
||||
|
||||
mouse_action_ = (mouse_actions_.find(hotkey::HOTKEY_EDITOR_TOOL_PAINT))->second;
|
||||
set_mouseover_overlay();
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ private:
|
|||
void init_brushes(const config& game_config);
|
||||
|
||||
/** init the mouse actions (tools) */
|
||||
void init_mouse_actions(const config& game_config, context_manager& c_manager);
|
||||
void init_mouse_actions(context_manager& c_manager);
|
||||
|
||||
public:
|
||||
void set_mouseover_overlay();
|
||||
|
|
@ -97,10 +97,6 @@ private:
|
|||
typedef std::map<hotkey::HOTKEY_COMMAND, mouse_action*> mouse_action_map;
|
||||
mouse_action_map mouse_actions_;
|
||||
|
||||
/** Usage tips for mouse actions */
|
||||
typedef std::map<hotkey::HOTKEY_COMMAND, std::string> mouse_action_string_map;
|
||||
mouse_action_string_map mouse_action_hints_;
|
||||
|
||||
//Brush members
|
||||
|
||||
/** The current brush */
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue