Skip to content

Commit

Permalink
NR: Decommission GENERIC_GUARDIAN_UNIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@aquileia
aquileia committed Feb 11, 2015
1 parent b337e13 commit 2f05861
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 124 deletions.
28 changes: 14 additions & 14 deletions data/campaigns/Northern_Rebirth/scenarios/06b_Slave_of_the_Undead.cfg
View file
Expand Up @@ -126,20 +126,20 @@
hitpoints=$betrayed_friend.hitpoints
[/unit]

{GENERIC_GUARDIAN_UNIT 2 (Dwarvish Stalwart) 15 10}
{GENERIC_GUARDIAN_UNIT 2 (Bandit) 12 7}
{GENERIC_GUARDIAN_UNIT 2 (Bandit) 18 7}
{GENERIC_GUARDIAN_UNIT 2 (Poacher) 13 7}
{GENERIC_GUARDIAN_UNIT 2 (Poacher) 17 7}
{GENERIC_GUARDIAN_UNIT 2 (Thug) 11 7}
{GENERIC_GUARDIAN_UNIT 2 (Thug) 19 7}
{GENERIC_GUARDIAN_UNIT 2 (Dwarvish Fighter) 14 9}
{GENERIC_GUARDIAN_UNIT 2 (Dwarvish Fighter) 16 9}
{GENERIC_GUARDIAN_UNIT 2 (Dwarvish Thunderer) 15 9}
{GENERIC_UNIT 2 (Dwarvish Steelclad) 16 4}
{GENERIC_UNIT 2 (Bandit) 14 4}
{GENERIC_UNIT 2 (Trapper) 15 4}
{GENERIC_UNIT 2 (Swordsman) 16 3}
{GENERIC_UNIT 2 (Dwarvish Stalwart) 15 10} {GUARDIAN}
{GENERIC_UNIT 2 (Bandit) 12 7} {GUARDIAN}
{GENERIC_UNIT 2 (Bandit) 18 7} {GUARDIAN}
{GENERIC_UNIT 2 (Poacher) 13 7} {GUARDIAN}
{GENERIC_UNIT 2 (Poacher) 17 7} {GUARDIAN}
{GENERIC_UNIT 2 (Thug) 11 7} {GUARDIAN}
{GENERIC_UNIT 2 (Thug) 19 7} {GUARDIAN}
{GENERIC_UNIT 2 (Dwarvish Fighter) 14 9} {GUARDIAN}
{GENERIC_UNIT 2 (Dwarvish Fighter) 16 9} {GUARDIAN}
{GENERIC_UNIT 2 (Dwarvish Thunderer) 15 9} {GUARDIAN}
{GENERIC_UNIT 2 (Dwarvish Steelclad) 16 4}
{GENERIC_UNIT 2 (Bandit) 14 4}
{GENERIC_UNIT 2 (Trapper) 15 4}
{GENERIC_UNIT 2 (Swordsman) 16 3}
{GENERIC_UNIT 1 (Ghost) 14 25}
{GENERIC_UNIT 1 (Ghost) 16 25}
{GENERIC_UNIT 1 (Ghost) 15 26}
Expand Down
90 changes: 45 additions & 45 deletions data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file
Expand Up @@ -228,51 +228,51 @@
{IS_HERO}
[/unit]

{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 10 13}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 11 15}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 12 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 11 13}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 13 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 15 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 9 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 7 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warlord" 9 12}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Slurbow" 12 13}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Slurbow" 10 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Slurbow" 19 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Slurbow" 18 15}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Slurbow" 6 10}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 14 9}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 15 10}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 17 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 18 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 15 19}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 13 19}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 7 18}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 6 17}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 4 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 4 15}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 4 12}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 4 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 8 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 9 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 8 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 9 17}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 13 17}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 16 13}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Warrior" 16 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 12 10}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 14 11}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 16 12}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 16 15}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 14 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 12 17}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 10 17}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 7 16}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 6 14}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 6 13}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 7 12}
{GENERIC_GUARDIAN_UNIT 3 "Orcish Crossbowman" 10 10}
{GENERIC_UNIT 3 "Orcish Warlord" 10 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 11 15} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 12 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 11 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 13 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 15 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 9 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 7 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warlord" 9 12} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Slurbow" 12 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Slurbow" 10 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Slurbow" 19 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Slurbow" 18 15} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Slurbow" 6 10} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 14 9} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 15 10} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 17 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 18 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 15 19} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 13 19} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 7 18} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 6 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 4 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 4 15} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 4 12} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 4 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 8 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 9 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 8 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 9 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 13 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 16 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Warrior" 16 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 12 10} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 14 11} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 16 12} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 16 15} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 14 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 12 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 10 17} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 7 16} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 6 14} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 6 13} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 7 12} {GUARDIAN}
{GENERIC_UNIT 3 "Orcish Crossbowman" 10 10} {GUARDIAN}
[/event]

# do the talk
Expand Down
112 changes: 56 additions & 56 deletions data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file
Expand Up @@ -477,62 +477,62 @@
[/hide_unit]

# Place bad guys
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 28 22}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 29 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 31 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 32 22}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 34 22}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 36 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 38 24}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 25}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 27}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 29}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 31}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 33}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 40 35}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 38 36}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 36 37}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 34 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 33 39}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 31 39}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 29 39}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 27 39}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 25 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 23 37}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 21 36}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 35}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 33}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 31}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 29}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 27}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 20 25}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 22 24}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 24 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Warlord" 26 22}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 33 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 35 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 37 24}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 39 36}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 39 25}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 40 26}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 40 28}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 40 32}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 40 34}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 37 37}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 35 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 32 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 28 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 26 38}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 24 37}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 22 36}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 20 32}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 20 28}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 20 26}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 21 25}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 23 24}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 25 23}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 20 34}
{GENERIC_GUARDIAN_UNIT 2 "Orcish Slurbow" 27 23}
{GENERIC_UNIT 2 "Orcish Warlord" 28 22} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 29 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 31 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 32 22} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 34 22} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 36 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 38 24} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 25} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 27} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 29} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 31} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 33} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 40 35} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 38 36} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 36 37} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 34 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 33 39} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 31 39} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 29 39} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 27 39} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 25 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 23 37} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 21 36} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 35} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 33} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 31} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 29} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 27} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 20 25} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 22 24} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 24 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Warlord" 26 22} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 33 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 35 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 37 24} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 39 36} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 39 25} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 40 26} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 40 28} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 40 32} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 40 34} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 37 37} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 35 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 32 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 28 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 26 38} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 24 37} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 22 36} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 20 32} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 20 28} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 20 26} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 21 25} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 23 24} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 25 23} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 20 34} {GUARDIAN}
{GENERIC_UNIT 2 "Orcish Slurbow" 27 23} {GUARDIAN}
[/event]

[event]
Expand Down
9 changes: 0 additions & 9 deletions data/campaigns/Northern_Rebirth/utils/utils.cfg
View file
Expand Up @@ -82,12 +82,3 @@
#define STORY_PART_HIDEL SPEECH_STRING
{STORY_PART_SPEECH portraits/Hidel.png (_ "Hidel") {SPEECH_STRING} }
#enddef

#macro for spawning a unit with ai guardian special
#define GENERIC_GUARDIAN_UNIT SIDE TYPE X Y
{GENERIC_UNIT {SIDE} {TYPE} {X} {Y} }
[+unit]
ai_special=guardian
animate=no
[/unit]
#enddef

0 comments on commit 2f05861

Please sign in to comment.