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

whitespace tidy (checked with diff -b)

Browse source
This commit is contained in:
András Salamon 2005-12-05 09:53:34 +00:00
parent bf6f621ae8
commit 80dff6f996
24 changed files with 513 additions and 513 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/game.cfg
View file

@ -217,10 +217,10 @@ default=yes
cmd=yes
[/hotkey]
[hotkey]
command=quit
key=q
cmd=yes
[/hotkey]
command=quit
key=q
cmd=yes
[/hotkey]
[hotkey]
command=save
key=s
@ -410,7 +410,7 @@ default=yes
key=q
ctrl=yes
[/hotkey]
[hotkey]
[hotkey]
command=save
key=s
ctrl=yes

42
data/scenario-test.cfg
View file

@ -23,19 +23,19 @@ ggggggggggggggggggggggggggggggggggggg
[event]
name=moveto
[filter]
x=11
y=6
side=1
[not]
description=Baldras
[/not]
[/filter]
[filter]
x=11
y=6
side=1
[not]
description=Baldras
[/not]
[/filter]
[message]
speaker=narrator
message= _ "You can come if you wish, but the leader is only interested in speaking to Baldras."
[/message]
[message]
speaker=narrator
message= _ "You can come if you wish, but the leader is only interested in speaking to Baldras."
[/message]
[/event]
turns=36
@ -267,15 +267,15 @@ name=moveto
* *
*"
[tile]
pos=1
type=*
[/tile]
[image]
name="forest"
position=vertical
base=90,144
[/image]
[tile]
pos=1
type=*
[/tile]
[image]
name="forest"
position=vertical
base=90,144
[/image]
[/terrain_graphics]
[label]

68
data/scenarios/Son_Of_The_Black_Eye/utils/utils.cfg
View file

@ -165,12 +165,12 @@ y={Y}
y={MOVEY}
[/move_unit_fake]
[teleport]
[filter]
[filter]
x={ORIGX}
y={ORIGY}
[/filter]
x={ENDX}
y={ENDY}
[/filter]
x={ENDX}
y={ENDY}
[/teleport]
[unhide_unit]
[/unhide_unit]
@ -199,10 +199,10 @@ y={Y}
#define SCORPION X Y
[unit]
type=Giant Scorpion
side=3
x={X}
y={Y}
type=Giant Scorpion
side=3
x={X}
y={Y}
[/unit]
#enddef
@ -233,21 +233,21 @@ y={Y}
#define STORE_UNIT NAME
[store_unit]
[filter]
description={NAME}
description={NAME}
[/filter]
kill=yes
variable=store{NAME}
kill=yes
variable=store{NAME}
[/store_unit]
#enddef
#define STORE_UNIT_XY NAME X Y
[store_unit]
[filter]
description={NAME}
x,y={X},{Y}
description={NAME}
x,y={X},{Y}
[/filter]
kill=yes
variable=store{NAME}
kill=yes
variable=store{NAME}
[/store_unit]
#enddef
@ -260,40 +260,40 @@ y={Y}
#define SAURIAN X Y NAME
[unit]
type=Saurian Skirmisher
description={NAME}
side=1
x={X}
y={Y}
type=Saurian Skirmisher
description={NAME}
side=1
x={X}
y={Y}
[/unit]
#enddef
#define SAURIAN_WARRIOR X Y NAME
[unit]
type=Saurian Ambusher
description={NAME}
side=1
x={X}
y={Y}
type=Saurian Ambusher
description={NAME}
side=1
x={X}
y={Y}
[/unit]
#enddef
#define MERMAN X Y NAME
[unit]
side=5
type=Merman Fighter
description={NAME}
x={X}
y={Y}
side=5
type=Merman Fighter
description={NAME}
x={X}
y={Y}
[/unit]
#enddef
#define HEAVY_INFANTRYMAN X Y
[unit]
type=Heavy Infantryman
side=2
x={X}
y={Y}
type=Heavy Infantryman
side=2
x={X}
y={Y}
[/unit]
#enddef

18
data/scenarios/The_Dark_Hordes/utils/intro.cfg
View file

