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

Fully integrate Dwarven Scout line into mainline.

Browse source
This commit is contained in:
Eric S. Raymond 2009-05-19 14:09:26 +00:00
parent 71a59825dc
commit af0a0a5292
29 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Delfadors_Memoirs/utils/dm-macros.cfg
View file

@ -5,10 +5,10 @@
#enddef
#define DWARVES
Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker#enddef
Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout#enddef
#define DWARVES2
Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Berserker#enddef
Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Berserker,Dwarvish Pathfinder#enddef
#define ELVES
Elvish Fighter,Elvish Archer,Elvish Scout,Elvish Shaman#enddef

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

@ -195,7 +195,7 @@
x,y=20,3
canrecruit=yes
[/unit]
{ALLOW_RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish Ulfserker,Dwarvish Berserker,Gryphon Rider,Gryphon Master)}
{ALLOW_RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish Ulfserker,Dwarvish Berserker,Dwarvish Scout,Dwarvish Pathfinder,Gryphon Rider,Gryphon Master)}
{INCIDENTAL_MUSIC knalgan_theme.ogg}
[music]

4
data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
View file

@ -44,9 +44,9 @@
canrecruit=yes
controller=ai
#ifdef EASY
recruit=Dwarvish Thunderguard,Dwarvish Steelclad,Dwarvish Fighter
recruit=Dwarvish Thunderguard,Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Scout
#else
recruit=Dwarvish Thunderguard,Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Berserker
recruit=Dwarvish Thunderguard,Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Berserker,Dwarvish Pathfinder
#endif
{GOLD 150 200 300}
[/side]

2
data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
View file

@ -90,7 +90,7 @@
canrecruit=yes
side=4
{GOLD4 150 130 120 100}
recruit=Dwarvish Fighter,Dwarvish Thunderer
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
team_name=rebels
user_team_name=_"Rebels"
[ai]

2
data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
View file

@ -98,7 +98,7 @@
side=1
controller=human
{GOLD4 250 200 150 100}
recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Footpad
[/side]
[side]

15
data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
View file

@ -21,7 +21,7 @@
side=1
controller=human
{GOLD4 550 450 400 350}
recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Footpad
team_name=alliance
user_team_name=_"Alliance"
[/side]
@ -107,6 +107,10 @@
type=Dwarvish Thunderer
role=dwarven_guard
[/role]
[role]
type=Dwarvish Scout
role=dwarven_guard
[/role]
[recall]
role=dwarven_guard
[/recall]
@ -520,7 +524,7 @@
# [/message]
# [disallow_recruit]
# side=1
# type=Dwarvish Fighter,Dwarvish Thunderer,Peasant,Thug,Poacher,Woodsman,Footpad
# type=Dwarvish Fighter,Dwarvish Thunderer,Peasant,Thug,Poacher,Woodsman,Dwarvish Scout,Footpad
# [/disallow_recruit]
# [store_unit]
# [filter]
@ -722,7 +726,7 @@
message= _ "So it shall be."
[/message]
[role]
type=Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Dragonguard,Dwarvish Thunderguard,Dwarvish Thunderer
type=Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Dragonguard,Dwarvish Thunderguard,Dwarvish Thunderer,Dwarvish Explorer,Dwarvish Pathfinder,Dwarvish Scout
role=follower
[/role]
[message]
@ -737,7 +741,8 @@
role=follower
message= _ "Thank you, Lord Hamel."
[/message]
# Lord Hamel becomes unavailable for following scenarios until the big showdown.
# Lord Hamel becomes unavailable for following scenarios until the '
# big showdown.
[kill]
id=Hamel
animate=no
@ -745,7 +750,7 @@
[/kill]
[disallow_recruit]
side=1
type=Dwarvish Fighter,Dwarvish Thunderer
type=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Dwarvish Guardsman
[/disallow_recruit]
[endlevel]
result=victory

2
data/campaigns/Northern_Rebirth/scenarios/07b_Protecting_the_Master.cfg
View file

@ -119,7 +119,7 @@
team_name=knalgans
user_team_name=_"Knalgans"
{GOLD4 700 800 900 1000}
recruit=Thug,Trapper,Peasant,Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Guardsman,Dwarvish Stalwart,Poacher,Footpad,Outlaw
recruit=Thug,Trapper,Peasant,Dwarvish Steelclad,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Guardsman,Dwarvish Stalwart,Dwarvish Scout,Dwarvish Pathfinder,Poacher,Footpad,Outlaw
[village]
x=5
y=33

2
data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file

@ -179,7 +179,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Footpad
team_name=knalgans
user_team_name=_"Knalgans"
[/side]

2
data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
View file

@ -21,7 +21,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Footpad
team_name=knalgans
user_team_name=_"Knalgans"
shroud=yes

2
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View file

@ -310,7 +310,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Footpad
team_name=alliance
user_team_name=_"Alliance"
gold=200

2
data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
View file

@ -32,7 +32,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Gryphon,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Footpad
team_name=knalgans
user_team_name=_"Alliance"
[/side]

2
data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
View file

