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

ran wmlindent

Browse source
This commit is contained in:
Bär Halberkamp 2013-12-20 19:59:12 +01:00
parent c65d8d4ae1
commit 9ce2dfbc84
8 changed files with 141 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
View file

@ -54,9 +54,9 @@
[/filter_attack]
start_time=-500
{SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500}
# [frame]
# image=units/wose-shaman-attack-[1~2].png:[400,225]
# [/frame]
# [frame]
# image=units/wose-shaman-attack-[1~2].png:[400,225]
# [/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
@ -69,9 +69,9 @@
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]
# [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_anim]
[/unit_type]

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

@ -7,8 +7,8 @@
map_data="{campaigns/Descent_Into_Darkness/maps/04_Beginning_of_the_Revenge.map}"
turns=36
victory_when_enemies_defeated=yes
{DEFAULT_SCHEDULE_DUSK}
{DEFAULT_SCHEDULE_DUSK}
{INTRO_AND_SCENARIO_MUSIC revelation.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}

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

@ -104,7 +104,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
y=15
[/unit]
[unit]
# wmllint: who {ARKILDUR} is Arkildur
# wmllint: who {ARKILDUR} is Arkildur
{ARKILDUR}
[/unit]
{SINGLEPLAYER_GOLD}
@ -112,10 +112,9 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
{MULTIPLAYER_GOLD}
#endif
[unit]
# wmllint: who {ANDUILAS} is Anduilas
# wmllint: who {ANDUILAS} is Anduilas
{ANDUILAS}
[/unit]
[/side]
[event]

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

