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

Get rid of more silly generator macros.

Browse source
This commit is contained in:
Eric S. Raymond 2008-11-20 05:09:15 +00:00
parent 2b5692e83f
commit a151880d5f
8 changed files with 81 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
View file

@ -141,7 +141,7 @@
# wmllint: recognize Lord Karres
# Place manor guards in hallways
{NAMED_UNIT 2 (Halberdier) 10 4 () (_"Guard") (ai_special=guardian)}
{NAMED_NOTRAIT_UNIT 2 (Halberdier) 10 4 () (_"Guard")} {GUARDIAN}
[store_locations]
terrain=Rr
@ -199,7 +199,7 @@
{RANDOM 1..$possible_guard_locations.length}
{VARIABLE_OP random add -1}
{NAMED_UNIT 2 $guardtypetable[$guardtypetable_i].type $possible_guard_locations[$random].x $possible_guard_locations[$random].y () (_ "Guard") (ai_special=guardian)}
{NAMED_NOTRAIT_UNIT 2 $guardtypetable[$guardtypetable_i].type $possible_guard_locations[$random].x $possible_guard_locations[$random].y () (_ "Guard")} {GUARDIAN}
[store_locations]
find_in=possible_guard_locations

12
data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
View file

@ -134,12 +134,12 @@
)}
# Place mages in rooms
{NAMED_UNIT 2 Mage 16 15 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_UNIT 2 Mage 18 15 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_UNIT 2 Mage 22 13 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_UNIT 2 Mage 24 12 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_UNIT 2 Mage 27 10 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_UNIT 2 Mage 29 10 "Guardian" (_"Guardian") (ai_special=guardian)}
{NAMED_NOTRAIT_UNIT 2 Mage 16 15 "Guardian" (_"Guardian")} {GUARDIAN}
{NAMED_NOTRAIT_UNIT 2 Mage 18 15 "Guardian" (_"Guardian")} {GUARDIAN}
{NAMED_NOTRAIT_UNIT 2 Mage 22 13 "Guardian" (_"Guardian")} {GUARDIAN}
{NAMED_NOTRAIT_UNIT 2 Mage 24 12 "Guardian" (_"Guardian")} {GUARDIAN}
{NAMED_NOTRAIT_UNIT 2 Mage 27 10 "Guardian" (_"Guardian")} {GUARDIAN}
{NAMED_NOTRAIT_UNIT 2 Mage 29 10 "Guardian" (_"Guardian")} {GUARDIAN}
# Who has the book?
{VARIABLE hasBook none}

50
data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg
View file