@ -125,7 +125,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Gryphon,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Gryphon,Footpad
team_name=knalgans
user_team_name=_"Alliance"
[/side]

2
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -43,7 +43,7 @@
canrecruit=yes
side=1
controller=human
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Gryphon,Footpad
recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Ulfserker,Dwarvish Scout,Gryphon,Footpad
team_name=knalgans
user_team_name=_"Alliance"
gold=100

2
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
View file

@ -21,7 +21,7 @@
facing=sw
profile=portraits/rugnur.png
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
team_name=good
user_team_name=_"Allies"
[/side]

2
data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
View file

@ -19,7 +19,7 @@
canrecruit=yes
shroud=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
[/side]
# Give Rugnur control of all the non-boneyard villages inside the cave.

4
data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
View file

@ -16,7 +16,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
gold=0
[/side]
@ -28,7 +28,7 @@
canrecruit=yes
profile=portraits/durstorn.png
facing=sw
recruit=Dwarvish Fighter
recruit=Dwarvish Fighter,Dwarvish Guardsman
[/side]
{STARTING_VILLAGES 2 20}

2
data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
View file

@ -18,7 +18,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
shroud=yes
fog=yes
[/side]

4
data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
View file

@ -16,7 +16,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
gold=0
[/side]
@ -27,7 +27,7 @@
side=2
canrecruit=yes
profile=portraits/durstorn.png
recruit=Dwarvish Fighter
recruit=Dwarvish Fighter,Dwarvish Guardsman
[/side]
{STARTING_VILLAGES 2 20}

2
data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
View file

@ -787,7 +787,7 @@
id=Rugnur
side=1
canrecruit=yes
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider,Dwarvish Miner
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider,Dwarvish Miner
controller=human
shroud=yes
[/side]

4
data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
View file

@ -16,7 +16,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
gold=0
[/side]
@ -27,7 +27,7 @@
side=2
canrecruit=yes
profile=portraits/durstorn.png
recruit=Dwarvish Fighter
recruit=Dwarvish Fighter,Dwarvish Guardsman
[/side]
{STARTING_VILLAGES 2 20}

4
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
View file

@ -17,7 +17,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
gold=200
[village]
x,y=5,2
@ -33,7 +33,7 @@
name= _ "Glonoin"
side=2
canrecruit=yes
{RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Guardsman) (Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Thunderer,Dwarvish Guardsman) (Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Thunderer,Dwarvish Stalwart)}
{RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Guardsman) (Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Thunderer,Dwarvish Guardsman) (Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Thunderer,Dwarvish Stalwart,Dwarvish Pathfinder,Dwarvish Scout)}
{GOLD 200 300 400}
[ai]
recruitment_pattern=fighter,fighter,fighter,mixed fighter

2
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
View file

@ -18,7 +18,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
gold=200
[/side]

2
data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
View file

@ -25,7 +25,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
gold=200
shroud=yes
[/side]

2
data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
View file

@ -13,7 +13,7 @@
side=1
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon Rider
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
team_name=good
user_team_name=_"Allies"
[/side]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
View file

@ -86,7 +86,7 @@
name= _ "Kwili"
side=2
canrecruit=yes
recruit=Dwarvish Fighter, Dwarvish Thunderer
recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout
[ai]
recruitment_pattern=fighter,fighter,mixed fighter
[/ai]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
View file

@ -109,7 +109,7 @@
value=50
[/target]
[/ai]
recruit=Dwarvish Fighter, Dwarvish Thunderer, Footpad, Bandit
recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Footpad, Bandit
team_name=villains
user_team_name=_"Villains"
{GOLD 200 250 300}

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
View file

@ -108,7 +108,7 @@
recruitment_ignore_bad_movement=yes
village_value=20
[/ai]
recruit=Dwarvish Fighter, Dwarvish Thunderer, Bandit, Gryphon Rider
recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Bandit, Gryphon Rider
user_team_name=_"Villains"
team_name=villains
{GOLD 200 250 300}

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
View file

@ -75,7 +75,7 @@
name= _ "Darstang"
side=4
canrecruit=yes
recruit=Dwarvish Fighter, Dwarvish Thunderer, Gryphon Rider, Dwarvish Steelclad
recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Gryphon Rider, Dwarvish Steelclad
team_name=villains
user_team_name=_"Villains"
{GOLD 350 400 450}

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
View file

@ -150,7 +150,7 @@
side=6
canrecruit=yes
facing=sw
recruit=Gryphon Rider, Gryphon Master, Spearman, Swordsman, Javelineer, Pikeman, Dwarvish Steelclad, Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Thunderguard, Bowman, Longbowman, Mage, White Mage, Red Mage, Fencer, Duelist
recruit=Gryphon Rider, Gryphon Master, Spearman, Swordsman, Javelineer, Pikeman, Dwarvish Steelclad, Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Thunderguard, Dwarvish Scout, Dwarvish Pathfinder, Bowman, Longbowman, Mage, White Mage, Red Mage, Fencer, Duelist
team_name=Kapoue
user_team_name=_ "Kapou'e"
{GOLD 400 350 300}