Ported 2010-04-07T07:02:35Z!lari.nieminen@iki.fi to trunk.

This commit is contained in:
Lari Nieminen 2010-04-07 07:07:51 +00:00
parent 445a5060f6
commit 683e871580
8 changed files with 53 additions and 244 deletions

View file

@ -62,31 +62,12 @@
[/side]
[side]
type=Orcish Warlord
id="Al'Brock"
name= _ "Al'Brock"
side=2
canrecruit=yes
profile=portraits/albrock.png
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{IS_HERO}
{ALBROCK_SIDE}
{GOLD 300 250 200}
[/side]
[side]
type=Orcish Warlord
id="Flar'Tar"
name= _ "Flar'Tar"
side=3
canrecruit=yes
profile=portraits/flartar.png
facing=sw
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{IS_HERO}
{FLARTAR_SIDE}
{GOLD 300 250 200}
[/side]
@ -245,12 +226,6 @@
[event]
name=enemies defeated
# FIXME: Save their followers for when they are generals again.
{MODIFY_UNIT id="Al'Brock" side 1}
{MODIFY_UNIT id="Al'Brock" canrecruit no}
{MODIFY_UNIT id="Flar'Tar" side 1}
{MODIFY_UNIT id="Flar'Tar" canrecruit no}
[endlevel]
result=victory
bonus=yes

View file

@ -60,20 +60,12 @@
[/side]
[side]
side=2
no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{ALBROCK_SIDE}
{GOLD 200 150 100}
[/side]
[side]
side=3
no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{FLARTAR_SIDE}
{GOLD 200 150 100}
[/side]
@ -151,16 +143,6 @@
[event]
name=prestart
[recall]
id="Al'Brock"
x,y=13,18
[/recall]
[recall]
id="Flar'Tar"
x,y=2,12
[/recall]
[store_unit]
[filter]
id="Kapou'e"
@ -219,9 +201,6 @@
variable=stored_Kapoue
[/unstore_unit]
{VARIABLE stored_AlBrock.side 2}
{VARIABLE stored_AlBrock.canrecruit yes}
[move_unit_fake]
type=Orcish Warlord
side=2
@ -233,9 +212,6 @@
variable=stored_AlBrock
[/unstore_unit]
{VARIABLE stored_FlarTar.side 3}
{VARIABLE stored_FlarTar.canrecruit yes}
[move_unit_fake]
type=Orcish Warlord
side=3
@ -320,11 +296,6 @@
message= _ "A human-worm's dog. Animal meat very tasty. When we fight humans again, can I have a pony?"
[/message]
{MODIFY_UNIT (id="Al'Brock") canrecruit no}
{MODIFY_UNIT (id="Al'Brock") side 1}
{MODIFY_UNIT (id="Flar'Tar") canrecruit no}
{MODIFY_UNIT (id="Flar'Tar") side 1}
[endlevel]
result=victory
bonus=yes

View file

@ -64,17 +64,11 @@
{STARTING_VILLAGES 1 2}
[side]
side=2
no_leader=yes
team_name=Kapoue
user_team_name=_ "Kapou'e"
{ALBROCK_SIDE}
[/side]
[side]
side=3
no_leader=yes
team_name=Kapoue
user_team_name=_ "Kapou'e"
{FLARTAR_SIDE}
[/side]
[side]
@ -197,46 +191,6 @@
[kill]
id=gruu_recall_enabling_hack_leader
[/kill]
[recall]
id="Al'Brock"
x,y=4,34
[/recall]
[recall]
id="Flar'Tar"
x,y=5,35
[/recall]
[store_unit]
[filter]
id="Al'Brock"
[/filter]
variable=stored_AlBrock
kill=yes
[/store_unit]
[store_unit]
[filter]
id="Flar'Tar"
[/filter]
variable=stored_FlarTar
kill=yes
[/store_unit]
{VARIABLE stored_AlBrock.side 2}
{VARIABLE stored_AlBrock.canrecruit yes}
{VARIABLE stored_FlarTar.side 3}
{VARIABLE stored_FlarTar.canrecruit yes}
[unstore_unit]
variable=stored_AlBrock
[/unstore_unit]
[unstore_unit]
variable=stored_FlarTar
[/unstore_unit]
[/event]
{GOT_THE_GREAT_HORDE 1,2,3,4}
@ -257,6 +211,7 @@
[role]
type=Orcish Warlord,Orcish Warrior,Orcish Grunt,Direwolf Rider,Goblin Pillager,Goblin Knight,Wolf Rider
x,y=recall,recall
side=1
role=army
[/role]
@ -324,13 +279,21 @@
message= _ "Whatever."
[/message]
[kill]
id="Flar'Tar"
[/kill]
[store_unit]
[filter]
id="Al'Brock"
[/filter]
variable=stored_AlBrock
kill=yes
[/store_unit]
[kill]
id="Al'Brock"
[/kill]
[store_unit]
[filter]
id="Flar'Tar"
[/filter]
variable=stored_FlarTar
kill=yes
[/store_unit]
[message]
speaker=Grüü
@ -790,12 +753,6 @@
[/not]
) side 1}
{MODIFY_UNIT (id="Al'Brock") side 1}
{MODIFY_UNIT (id="Al'Brock") canrecruit no}
{MODIFY_UNIT (id="Flar'Tar") side 1}
{MODIFY_UNIT (id="Flar'Tar") canrecruit no}
{CLEAR_VARIABLE stored_Gruu_side,stored_Gruu,stored_trolls}
[endlevel]

