UtBS: add and remove "wmllint: who" and "recognize" magic comments
The main character macros now have "who is" pairings. This, along with the advent of auto-recognition of NAMED_*UNIT ids, makes some "recognize" magic comments unnecessary. Meanwhile, the new "unknown speaker" warning makes adding others necessary. The ally characters still trigger "unknown speaker" warnings. There are two possible solutions: one, to add a set of four "recognize" mcs to several scenarios. The second, which I lean towards, would be to create a macro for the recall of the ally character, and pair it with a "who" mc. I will leave the choice to the UtBS maintainer, however.
This commit is contained in:
Groggy Dice
parent
9689cd0d0b
commit
f6983d516d
12 changed files with 8 additions and 38 deletions
|
|
@ -158,6 +158,7 @@
|
|||
|
||||
# Start with Nym
|
||||
[unit]
|
||||
# wmllint: who NYM is Nym
|
||||
{NYM}
|
||||
x=27
|
||||
y=22
|
||||
|
|
@ -293,7 +294,7 @@
|
|||
# Medium: 2 giant mudcrawlers, 2 small mudcrawlers
|
||||
# Hard: 3 giant mudcrawlers, 1 small mudcrawler
|
||||
|
||||
# wmllint: local spelling Yasi Nisa
|
||||
# wmllint: local spelling Yasi
|
||||
|
||||
# First mudcrawler encounter event trigger
|
||||
[event]
|
||||
|
|
@ -514,6 +515,7 @@
|
|||
#endif
|
||||
|
||||
[unit]
|
||||
# wmllint: who GARAK is Garak
|
||||
{GARAK}
|
||||
x=35
|
||||
y=34
|
||||
|
|
@ -650,6 +652,7 @@
|
|||
message= _ "Is anyone still alive?"
|
||||
[/message]
|
||||
[unit]
|
||||
# wmllint: who ZHUL is Zhul
|
||||
{ZHUL}
|
||||
x=31
|
||||
y=27
|
||||
|
|
|
|||
|
|
@ -1127,7 +1127,7 @@
|
|||
{PLACE_UNITS_RANDOMLY $archers 4 "Skeleton Archer" () ( _ "Undead Raider") (role="ElyssaUndead")}
|
||||
{PLACE_UNITS_RANDOMLY $revenants 4 "Revenant" () ( _ "Undead Raider") (role="ElyssaUndead")}
|
||||
{PLACE_UNITS_RANDOMLY $shooters 4 "Bone Shooter" () ( _ "Undead Raider") (role="ElyssaUndead")}
|
||||
# wmllint: recognize Go’hag
|
||||
# wmllint: recognize Go'hag
|
||||
|
||||
{CLEAR_VARIABLE skeletons}
|
||||
{CLEAR_VARIABLE archers}
|
||||
|
|
|
|||
|
|
@ -285,9 +285,9 @@
|
|||
placement=leader
|
||||
[/unit]
|
||||
|
||||
# wmllint: recognize Garak
|
||||
[unit]
|
||||
{GARAK}
|
||||
# wmllint: unwho GARAK
|
||||
placement=leader
|
||||
[/unit]
|
||||
|
||||
|
|
|
|||
|
|
@ -447,8 +447,6 @@
|
|||
#endif
|
||||
|
||||
#endif
|
||||
# wmllint: recognize Goblin Scout
|
||||
# wmllint: recognize Goblin Coward
|
||||
|
||||
[message]
|
||||
speaker=Goblin Scout
|
||||
|
|
@ -489,7 +487,6 @@
|
|||
#else
|
||||
{NAMED_NOTRAIT_UNIT 2 (Orcish Slayer) 24 32 (Orac) ( _ "Orac")}
|
||||
#endif
|
||||
# wmllint: recognize Orac
|
||||
|
||||
#2 nagas appear at edge of lake
|
||||
|
||||
|
|
@ -498,7 +495,6 @@
|
|||
#else
|
||||
{NAMED_NOTRAIT_UNIT 2 (Naga Warrior) 20 34 (Scylla) ( _ "Scylla")}
|
||||
#endif
|
||||
# wmllint: recognize Scylla
|
||||
#hack to make Scylla female
|
||||
[+unit]
|
||||
gender=female
|
||||
|
|
@ -763,7 +759,6 @@
|
|||
[/filter]
|
||||
|
||||
{NAMED_NOTRAIT_UNIT 4 (Goblin Impaler) 35 7 (Greebo) ( _ "Greebo")}
|
||||
# wmllint: recognize Greebo
|
||||
|
||||
{PLACE_IMAGE items/chest-plain-closed.png 35 6}
|
||||
|
||||
|
|
@ -850,7 +845,6 @@
|
|||
[/object]
|
||||
|
||||
{NAMED_NOTRAIT_UNIT 3 (Dawarf) 14 15 (Purple Abomination) ( _ "Purple Abomination")}
|
||||
# wmllint: recognize Purple Abomination
|
||||
|
||||
[message]
|
||||
speaker=Purple Abomination
|
||||
|
|
|
|||
|
|
@ -688,7 +688,6 @@
|
|||
|
||||
#TODO maybe the wounded dwarf should really be wounded?
|
||||
{NAMED_NOTRAIT_UNIT 4 (Dwarvish Fighter) 21 29 (Wounded Dwarf) ( _ "Wounded Dwarf")}
|
||||
# wmllint: recognize Wounded Dwarf
|
||||
|
||||
[message]
|
||||
speaker=Wounded Dwarf
|
||||
|
|
@ -853,7 +852,6 @@
|
|||
time=200
|
||||
[/delay]
|
||||
|
||||
# wmllint: recognize Zurg
|
||||
# wmllint: recognize Cloaked Figure
|
||||
[message]
|
||||
speaker=Zurg
|
||||
|
|
@ -963,7 +961,6 @@
|
|||
side=1
|
||||
[/redraw]
|
||||
|
||||
# wmllint: recognize Grimnir
|
||||
[message]
|
||||
speaker=Grimnir
|
||||
message= _ "Congratulations, some of me boys didn’t think you could beat the trolls."
|
||||
|
|
@ -1166,8 +1163,6 @@
|
|||
|
||||
#undef DEFENDER
|
||||
|
||||
# wmllint: recognize Dwarf Leader
|
||||
# wmllint: recognize Troll Leader
|
||||
# wmllint: recognize Dwarf Defender
|
||||
# wmllint: recognize Troll Defender
|
||||
|
||||
|
|
@ -1808,7 +1803,6 @@
|
|||
[/move_unit_fake]
|
||||
|
||||
{NAMED_GENERIC_UNIT 3 (Troll Shaman) 43 20 () ( _ "Troll Flamecaster")}
|
||||
# wmllint: recognize Troll Flamecaster
|
||||
#endif
|
||||
|
||||
[message]
|
||||
|
|
@ -2038,7 +2032,6 @@
|
|||
[/move_unit_fake]
|
||||
|
||||
{NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 42 22 () ( _ "Dwarf Grenadier")}
|
||||
# wmllint: recognize Dwarf Grenadier
|
||||
#endif
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -504,7 +504,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
|
|||
#ifndef EASY
|
||||
{NAMED_NOTRAIT_UNIT 3 (Troll Whelp) 21 19 () ( _ "Troll Guard")}
|
||||
#endif
|
||||
# wmllint: recognize Troll Guard
|
||||
|
||||
# Have Grimnir blow the explosives to destroy the wall
|
||||
|
||||
|
|
|
|||
|
|
@ -483,7 +483,6 @@
|
|||
{NAMED_NOTRAIT_UNIT 2 (Dwarvish Scout) 20 34 () ( _ "Dwarf Guard")}
|
||||
{NAMED_NOTRAIT_UNIT 2 (Dwarvish Scout) 24 34 () ( _ "Dwarf Guard")}
|
||||
#endif
|
||||
# wmllint: recognize Dwarf Guard
|
||||
|
||||
# Have Zurg cast spell to destroy wall
|
||||
|
||||
|
|
@ -620,7 +619,6 @@
|
|||
#ifdef HARD
|
||||
{NAMED_GENERIC_UNIT 2 (Dwarvish Fighter) 9 35 () ( _ "Dwarf Conscript")}
|
||||
#endif
|
||||
# wmllint: recognize Dwarf Conscript
|
||||
|
||||
[message]
|
||||
speaker=Dwarf Sergeant
|
||||
|
|
@ -952,7 +950,6 @@
|
|||
[/remove_shroud]
|
||||
|
||||
{NAMED_GENERIC_UNIT 6 (Dwarvish Sentinel) 19 25 (Jorgi) ( _ "Jorgi")}
|
||||
# wmllint: recognize Jorgi
|
||||
|
||||
#ifdef HARD
|
||||
{NAMED_GENERIC_UNIT 6 (Dwarvish Steelclad) 18 26 () ( _ "Dwarf Guard")}
|
||||
|
|
@ -1705,7 +1702,6 @@
|
|||
[/object]
|
||||
|
||||
{NAMED_NOTRAIT_UNIT 5 (Ghost) 47 22 (Angry Ghost) ( _ "Angry Ghost")}
|
||||
# wmllint: recognize Angry Ghost
|
||||
|
||||
[message]
|
||||
speaker=Angry Ghost
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
value=Nog
|
||||
[/set_variable]
|
||||
|
||||
# Nog's traits are is intentionally inferior to Grog's
|
||||
# Nog's traits are intentionally inferior to Grog's
|
||||
[unit]
|
||||
type=Troll
|
||||
id=Nog
|
||||
|
|
|
|||
|
|
@ -884,10 +884,6 @@
|
|||
{NAMED_UNIT 2 {ON_DIFFICULTY (Bowman) (Longbowman) (Master Bowman)} 34 43 (Othgar) ( _ "Othgar") (upkeep=free
|
||||
role=human_scout)}
|
||||
|
||||
# wmllint: recognize Bellerin
|
||||
# wmllint: recognize Durth
|
||||
# wmllint: recognize Othgar
|
||||
|
||||
[message]
|
||||
speaker=Durth
|
||||
# wmllint: local spelling durn
|
||||
|
|
@ -1565,10 +1561,6 @@
|
|||
{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
|
||||
# wmllint: recognize Novice Iona
|
||||
# wmllint: recognize Novice Dani
|
||||
# wmllint: local spelling Kali Pior Iona Dani
|
||||
|
||||
[message]
|
||||
|
|
@ -1996,7 +1988,6 @@
|
|||
[/remove_item]
|
||||
|
||||
{NAMED_UNIT 1 (Flesh Golem) 18 29 (Kromph) ( _ "Kromph") (upkeep=loyal)}
|
||||
# wmllint: recognize Kromph
|
||||
|
||||
[message]
|
||||
speaker=Kromph
|
||||
|
|
@ -2302,7 +2293,6 @@
|
|||
#create crypt guardian unit
|
||||
|
||||
{NAMED_UNIT 3 (Spider Lich) 12 25 (Crypt Guardian) ( _ "Crypt Guardian") (upkeep=free)}
|
||||
# wmllint: recognize Crypt Guardian
|
||||
|
||||
[message]
|
||||
speaker=Crypt Guardian
|
||||
|
|
@ -3074,7 +3064,6 @@
|
|||
|
||||
[then]
|
||||
#if Kaleh isn't the unit moving outside then Eloh calls for him
|
||||
# wmllint: recognize Eloh
|
||||
|
||||
[message]
|
||||
speaker=Eloh
|
||||
|
|
@ -3267,7 +3256,6 @@
|
|||
{NAMED_UNIT 2 (Dragoon) 31 26 () ( _ "Human Guard") (facing=nw)}
|
||||
{NAMED_UNIT 2 (Swordsman) 30 24 () ( _ "Human Guard") (facing=nw)}
|
||||
{NAMED_UNIT 2 (Longbowman) 30 26 () ( _ "Human Guard") (facing=nw)}
|
||||
# wmllint: recognize Sergeant Durstrag
|
||||
|
||||
[message]
|
||||
speaker=Sergeant Durstrag
|
||||
|
|
@ -3687,7 +3675,6 @@
|
|||
[/move_unit_fake]
|
||||
|
||||
{NAMED_UNIT 5 (ENightgaunt) 35 30 (Undead Emissary) ( _ "Undead Emissary") ()}
|
||||
# wmllint: recognize Undead Emissary
|
||||
|
||||
[message]
|
||||
speaker=Undead Emissary
|
||||
|
|
|
|||
|
|
@ -1324,7 +1324,6 @@
|
|||
side=1
|
||||
[/remove_shroud]
|
||||
{NAMED_GENERIC_UNIT 4 (Necromancer) 15 28 (Hekuba) ( _ "Hekuba")}
|
||||
# wmllint: recognize Hekuba
|
||||
[message]
|
||||
speaker=Hekuba
|
||||
message= _ "The time has come, my brethren. On this most holy day, let us sacrifice these infidels unto The Dark Lady. Their suffering shall be a testament to her power and glory!"
|
||||
|
|
@ -1578,7 +1577,6 @@
|
|||
[/remove_shroud]
|
||||
|
||||
{NAMED_NOTRAIT_UNIT 4 (Necromancer) 15 28 (Hekuba) ( _ "Hekuba")}
|
||||
# wmllint: recognize Hekuba
|
||||
|
||||
[message]
|
||||
speaker=Hekuba
|
||||
|
|
|
|||
|
|
@ -1147,7 +1147,6 @@
|
|||
[/filter]
|
||||
|
||||
{NAMED_GENERIC_UNIT 2 (Sea Serpent) 13 9 (Sea Serpent) ( _ "Sea Serpent")}
|
||||
# wmllint: recognize Sea Serpent
|
||||
|
||||
[message]
|
||||
speaker=Sea Serpent
|
||||
|
|
|
|||
|
|
@ -218,6 +218,7 @@
|
|||
|
||||
[unit]
|
||||
{NYM}
|
||||
# wmllint: unwho ALL
|
||||
x,y=10,16
|
||||
[/unit]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue