Pre-1.6 reindent and whitespace cleanup.

This commit is contained in:
Eric S. Raymond 2009-03-01 12:56:14 +00:00
parent b76d754811
commit 51c13fb819
108 changed files with 958 additions and 973 deletions

View file

@ -112,7 +112,7 @@
[/side]
{STARTING_VILLAGES 4 10}
# For storyline purposes, make it impossible to kill Dela.
{FORCE_CHANCE_TO_HIT side=1,2 id="Dela Keshar" 0 ()}

View file

@ -110,7 +110,7 @@
[/target]
[/ai]
[/side]
# For storyline purposes, make it impossible to kill Dela.
{FORCE_CHANCE_TO_HIT side=1 id="Dela Keshar" 0 ()}

View file

@ -473,7 +473,7 @@
type=Dark Adept
[/allow_recruit]
[/event]
# Ensure that you can't lose to the first couple of bats and rats simply by
# getting unlucky.
{FORCE_CHANCE_TO_HIT id="Mal Keshar" side=5 100 (

View file

@ -200,8 +200,8 @@
[/event]
{PICKUPPABLE_ITEM holy_amulet 12 2 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
image=items/ankh-necklace.png

View file

@ -71,13 +71,13 @@
{GOLD 10 20 30}
{FLAG_VARIANT undead}
[/side]
# As long as Mal-Tar sits on his keep, ensure that he can't survive long by
# getting lucky.
{FORCE_CHANCE_TO_HIT side=1 id=Mal-Tar 100 (
[have_unit]
id=Mal-Tar
[filter_location]
terrain=Ke
[/filter_location]

View file

@ -58,7 +58,7 @@
team_name=undead
user_team_name=_"Undead"
[/side]
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 Skeleton 3}
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Skeleton Archer" 2}
@ -78,7 +78,7 @@
team_name=undead
user_team_name=_"Undead"
[/side]
{LIMIT_CONTEMPORANEOUS_RECRUITS 3 Skeleton 2}
{LIMIT_CONTEMPORANEOUS_RECRUITS 3 "Vampire Bat" 2}
@ -120,7 +120,7 @@
[/side]
{STARTING_VILLAGES 5 16}
{LIMIT_CONTEMPORANEOUS_RECRUITS 5 Shadow 1}
# the prisoners' side

View file

@ -175,7 +175,6 @@
kill=yes
[/store_unit]
# mark half of the villages as containing bandits
[store_locations]
terrain=*^V*
@ -621,8 +620,8 @@
[/event]
{PICKUPPABLE_ITEM holy_amulet 2 25 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
image=items/ankh-necklace.png

View file

@ -50,7 +50,7 @@
{GOLD 100 150 200}
{FLAG_VARIANT undead}
[/side]
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Vampire Bat" 3}
[side]

View file

@ -45,7 +45,7 @@
team_name=undead
user_team_name=_"Undead"
[/side]
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Blood Bat" 3}
{STARTING_VILLAGES 2 7}

View file

@ -90,7 +90,7 @@
grouping=defensive
[/ai]
[/side]
#ifndef EASY
{LIMIT_CONTEMPORANEOUS_RECRUITS 4 "Elvish Avenger" 1}
#endif
@ -316,8 +316,8 @@
[/event]
{PICKUPPABLE_ITEM holy_amulet 20 12 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
image=items/ankh-necklace.png

View file

@ -397,8 +397,8 @@
###########################
{PICKUPPABLE_ITEM holy_amulet 22 38 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
_"Wearing this amulet will cause every blow you deal to inflict arcane damage!"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
image=items/ankh-necklace.png

View file

@ -90,7 +90,7 @@
user_team_name=_"Humans"
experience=62
[/side]
# Ensure that Li'sar can't get herself killed during the first couple of
# turns when the player can't necessarily yet be able to protect her.
{FORCE_CHANCE_TO_HIT side=3 id="Li'sar" 0 (

View file

@ -109,9 +109,9 @@
-the main reason for having a polished campaign"
[/entry]
[entry]
name= "Steven Panek (Espreon)"
name= "Steven Panek (Espreon)"
comment="map artist"
[/entry]
[/entry]
[entry]
name="Santi/fnaek"
comment="initial invisible units and camera pics"
@ -181,7 +181,7 @@
criticism, help with WML code and graphics."
[/entry]
[/about]
#undef LOW_C_SEPARATOR
#undef LOW_C_SEPARATOR
[/campaign]
# wmllint: directory spellings Delfador Cleodil Kalenz Galtrid Crelanu Uraredia

View file

@ -50,7 +50,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
[/part]
[/story]
#### Kalenz's side ####
#### Kalenz's side ####
[side]
side=1
no_leader=yes
@ -110,7 +110,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
message= _ "Take that, you orcish scum!"
[/message]
[/event]
#### /Kalenz side ####
#### /Kalenz side ####
[side]
side=2
@ -452,7 +452,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
name=victory
[kill]
id=Velon
id=Velon
[/kill]
[/event]
{@campaigns/Legend_of_Wesmere/utils/deaths.cfg}

View file

@ -61,7 +61,7 @@
### Olurf's Code ###
#define OLURFS_LAND
x=20-24,19-30,17-30,16-30,14-30,12-30,11-30,10-30,6-30,8-30,10-30,13-30,15-30,18-30,19-30,20-30,22-30,23-30,24-30,23-30,22-30
y=10,11,12,13-15,16-17,18-19,20,21,22,23,24,25,26,27,28-29,30,31-32 ,33-36,37,38-39,40
y=10,11,12,13-15,16-17,18-19,20,21,22,23,24,25,26,27,28-29,30,31-32 ,33-36,37,38-39,40
#enddef
#define NOT_OLURFS_LAND
x=1-30,1-19,1-18,1-16,1-15,1-13,1-11,1-10,1-9,1-5,1-7,1-9,1-12,1-14,1-17,1-18,1-19,1-21,1-22 ,1-23,1-22,1-21
@ -76,7 +76,7 @@
recruit={DWARVES}
#ifdef EASY
team_name=dwarves
#else
#else
team_name=trolls
#endif
[ai]
@ -201,7 +201,7 @@
[/modify_side]
[/event]
#undef NOT_OLURFS_LAND
#undef NOT_OLURFS_LAND
[event]
name=victory
@ -289,7 +289,7 @@
### /Enemy Side ###
#### Objectives and corresponding events ####
#### Objectives and corresponding events ####
[event]
name=start
[message]

View file

@ -27,7 +27,7 @@
{EXTRA_SCENARIO_MUSIC suspense.ogg}
{DEFAULT_SCHEDULE}
[story]
[part]
story= _ "Kalenz and his band finally made it to the Ka'lian, but things were not as they had hoped..."
@ -40,7 +40,7 @@
[/part]
[/story]
#### Kalenz's code ####
#### Kalenz's code ####
#wmllint: validate-off
[side]
side=1
@ -62,7 +62,7 @@
# wmllint: recognize Landar
[/event]
#### /Kalenz's code ####
#### /Kalenz's code ####
[side]
side=2
@ -90,7 +90,7 @@
{STARTING_VILLAGES_ALL 2}
#wmllint: validate-on
#### Side3 code ####
#### Side3 code ####
[side]
side=3
no_leader=yes
@ -137,7 +137,7 @@
message= _ "We die, but more come after us, Orcs will rule all!"
[/message]
[/event]
#### /Side3 code ####
#### /Side3 code ####
[side]
side=4

View file

@ -22,7 +22,7 @@
[/part]
[/story]
#### Kalenz's code ####
#### Kalenz's code ####
#wmllint: validate-off
[side]
{KALENZ}
@ -36,19 +36,19 @@
# wmllint: recognize Landar
# wmllint: recognize Cleodil
# wmllint: recognize Olurf
{CHECK_LANDAR}
{CHECK_CLEODIL}
[/event]
#### /Kalenz's code ####
#### /Kalenz's code ####
#### Olurf's code ####
#### Olurf's code ####
[side]
# {OLURF}
# {OLURF}
# wmllint: recognize Olurf
side=2
no_leader=yes
# canrecruit=yes
# canrecruit=yes
{GOLD 120 160 200}
{INCOME 4 8 12}
team_name=kalenz
@ -92,7 +92,7 @@
[/filter]
amount=999
[/heal_unit]
{NEXT dwarf}
{NEXT dwarf}
{CLEAR_VARIABLE olurf_party}
[/event]
@ -105,7 +105,7 @@
[/filter]
[/store_unit]
[/event]
#### Olurf's code ####
#### Olurf's code ####
[side]
type=Orcish Warlord

View file

@ -128,7 +128,7 @@
aggression=0.75
caution=0.0
attack_depth=5
grouping=offensive
grouping=offensive
[/ai]
[ai]
time_of_day=dusk,first_watch,second_watch
@ -251,7 +251,7 @@
[/ai]
[/side]
#### Objectives and corresponding events ####
#### Objectives and corresponding events ####
[event]
name=prestart
[objectives]
@ -295,9 +295,7 @@
carryover_percentage=100
[/endlevel]
[/event]
#### /Objectives and corresponding events ####
#### /Objectives and corresponding events ####
[event]
name=start
@ -350,119 +348,119 @@
# wmllint: local spelling da
message= _ "We'll crush those weak elves and I'll get da stone!"
[/message]
### disabled till after the stringfreeze, don't remove ####
# [message]
# id=Kalenz
#
# [option]
# message= _ "These are hardened orc and troll veterans. Men, prepare for a long, hard fight..."
# [/option]
#
# [option]
# message= _ "I see the orcish army is big but consists mostly of inexperienced fighters. This should not take too long...."
### but gave orcs some more troops..
### disabled till after the stringfreeze, don't remove ####
# [message]
# id=Kalenz
#
# [option]
# message= _ "These are hardened orc and troll veterans. Men, prepare for a long, hard fight..."
# [/option]
#
# [option]
# message= _ "I see the orcish army is big but consists mostly of inexperienced fighters. This should not take too long...."
### but gave orcs some more troops..
### do AI changes here for lower attack depth
# [command]
# [modify_side]
# side=4 # Mordrun
### do AI changes here for lower attack depth
# [command]
# [modify_side]
# side=4 # Mordrun
# {GOLD 580 730 880}
## give them +30 gold to offset more stupid AI
# {GOLD 580 730 880}
## give them +30 gold to offset more stupid AI
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [command]
# [modify_side]
# side=5
# [command]
# [modify_side]
# side=5
# {GOLD 350 730 930}
# ## give them +30 gold to offset more stupid AI
# {GOLD 350 730 930}
# ## give them +30 gold to offset more stupid AI
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [command]
# [modify_side]
# side=6
# [command]
# [modify_side]
# side=6
# {GOLD 340 490 540}
# {INCOME 4 8 12}
# [ai]
# {NO_SCOUTS}
##ifdef EASY
# recruitment_pattern=fighter
##else
# recruitment_pattern=fighter, mixed fighter, fighter, mixed fighter, fighter
##endif
# recruitment_ignore_bad_movement=yes
# recruitment_ignore_bad_combat=yes
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# recruitment_ignore_bad_combat=yes
# recruitment_ignore_bad_movement=yes
##ifdef EASY
# recruitment_pattern=fighter
##else
# recruitment_pattern=fighter, mixed fighter, fighter, mixed fighter, fighter
##endif
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# {GOLD 340 490 540}
# {INCOME 4 8 12}
# [ai]
# {NO_SCOUTS}
##ifdef EASY
# recruitment_pattern=fighter
##else
# recruitment_pattern=fighter, mixed fighter, fighter, mixed fighter, fighter
##endif
# recruitment_ignore_bad_movement=yes
# recruitment_ignore_bad_combat=yes
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# recruitment_ignore_bad_combat=yes
# recruitment_ignore_bad_movement=yes
##ifdef EASY
# recruitment_pattern=fighter
##else
# recruitment_pattern=fighter, mixed fighter, fighter, mixed fighter, fighter
##endif
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [command]
# [modify_side]
# side=7
# [command]
# [modify_side]
# side=7
# {GOLD 430 580 630}
# ## give them +30 gold to offset more stupid AI
#
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [/option]
# [/message]
# {GOLD 430 580 630}
# ## give them +30 gold to offset more stupid AI
#
# [ai]
# {NO_SCOUTS}
# recruitment_ignore_bad_movement=yes
# recruitment_pattern=scout,fighter,fighter,archer
# [/ai]
# [ai]
# time_of_day=dusk,first_watch,second_watch
# aggression=0.75
# caution=0.0
# attack_depth=1
# grouping=no
# [/ai]
# [/modify_side]
# [/command]
# [/option]
# [/message]
[/event]
### AI_CONTROLLER ID PLAYER_SIDE ALLY_SIDES VARIABLES
@ -475,19 +473,18 @@
{VARIABLE olurf_party[$dwarf].side 1}
{VARIABLE olurf_party[$dwarf].x 42}
{VARIABLE olurf_party[$dwarf].y 2}
[unstore_unit]
variable=olurf_party[$dwarf]
find_vacant=yes
[/unstore_unit]
{NEXT dwarf}
{NEXT dwarf}
{CLEAR_VARIABLE olurf_party}
#wmllint: recognize Olurf
{MODIFY_UNIT (id=Olurf) canrecruit no}
{MAKE_HERO Olurf}
{OLURF_SPEAK}
[/event]
[event]

View file

@ -154,8 +154,8 @@
[/have_unit]
[else]
[message]
id=Olurf
message= _ "Some scary fellow this Aquagar thinks he is! Come now, I think Crelanu owes us some drinks."
id=Olurf
message= _ "Some scary fellow this Aquagar thinks he is! Come now, I think Crelanu owes us some drinks."
[/message]
[/else]
[/if]

View file

@ -160,7 +160,7 @@
[/ai]
{INCOME 4 8 12}
[/side]
#undef HIGH_PRIORITY_TARGETS
#undef HIGH_PRIORITY_TARGETS
{STARTING_VILLAGES_ALL 1}

View file

@ -168,7 +168,7 @@
{GOBLIN_RAIDER (Goblin Pillager) 18 28 ( _ "Gorokh")}
#endif
#undef GOBLIN_RAIDER
#undef GOBLIN_RAIDER
# now store the the good guys so they are invisible during the
# goblin conversation

View file

@ -651,7 +651,7 @@
side=3
[/filter]
{INCIDENTAL_MUSIC vengeful.ogg}
{INCIDENTAL_MUSIC vengeful.ogg}
[message]
speaker=Harper

View file

@ -247,7 +247,7 @@
#endif
{TROOPER "Heavy Infantryman" 36 24}
#ifdef HARD
{TROOPER "Shock Trooper" 36 23}
#else

View file

@ -346,7 +346,7 @@
{MK_GUARD 2 (Pikeman) 24 18}
{MK_GUARD 2 (Halberdier) 18 16}
#endif
#undef MK_GUARD
#undef MK_GUARD
{CHG_TERRAIN Gg (5) (3)}

View file

@ -237,5 +237,5 @@
#define DEFEAT_WHEN_HAMEL_DEAD
#enddef
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
#undef DEFEAT_WHEN_HAMEL_DEAD
#undef DEFEAT_WHEN_HAMEL_DEAD
[/scenario]

View file

@ -769,5 +769,5 @@
#define DEFEAT_WHEN_HAMEL_DEAD
#enddef
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
#undef DEFEAT_WHEN_HAMEL_DEAD
#undef DEFEAT_WHEN_HAMEL_DEAD
[/scenario]

View file

@ -488,10 +488,10 @@
{GLADIATOR 34 26}
{GLADIATOR 36 26}
#undef WARDEN
#undef SLASHER
#undef ENFORCER
#undef GLADIATOR
#undef WARDEN
#undef SLASHER
#undef ENFORCER
#undef GLADIATOR
{PLACE_IMAGE terrain/village/desert2.png 12 28}
{PLACE_IMAGE terrain/village/desert2.png 14 29}

View file

@ -4,7 +4,7 @@
id=4_Gathering_Materials
scenario_generation=cave
next_scenario=4t_The_Jeweler
[story]
[part]
story= _ "Those who went to the eastern mines were brave indeed. They were infested with trolls and other vile creatures, who thrived in the dark and gloom of the caves."

View file

@ -157,7 +157,7 @@
[/side]
# Here is the code for popping up random bandits on village
# captures.
# captures.
#
# Note: If the AI moves an unit onto a village spawning
# villagers this unit will not attack even it is level 2

View file

@ -42,9 +42,9 @@
[filter_attack]
name=hammer
[/filter_attack]
offset=0.0~-0.17,-0.17~-0.25,-0.25~0.0,-0.0~0.8,0.8~0.4,0.4~0.0
[frame]
begin=-400
end=-300
@ -108,7 +108,7 @@
name=chill tempest
range=ranged
[/filter_attack]
[missile_frame]
begin=-50
end=50
@ -117,7 +117,7 @@
x=4~0
y=3~0
[/missile_frame]
[frame]
begin=-500
end=-450

View file

@ -266,7 +266,7 @@
message= _ "You already have the Fire Ruby."
image=wesnoth-icon.png
[/message]
[allow_undo]
[/allow_undo]
[/then]

View file

@ -369,7 +369,7 @@
speaker="Ut'Tan-Vrork"
message= _ "Push 'em into the sea! They're in our winter homes! Heh...Tan-Vragar, I 'm sure they will enjoy your little surprise!"
[/message]
[scroll_to]
x,y=30,30
[/scroll_to]

View file

@ -30,7 +30,7 @@
shroud=yes
team_name=Haldric
user_team_name=_"Refugees"
{FLAG_VARIANT loyalist}
{FLAG_VARIANT loyalist}
[/side]
[side]

View file

@ -651,7 +651,7 @@
{HERO (Lieutenant) (Commander Aethyr) ( _ "Commander Aethyr") 1 19 24 ("portraits/aethyr.png")}
# wmllint: recognize Commander Aethyr
[delay]
time=500
[/delay]

View file

@ -240,11 +240,11 @@
message= _ "After some days of travel Haldric finds himself confronted by a vast expanse of swamp. A small island with a mountain dominates the view. That can only be the home of the dragon."
image=wesnoth-icon.png
[/message]
[scroll_to]
x,y=20,27
[/scroll_to]
[delay]
time=1000
[/delay]

View file

@ -288,7 +288,7 @@
message= _ "We are a refugee people. We must push back their vanguard, and secure our beachhead. If they capture our ships all is lost. We will be crushed under a tide of orcs."
image=portraits/haldric-mad.png
[/message]
[recall]
id=Burin the Lost
[/recall]

View file

@ -333,7 +333,7 @@
x=28,28,29
y=2,1,1
[/move_unit_fake]
[modify_side]
side=1
shroud=yes
@ -344,7 +344,7 @@
x=1-40
y=1-40
[/place_shroud]
[redraw]
side=1
[/redraw]

View file

@ -1055,12 +1055,12 @@
speaker=Lich-Lord Jevyan
message= _ "Come in from the deep my loyal soldiers!"
[/message]
[scroll_to]
x=1
y=$yy1
[/scroll_to]
[delay]
time=500
[/delay]
@ -1088,12 +1088,12 @@
speaker=Lich-Lord Jevyan
message= _ "Rise, rise from the ground!"
[/message]
[scroll_to]
x=$xx1
y=$yy1
[/scroll_to]
[delay]
time=500
[/delay]

View file

@ -70,23 +70,23 @@
canrecruit=yes
{QUANTITY recruit (Ruffian,Thief,Footpad)
(Ruffian,Thug,Thief,Poacher)
(Footpad,Thug,Thief,Poacher,Trapper)}
(Ruffian,Thug,Thief,Poacher)
(Footpad,Thug,Thief,Poacher,Trapper)}
[ai]
# macroified the params here because they'll be reused later in the scenario
# macroified the params here because they'll be reused later in the scenario
#define URZA_NALMATH_AI_PARAMS
{ATTACK_DEPTH 2 3 4}
grouping=no
{NO_SCOUTS}
village_value=3
{ATTACK_DEPTH 2 3 4}
grouping=no
{NO_SCOUTS}
village_value=3
#enddef
{URZA_NALMATH_AI_PARAMS}
{QUANTITY recruitment_pattern (fighter,fighter,scout,fighter)
(fighter,archer,fighter,fighter)
(scout,fighter,archer,fighter,fighter)}
(fighter,archer,fighter,fighter)
(scout,fighter,archer,fighter,fighter)}
[/ai]
[/side]
@ -119,7 +119,7 @@
{MAKE_PREVIOUS_AN_AMBUSHER}
{NAMED_GENERIC_UNIT 2 Thief 22 12 Criminal (_"Criminal")} {GUARDIAN}
#endif
#undef MAKE_PREVIOUS_AN_AMBUSHER
#undef MAKE_PREVIOUS_AN_AMBUSHER
{NAMED_GENERIC_UNIT 2 Footpad 21 17 Criminal (_"Criminal")} {GUARDIAN}
#ifdef NORMAL
@ -367,8 +367,8 @@
[set_recruit]
side=2
{QUANTITY recruit (Walking Corpse)
(Walking Corpse,Skeleton,Vampire Bat)
(Skeleton,Skeleton Archer,Vampire Bat,Blood Bat)}
(Walking Corpse,Skeleton,Vampire Bat)
(Skeleton,Skeleton Archer,Vampire Bat,Blood Bat)}
[/set_recruit]
# update the [ai] params so that the recruitment_pattern matches the new
@ -380,8 +380,8 @@
{URZA_NALMATH_AI_PARAMS}
{QUANTITY recruitment_pattern (fighter)
(fighter,fighter,scout,fighter)
(fighter,archer,fighter,archer,scout)}
(fighter,fighter,scout,fighter)
(fighter,archer,fighter,archer,scout)}
[/ai]
[/modify_side]

View file

@ -673,7 +673,7 @@
[event]
name=moveto
first_time_only=no
[filter]
side=1
x,y=17,24
@ -724,10 +724,10 @@
speaker=unit
message= _ "I've broken through!"
[/message]
{VARIABLE bomb_status blown}
[/then]
[else]
[allow_undo]
[/allow_undo]

View file

@ -74,7 +74,7 @@
[/ai]
recruit=Wraith, Shadow, Skeleton, Revenant, Draug, Bone Shooter, Blood Bat, Chocobone
[/side]
# Make it impossible for the player to kill him, no matter how lucky.
{FORCE_CHANCE_TO_HIT side=1 id="Mal M'Brin" 0 ()}

View file

@ -736,7 +736,7 @@
terrain=Re
[/terrain]
[redraw]
[redraw]
[/redraw]
{PLACE_IMAGE scenery/rubble.png 16 7}
@ -915,7 +915,6 @@
message= _ "If we move fast we might be able to save the other prisoner before he gets killed too."
[/message]
{CLEAR_VARIABLE explorer}
[/event]
[event]
@ -947,7 +946,6 @@
speaker=Ulg
message= _ "I'm gonna make you squeal, dwarf!"
[/message]
[/event]
[event]
@ -964,7 +962,6 @@
[/have_unit]
[then]
{CHECK_EXPLORER}
[fire_event]
name=interrogation
@ -990,12 +987,11 @@
[then]
[fire_event]
name=rogrimir
name=rogrimir
[/fire_event]
[/then]
[/if]
[/event]
[/then]
[/if]
[/event]
@ -1020,7 +1016,7 @@
[/message]
{MODIFY_UNIT id=Rogrimir side 1}
{MODIFY_UNIT id=Rogrimir moves 5}
{MODIFY_UNIT id=Rogrimir moves 5}
[/event]
# Event 3: Troll Lava Maze
@ -1107,7 +1103,7 @@
[/if]
{CLEAR_VARIABLE unit_on_lava}
{CLEAR_VARIABLE damage_msg}
{NEXT i}
{NEXT i}
{CLEAR_VARIABLE lava_hex}
[/event]
@ -1215,7 +1211,7 @@
[/unstore_unit]
{CLEAR_VARIABLE unitstats}
{NEXT i}
{NEXT i}
{CLEAR_VARIABLE locs}
{CLEAR_VARIABLE damage_msg}

View file

@ -14,5 +14,4 @@
{core/editor/time-of-day.cfg}
{core/editor/tool-hints.cfg}
#endif

View file

@ -2,5 +2,5 @@
# Defines the music playlist for the editor
[editor_music]
{DEFAULT_MUSIC_PLAYLIST}
{DEFAULT_MUSIC_PLAYLIST}
[/editor_music]

View file

@ -15,68 +15,68 @@
id=water
name= _ "water"
icon="group_water"
core=yes
core=yes
[/editor_group]
[editor_group]
id=flat
name= _ "flat"
icon="group_flat"
core=yes
core=yes
[/editor_group]
[editor_group]
id=desert
name= _ "desert"
icon="group_desert"
core=yes
core=yes
[/editor_group]
[editor_group]
id=forest
name= _ "forest"
icon="group_forest"
core=yes
core=yes
[/editor_group]
[editor_group]
id=frozen
name= _ "frozen"
icon="group_frozen"
core=yes
core=yes
[/editor_group]
[editor_group]
id=rough
name= _ "rough"
icon="group_rough"
core=yes
core=yes
[/editor_group]
[editor_group]
id=cave
name= _ "cave"
icon="group_cave"
core=yes
core=yes
[/editor_group]
[editor_group]
id=village
name= _ "village"
icon="group_village"
core=yes
core=yes
[/editor_group]
[editor_group]
id=castle
name= _ "castle"
icon="group_castle"
core=yes
core=yes
[/editor_group]
[editor_group]
id=special
name= _ "special"
icon="group_x"
core=yes
core=yes
[/editor_group]

View file

@ -1,5 +1,5 @@
#textdomain wesnoth-editor
# Editor time-of-day (lighting settings) presets
# Editor time-of-day (lighting settings) presets
[editor_times]
{DAWN}

View file

@ -922,10 +922,10 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[command]
{VARIABLE ai_controller_finished yes}
#ifndef MULTIPLAYER
[allow_undo]
[/allow_undo]
#endif
#ifndef MULTIPLAYER
[allow_undo]
[/allow_undo]
#endif
[/command]
[/literal]
[/set_variables]
@ -1038,5 +1038,5 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
# A stub for scenario 7 of LoW
#define AI_LOCATION AFFIX STRING RADIUS X Y
{SET_LABEL {X} {Y} ({STRING})}
{SET_LABEL {X} {Y} ({STRING})}
#enddef

View file

@ -168,7 +168,6 @@
[/event]
#enddef
#define CALL_FUNCTION FNAME PARAMS
# This will fire an event with a set of parameters, for example:
#! {CALL_FUNCTION my_event a,b,c=1,2,3}
@ -196,4 +195,3 @@
name=param[0]
[/clear_variable]
#enddef

View file

@ -197,10 +197,10 @@
[/else]
[/if]
[/event]
[event]
name=victory
[clear_variable]
name=item_{ID}_picked_up
[/clear_variable]
@ -284,10 +284,10 @@
#define OBJ_POTION_HOLY X Y ID
{PICKUPPABLE_ITEM {ID} {X} {Y} side=1 items/holy-water.png
# FIXME: when not in string freeze, this string should be changed and the object description message
# re-enabled by removing silent=yes
_"This water will make melee weapons have the 'arcane' damage type until the end of the current scenario."
_"I am not suited to the use of this item! Let another take it." (
# FIXME: when not in string freeze, this string should be changed and the object description message
# re-enabled by removing silent=yes
_"This water will make melee weapons have the 'arcane' damage type until the end of the current scenario."
_"I am not suited to the use of this item! Let another take it." (
[object]
name= _ "Holy Water"
image=items/holy-water.png

View file

@ -672,22 +672,22 @@
variable=unit
find_vacant=no
[/unstore_unit]
[event]
name=attack end
delayed_variable_substitution=yes
{FOREACH unit.attack i}
{CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit}
[set_variables]
name=unit.attack[$i].specials.chance_to_hit
to_variable=unit.attack[$i].specials.original_chance_to_hit
[/set_variables]
{CLEAR_VARIABLE unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[unstore_unit]
variable=unit
find_vacant=no
@ -750,22 +750,22 @@
variable=second_unit
find_vacant=no
[/unstore_unit]
[event]
name=attack end
delayed_variable_substitution=yes
{FOREACH second_unit.attack i}
{CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit}
[set_variables]
name=second_unit.attack[$i].specials.chance_to_hit
to_variable=second_unit.attack[$i].specials.original_chance_to_hit
[/set_variables]
{CLEAR_VARIABLE second_unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[unstore_unit]
variable=second_unit
find_vacant=no

View file

@ -1579,7 +1579,7 @@ While undead lords arrived on the Great Continent in considerable numbers only i
# this has been commented out because it interferes with the standard
# drake standing/flying animations
# flies=true
# Drakes are huge (easy targets) flying beasts, but are different
# from the classical flying unit: to fight they have to land
# They love caves and mountains, and above all: warmth

View file

@ -97,7 +97,7 @@
[/defend]
[standing_anim]
layer=60
layer=60
direction=s,se,sw
start_time=0
[frame]
@ -135,7 +135,7 @@
[/standing_anim]
[standing_anim]
direction=n,ne,nw
layer=60
layer=60
start_time=0
[frame]
duration=50

View file

@ -107,7 +107,7 @@
[/frame]
[/defend]
[standing_anim]
layer=60
layer=60
direction=s,se,sw
start_time=0
[frame]
@ -144,7 +144,7 @@
[/frame]
[/standing_anim]
[standing_anim]
layer=60
layer=60
direction=n,ne,nw
start_time=0
[frame]

View file

@ -99,7 +99,7 @@
[standing_anim]
direction=s,se,sw
start_time=0
layer=60
layer=60
[frame]
duration=50
image="units/undead/bat-se-3.png"
@ -134,7 +134,7 @@
[/frame]
[/standing_anim]
[standing_anim]
layer=60
layer=60
direction=n,ne,nw
start_time=0
[frame]

View file

@ -20,18 +20,18 @@
usage=archer
description= _ "Elves have always had a reputation for archery, a skill that, for many reasons, comes naturally to them. Even the frail of body can be deadly with a bow in hand, and in times of war, many will take up this weapon. Though their relative inexperience with combat leaves them somewhat vulnerable, their natural grace ensures that they can best any of humanity's fresh recruits."
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/archer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/archer.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/archer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/archer.png"
[/portrait]
[attack]
name=sword
description=_"sword"
@ -185,18 +185,18 @@
image="units/elves-wood/archer+female.png"
profile="portraits/elves/archer+female.png"
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/archer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/archer+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/archer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/archer+female.png"
[/portrait]
# FIXME: Commented out because these images are in 1.2 size and style
#ifdef __UNUSED__
[death]

View file

@ -22,18 +22,18 @@
This has, at times, been interpreted as a form of vengeance for their brethren lost earlier in the battle. Although not so base in design, it is not at all inaccurate."+{SPECIAL_NOTES}+{SPECIAL_NOTES_AMBUSH}
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[movement_costs]
shallow_water=2
mountains=2
@ -196,18 +196,18 @@ This has, at times, been interpreted as a form of vengeance for their brethren l
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
{DEFENSE_ANIM_RANGE "units/elves-wood/avenger-sword-defend.png" "units/elves-wood/avenger+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/avenger+female-bow-defend.png" "units/elves-wood/avenger+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
# FIXME: Commented out because these images are in 1.2 size and style
#ifdef __UNUSED__
[death]

View file

@ -25,18 +25,18 @@
usage=fighter
description= _ "Elves, unlike many other races, will quickly acknowledge and follow any of their peers who have experience in combat. In this they differ greatly from humanity, for whom leadership is often a matter of coercion and intimidation. The combination of their willingness to accept the wisdom of their leaders, and the tendency to choose leaders of merit is one of the quiet strengths of the elves."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/captain.png"
[/portrait]
{DEFENSE_ANIM_RANGE "units/elves-wood/captain-defend.png" "units/elves-wood/captain.png" {SOUND_LIST:ELF_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/captain-bow-defend.png" "units/elves-wood/captain-bow.png" {SOUND_LIST:ELF_HIT} ranged }
[abilities]

View file

@ -19,18 +19,18 @@
usage=fighter
description= _ "Those few elves who deliberately hone themselves into weapons of war become something which belies the rather docile reputation of their race. Dedication and skill are matched with purity of form, and the result is swordsmanship to which few can compare. Even archery, treated as a secondary pursuit, is masterfully executed."
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/hero.png"
[/portrait]
[attack]
name=sword
description=_"sword"

View file

@ -20,18 +20,18 @@
Their chief ability lies in healing, and it is for this skill that the elvish druids are revered by their people."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_CURES}+{SPECIAL_NOTES_MAGICAL}
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/druid.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/druid.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/druid.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/druid.png"
[/portrait]
[abilities]
{ABILITY_CURES}
[/abilities]

View file

@ -18,18 +18,18 @@
usage=mixed fighter
description= _ "The magic of the elves is wholly unlike that of humanity, so much so that humans are almost universally incapable of understanding it, let alone using it. Likewise, those who are masters of it are equally enigmatic; though it can be said that they are revered by their people, very little can be said about their actual function or purpose within that society."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_ARCANE}
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[resistance]
arcane=90
[/resistance]
@ -78,7 +78,7 @@
[if]
hits=yes
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-1.png"
sound=magic-faeriefire.ogg
@ -89,7 +89,7 @@
[else]
hits=no
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-1.png"
sound=magic-faeriefire-miss.ogg
@ -99,37 +99,37 @@
[/else]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/faerie-fire-halo2.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/faerie-fire-halo3.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/faerie-fire-halo4.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/faerie-fire-halo5.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/faerie-fire-halo6.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-1.png"
halo=halo/elven/faerie-fire-halo7.png
halo_x,halo_y=0,-28
@ -148,51 +148,51 @@
image_diagonal="projectiles/entangle.png"
[/missile_frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-1.png"
halo=halo/elven/nature-halo1.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo2.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo3.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo4.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo5.png
halo_x,halo_y=0,-28
[/frame]
{SOUND:SLOW}
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo6.png
sound=entangle.wav
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-2.png"
halo=halo/elven/nature-halo7.png
halo_x,halo_y=0,-28
[/frame]
[frame]
duration=75
duration=75
image="units/elves-wood/enchantress-magic-1.png"
halo=halo/elven/nature-halo8.png
halo_x,halo_y=0,-28
@ -216,7 +216,7 @@
hits=yes
[frame]
duration=100
image="units/elves-wood/enchantress-melee-3.png"
image="units/elves-wood/enchantress-melee-3.png"
sound=staff.wav
[/frame]
[/if]
@ -224,7 +224,7 @@
hits=no
[frame]
duration=100
image="units/elves-wood/enchantress-melee-3.png"
image="units/elves-wood/enchantress-melee-3.png"
sound={SOUND_LIST:MISS}
[/frame]
[/else]

View file

@ -19,18 +19,18 @@
usage=fighter
description= _ "Elves are not warlike by nature, but in times of need, their natural grace and agility serve them well, as does their skillful craftsmanship. An elf can grasp the basics of swordsmanship and archery in an uncannily short time, and put them to effective use on the battlefield."
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/fighter.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/fighter.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/fighter.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/fighter.png"
[/portrait]
[attack]
name=sword
description=_"sword"

View file

@ -18,18 +18,18 @@
usage=fighter
description= _ "A relatively small amount of experience will turn an elf from a competent fighter into a master of combat. Those who are honored as heroes are strong with both sword and bow, and their skill once acquired does not fade for lack of practice."
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/hero.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/hero.png"
[/portrait]
[attack]
name=sword
description=_"sword"

View file

@ -18,18 +18,18 @@
usage=fighter
description= _ "The leaders of the elves do not fall sallow and frail with age. Rather, it is then that they grow to their true potential. Quiet and contemplative in times of peace, a High Lord in the full of his wrath is an awesome sight indeed."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/high-lord.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/high-lord.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/high-lord.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/high-lord.png"
[/portrait]
[defend]
start_time=-151
[filter_attack]

View file

@ -18,16 +18,16 @@
cost=10
usage=null
description= _ "Elves choose their leaders for their power and wisdom; foresight is what has protected them in times of uncertainty. Their just reign is rewarded by the unflagging fealty of their people, which is the greatest gift any ruler could ask for."
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/lady.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/lady.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/lady.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/lady.png"
[/portrait]
[/unit_type]

View file

@ -19,21 +19,21 @@
die_sound={SOUND_LIST:ELF_HIT}
{DEFENSE_ANIM_RANGE "units/elves-wood/lord-defend.png" "units/elves-wood/lord.png" {SOUND_LIST:ELF_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/lord-magic-defend.png" "units/elves-wood/lord-magic.png" {SOUND_LIST:ELF_HIT} ranged}
# Upon Kitty's request only on the right side.
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/lord.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="left"
mirror="true"
image=" "
[/portrait]
# Upon Kitty's request only on the right side.
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/lord.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="left"
mirror="true"
image=" "
[/portrait]
[attack]
name=sword
description= _"sword"

View file

@ -21,19 +21,19 @@
Realizing this prodigious skill does come with one cost, that being a lack of practice with the sword."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
die_sound={SOUND_LIST:ELF_HIT}
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/marksman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/marksman.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/marksman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/marksman.png"
[/portrait]
[death]
[frame]
begin=0
@ -189,21 +189,21 @@ Realizing this prodigious skill does come with one cost, that being a lack of pr
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
{DEFENSE_ANIM_RANGE "units/elves-wood/marksman+female-sword-defend.png" "units/elves-wood/marksman+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/marksman+female-bow-defend.png" "units/elves-wood/marksman+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
# Upon Kitty's request only on the left side.
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="right"
mirror="true"
image=" "
[/portrait]
# Upon Kitty's request only on the left side.
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="right"
mirror="true"
image=" "
[/portrait]
[death]
[frame]
image="units/elves-wood/marksman+female-die-1.png"

View file

@ -26,18 +26,18 @@
usage=fighter
description= _ "The longevity and natural intelligence of elves make them apt for military matters, enough even to counter their general distaste for such things. Elves remember things much more clearly than humankind, and can often intuit what others can only be trained to do. Certainly, on those rare occasions when an elf sets his mind to war, the strategy that results is the work of a master."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/captain.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/captain.png"
[/portrait]
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
[/abilities]

View file

@ -22,19 +22,19 @@
The speed of these soldiers allows the elves to strike when and where they choose when fighting on their home ground, a fact that has saved many of their number from death."
die_sound=horse-die.ogg
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
[defense]
forest=40
[/defense]

View file

@ -19,18 +19,18 @@
usage=mixed fighter
description= _ "Though a man might spend years in the forest, he will never shake the feeling that he is a guest in a place he is not truly a part of. With elves, this is quite reversed. Any elf that studies the lore of the woods becomes a fitting master of them. This, combined with a considerable skill at archery and swordsmanship, is very useful in warfare."+{SPECIAL_NOTES}+{SPECIAL_NOTES_AMBUSH}
die_sound={SOUND_LIST:ELF_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger.png"
[/portrait]
[movement_costs]
shallow_water=2
mountains=2
@ -193,18 +193,18 @@
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
{DEFENSE_ANIM_RANGE "units/elves-wood/ranger-sword-defend.png" "units/elves-wood/ranger+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/ranger+female-bow-defend.png" "units/elves-wood/ranger+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/ranger+female.png"
[/portrait]
# FIXME: Commented out because these images are in 1.2 size and style
#ifdef __UNUSED__
[death]

View file

@ -23,19 +23,19 @@
This combination of incredible mobility and potent combat strength is one of the greatest assets the elves possess in warfare."
die_sound=horse-die.ogg
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
[defense]
village=50
forest=40

View file

@ -22,19 +22,19 @@
usage=scout
description= _ "The horsemen of the wood elves have some skill with bow and sword, but their true skill lies in their horsemanship. Even other elves are impressed by their uncanny speed in the woods, and their ability to dart through the thick of the forest with nary a scratch. They may be the only cavalry in existence that fares better in the woods than on open ground."
die_sound=horse-die.ogg
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/scout.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/scout.png"
[/portrait]
[defense]
village=60
forest=40

View file

@ -22,18 +22,18 @@
The healing abilities of the elves are also remarkable, and of capital use in battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_HEALS}
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/shaman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/shaman.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/shaman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/shaman.png"
[/portrait]
[abilities]
{ABILITY_HEALS}
[/abilities]

View file

@ -20,19 +20,19 @@
usage=archer
description= _ "There was a legend of an elf who stopped an arrow by shooting it out of the air with one of his own. It is a testament to the skill of the elves that such a story could be taken seriously. The sharpshooters of the elves have, quite simply, mastered the art of archery."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
die_sound={SOUND_LIST:ELF_HIT}
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/marksman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/marksman.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/elves/transparent/marksman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/elves/transparent/marksman.png"
[/portrait]
#ifdef __UNUSED__
# FIXME: Commented out because these images are in 1.2 size and style
[death]
@ -186,18 +186,18 @@
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
{DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-sword-defend.png" "units/elves-wood/sharpshooter+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-bow-defend.png" "units/elves-wood/sharpshooter+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/marksman+female.png"
[/portrait]
#ifdef __UNUSED__
# FIXME: Commented out because these images are in 1.2 size and style
[death]

View file

@ -21,18 +21,18 @@
usage=healer
description= _ "Devotion to her faerie side will eventually transform an elf maiden into a creature of both worlds. Guided by a nature which is little understood, these beautiful stewards of the elven forests epitomize the grace and mystery of their people."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_CURES}+{SPECIAL_NOTES_MAGICAL}
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/shyde.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/shyde.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/shyde.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/shyde.png"
[/portrait]
[abilities]
{ABILITY_CURES}
[/abilities]

View file

@ -20,18 +20,18 @@
Those able to do so are roughly titled as 'sorceresses' by other races; and certainly are capable of acting the part."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_ARCANE}
die_sound={SOUND_LIST:ELF_FEMALE_HIT}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/elves/transparent/sorceress.png"
[/portrait]
[resistance]
arcane=100
[/resistance]

View file

@ -30,95 +30,95 @@
mirror="true"
image="portraits/monsters/transparent/gryphon.png"
[/portrait] [defense]
mountains=40
[/defense]
[resistance]
arcane=90
[/resistance]
[attack]
name=claws
description=_"claws"
icon=attacks/claws-animal.png
type=blade
range=melee
damage=10
number=3
[/attack]
[movement_anim]
[frame]
begin=0
end=150
image="units/monsters/gryphon-flying-1and3.png"
[/frame]
[frame]
begin=150
end=300
image="units/monsters/gryphon-flying-2.png"
[/frame]
[frame]
begin=300
end=450
image="units/monsters/gryphon-flying-1and3.png"
[/frame]
[frame]
begin=450
end=600
image="units/monsters/gryphon-flying-4.png"
[/frame]
[frame]
begin=600
end=750
image="units/monsters/gryphon-flying-5and7.png"
[/frame]
[frame]
begin=750
end=900
image="units/monsters/gryphon-flying-6.png"
[/frame]
[frame]
begin=900
end=1050
image="units/monsters/gryphon-flying-5and7.png"
[/frame]
[frame]
begin=1050
end=1200
image="units/monsters/gryphon-flying-8.png"
[/frame]
[/movement_anim]
mountains=40
[/defense]
[resistance]
arcane=90
[/resistance]
[attack]
name=claws
description=_"claws"
icon=attacks/claws-animal.png
type=blade
range=melee
damage=10
number=3
[/attack]
[movement_anim]
[frame]
begin=0
end=150
image="units/monsters/gryphon-flying-1and3.png"
[/frame]
[frame]
begin=150
end=300
image="units/monsters/gryphon-flying-2.png"
[/frame]
[frame]
begin=300
end=450
image="units/monsters/gryphon-flying-1and3.png"
[/frame]
[frame]
begin=450
end=600
image="units/monsters/gryphon-flying-4.png"
[/frame]
[frame]
begin=600
end=750
image="units/monsters/gryphon-flying-5and7.png"
[/frame]
[frame]
begin=750
end=900
image="units/monsters/gryphon-flying-6.png"
[/frame]
[frame]
begin=900
end=1050
image="units/monsters/gryphon-flying-5and7.png"
[/frame]
[frame]
begin=1050
end=1200
image="units/monsters/gryphon-flying-8.png"
[/frame]
[/movement_anim]
{DEFENSE_ANIM "units/monsters/gryphon-attack.png" "units/monsters/gryphon-flying-8.png" {SOUND_LIST:GRYPHON_HIT} }
[attack_anim]
[filter_attack]
name=claws
[/filter_attack]
{DEFENSE_ANIM "units/monsters/gryphon-attack.png" "units/monsters/gryphon-flying-8.png" {SOUND_LIST:GRYPHON_HIT} }
[attack_anim]
[filter_attack]
name=claws
[/filter_attack]
[frame]
begin=-200
end=-100
image="units/monsters/gryphon-flying-8.png"
[/frame]
[if]
hits=no
[frame]
begin=-200
end=-100
image="units/monsters/gryphon-flying-8.png"
begin=-100
end=100
image="units/monsters/gryphon-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[if]
hits=no
[frame]
begin=-100
end=100
image="units/monsters/gryphon-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/if]
[else]
hits=yes
[frame]
begin=-100
end=100
image="units/monsters/gryphon-attack.png"
sound=claws.ogg
[/frame]
[/else]
[/if]
[else]
hits=yes
[frame]
begin=100
end=200
image="units/monsters/gryphon-flying-8.png"
begin=-100
end=100
image="units/monsters/gryphon-attack.png"
sound=claws.ogg
[/frame]
[/attack_anim]
[/else]
[frame]
begin=100
end=200
image="units/monsters/gryphon-flying-8.png"
[/frame]
[/attack_anim]
[/unit_type]

View file

@ -34,7 +34,7 @@
number=2
[/attack]
[standing_anim]
layer=60
layer=60
start_time=0
[frame]
duration=150

View file

@ -35,7 +35,7 @@
[/attack]
[standing_anim]
start_time=0
layer=60
layer=60
[frame]
duration=150
image="units/dwarves/gryphon-rider-flying-1.png"

View file

@ -20,18 +20,18 @@
die_sound={SOUND_LIST:HUMAN_DIE}
usage=fighter
{DEFENSE_ANIM "units/human-loyalists/heavyinfantry-defend-2.png" "units/human-loyalists/heavyinfantry-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/heavy-infantry.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/heavy-infantry.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/heavy-infantry.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/heavy-infantry.png"
[/portrait]
[attack]
name=mace
description=_"mace"

View file

@ -25,7 +25,7 @@
description= _ "Trained at swords and crossbows, Lieutenants lead small groups of human soldiers, coordinating their attacks."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-defend.png" "units/human-loyalists/lieutenant.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-crossbow-defend.png" "units/human-loyalists/lieutenant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-crossbow-defend.png" "units/human-loyalists/lieutenant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[portrait]
size=400
side="left"

View file

@ -23,18 +23,18 @@
blade=80
impact=80
[/resistance]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/royal-guard.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/royal-guard.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/royal-guard.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/royal-guard.png"
[/portrait]
[attack]
name=sword
description=_"sword"

View file

@ -19,18 +19,18 @@
usage=fighter
description= _ "Swords are, for many, an expensive luxury, and one which peasants can ill afford. Spears are much easier to make and will do well even without a spearhead, though most can afford one. Clad in leather armor, and often armed with a shield and a few javelins, spearmen are the staple of most armies, often thrown into the front lines with only the most basic training."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}
die_sound={SOUND_LIST:HUMAN_DIE}
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/spearman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/spearman.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/spearman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/spearman.png"
[/portrait]
[death]
[frame]
begin=0

View file

@ -18,18 +18,18 @@
description= _ "An experienced soldier will often save enough to equip himself with a suit of scale or chain armor, and a sturdy broadsword. Though trading their spears for swords can be a jarring change, most spearmen will leap at the chance, knowing all too well the limitations of the weapon they are leaving behind. A sword is not without its own drawbacks, but is more versatile than a spear, and much better in close quarters."
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/human-loyalists/swordsman-defend.png" "units/human-loyalists/swordsman.png" {SOUND_LIST:HUMAN_HIT} }
[portrait]
size=400
side="left"
mirror="true"
image="portraits/humans/transparent/swordsman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/swordsman.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="true"
image="portraits/humans/transparent/swordsman.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/swordsman.png"
[/portrait]
[resistance]
blade=80
impact=80

View file

@ -177,18 +177,18 @@ Physically frail, and lacking familiarity with combat, magi do possess certain a
profile="portraits/humans/mage+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/mage+female-defend.png" "units/human-magi/mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage+female.png"
[/portrait]
#ifdef __UNUSED__
# FIXME: Commented out because these images are in 1.2 size and style
[death]

View file

@ -174,18 +174,18 @@ Though not trained for any sort of combat, if need arises an Arch Mage can unlea
profile="portraits/humans/mage-arch+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/arch-mage+female-defend.png" "units/human-magi/arch-mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[attack_anim]
[filter_attack]
name=fireball

View file

@ -22,18 +22,18 @@
Though they are not warriors, by any means, the application of their art to combat is something that often causes other soldiers to stand aside in awe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
die_sound={SOUND_LIST:HUMAN_OLD_DIE}
{DEFENSE_ANIM "units/human-magi/great-mage-defend.png" "units/human-magi/great-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch.png"
[/portrait]
[resistance]
fire=70
[/resistance]
@ -135,18 +135,18 @@ Though they are not warriors, by any means, the application of their art to comb
profile="portraits/humans/mage-arch+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/great-mage+female-defend.png" "units/human-magi/great-mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-arch+female.png"
[/portrait]
[attack_anim]
[filter_attack]
name=fireball

View file

@ -160,18 +160,18 @@ Though physically frail, and untrained as warriors, the 'Red Magi' have a number
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
profile="portraits/humans/mage-red+female.png"
{DEFENSE_ANIM "units/human-magi/red-mage+female-defend.png" "units/human-magi/red-mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-red+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-red+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-red+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-red+female.png"
[/portrait]
#ifdef __UNUSED__
# FIXME: Commented out because these images are in 1.2 size and style
[death]

View file

@ -286,21 +286,21 @@ Silver magi are often more physically adept than other magi, and their skills ar
profile="portraits/humans/mage-silver+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/silver-mage+female-defend.png" "units/human-magi/silver-mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
# Upon Kitty's request only on the left side.
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-silver+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="right"
mirror="true"
image=" "
[/portrait]
# Upon Kitty's request only on the left side.
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-silver+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="right"
mirror="true"
image=" "
[/portrait]
[attack_anim]
[filter_attack]
name=missile

View file

@ -280,21 +280,21 @@ Though not trained for combat, they are a potent ally against magical or unnatur
profile="portraits/humans/mage-white+female.png~RIGHT()"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/white-mage+female-defend.png" "units/human-magi/white-mage+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
# Upon Kitty's request only on the right side.
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/mage-white+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="left"
mirror="true"
image=" "
[/portrait]
# Upon Kitty's request only on the right side.
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/mage-white+female.png"
[/portrait]
# Single sided portraits are not properly supported yet so use an
# invalid image to override the inherited version.
[portrait]
size=400
side="left"
mirror="true"
image=" "
[/portrait]
#ifdef __UNUSED__
# FIXME: Commented out because these images are in 1.2 size and style
[death]

View file

@ -248,18 +248,18 @@ Following a strict code of piety and honor, these men and women work tirelessly
profile="portraits/humans/mage-light+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/human-magi/white-cleric+female-defend.png" "units/human-magi/white-cleric+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-light+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-light+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/mage-light+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/mage-light+female.png"
[/portrait]
[healing_anim]
[frame]
image="units/human-magi/white-cleric+female-magic-1.png"

View file

@ -20,18 +20,18 @@
description= _ "Peasants are the backbone of the rural economy, and the soldiers of last resort. While not warlike by nature, they will stubbornly defend their homes. However, if you're hurling peasants at your foes, you're clearly out of superior forces."
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/human-peasants/peasant-defend.png" "units/human-peasants/peasant.png" {SOUND_LIST:HUMAN_OLD_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/peasant.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/peasant.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/peasant.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/peasant.png"
[/portrait]
[attack]
name=pitchfork
description=_"pitchfork"

View file

@ -49,7 +49,7 @@
[if]
hits=yes
[frame]
duration=100
duration=100
image="units/nagas/myrmidon-melee-2.png"
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
@ -57,7 +57,7 @@
[else]
hits=no
[frame]
duration=100
duration=100
image="units/nagas/myrmidon-melee-2.png"
sound={SOUND_LIST:MISS}
[/frame]

View file

@ -46,7 +46,7 @@
[if]
hits=yes
[frame]
duration=100
duration=100
image="units/nagas/warrior-melee-2.png"
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
@ -54,7 +54,7 @@
[else]
hits=no
[frame]
duration=100
duration=100
image="units/nagas/warrior-melee-2.png"
sound={SOUND_LIST:MISS}
[/frame]

View file

@ -151,7 +151,7 @@
[if]
hits=yes
[frame]
duration=100
duration=100
image="units/saurians/oracle-melee-2.png"
sound=staff.wav
[/frame]
@ -159,7 +159,7 @@
[else]
hits=no
[frame]
duration=100
duration=100
image="units/saurians/oracle-melee-2.png"
sound={SOUND_LIST:MISS}
[/frame]

View file

@ -151,7 +151,7 @@
[if]
hits=yes
[frame]
duration=100
duration=100
image="units/saurians/soothsayer-melee-2.png"
sound=staff.wav
[/frame]
@ -159,7 +159,7 @@
[else]
hits=no
[frame]
duration=100
duration=100
image="units/saurians/soothsayer-melee-2.png"
sound={SOUND_LIST:MISS}
[/frame]

View file

@ -217,19 +217,19 @@ In such condition, their only weapon is the craft they have so committed themsel
In such condition, their only weapon is the craft they have so committed themselves to learning."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/undead-necromancers/adept+female-defend-2.png" "units/undead-necromancers/adept+female-defend-1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/humans/transparent/dark-adept+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/dark-adept+female.png"
[/portrait]
# Base image is drawn for the right side.
[portrait]
size=400
side="left"
mirror="true"
image="portraits/humans/transparent/dark-adept+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="false"
image="portraits/humans/transparent/dark-adept+female.png"
[/portrait]
[attack_anim]
[filter_attack]
range=ranged

View file

@ -21,18 +21,18 @@
Despite any design they may have of using this to wrest their own immortality from nature's grasp, the first results of their work have immediate, and unpleasant applications. The life they breathe into dead matter can create servants for them, servants which will work, but which will also kill, and will never question their masters. These creations have a loyalty any tyrant would dream of, and it is tempting to those with even the merest desire for power."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/undead-necromancers/dark-sorcerer-defend.png" "units/undead-necromancers/dark-sorcerer.png" {SOUND_LIST:HUMAN_OLD_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[attack]
name=staff
description=_"staff"
@ -196,18 +196,18 @@ Despite any design they may have of using this to wrest their own immortality fr
Despite any design they may have of using this to wrest their own immortality from nature's grasp, the first results of their work have immediate, and unpleasant applications. The life they breathe into dead matter can create servants for them, servants which will work, but which will also kill, and will never question their mistress. These creations have a loyalty any tyrant would dream of, and it is tempting to those with even the merest desire for power."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/undead-necromancers/dark-sorcerer+female-defend.png" "units/undead-necromancers/dark-sorcerer+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[attack_anim]
[filter_attack]
range=ranged

View file

@ -22,18 +22,18 @@
This ability, in all aspects, is the first step towards cheating death of its ultimate prize."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_PLAGUE}+{SPECIAL_NOTES_ARCANE}
die_sound={SOUND_LIST:HUMAN_OLD_DIE}
{DEFENSE_ANIM "units/undead-necromancers/necromancer-defend.png" "units/undead-necromancers/necromancer.png" {SOUND_LIST:HUMAN_OLD_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer.png"
[/portrait]
[attack]
name=plague staff
description=_"plague staff"
@ -197,18 +197,18 @@ This ability, in all aspects, is the first step towards cheating death of its ul
profile="portraits/humans/necromancer+female.png"
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "units/undead-necromancers/necromancer+female-defend.png" "units/undead-necromancers/necromancer+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="left"
mirror="false"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[portrait]
size=400
side="right"
mirror="true"
image="portraits/humans/transparent/necromancer+female.png"
[/portrait]
[attack_anim]
[filter_attack]
range=ranged

View file

@ -99,7 +99,7 @@ His home to steal the Basilisk's gold.
{UNIT_STONE "Saurian Flanker" _"Xikkrisx" 40 8}
[+unit]
facing=sw
facing=sw
# wmllint: local spelling Xikkrisx Syrsszk Rysssrylosszkk Oxsrrsk
# wmllint: local spelling Ruaskkolin Xraxss Hesx-rzzak Ney'yks
# wmllint: local spelling Chak'kso dragonbane
@ -209,5 +209,5 @@ she hasn't moved her eyes
[/unit]
[/side]
#undef UNIT_STONE
#undef UNIT_STONE
[/multiplayer]

View file

@ -1572,26 +1572,26 @@ The weather will also change randomly, affecting the layout of the map.
[/message]
[/event]
#undef RANDOMIZE
#undef RANDOMIZE_INDEX
#undef PLACE_SPAWN_GROUP
#undef ADJUST_AGGRESSION
#undef SPAWN_UNIT
#undef ADJUST_UNIT_LEVEL
#undef CLEAR_SPAWN_GROUP
#undef REMOVE_SPAWN_GROUP
#undef VICTORY_CHECK_FROM_TURN
#undef FINAL_SPAWN
#undef REGULAR_RANDOM_SPAWNS
#undef DEFINE_MAIN_GROUP
#undef ADD_MAIN_SPAWN
#undef DEFINE_SPAWN_LOCATION
#undef DEFINE_FIXED_GROUP
#undef ADD_FIXED_SPAWN
#undef SET_TIMID_AI_AND_BOLD_AI
#undef WEATHER_EVENT_AT
#undef WEATHER_MAP
#undef WEATHER_ALERT
#undef ADJUST_WEATHER
#undef INIT_WEATHER
#undef RANDOMIZE
#undef RANDOMIZE_INDEX
#undef PLACE_SPAWN_GROUP
#undef ADJUST_AGGRESSION
#undef SPAWN_UNIT
#undef ADJUST_UNIT_LEVEL
#undef CLEAR_SPAWN_GROUP
#undef REMOVE_SPAWN_GROUP
#undef VICTORY_CHECK_FROM_TURN
#undef FINAL_SPAWN
#undef REGULAR_RANDOM_SPAWNS
#undef DEFINE_MAIN_GROUP
#undef ADD_MAIN_SPAWN
#undef DEFINE_SPAWN_LOCATION
#undef DEFINE_FIXED_GROUP
#undef ADD_FIXED_SPAWN
#undef SET_TIMID_AI_AND_BOLD_AI
#undef WEATHER_EVENT_AT
#undef WEATHER_MAP
#undef WEATHER_ALERT
#undef ADJUST_WEATHER
#undef INIT_WEATHER
[/multiplayer]

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