View file

@ -186,30 +186,6 @@
[/part]
[/story]
[event]
name=prestart
# wmllint: recognize Al'Brock
[store_unit]
[filter]
id="Al'Brock"
[/filter]
kill=yes
variable=stored_AlBrock
[/store_unit]
# wmllint: recognize Flar'Tar
[store_unit]
[filter]
id="Flar'Tar"
[/filter]
kill=yes
variable=stored_FlarTar
[/store_unit]
[/event]
{GOT_THE_GREAT_HORDE 1}
[event]
@ -680,5 +656,4 @@
[/event]
{campaigns/Son_Of_The_Black_Eye/utils/deaths.cfg}
{GENERALS_MUST_SURVIVE}
[/scenario]

View file

@ -344,5 +344,4 @@
[/event]
{campaigns/Son_Of_The_Black_Eye/utils/deaths.cfg}
{GENERALS_MUST_SURVIVE}
[/scenario]

View file

@ -63,30 +63,14 @@
{STARTING_VILLAGES 1 10}
[side]
type=Orcish Warlord
id="Al'Brock"
name= _ "Al'Brock"
side=2
canrecruit=yes
profile=portraits/albrock.png
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
{ALBROCK_SIDE}
{GOLD 300 250 200}
[/side]
{STARTING_VILLAGES 2 6}
[side]
type=Orcish Warlord
id="Flar'Tar"
name= _ "Flar'Tar"
side=3
canrecruit=yes
profile=portraits/flartar.png
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
{FLARTAR_SIDE}
{GOLD 300 250 200}
[/side]
@ -163,48 +147,6 @@
[event]
name=prestart
[if]
[variable]
name=stored_AlBrock.length
equals=1
[/variable]
[then]
{VARIABLE stored_AlBrock.x 11}
{VARIABLE stored_AlBrock.y 10}
{VARIABLE stored_AlBrock.side 2}
{VARIABLE stored_AlBrock.canrecruit yes}
[unstore_unit]
variable=stored_AlBrock
find_vacant=no
[/unstore_unit]
{CLEAR_VARIABLE stored_AlBrock}
[/then]
[/if]
[if]
[variable]
name=stored_FlarTar.length
equals=1
[/variable]
[then]
{VARIABLE stored_FlarTar.x 33}
{VARIABLE stored_FlarTar.y 10}
{VARIABLE stored_FlarTar.side 3}
{VARIABLE stored_FlarTar.canrecruit yes}
[unstore_unit]
variable=stored_FlarTar
find_vacant=no
[/unstore_unit]
{CLEAR_VARIABLE stored_FlarTar}
[/then]
[/if]
{GENERIC_UNIT 4 Halberdier 21 26}
{GENERIC_UNIT 4 Halberdier 23 26}
@ -805,20 +747,6 @@
speaker="Kapou'e"
message= _ "Funny, that name sounds oddly familiar..."
[/message]
[store_unit]
[filter]
id="Al'Brock"
[/filter]
kill=yes
variable=stored_AlBrock
[/store_unit]
{MODIFY_UNIT (id="Al'Brock") side 1}
{MODIFY_UNIT (id="Al'Brock") canrecruit no}
{MODIFY_UNIT (id="Flar'Tar") side 1}
{MODIFY_UNIT (id="Flar'Tar") canrecruit no}
[/event]
[event]

View file

@ -59,22 +59,14 @@
{STARTING_VILLAGES_AREA 1 22 5 10}
[side]
side=2
no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
{ALBROCK_SIDE}
{GOLD 300 250 200}
[/side]
{STARTING_VILLAGES 2 6}
[side]
side=3
no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
{FLARTAR_SIDE}
{GOLD 300 250 200}
[/side]
@ -196,22 +188,6 @@
[event]
name=prestart
[recall]
id="Al'Brock"
x,y=11,10
[/recall]
{MODIFY_UNIT (id="Al'Brock") side 2}
{MODIFY_UNIT (id="Al'Brock") canrecruit yes}
[recall]
id="Flar'Tar"
x,y=33,10
[/recall]
{MODIFY_UNIT (id="Flar'Tar") side 3}
{MODIFY_UNIT (id="Flar'Tar") canrecruit yes}
[recall]
id=Grüü
x,y=45,20

View file

@ -68,6 +68,34 @@
[/if]
#enddef
#define ALBROCK_SIDE
type=Orcish Warlord
id="Al'Brock"
name= _ "Al'Brock"
side=2
canrecruit=yes
profile=portraits/albrock.png
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{IS_HERO}
persistent=yes
#enddef
#define FLARTAR_SIDE
type=Orcish Warlord
id="Flar'Tar"
name= _ "Flar'Tar"
side=3
canrecruit=yes
profile=portraits/flartar.png
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
{IS_HERO}
persistent=yes
#enddef
#define GOT_THE_GREAT_HORDE SIDES
[event]
name=prerecruit