@ -149,35 +149,35 @@
value=0
[/set_variable]
{ELVISH_FIGHTER 18 14}
{ELVISH_FIGHTER 21 12}
{ELVISH_FIGHTER 22 11}
{ELVISH_FIGHTER 18 16}
{GENERIC_UNIT 2 "Elvish Fighter" 18 14}
{GENERIC_UNIT 2 "Elvish Fighter" 21 12}
{GENERIC_UNIT 2 "Elvish Fighter" 22 11}
{GENERIC_UNIT 2 "Elvish Fighter" 18 16}
{ELVISH_FIGHTER 26 15}
{ELVISH_FIGHTER 22 17}
{GENERIC_UNIT 2 "Elvish Fighter" 26 15}
{GENERIC_UNIT 2 "Elvish Fighter" 22 17}
{ELVISH_ARCHER 23 12}
{ELVISH_ARCHER 26 13}
{ELVISH_ARCHER 25 17}
{GENERIC_UNIT 2 "Elvish Archer" 23 12}
{GENERIC_UNIT 2 "Elvish Archer" 26 13}
{GENERIC_UNIT 2 "Elvish Archer" 25 17}
{ELVISH_ARCHER 20 17}
{ELVISH_ARCHER 20 12}
{GENERIC_UNIT 2 "Elvish Archer" 20 17}
{GENERIC_UNIT 2 "Elvish Archer" 20 12}
{ORCISH_ARCHER_G 19 14}
{ORCISH_ARCHER_G 22 13}
{ORCISH_ARCHER_G 20 16}
{GENERIC_UNIT 3 "Orcish Archer" 19 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Archer" 22 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Archer" 20 16} {GUARDIAN}
{ORCISH_ARCHER_G 23 17}
{ORCISH_ARCHER_G 24 14}
{GENERIC_UNIT 3 "Orcish Archer" 23 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Archer" 24 14} {GUARDIAN}
{ORCISH_GRUNT_G 24 16}
{ORCISH_GRUNT_G 22 12}
{ORCISH_GRUNT_G 20 13}
{ORCISH_GRUNT_G 19 16}
{GENERIC_UNIT 3 "Orcish Grunt" 24 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Grunt" 22 12} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Grunt" 20 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Grunt" 19 16} {GUARDIAN}
{ORCISH_GRUNT_G 25 15}
{ORCISH_GRUNT_G 22 16}
{GENERIC_UNIT 3 "Orcish Grunt" 25 15} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Grunt" 22 16} {GUARDIAN}
{ORCISH_SHAMAN 22 14 Pirk _"Pirk"}
{OLD_ORCISH_SHAMAN 22 15 Gork _"Gork"}
{NOVICE_ORCISH_SHAMAN 21 15 Vraurk _"Vraurk"}
@ -197,9 +197,9 @@
image=items/cage.png
[/item]
{ELVISH_FIGHTER_G 5 30}
{ELVISH_CAPTAIN_G 7 29}
{ELVISH_FIGHTER_G 9 30}
{GENERIC_UNIT 2 "Elvish Fighter" 5 30} {GUARDIAN}
{GENERIC_UNIT 2 "Elvish Captain" 7 29} {GUARDIAN}
{GENERIC_UNIT 2 "Elvish Fighter" 9 30} {GUARDIAN}
[/event]
[event]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
View file

@ -252,7 +252,7 @@
[/variable]
[then]
{TRANSPORT_GALLEON 1 30}
{NOTRAIT_UNIT 3 "Transport Galleon" 1 30}
[/then]
[/if]
[/event]

20
data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
View file

@ -180,20 +180,20 @@
message= _ "We don't have any other choice. If we remain here we'll die."
[/message]
{SCORPION 10 10}
{SCORPION 11 8}
{SCORPION 17 11}
{SCORPION 8 7}
{SCORPION 11 15}
{NOTRAIT_UNIT 3 "Giant Scorpion" 10 10}
{NOTRAIT_UNIT 3 "Giant Scorpion" 11 8}
{NOTRAIT_UNIT 3 "Giant Scorpion" 17 11}
{NOTRAIT_UNIT 3 "Giant Scorpion" 8 7}
{NOTRAIT_UNIT 3 "Giant Scorpion" 11 15}
#ifdef NORMAL
{SCORPION 13 3}
{NOTRAIT_UNIT 3 "Giant Scorpion" 13 3}
#endif
#ifdef HARD
{SCORPION 6 11}
{SCORPION 13 3}
{NOTRAIT_UNIT 3 "Giant Scorpion" 6 11}
{NOTRAIT_UNIT 3 "Giant Scorpion" 13 3}
#endif
{SCORPION 26 4}
{SCORPION 11 22}
{NOTRAIT_UNIT 3 "Giant Scorpion" 26 4}
{NOTRAIT_UNIT 3 "Giant Scorpion" 11 22}
[/event]
[event]

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

@ -138,13 +138,13 @@
[/modifications]
[/unit]
{WATCH_TOWER 30 5 (Eastern Tower)}
{WATCH_TOWER 10 4 (Western Tower)}
{WATCH_TOWER 19 5 (Southern Tower)}
{ELVISH_FIGHTER_G 19 11}
{ELVISH_FIGHTER_G 19 12}
{ELVISH_ARCHER_G 20 11}
{ELVISH_ARCHER_G 18 11}
{NAMED_UNIT 1 (Watch Tower) 30 5 (Eastern Tower) (_"Eastern Tower") (upkeep=free)}
{NAMED_UNIT 1 (Watch Tower) 10 4 (Western Tower) (_"Western Tower") (upkeep=free)}
{NAMED_UNIT 1 (Watch Tower) 19 5 (Southern Tower) (_"Southern Tower") (upkeep=free)}
{GENERIC_UNIT 2 "Elvish Fighter" 19 11} {GUARDIAN}
{GENERIC_UNIT 2 "Elvish Fighter" 19 12} {GUARDIAN}
{GENERIC_UNIT 2 "Elvish Archer" 20 11} {GUARDIAN}
{GENERIC_UNIT 2 "Elvish Archer" 18 11} {GUARDIAN}
[unit]
type=Dwarvish Guardsman
@ -244,15 +244,15 @@
[/modifications]
[/unit]
{SAURIAN 8 42}
{SAURIAN 8 42}
{SAURIAN 8 42}
{SAURIAN_HEALER 8 42}
{SAURIAN_HEALER 8 42}
{SAURIAN_HEALER 8 42}
{SAURIAN 8 42}
{SAURIAN 8 42}
{SAURIAN 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
{GENERIC_UNIT 1 "Saurian Augur" 8 42}
{GENERIC_UNIT 1 "Saurian Augur" 8 42}
{GENERIC_UNIT 1 "Saurian Augur" 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
{GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}
[message]
speaker="Inarix"
@ -663,13 +663,13 @@
y=42
random_traits=no
[/unit]
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{HEAVY_INFANTRYMAN 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
{GENERIC_UNIT 2 "Heavy Infantryman" 8 42}
[message]
speaker="Earl Lanbec'h"
message= _ "At them! Rip them to the last!"

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

@ -172,9 +172,9 @@
type=Watch Tower
fire_event=no
[/kill]
{WATCH_TOWER 30 5 (Eastern Tower)}
{WATCH_TOWER 10 4 (Western Tower)}
{WATCH_TOWER 19 5 (Southern Tower)}
{NAMED_UNIT 1 (Watch Tower) 30 5 (Eastern Tower) (_"Eastern Tower") (upkeep=free)}
{NAMED_UNIT 1 (Watch Tower) 10 4 (Western Tower) (_"Western Tower") (upkeep=free)}
{NAMED_UNIT 1 (Watch Tower) 19 5 (Southern Tower) (_"Southern Tower") (upkeep=free)}
[role]
type=Orcish Warlord,Troll Warrior,Orcish Warrior,Saurian Ambusher,Troll,Orcish Grunt,Saurian Skirmisher,Troll Whelp
role=cannonfodder
@ -346,17 +346,17 @@
[event]
name=time over
{ORCISH_GRUNT 38 1}
{ORCISH_GRUNT 38 1}
{ORCISH_GRUNT 38 1}
{ORCISH_ARCHER 38 1}
{ORCISH_ARCHER 38 1}
{ORCISH_ARCHER 38 1}
{WOLF_RIDER 38 1}
{WOLF_RIDER 38 1}
{WOLF_RIDER 38 1}
{WOLF_RIDER 38 1}
{WOLF_RIDER 38 1}
{GENERIC_UNIT 1 "Orcish Grunt" 38 1}
{GENERIC_UNIT 1 "Orcish Grunt" 38 1}
{GENERIC_UNIT 1 "Orcish Grunt" 38 1}
{GENERIC_UNIT 1 "Orcish Archer" 38 1}
{GENERIC_UNIT 1 "Orcish Archer" 38 1}
{GENERIC_UNIT 1 "Orcish Archer" 38 1}
{GENERIC_UNIT 1 "Wolf Rider" 38 1}
{GENERIC_UNIT 1 "Wolf Rider" 38 1}
{GENERIC_UNIT 1 "Wolf Rider" 38 1}
{GENERIC_UNIT 1 "Wolf Rider" 38 1}
{GENERIC_UNIT 1 "Wolf Rider" 38 1}
{ORCISH_SHAMAN 38 1 Pirk _"Pirk"}
{OLD_ORCISH_SHAMAN 38 1 Gork _"Gork"}
{NOVICE_ORCISH_SHAMAN 38 1 Vraurk _"Vraurk"}

216
data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
View file

@ -1,123 +1,5 @@
#textdomain wesnoth-sotbe
#define ELVISH_FIGHTER X Y
[unit]
type=Elvish Fighter
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ELVISH_FIGHTER_G X Y
[unit]
type=Elvish Fighter
ai_special=guardian
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ELVISH_ARCHER_G X Y
[unit]
type=Elvish Archer
ai_special=guardian
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ELVISH_CAPTAIN_G X Y
[unit]
type=Elvish Captain
ai_special=guardian
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ELVISH_ARCHER X Y
[unit]
type=Elvish Archer
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ORCISH_GRUNT_G X Y
[unit]
type=Orcish Grunt
side=3
generate_name=yes
random_traits=yes
ai_special=guardian
x={X}
y={Y}
[/unit]
#enddef
#define ORCISH_ARCHER_G X Y
[unit]
type=Orcish Archer
side=3
generate_name=yes
random_traits=yes
ai_special=guardian
x={X}
y={Y}
[/unit]
#enddef
#define ORCISH_GRUNT X Y
[unit]
type=Orcish Grunt
side=1
generate_name=yes
random_traits=yes
ai_special=guardian
x={X}
y={Y}
[/unit]
#enddef
#define ORCISH_ARCHER X Y
[unit]
type=Orcish Archer
side=1
generate_name=yes
random_traits=yes
ai_special=guardian
x={X}
y={Y}
[/unit]
#enddef
#define WOLF_RIDER X Y
[unit]
type=Wolf Rider
side=1
generate_name=yes
random_traits=yes
ai_special=guardian
x={X}
y={Y}
[/unit]
#enddef
#define OLD_ORCISH_SHAMAN X Y ID_STRING NAME_STRING
[unit]
id={ID_STRING}
@ -166,109 +48,11 @@
[/unit]
#enddef
#define WATCH_TOWER X Y ID_STRING
[unit]
id={ID_STRING}
type=Watch Tower
side=1
x={X}
y={Y}
upkeep=free
[/unit]
#enddef
#define TRANSPORT_GALLEON X Y
[unit]
side=3
type=Transport Galleon
x={X}
y={Y}
[/unit]
#enddef
#define SCORPION X Y
[unit]
type=Giant Scorpion
side=3
x={X}
y={Y}
[/unit]
#enddef
#define SAURIAN X Y
[unit]
type=Saurian Skirmisher
side=1
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define SAURIAN_HEALER X Y
[unit]
type=Saurian Augur
side=1
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define MERMAN X Y ID_STRING
[unit]
side=5
type=Merman Fighter
id={ID_STRING}
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define HEAVY_INFANTRYMAN X Y
[unit]
type=Heavy Infantryman
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define BLACK_FLAG
flag=flags/black-flag-1.png:100,flags/black-flag-2.png:300,flags/black-flag-1.png:100,flags/black-flag-3.png:300
flag_icon=flags/black-flag-icon.png
#enddef
#define HUMAN_GUARD X Y
[unit]
type=Pikeman
ai_special=guardian
side=4
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define ORC_GUARD X Y
[unit]
type=Orcish Warrior
ai_special=guardian
side=2
generate_name=yes
random_traits=yes
x={X}
y={Y}
[/unit]
#enddef
#define RENAME_IF_DEAD VAR NAME STRING
[if]
[variable]