@ -1,40 +1,40 @@
[story]
#textdomain wesnoth-tdh
#textdomain wesnoth-tdh
[part]
[part]
story= _ "At a great battle at the Stone of Erzen, the brothers Gwiti and Nati Ha'atel showed their skills for the first time: Thinking that their side was losing the battle, they called upon the corpses of former enemies to rise again and fight on their side."
background=misc/blank.png
[image]
file=undead-initiate-attack2.png
x,y=284,204
[/image]
[/part]
[/part]
[part]
[part]
story= _ "However, not only was this forbidden, but rash as well. The cavalry meant to come as reinforcements instead clashed with the undead legions, and so the battle was lost where it would have been won had it not been for these two necromancers."
background=misc/blank.png
[image]
file=human-cavalier-defend.png
x,y=284,204
[/image]
[/part]
[/part]
[part]
[part]
story= _ "The Ha'atel brothers fled. Immediately upon their return, they were clapped in irons, marched onto a ship with no rudder, and sent off to drown in the sea, for the Wesnothians feared that their corpses might only rise again."
background=misc/blank.png
[image]
file=pirate-galleon.png
x,y=284,204
[/image]
[/part]
[/part]
[part]
[part]
story= _ "But Fate intervened. The ship was beset by a sudden storm and disintegrated, separating the brothers and washing them both ashore. This was the beginning of the Rise of the Dark Hordes."
background=misc/blank.png
[image]
file=misc/schedule-firstwatch.png
x,y=284,204
[/image]
[/part]
[/part]
[/story]

4
data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
View file

@ -210,7 +210,7 @@
{PLACE_IMAGE (terrain/temple.png) 10 17}
{PLACE_IMAGE (terrain/temple.png) 9 15}
{OBJ_POTION_HOLY 29 24 (holy_water1)}
{OBJ_POTION_HOLY 29 24 (holy_water1)}
[set_variable]
name=queen_awake
@ -286,7 +286,7 @@
{CLEAR_VARIABLE random}
#ifdef EASY
{OBJ_POTION_HOLY 28 26 (holy_water2)}
{OBJ_POTION_HOLY 28 26 (holy_water2)}
#endif
[objectives]

28
data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
View file