@ -182,7 +182,7 @@
#{GOLD 300 500 730}
#{GOLD 550 700 900}
#{GOLD 350 520 630}
#{GOLD 350 520 630}
{GOLD 1200 1720 2260}
{INCOME 50 80 120}
@ -204,111 +204,109 @@
extra_recruit=Naga Fighter, Naga Warrior
#endif
# #ifdef HARD
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior, Orcish Slayer, Goblin Impaler, Goblin Rouser, Direwolf Rider, Orcish Slurbow, Orcish Warlord, Goblin Impaler, Goblin Rouser, Naga Myrmidon
# #endif
# #ifdef NORMAL
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior, Orcish Slayer, Goblin Impaler, Goblin Rouser, Direwolf Rider
# #endif
# #ifdef EASY
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior
# #endif
# #ifdef HARD
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior, Orcish Slayer, Goblin Impaler, Goblin Rouser, Direwolf Rider, Orcish Slurbow, Orcish Warlord, Goblin Impaler, Goblin Rouser, Naga Myrmidon
# #endif
# #ifdef NORMAL
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior, Orcish Slayer, Goblin Impaler, Goblin Rouser, Direwolf Rider
# #endif
# #ifdef EASY
# recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager, Naga Fighter, Naga Warrior
# #endif
# {ai/aliases/stable_singleplayer.cfg}
# [ai]
# {AI_NO_SCOUTS}
# {ai/aliases/stable_singleplayer.cfg}
# [ai]
# {AI_NO_SCOUTS}
# {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
# {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
# {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
# {AI_SIMPLE_ALWAYS_ASPECT caution 0.0}
# {AI_SIMPLE_ALWAYS_ASPECT attack_depth 5}
# {AI_SIMPLE_ALWAYS_ASPECT grouping offensive}
# {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
# {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
# {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
# {AI_SIMPLE_ALWAYS_ASPECT caution 0.0}
# {AI_SIMPLE_ALWAYS_ASPECT attack_depth 5}
# {AI_SIMPLE_ALWAYS_ASPECT grouping offensive}
# {AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
# {AI_SIMPLE_NIGHT_ASPECT caution 0.0}
# {AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
# {AI_SIMPLE_NIGHT_ASPECT grouping offensive}
# [/ai]
# {INCOME 4 8 12}
[/unit]
# {AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
# {AI_SIMPLE_NIGHT_ASPECT caution 0.0}
# {AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
# {AI_SIMPLE_NIGHT_ASPECT grouping offensive}
# [/ai]
# {INCOME 4 8 12}
[/unit]
[unit]
# side=5
# allow_player=no
# controller=ai
# team_name=orcs
# user_team_name= _ "Enemies"
# {ORC_SETUP}
type=Orcish Warlord
id=Urug-Pir
name=_ "Urug-Pir"
profile=portraits/orcs/transparent/grunt-2.png
canrecruit=yes
x=6
y=17
[unit]
# side=5
# allow_player=no
# controller=ai
# team_name=orcs
# user_team_name= _ "Enemies"
# {ORC_SETUP}
type=Orcish Warlord
id=Urug-Pir
name=_ "Urug-Pir"
profile=portraits/orcs/transparent/grunt-2.png
canrecruit=yes
x=6
y=17
#ifdef HARD
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Slurbow, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Orcish Warlord, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Slurbow, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Orcish Warlord, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
#endif
#ifdef NORMAL
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
#endif
#ifdef EASY
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager
extra_recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager
#endif
{ai/aliases/stable_singleplayer.cfg}
[ai]
{AI_NO_SCOUTS}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
{AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
{AI_SIMPLE_NIGHT_ASPECT caution 0.0}
{AI_SIMPLE_NIGHT_ASPECT grouping no}
{AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
[/ai]
[/unit]
[unit]
#side=6
#allow_player=no
#controller=ai
#team_name=orcs
#user_team_name= _ "Enemies"
#{TROLL_SETUP}
type=Great Troll
id=Truugl
name= _ "Truugl"
canrecruit=yes
x=26
y=7
{ai/aliases/stable_singleplayer.cfg}
[ai]
{AI_NO_SCOUTS}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
{AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
{AI_SIMPLE_NIGHT_ASPECT caution 0.0}
{AI_SIMPLE_NIGHT_ASPECT grouping no}
{AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
[/ai]
[/unit]
[unit]
#side=6
#allow_player=no
#controller=ai
#team_name=orcs
#user_team_name= _ "Enemies"
#{TROLL_SETUP}
type=Great Troll
id=Truugl
name= _ "Truugl"
canrecruit=yes
x=26
y=7
#ifdef EASY
extra_recruit=Troll Whelp
extra_recruit=Troll Whelp
#endif
#ifdef NORMAL
extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Shaman
extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Shaman
#endif
#ifdef HARD
extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Shaman, Troll Warrior, Troll Hero
extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Shaman, Troll Warrior, Troll Hero
#endif
{ai/aliases/stable_singleplayer.cfg}
[ai]
{AI_NO_SCOUTS}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes}
{ai/aliases/stable_singleplayer.cfg}
[ai]
{AI_NO_SCOUTS}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes}
#ifdef EASY
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter"}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter"}
#else
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter, mixed fighter, fighter, mixed fighter, fighter"}
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter, mixed fighter, fighter, mixed fighter, fighter"}
#endif
{AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
{AI_SIMPLE_NIGHT_ASPECT caution 0.0}
{AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
{AI_SIMPLE_NIGHT_ASPECT grouping offensive}
[/ai]
{AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
{AI_SIMPLE_NIGHT_ASPECT caution 0.0}
{AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
{AI_SIMPLE_NIGHT_ASPECT grouping offensive}
[/ai]
[/unit]
[/side]
@ -343,43 +341,43 @@
# # )}
# [/event]
# [side]
# side=7
# allow_player=no
# controller=ai
# team_name=orcs
# user_team_name= _ "Enemies"
# {ORC_SETUP}
# # type=Orcish Warlord
# # id=Grubr
# # name= _ "Grubr"
# # profile=portraits/orcs/transparent/grunt-3.png
# # canrecruit=yes
# # x=25
# # y=42
# # #ifdef HARD
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Slurbow, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Orcish Warlord, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
# # #endif
# # #ifdef NORMAL
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager
# # #endif
# # #ifdef EASY
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager
# # #endif
# # {GOLD 400 550 650}
# # {INCOME 4 8 12}
# # {ai/aliases/stable_singleplayer.cfg}
# # [ai]
# # {AI_NO_SCOUTS}
# # {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
# # {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
# # {AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
# # {AI_SIMPLE_NIGHT_ASPECT caution 0.0}
# # {AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
# # {AI_SIMPLE_NIGHT_ASPECT grouping offensive}
# # [/ai]
# [/side]
# ### /ENEMIES ####
# [side]
# side=7
# allow_player=no
# controller=ai
# team_name=orcs
# user_team_name= _ "Enemies"
# {ORC_SETUP}
# # type=Orcish Warlord
# # id=Grubr
# # name= _ "Grubr"
# # profile=portraits/orcs/transparent/grunt-3.png
# # canrecruit=yes
# # x=25
# # y=42
# # #ifdef HARD
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Slurbow, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Orcish Warlord, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager, Direwolf Rider
# # #endif
# # #ifdef NORMAL
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Slayer, Orcish Grunt, Orcish Warrior, Goblin Spearman, Goblin Impaler, Goblin Rouser, Wolf Rider, Goblin Knight, Goblin Pillager
# # #endif
# # #ifdef EASY
# # recruit=Orcish Archer, Orcish Crossbowman, Orcish Assassin, Orcish Grunt, Orcish Warrior, Goblin Spearman, Wolf Rider, Goblin Knight, Goblin Pillager
# # #endif
# # {GOLD 400 550 650}
# # {INCOME 4 8 12}
# # {ai/aliases/stable_singleplayer.cfg}
# # [ai]
# # {AI_NO_SCOUTS}
# # {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
# # {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
# # {AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
# # {AI_SIMPLE_NIGHT_ASPECT caution 0.0}
# # {AI_SIMPLE_NIGHT_ASPECT attack_depth 5}
# # {AI_SIMPLE_NIGHT_ASPECT grouping offensive}
# # [/ai]
# [/side]
# ### /ENEMIES ####
#### Side for Olurf ####
# [side]

1
data/campaigns/Legend_of_Wesmere/utils/characters.cfg
View file

@ -174,7 +174,6 @@
[modifications]
{TRAIT_LOYAL}
{TRAIT_DEXTROUS}
[/modifications]
{IS_LOYAL}
placement=leader

4
data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
View file

@ -485,7 +485,7 @@
#endif
[/event]
[/event]
[event]
name=side turn
first_time_only=no
@ -510,8 +510,6 @@
message= _ "Now the Guard will feel the wrath of my new friends! It is time for the dead to wage war! Rise, warriors!"
[/message]
[scroll_to_unit]
race=undead
[/scroll_to_unit]

13
data/core/hotkeys.cfg
View file

@ -14,17 +14,16 @@
#enddef
[hotkey]
button=1
command="selecthex"
mouse=0
button=1
command="selecthex"
mouse=0
[/hotkey]
[hotkey]
button=3
command="moveaction"
mouse=0
button=3
command="moveaction"
mouse=0
[/hotkey]
[hotkey]
command=aiformula
key=f

7
data/core/terrain.cfg
View file

@ -56,7 +56,6 @@
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tile
id=medium_shallow_water
@ -87,7 +86,7 @@
string=Wwf
aliasof=Gt, Wst
submerge=0.3
editor_group=water
editor_group=water
help_topic_text= _ "When a river happens to be extremely shallow, passing over it is a trivial matter for land based units. Moreover, any creature best adapted to swimming has full mobility even at such places in the river. As far as gameplay is concerned, a river ford is treated as either grassland or shallow water, choosing whichever one offers the best defensive and movement bonuses for the unit on it."
[/terrain_type]
@ -2232,7 +2231,7 @@ Most units receive 20 to 40% defense in caves, whereas dwarves have 50%."
name= _ "Sand"
editor_name= _ "Sands"
string=Dt
editor_group=desert
editor_group=desert
help_topic_text= _ "The instability of <italic>text='sand'</italic> makes it harder for most units to cross, and leaves them wide open to attack. In contrast, the wide feet or snakelike bodies of the reptilian races make sand much easier for them to navigate.
Most units receive 20 to 40% defense in sand."
@ -2393,7 +2392,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%.
id=impassable
name= _ "Impassable"
editor_name= _ "Impassable"
string=Xt # wmllint: ignore
string=Xt # wmllint: ignore
help_topic_text= _ "Obstacles that not even the most determined traveler may overcome include solid walls of stone and mountains so tall and steep that they are constantly wreathed in cloud. Even flying creatures cannot navigate the jagged peaks at such rarified heights, and not even the fiercest troll can smash through thick walls of stone."
hidden=yes
[/terrain_type]