Cleaned up some clumsy WML and changed duplicate id's to roles instead.
This commit is contained in:
parent
871dab2d25
commit
0cc82225bf
1 changed files with 48 additions and 93 deletions
|
@ -1225,38 +1225,51 @@
|
|||
#Western side
|
||||
#battling over the castle
|
||||
#1 dwarvish fighter, 1 dwarvish thunderer, 1 dwarvish guardsman
|
||||
|
||||
#define DEFENDER SIDE TYPE X Y ROLE NAME_STRING
|
||||
[unit]
|
||||
side={SIDE}
|
||||
type={TYPE}
|
||||
name={NAME_STRING}
|
||||
x={X}
|
||||
y={Y}
|
||||
random_traits=yes
|
||||
upkeep=full
|
||||
role={ROLE}
|
||||
[/unit]
|
||||
#enddef
|
||||
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Fighter) 30 27 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Thunderer) 30 25 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Guardsman) 29 30 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 4 (Dwarvish Fighter) 30 27 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 4 (Dwarvish Thunderer) 30 25 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 4 (Dwarvish Guardsman) 29 30 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
|
||||
#2 troll whelps
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Whelp) 31 30 (Troll Defender) ( _ "Troll Defender")}
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Whelp) 29 28 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll Whelp) 31 30 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Whelp) 29 28 (Troll Defender) ( _ "Troll Defender")}
|
||||
|
||||
#western reinforcements
|
||||
|
||||
#1 dwarvish berserker, 1 dwarvish steelclad (captain), 1 dwarvish fighter, (added: 1 dwarvish scout)
|
||||
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Ulfserker) 30 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 4 (Dwarvish Ulfserker) 30 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Steelclad) 32 20 (Dwarf Leader) ( _ "Dwarf Leader")}
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Fighter) 34 22 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Fighter) 34 22 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
|
||||
{NAMED_GENERIC_UNIT 4 (Dwarvish Scout) 34 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 4 (Dwarvish Scout) 34 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
|
||||
#2 troll whelps, 1 troll rocklobber, 1 shaman (captain)
|
||||
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Whelp) 29 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Whelp) 29 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
|
||||
#unit was originally a troll
|
||||
#ifdef HARD
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Whelp) 34 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Whelp) 34 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
#endif
|
||||
|
||||
#ifdef EASY
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Whelp) 33 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Whelp) 33 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
#else
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Rocklobber) 33 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Rocklobber) 33 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
#endif
|
||||
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Shaman) 28 33 (Troll Leader) ( _ "Troll Leader")}
|
||||
|
@ -1266,7 +1279,7 @@
|
|||
|
||||
#ifdef EASY
|
||||
#else
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Thunderer) 35 20 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Thunderer) 35 20 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
#endif
|
||||
|
||||
#Eastern side
|
||||
|
@ -1274,33 +1287,35 @@
|
|||
|
||||
#1 dwarvish steelclad, 1 dwarvish guardsman, 1 dwarvish thunderer
|
||||
#1 dwarvish pathfinder
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Steelclad) 40 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Guardsman) 39 24 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Thunderer) 42 23 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Pathfinder) 44 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Steelclad) 40 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Guardsman) 39 24 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Thunderer) 42 23 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Pathfinder) 44 26 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
|
||||
#1 troll whelp, 1 troll, 1 troll rocklobber
|
||||
{NAMED_GENERIC_UNIT 2 (Troll Whelp) 41 27 (Troll Defender) ( _ "Troll Defender")}
|
||||
{NAMED_GENERIC_UNIT 3 (Troll) 42 29 (Troll Defender) ( _ "Troll Defender")}
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Rocklobber) 39 29 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 2 (Troll Whelp) 41 27 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll) 42 29 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll Rocklobber) 39 29 (Troll Defender) ( _ "Troll Defender")}
|
||||
|
||||
#eastern reinforcements
|
||||
|
||||
#1 dwarvish steelclad, 1 dwarvish fighter
|
||||
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Steelclad) 42 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Steelclad) 42 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
|
||||
#ifdef HARD
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Fighter) 39 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
{DEFENDER 5 (Dwarvish Fighter) 39 21 (Dwarf Defender) ( _ "Dwarf Defender")}
|
||||
#endif
|
||||
|
||||
#2 troll whelps, 1 shaman
|
||||
|
||||
#ifdef HARD
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Whelp) 37 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll Whelp) 37 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
#endif
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Whelp) 42 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Shaman) 44 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll Whelp) 42 32 (Troll Defender) ( _ "Troll Defender")}
|
||||
{DEFENDER 3 (Troll Shaman) 44 31 (Troll Defender) ( _ "Troll Defender")}
|
||||
|
||||
#undef DEFENDER
|
||||
|
||||
# wmllint: recognize Dwarf Leader
|
||||
# wmllint: recognize Troll Leader
|
||||
|
@ -1842,21 +1857,7 @@
|
|||
{TRAIT_QUICK}
|
||||
[/modifications]
|
||||
[/unit]
|
||||
|
||||
[set_variable]
|
||||
name=number_enemies
|
||||
value=12
|
||||
[/set_variable]
|
||||
|
||||
#change description of units on enemy side
|
||||
|
||||
[set_variable]
|
||||
name=i
|
||||
value=$number_enemies
|
||||
[/set_variable]
|
||||
|
||||
{STARTLOOP i}
|
||||
|
||||
|
||||
[if]
|
||||
[variable]
|
||||
name=elvish_ally
|
||||
|
@ -1864,60 +1865,14 @@
|
|||
[/variable]
|
||||
|
||||
[then]
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=Dwarf Defender
|
||||
[/filter]
|
||||
variable=unitstats
|
||||
[/store_unit]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.id
|
||||
value=Dwarf Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.name
|
||||
value=_ "Dwarf Skirmisher"
|
||||
[/set_variable]
|
||||
|
||||
[unstore_unit]
|
||||
variable=unitstats
|
||||
[/unstore_unit]
|
||||
|
||||
{CLEAR_VARIABLE unitstats}
|
||||
{MODIFY_UNIT (role=Dwarf Defender) name _"Dwarf Skirmisher"}
|
||||
[/then]
|
||||
|
||||
|
||||
[else]
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=Troll Defender
|
||||
[/filter]
|
||||
variable=unitstats
|
||||
[/store_unit]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.id
|
||||
value=Troll Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.name
|
||||
value=_ "Troll Skirmisher"
|
||||
[/set_variable]
|
||||
|
||||
[unstore_unit]
|
||||
variable=unitstats
|
||||
[/unstore_unit]
|
||||
|
||||
{CLEAR_VARIABLE unitstats}
|
||||
{MODIFY_UNIT (role=Troll Defender) name _"Troll Skirmisher"}
|
||||
[/else]
|
||||
[/if]
|
||||
|
||||
{CLEAR_VARIABLE unitstats}
|
||||
|
||||
{ENDLOOP i}
|
||||
|
||||
#destroy ally's villages in the tunnels
|
||||
[if]
|
||||
[variable]
|
||||
|
@ -2164,7 +2119,7 @@
|
|||
x=24-46
|
||||
y=19-35
|
||||
[filter]
|
||||
id="Dwarf Defender"
|
||||
role="Dwarf Defender"
|
||||
[/filter]
|
||||
variable=dwarf_list
|
||||
[/store_locations]
|
||||
|
@ -2221,7 +2176,7 @@
|
|||
x=24-46
|
||||
y=19-35
|
||||
[filter]
|
||||
id="Dwarf Defender"
|
||||
role="Dwarf Defender"
|
||||
[/filter]
|
||||
variable=dwarf_victims
|
||||
[/store_locations]
|
||||
|
@ -2424,7 +2379,7 @@
|
|||
x=24-46
|
||||
y=19-35
|
||||
[filter]
|
||||
id="Troll Defender"
|
||||
role="Troll Defender"
|
||||
[/filter]
|
||||
variable=troll_list
|
||||
[/store_locations]
|
||||
|
@ -2481,7 +2436,7 @@
|
|||
x=24-46
|
||||
y=19-35
|
||||
[filter]
|
||||
id="Troll Defender"
|
||||
role="Troll Defender"
|
||||
[/filter]
|
||||
variable=troll_victims
|
||||
[/store_locations]
|
||||
|
|
Loading…
Add table
Reference in a new issue