@ -68,11 +68,11 @@
passive_leader=yes
{ATTACK_DEPTH 5 6 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
[ai]
time_of_day=dusk,first_watch,second_watch
aggression=0.65
[/ai]
[ai]
[ai]
[protect_location]
x=42
y=40
@ -98,8 +98,8 @@
recruitment_pattern=fighter,fighter,scout
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
[ai]
time_of_day=dusk,first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -134,7 +134,7 @@
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
time_of_day=dusk,first_watch,second_watch
aggression=0.65
grouping=offensive
[/ai]
@ -168,7 +168,7 @@
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
time_of_day=dusk,first_watch,second_watch
aggression=0.65
grouping=offensive
[/ai]
@ -201,8 +201,8 @@
recruitment_pattern=scout,fighter,fighter,archer,scout,fighter,fighter,archer
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
[ai]
time_of_day=dusk,first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -411,11 +411,11 @@
[event]
name=die
first_time_only=no
[filter]
[not]
description=Lt. Aethyr
[/not]
[/filter]
[filter]
[not]
description=Lt. Aethyr
[/not]
[/filter]
{RISE_UP_RISE_UP $x1 $y1}
[/event]

8
data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
View file

@ -98,7 +98,7 @@
{PLACE_IMAGE (terrain/rocks.png) 6 6}
{PLACE_IMAGE (terrain/rocks.png) 17 3}
{OBJ_POTION_HOLY 13 19 (holy_helper)}
{OBJ_POTION_HOLY 13 19 (holy_helper)}
[recall]
description=Burin the Lost
@ -242,9 +242,9 @@
[filter]
type=Tentacle of the Deep
[/filter]
[filter_second]
side=1
[/filter_second]
[filter_second]
side=1
[/filter_second]
[message]
speaker=second_unit
message= _ "I don't like the look of that pool at all."

6
data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
View file

@ -63,7 +63,7 @@
recruitment_pattern=scout,archer,scout,scout,healer
{ATTACK_DEPTH 4 5 5}
[/ai]
[ai]
[ai]
[protect_location]
x=20
y=23
@ -93,7 +93,7 @@
recruitment_pattern=scout,archer,scout,scout,healer
{ATTACK_DEPTH 4 5 5}
[/ai]
[ai]
[ai]
[protect_location]
x=20
y=23
@ -125,7 +125,7 @@
recruitment_pattern=scout,archer,scout,scout,healer
{ATTACK_DEPTH 4 5 5}
[/ai]
[ai]
[ai]
[protect_location]
x=20
y=23

18
data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
View file

@ -74,8 +74,8 @@
passive_leader=yes
recruitment_ignore_bad_movement=yes
[/ai]
[ai]
time_of_day=first_watch,second_watch
[ai]
time_of_day=first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -95,8 +95,8 @@
recruitment_pattern=scout,scout,fighter,fighter,archer
{NO_SCOUTS}
[/ai]
[ai]
time_of_day=first_watch,second_watch
[ai]
time_of_day=first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -249,16 +249,16 @@
[/event]
[event]
name=die
name=die
[filter]
description=Wesfolk Leader
[/filter]
description=Wesfolk Leader
[/filter]
[filter_second]
side=1
[/filter_second]
[message]
speaker=unit
image="portraits/The_Rise_of_Wesnoth/lady_outlaw.png"
@ -274,7 +274,7 @@
speaker=unit
message= _ "But I can help! Really! You could use me and my men's skills on the long road ahead!"
[/message]
[message]
description=King Eldaric IV
message= _ "Haldric, what say you on this matter?"

8
data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
View file

@ -82,8 +82,8 @@
recruitment_pattern=scout,fighter,fighter,archer
{ATTACK_DEPTH 3 4 5}
[/ai]
[ai]
time_of_day=first_watch,second_watch
[ai]
time_of_day=first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -115,8 +115,8 @@
recruitment_pattern=scout,fighter,fighter,archer
{ATTACK_DEPTH 3 4 5}
[/ai]
[ai]
time_of_day=first_watch,second_watch
[ai]
time_of_day=first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no

42
data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
View file

@ -63,7 +63,7 @@
team_name=Haldric
fog=yes
[/side]
[side]
type=Orcish Warlord
description=Tan-Gralg
@ -91,7 +91,7 @@
#endif
team_name=orcs
[/side]
[side]
type=Orcish Warlord
description=Tan-Rugar
@ -119,7 +119,7 @@
#endif
team_name=orcs
[/side]
[side]
type=Ancient Wose
description=Elilmaldur-Rithrandil
@ -159,18 +159,18 @@
[recall]
description=Lady Outlaw
[/recall]
[recall]
description=Burin the Lost
[/recall]
[recall]
description=Sir Ruddry
[/recall]
[recall]
description=Sir Ladoc
[/recall]
[recall]
description=Minister Edmond
[/recall]
@ -263,7 +263,7 @@
message= _ "What! What are you looking at me for?"
[/message]
[/event]
[event]
name=moveto
[filter]
@ -279,7 +279,7 @@
[allow_undo]
[/allow_undo]
[/event]
[event]
name=turn 4
[message]
@ -287,7 +287,7 @@
message= _ "Stupid stinking trees, we'll show you!"
[/message]
[/event]
[event]
name=turn 6
[message]
@ -295,12 +295,12 @@
message= _ "Chop 'em down. It's cool in these woods, I think we need a fire!"
[/message]
[/event]
[event]
name=die
name=die
[filter]
description=Elilmaldur-Rithrandil
[/filter]
description=Elilmaldur-Rithrandil
[/filter]
[message]
description=Prince Haldric
message= _ "Without the help of these tree-folk we'll be trapped in these woods till we die! There will be nothing to hold the Orcs back!"
@ -309,12 +309,12 @@
speaker=Burin the Lost
message= _ "Stupid tree-folk."
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
[endlevel]
result=defeat
[/endlevel]
[/event]
[event]
name=victory
[message]
@ -412,7 +412,7 @@
[/then]
[/if]
[/event]
[event]
name=time over
[message]
@ -420,5 +420,5 @@
message= _ "We have run out of time... We'll be trapped in these woods until we die!"
[/message]
[/event]
[/scenario]

8
data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
View file

@ -7,9 +7,9 @@
{AFTERNOON}
next_scenario=Rise_of_Wesnoth
music=elf-land.ogg
{scenarios/The_Rise_of_Wesnoth/utils/trow-deaths.cfg}
[story]
@ -62,7 +62,7 @@
[/unstore_unit]
{CLEAR_VARIABLE jessica_store}
[/else]
[/if]
@ -98,7 +98,7 @@
x=14
y=10
[/hide_unit]
[terrain]
x=9
y=10

54
data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
View file

@ -49,7 +49,7 @@
team_name=Haldric
fog=yes
[/side]
[side]
type=Necromancer
description=Cleon
@ -68,7 +68,7 @@
{GOLD 80 120 160}
team_name=cult
[/side]
[side]
type=Necromancer
description=Lollyra
@ -93,7 +93,7 @@
#endif
team_name=cult
[/side]
[side]
type=Necromancer
description=Clurka
@ -149,7 +149,7 @@
[recall]
description=Lady Outlaw
[/recall]
[recall]
description=Burin the Lost
[/recall]
@ -170,7 +170,7 @@
[/objective]
[/objectives]
[/event]
[event]
name=start
[message]
@ -204,9 +204,9 @@
speaker=Prince Haldric
message= _ "Wait, I think I hear Something... To Arms!"
[/message]
[/event]
[event]
name=moveto
[filter]
@ -216,17 +216,17 @@
[/filter]
{UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 16 5}
[/event]
[event]
name=moveto
[filter]
[filter]
x=10
y=25
side=1
[/filter]
{UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 10 27}
[/event]
[event]
name=moveto
[filter]
@ -236,7 +236,7 @@
[/filter]
{UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 32 33}
[/event]
#define TEMPLE_HELP X Y
[event]
name=moveto
@ -358,8 +358,8 @@
[/if]
[/event]
[event]
name=moveto
[filter]
@ -379,40 +379,40 @@ Enter at Your Own Risk!"
[allow_undo]
[/allow_undo]
[/event]
[event]
name=die
name=die
[filter]
description=Lollyra
[/filter]
description=Lollyra
[/filter]
[message]
speaker=Lollyra
message= _ "May I live forever in Un-death!"
[/message]
[/event]
[event]
name=die
name=die
[filter]
description=Clurka
[/filter]
description=Clurka
[/filter]
[message]
speaker=Clurka
message= _ "Ohh! To be risen again!"
[/message]
[/event]
[event]
name=die
name=die
[filter]
description=Cleon
[/filter]
description=Cleon
[/filter]
[message]
speaker=Cleon
message= _ "A prayer for life immortal!"
[/message]
[/event]
[event]
name=victory
@ -502,7 +502,7 @@ Enter at Your Own Risk!"
{CLEAR_VARIABLE random}
[/event]
[event]
name=time over
[message]

42
data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
View file

@ -53,7 +53,7 @@
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Knight, Goblin Spearman
#endif
#ifdef NORMAL
#ifdef NORMAL
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Knight, Orcish Slayer, Orcish Warrior, Goblin Spearman
#endif
@ -68,15 +68,15 @@
recruitment_pattern=scout,fighter,fighter,archer
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
[ai]
time_of_day=dusk,first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
[/ai]
{INCOME 2 4 8}
[/side]
[side]
type=Orcish Warlord
description=Tan-Gagar
@ -87,7 +87,7 @@
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Knight, Goblin Spearman
#endif
#ifdef NORMAL
#ifdef NORMAL
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Knight, Orcish Slayer, Orcish Warrior, Goblin Spearman
#endif
@ -102,8 +102,8 @@
recruitment_pattern=scout,fighter,fighter,archer
{ATTACK_DEPTH 5 5 6}
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
[ai]
time_of_day=dusk,first_watch,second_watch
aggression=0.75
caution=0.0
grouping=no
@ -121,7 +121,7 @@
recruit=Troll Whelp
#endif
#ifdef NORMAL
#ifdef NORMAL
recruit=Troll Whelp,Troll,Troll Rocklobber
#endif
@ -154,7 +154,7 @@
{PLACE_IMAGE (items/fire.png) 26 9}
{PLACE_IMAGE (items/fire.png) 25 17}
{VARIABLE_OP xx1 random 10..18}
{VARIABLE_OP xx1 random 10..18}
{VARIABLE_OP yy1 random 2..6}
{PLACE_IMAGE (items/chest-plain-closed.png) $xx1 $yy1}
@ -363,7 +363,7 @@
{UNDEAD_UNIT (Chocobone) 2 2 28}
#endif
[/event]
[event]
name=attack
[filter_second]
@ -383,7 +383,7 @@
image="portraits/The_Rise_of_Wesnoth/edmond.png"
message= _ "The only job of the dead is to remain dead. Prepare to be reunited with the ground."
[/message]
{UNDEAD_UNIT (Chocobone) 3 35 18}
{UNDEAD_UNIT (Chocobone) 3 35 20}
#ifdef HARD
@ -391,13 +391,13 @@
{UNDEAD_UNIT (Chocobone) 3 35 21}
#endif
[/event]
[event]
name=die
[filter]
description=Tan-Erirt
[/filter]
[filter_second]
side=1
[/filter_second]
@ -406,19 +406,19 @@
description=Tan-Gagar
message= _ "We must block the human advance!"
[/message]
[gold]
side=3
amount=80
[/gold]
[/event]
[event]
name=die
[filter]
description=Tan-Gagar
[/filter]
[filter_second]
side=1
[/filter_second]
@ -427,7 +427,7 @@
description=Tan-Erirt
message= _ "Reserves! We can't let them get to their landing site."
[/message]
[gold]
side=2
amount=80
@ -451,24 +451,24 @@
[filter]
description=Lt. Aethyr
[/filter]
[message]
speaker=Lt. Aethyr
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Oh, to join my family again! Do not mourn my passing."
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
[event]
name=attack
[filter]
description=Burin the Lost
[/filter]
[message]
speaker=Burin the Lost
message= _ "Ahh, it's great to be home! I'm not much for the politics, but it's great to be home!"

2
data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg
View file

@ -1,7 +1,7 @@
[multiplayer]
id=multiplayerDivideandConquer
name= _ "2p - Divide and Conquer"
description= _ "This small duel map divides the field of battle into three segments. Recommended settings of 2G per village."
description= _ "This small duel map divides the field of battle into three segments. Recommended settings of 2G per village."
map_data="{maps/multiplayer/2p_Divide_and_Conquer}"
turns=90

2
data/scenarios/multiplayer/3p_Triple_Blitz.cfg
View file

@ -1,7 +1,7 @@
[multiplayer]
id=multiplayer3pTripleBlitz
name= _ "3p - Triple Blitz"
description= _ "Three players come head to head on this water-cut battlefield. Recommended settings of 2G per village."
description= _ "Three players come head to head on this water-cut battlefield. Recommended settings of 2G per village."
map_data="{maps/multiplayer/3p_Triple_Blitz}"
turns=90

2
data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg
View file

@ -1,6 +1,6 @@
#
# Many close by and strategically located castles. Which one will you hop to?
# Small map for fast play. Recommended setting of 2g per village and usage
# Small map for fast play. Recommended setting of 2g per village and usage
# of leaders that move 7 or less.
#

2
data/scenarios/multiplayer/4p_The_Valley_of_Death.cfg
View file

@ -1,7 +1,7 @@
[multiplayer]
id=multiplayer3
name= _ "4p - The Valley of Death"
map_data="{maps/Heir_To_The_Throne/Valley_of_Death}"
map_data="{maps/Heir_To_The_Throne/Valley_of_Death}"
description= _ "Can you defeat all enemies and declare victory in this desolate valley?"
turns=90

110
data/scenarios/multiplayer/6p_Hexcake.cfg
View file

@ -1,58 +1,58 @@
[multiplayer]
id=Hexcake
name= _ "6p - Hexcake"
map_data="{maps/multiplayer/Hexcake}"
description= _ "2 vs. 2 or 3 vs. 3 team game."
turns=90
{DAWN}
{MORNING}
{AFTERNOON}
{DUSK}
{FIRST_WATCH}
{SECOND_WATCH}
[side]
side=1
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=2
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=3
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=4
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=5
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=6
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
id=Hexcake
name= _ "6p - Hexcake"
map_data="{maps/multiplayer/Hexcake}"
description= _ "2 vs. 2 or 3 vs. 3 team game."
turns=90
{DAWN}
{MORNING}
{AFTERNOON}
{DUSK}
{FIRST_WATCH}
{SECOND_WATCH}
[side]
side=1
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=2
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=3
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=4
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=5
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=6
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[/multiplayer]

110
data/scenarios/multiplayer/6p_Smallolof.cfg
View file

@ -1,58 +1,58 @@
[multiplayer]
id=Smallolof
name= _ "6p - Smallolof"
description= _ "Only a true tactician will survive in this deadly and confining battlefield, where six boxed-in armies come to a head. Recommended settings of 2 gold per village."
map_data="{maps/multiplayer/6p_Smallolof}"
turns=90
{DAWN}
{MORNING}
{AFTERNOON}
{DUSK}
{FIRST_WATCH}
{SECOND_WATCH}
[side]
side=1
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=2
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=3
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=4
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=5
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=6
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
id=Smallolof
name= _ "6p - Smallolof"
description= _ "Only a true tactician will survive in this deadly and confining battlefield, where six boxed-in armies come to a head. Recommended settings of 2 gold per village."
map_data="{maps/multiplayer/6p_Smallolof}"
turns=90
{DAWN}
{MORNING}
{AFTERNOON}
{DUSK}
{FIRST_WATCH}
{SECOND_WATCH}
[side]
side=1
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=2
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=3
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=4
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=5
team_name=1
canrecruit=1
controller=human
fog=yes
[/side]
[side]
side=6
team_name=2
canrecruit=1
controller=human
fog=yes
[/side]
[/multiplayer]

404
data/themes/editor.cfg
View file

@ -12,205 +12,205 @@ name=editor
#textdomain wesnoth-editor
#ifdef APPLE
[hotkey]
command="zoomin"
key="z"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomin"
key="z"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="undo"
key="u"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="undo"
key="u"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="redo"
key="r"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="redo"
key="r"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomout"
key="x"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomout"
key="x"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomdefault"
key="d"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomdefault"
key="d"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="togglegrid"
key="g"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="togglegrid"
key="g"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsavemap"
key="s"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsavemap"
key="s"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsaveas"
key="s"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editsaveas"
key="s"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editquit"
key="q"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editquit"
key="q"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsetstartpos"
key="t"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsetstartpos"
key="t"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editnewmap"
key="n"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editnewmap"
key="n"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editloadmap"
key="l"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editloadmap"
key="l"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfloodfill"
key="f"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfloodfill"
key="f"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfillselection"
key="f"
cmd=no
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editfillselection"
key="f"
cmd=no
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editcut"
key="x"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcut"
key="x"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcopy"
key="c"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcopy"
key="c"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editpaste"
key="v"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editpaste"
key="v"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrevert"
key="r"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrevert"
key="r"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="preferences"
key="p"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="preferences"
key="p"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editresize"
key="r"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editresize"
key="r"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="fullscreen"
key="f"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="fullscreen"
key="f"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editselectall"
key="a"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editselectall"
key="a"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editflip"
key="f"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editflip"
key="f"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editdraw"
key="d"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editdraw"
key="d"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrefresh"
key="e"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrefresh"
key="e"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="changelanguage"
@ -497,37 +497,37 @@ height=600
yachnor=fixed
[/menu]
[menu]
image=flip_map_button_editor
items=editflip
rect=945,264,969,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=flip_map_button_editor
items=editflip
rect=945,264,969,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=undo_button_editor
items=undo
rect=957,304,981,328
xanchor=right
yachnor=fixed
[/menu]
image=undo_button_editor
items=undo
rect=957,304,981,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=redo_button_editor
items=redo
rect=985,304,1009,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=redo_button_editor
items=redo
rect=985,304,1009,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=toggle_grid_button_editor
items=togglegrid
rect=977,264,1001,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=toggle_grid_button_editor
items=togglegrid
rect=977,264,1001,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=zoom_in_button_editor

2
data/units.cfg
View file

@ -1116,7 +1116,7 @@
tundra=60
[/defense]
[resistance]
[resistance]
blade=90
pierce=90
impact=30

2
data/units/Fencer.cfg
View file

@ -3,7 +3,7 @@ id=Fencer
name= _ "Fencer"
race=human
image="human-fencer.png"
# Yes, the above line is deliberate - otherwise his solitary defensive frame flickers in when the defensive animations are not playing. It looks better to use that only when he is hit.
# Yes, the above line is deliberate - otherwise his solitary defensive frame flickers in when the defensive animations are not playing. It looks better to use that only when he is hit.
hitpoints=28
movement_type=elusivefoot
movement=6

34
data/units/Walking_Corpse.cfg
View file

@ -24,23 +24,23 @@ usage=fighter
unit_description= _ "Walking Corpses are the bodies of the dead, re-animated by dark magic. Although weak in combat, these zombies can spread their curse to those they kill, increasing the army of undead."
get_hit_sound=zombie-hit.wav
[death]
[frame]
begin=0
end=200
image="{BASE_IMAGE}-die-1.png"
[/frame]
[frame]
begin=200
end=400
image="{BASE_IMAGE}-die-2.png"
[/frame]
[frame]
begin=400
end=600
image="{BASE_IMAGE}-die-3.png"
[/frame]
[/death]
[death]
[frame]
begin=0
end=200
image="{BASE_IMAGE}-die-1.png"
[/frame]
[frame]
begin=200
end=400
image="{BASE_IMAGE}-die-2.png"
[/frame]
[frame]
begin=400
end=600
image="{BASE_IMAGE}-die-3.png"
[/frame]
[/death]
[attack]
name=fist