Get rid of another private unit generator.

We now have what ought to be a fairly complete orthogonal set in
unit-utils.cfg.
This commit is contained in:
Eric S. Raymond 2008-11-19 19:55:13 +00:00
parent e0478fbd84
commit ab7cc8c348
7 changed files with 80 additions and 80 deletions

View file

@ -2131,7 +2131,7 @@ This unit always strikes first with this attack, even if they are defending."
equals=$orc_warning
[/variable]
[then]
{FREE_UNIT (Desert Scout) (Elven Scout) ( _ "Wounded Elven Scout") 1 1 1}
{NAMED_UNIT 1 (Desert Scout) 1 1 (Elven Scout) ( _ "Wounded Elven Scout") (upkeep=free)}
[message]
speaker=Elven Scout
message=_"Orcs... Not far behind me... From the hills..."

View file

@ -1437,7 +1437,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
{NAMED_UNIT 2 (Javelineer) 33 44 (Bellerin) ( _ "Bellerin") (upkeep=free)}
[redraw]
[/redraw]
@ -1448,7 +1448,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
{NAMED_UNIT 2 (Swordsman) 34 44 (Durth) ( _ "Durth") (upkeep=free)}
[redraw]
[/redraw]
@ -1459,7 +1459,7 @@
y=42,43,43
[/move_unit_fake]
{FREE_UNIT (Bowman) (Othgar) ( _ "Othgar") 2 34 43}
{NAMED_UNIT 2 (Bowman) 34 43 (Othgar) ( _ "Othgar") (upkeep=free)}
[redraw]
[/redraw]
@ -1474,7 +1474,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
{NAMED_UNIT 2 (Javelineer) 33 44 (Bellerin) ( _ "Bellerin") (upkeep=free)}
[redraw]
[/redraw]
@ -1485,7 +1485,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
{NAMED_UNIT 2 (Swordsman) 34 44 (Durth) ( _ "Durth") (upkeep=free)}
[redraw]
[/redraw]
@ -1496,7 +1496,7 @@
y=42,43,43
[/move_unit_fake]
{FREE_UNIT (Longbowman) (Othgar) ( _ "Othgar") 2 34 43}
{NAMED_UNIT 2 (Longbowman) 34 43 (Othgar) ( _ "Othgar") (upkeep=free)}
[redraw]
[/redraw]
@ -1511,7 +1511,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
{NAMED_UNIT 2 (Javelineer) 33 44 (Bellerin) ( _ "Bellerin") (upkeep=free)}
[redraw]
[/redraw]
@ -1522,7 +1522,7 @@
y=42,43,43,44
[/move_unit_fake]
{FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
{NAMED_UNIT 2 (Swordsman) 34 44 (Durth) ( _ "Durth") (upkeep=free)}
[redraw]
[/redraw]
@ -1533,7 +1533,7 @@
y=42,43,43
[/move_unit_fake]
{FREE_UNIT (Master Bowman) (Othgar) ( _ "Othgar") 2 34 43}
{NAMED_UNIT 2 (Master Bowman) 34 43 (Othgar) ( _ "Othgar") (upkeep=free)}
[redraw]
[/redraw]
@ -2143,22 +2143,22 @@
# HARD: 2 necrophages, 2 skeletons
#ifdef EASY
{FREE_UNIT (Soulless) (Gate Guard) ( _ "Gate Guard") 3 21 48}
{FREE_UNIT (Ghoul) (Gate Guard) ( _ "Gate Guard") 3 24 46}
{NAMED_UNIT 3 (Soulless) 21 48 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
{NAMED_UNIT 3 (Ghoul) 24 46 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
#endif
#ifdef NORMAL
{FREE_UNIT (Ghoul) (Gate Guard) ( _ "Gate Guard") 3 21 48}
{FREE_UNIT (Necrophage) (Gate Guard) ( _ "Gate Guard") 3 24 46}
{NAMED_UNIT 3 (Ghoul) 21 48 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
{NAMED_UNIT 3 (Necrophage) 24 46 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
#endif
#ifdef HARD
{FREE_UNIT (Necrophage) (Gate Guard) ( _ "Gate Guard") 3 21 48}
{FREE_UNIT (Necrophage) (Gate Guard) ( _ "Gate Guard") 3 24 46}
{NAMED_UNIT 3 (Necrophage) 21 48 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
{NAMED_UNIT 3 (Necrophage) 24 46 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
#endif
{FREE_UNIT (Skeleton) (Gate Guard) ( _ "Gate Guard") 3 22 45}
{FREE_UNIT (Skeleton) (Gate Guard) ( _ "Gate Guard") 3 20 46}
{NAMED_UNIT 3 (Skeleton) 22 45 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
{NAMED_UNIT 3 (Skeleton) 20 46 (Gate Guard) ( _ "Gate Guard") (upkeep=free)}
[/then]
[/if]
[/event]
@ -2467,8 +2467,8 @@
# I replaced the water snake units with soulless units
# I deleted the water snake units becuase they lacked proper animation
{FREE_UNIT (Soulless) (Bloated Corpse) ( _ "Bloated Corpse") 3 7 48}
{FREE_UNIT (Soulless) (Bloated Corpse) ( _ "Bloated Corpse") 3 8 49}
{NAMED_UNIT 3 (Soulless) 7 48 (Bloated Corpse) ( _ "Bloated Corpse") (upkeep=free)}
{NAMED_UNIT 3 (Soulless) 8 49 (Bloated Corpse) ( _ "Bloated Corpse") (upkeep=free)}
[/event]
# Event 8: Training Hall
@ -2539,11 +2539,11 @@
#create wraith and ghosts
{FREE_UNIT (Haunt) (Blessed Kali) ( _ "Blessed Kali") 3 9 40}
{NAMED_UNIT 3 (Haunt) 9 40 (Blessed Kali) ( _ "Blessed Kali") (upkeep=free)}
{FREE_UNIT (Ghost) (Novice Pior) ( _ "Novice Pior") 3 9 43}
{FREE_UNIT (Ghost) (Novice Iona) ( _ "Novice Iona") 3 11 41}
{FREE_UNIT (Ghost) (Novice Dani) ( _ "Novice Dani") 3 12 42}
{NAMED_UNIT 3 (Ghost) 9 43 (Novice Pior) ( _ "Novice Pior") (upkeep=free)}
{NAMED_UNIT 3 (Ghost) 11 41 (Novice Iona) ( _ "Novice Iona") (upkeep=free)}
{NAMED_UNIT 3 (Ghost) 12 42 (Novice Dani) ( _ "Novice Dani") (upkeep=free)}
# wmllint: recognize Blessed Kali
# wmllint: recognize Novice Pior
@ -2704,7 +2704,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Dani) ( _ "Novice Dani") 3 12 42}
{NAMED_UNIT 3 (Ghost) 12 42 (Novice Dani) ( _ "Novice Dani") (upkeep=free)}
[/then]
[/if]
@ -2715,7 +2715,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Iona) ( _ "Novice Iona") 3 11 41}
{NAMED_UNIT 3 (Ghost) 11 41 (Novice Iona) ( _ "Novice Iona") (upkeep=free)}
[/then]
[/if]
@ -2726,7 +2726,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Pior) ( _ "Novice Pior") 3 9 43}
{NAMED_UNIT 3 (Ghost) 9 43 (Novice Pior) ( _ "Novice Pior") (upkeep=free)}
[/then]
[/if]
[/then]
@ -2809,7 +2809,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Dani) ( _ "Novice Dani") 3 13 43}
{NAMED_UNIT 3 (Ghost) 13 43 (Novice Dani) ( _ "Novice Dani") (upkeep=free)}
[/then]
[/if]
@ -2820,7 +2820,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Iona) ( _ "Novice Iona") 3 11 41}
{NAMED_UNIT 3 (Ghost) 11 41 (Novice Iona) ( _ "Novice Iona") (upkeep=free)}
[/then]
[/if]
@ -2831,7 +2831,7 @@
[/variable]
[then]
{FREE_UNIT (Ghost) (Novice Pior) ( _ "Novice Pior") 3 9 43}
{NAMED_UNIT 3 (Ghost) 9 43 (Novice Pior) ( _ "Novice Pior") (upkeep=free)}
[/then]
[/if]
@ -2934,21 +2934,21 @@
message= _ "This must have been the barracks. Remains of cots and beds litter the floor. Whatever happened here, it must have been sudden. Several skeletons still lie in their beds, sleeping for eternity."
[/message]
{FREE_UNIT (Skeleton) (Restless Dead) ( _ "Restless Dead") 3 15 40}
{FREE_UNIT (Skeleton Archer) (Restless Dead) ( _ "Restless Dead") 3 14 36}
{NAMED_UNIT 3 (Skeleton) 15 40 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
{NAMED_UNIT 3 (Skeleton Archer) 14 36 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
#ifdef HARD
{FREE_UNIT (Deathblade) (Restless Dead) ( _ "Restless Dead") 3 13 39}
{NAMED_UNIT 3 (Deathblade) 13 39 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
#else
{FREE_UNIT (Skeleton) (Restless Dead) ( _ "Restless Dead") 3 13 39}
{NAMED_UNIT 3 (Skeleton) 13 39 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
#endif
#ifdef HARD
{FREE_UNIT (Bone Shooter) (Restless Dead) ( _ "Restless Dead") 3 17 37}
{NAMED_UNIT 3 (Bone Shooter) 17 37 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
#endif
#ifdef NORMAL
{FREE_UNIT (Skeleton Archer) (Restless Dead) ( _ "Restless Dead") 3 17 37}
{NAMED_UNIT 3 (Skeleton Archer) 17 37 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
#endif
# wmllint: recognize Restless Dead
@ -3101,8 +3101,8 @@
{CLEAR_VARIABLE unitstats}
{FREE_UNIT (Crab Man) (Failed Experiment) ( _ "Failed Experiment") 3 17 32}
{FREE_UNIT (Young Ogre) (Failed Experiment) ( _ "Failed Experiment") 3 19 32}
{NAMED_UNIT 3 (Crab Man) 17 32 (Failed Experiment) ( _ "Failed Experiment") (upkeep=free)}
{NAMED_UNIT 3 (Young Ogre) 19 32 (Failed Experiment) ( _ "Failed Experiment") (upkeep=free)}
[message]
speaker=unit
@ -3169,7 +3169,7 @@
x,y=18,29
[/removeitem]
{FREE_UNIT (Flesh Golem) (Kromph) ( _ "Kromph") 1 18 29}
{NAMED_UNIT 1 (Flesh Golem) 18 29 (Kromph) ( _ "Kromph") (upkeep=free)}
# wmllint: recognize Kromph
[/command]
@ -3317,8 +3317,8 @@
[redraw]
[/redraw]
{FREE_UNIT (Ixthala Demon) (Ancient Guardian) ( _ "Ancient Guardian") 9 5 35}
{FREE_UNIT (Ixthala Demon) (Ancient Guardian) ( _ "Ancient Guardian") 9 8 33}
{NAMED_UNIT 9 (Ixthala Demon) 5 35 (Ancient Guardian) ( _ "Ancient Guardian") (upkeep=free)}
{NAMED_UNIT 9 (Ixthala Demon) 8 33 (Ancient Guardian) ( _ "Ancient Guardian") (upkeep=free)}
[message]
x,y=5,35
@ -3491,7 +3491,7 @@
#create crypt guardian unit
{FREE_UNIT (Spider Lich) (Crypt Guardian) ( _ "Crypt Guardian") 3 12 25}
{NAMED_UNIT 3 (Spider Lich) 12 25 (Crypt Guardian) ( _ "Crypt Guardian") (upkeep=free)}
# wmllint: recognize Crypt Guardian
[message]
@ -4516,7 +4516,7 @@
#eloh appears
{FREE_UNIT (Divine Avatar) (Eloh) ( _ "Eloh") 2 30 22}
{NAMED_UNIT 2 (Divine Avatar) 30 22 (Eloh) ( _ "Eloh") (upkeep=free)}
[store_locations]
x,y=$x1,$y1
@ -4722,11 +4722,11 @@
[/delay]
# wmllint: directory spelling Durstrag
{FREE_UNIT (Human Commander) (Sergeant Durstrag) ( _ "Sergeant Durstrag") 2 30 25}
{FREE_UNIT (Dragoon) (Human Guard) ( _ "Human Guard") 2 31 25}
{FREE_UNIT (Dragoon) (Human Guard) ( _ "Human Guard") 2 31 26}
{FREE_UNIT (Swordsman) (Human Guard) ( _ "Human Guard") 2 30 24}
{FREE_UNIT (Longbowman) (Human Guard) ( _ "Human Guard") 2 30 26}
{NAMED_UNIT 2 (Human Commander) 30 25 (Sergeant Durstrag) ( _ "Sergeant Durstrag") (upkeep=free)}
{NAMED_UNIT 2 (Dragoon) 31 25 (Human Guard) ( _ "Human Guard") (upkeep=free)}
{NAMED_UNIT 2 (Dragoon) 31 26 (Human Guard) ( _ "Human Guard") (upkeep=free)}
{NAMED_UNIT 2 (Swordsman) 30 24 (Human Guard) ( _ "Human Guard") (upkeep=free)}
{NAMED_UNIT 2 (Longbowman) 30 26 (Human Guard) ( _ "Human Guard") (upkeep=free)}
# wmllint: recognize Sergeant Durstrag
# wmllint: recognize Human Guard
@ -5226,7 +5226,7 @@
y=32,32,31,30,30
[/move_unit_fake]
{FREE_UNIT (ENightgaunt) (Undead Emissary) ( _ "Undead Emissary") 5 35 30}
{NAMED_UNIT 5 (ENightgaunt) 35 30 (Undead Emissary) ( _ "Undead Emissary") (upkeep=free)}
# wmllint: recognize Undead Emissary
[message]
@ -6162,12 +6162,12 @@
variable=Nymstats
[/store_unit]
{FREE_UNIT (Desert Fighter) (Dummy Unit1) ( _ "Dummy Unit1") 1 66 2}
{FREE_UNIT (Desert Fighter) (Dummy Unit2) ( _ "Dummy Unit2") 1 57 3}
{FREE_UNIT (Desert Archer) (Dummy Unit3) ( _ "Dummy Unit3") 1 65 3}
{FREE_UNIT (Desert Archer) (Dummy Unit4) ( _ "Dummy Unit4") 1 59 2}
{FREE_UNIT (Desert Hunter) (Dummy Unit5) ( _ "Dummy Unit5") 1 58 5}
{FREE_UNIT (Desert Shaman) (Dummy Unit6) ( _ "Dummy Unit6") 1 62 2}
{NAMED_UNIT 1 (Desert Fighter) 66 2 (Dummy Unit1) ( _ "Dummy Unit1") (upkeep=free)}
{NAMED_UNIT 1 (Desert Fighter) 57 3 (Dummy Unit2) ( _ "Dummy Unit2") (upkeep=free)}
{NAMED_UNIT 1 (Desert Archer) 65 3 (Dummy Unit3) ( _ "Dummy Unit3") (upkeep=free)}
{NAMED_UNIT 1 (Desert Archer) 59 2 (Dummy Unit4) ( _ "Dummy Unit4") (upkeep=free)}
{NAMED_UNIT 1 (Desert Hunter) 58 5 (Dummy Unit5) ( _ "Dummy Unit5") (upkeep=free)}
{NAMED_UNIT 1 (Desert Shaman) 62 2 (Dummy Unit6) ( _ "Dummy Unit6") (upkeep=free)}
[scroll_to_unit]
id=Kaleh

View file

@ -1826,11 +1826,11 @@
message= _ "What a dark nasty place. Something smells horrible."
[/message]
#ifdef EASY
{FREE_UNIT (Walking Corpse) (Undead Warden) ( _ "Undead Warden") 4 27 18}
{FREE_UNIT (Walking Corpse) (Undead Warden) ( _ "Undead Warden") 4 28 19}
{NAMED_UNIT 4 (Walking Corpse) 27 18 (Undead Warden) ( _ "Undead Warden") (upkeep=free)}
{NAMED_UNIT 4 (Walking Corpse) 28 19 (Undead Warden) ( _ "Undead Warden") (upkeep=free)}
#else
{FREE_UNIT (Soulless) (Undead Warden) ( _ "Undead Warden") 4 27 18}
{FREE_UNIT (Walking Corpse) (Undead Warden) ( _ "Undead Warden") 4 28 19}
{NAMED_UNIT 4 (Soulless) 27 18 (Undead Warden) ( _ "Undead Warden") (upkeep=free)}
{NAMED_UNIT 4 (Walking Corpse) 28 19 (Undead Warden) ( _ "Undead Warden") (upkeep=free)}
#endif
[/event]
@ -2920,10 +2920,10 @@
# NW base island
{FREE_UNIT (Revenant) (Arisen Warrior) ( _ "Arisen Warrior") 4 17 14}
{FREE_UNIT (Bone Shooter) (Arisen Warrior) ( _ "Arisen Warrior") 4 11 18}
{FREE_UNIT (Skeleton) (Arisen Warrior) ( _ "Arisen Warrior") 4 8 12}
{FREE_UNIT (Skeleton Archer) (Arisen Warrior) ( _ "Arisen Warrior") 4 14 10}
{NAMED_UNIT 4 (Revenant) 17 14 (Arisen Warrior) ( _ "Arisen Warrior") (upkeep=free)}
{NAMED_UNIT 4 (Bone Shooter) 11 18 (Arisen Warrior) ( _ "Arisen Warrior") (upkeep=free)}
{NAMED_UNIT 4 (Skeleton) 8 12 (Arisen Warrior) ( _ "Arisen Warrior") (upkeep=free)}
{NAMED_UNIT 4 (Skeleton Archer) 14 10 (Arisen Warrior) ( _ "Arisen Warrior") (upkeep=free)}
[message]
speaker=Nym

View file

@ -2269,7 +2269,7 @@
{CLEAR_VARIABLE array_length}
{CLEAR_VARIABLE random_string}
{FREE_UNIT (Vampire Bat) (Nocturnal Pest) ( _ "Nocturnal Pest") 6 $temp_x $temp_y}
{NAMED_UNIT 6 (Vampire Bat) $temp_x $temp_y (Nocturnal Pest) ( _ "Nocturnal Pest") (upkeep=free)}
[set_variable]
name=counter
@ -2334,7 +2334,7 @@
{CLEAR_VARIABLE array_length}
{CLEAR_VARIABLE random_string}
{FREE_UNIT (Blood Bat) (Nocturnal Pest) ( _ "Nocturnal Pest") 6 $temp_x $temp_y}
{NAMED_UNIT 6 (Blood Bat) $temp_x $temp_y (Nocturnal Pest) ( _ "Nocturnal Pest") (upkeep=free)}
[set_variable]
name=counter

View file

@ -908,7 +908,7 @@
[/variable]
[then]
{FREE_UNIT (Crawling Horror) () ("") 2 $temp_x $temp_y}
{UNIT 2 (Crawling Horror) $temp_x $temp_y (upkeep=free)}
[set_variable]
name=counter

View file

@ -98,20 +98,6 @@ multiply=-1
#enddef
# wmlindent: stop ignoring
# create a unit with no upkeep
#define FREE_UNIT TYPE ID_STRING NAME_STRING SIDE X Y
[unit]
type={TYPE}
id={ID_STRING}
name={NAME_STRING}
side={SIDE}
upkeep=free
x={X}
y={Y}
[/unit]
#enddef
#define INVOKE_TROLL_VARIATION FILTER
[object]
silent=yes

View file

@ -95,6 +95,20 @@
[/unit]
#enddef
#define NAMED_UNIT SIDE TYPE X Y ID_STRING NAME_STRING WML
# Place a named unit with embedded WML specified.
#
[unit]
side={SIDE}
type={TYPE}
x={X}
y={Y}
id={ID_STRING}
name={NAME_STRING}
{WML}
[/unit]
#enddef
#define NAMED_LOYAL_UNIT SIDE TYPE X Y ID_STRING NAME_STRING
# Creates a unit with the Loyal trait.
#