Skip to content

Commit

Permalink
NR: Explicitly specify redundant side parameter in unit macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Apr 6, 2018
1 parent 7383e4a commit 58bb287
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 156 deletions.
8 changes: 4 additions & 4 deletions data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
View file
Expand Up @@ -110,10 +110,10 @@
recruitment_pattern=fighter,fighter,fighter,mixed fighter
[/ai]

{NOTRAIT_UNIT () "Dwarvish Stalwart" 31 28} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT () "Dwarvish Stalwart" 28 21} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT () "Dwarvish Stalwart" 32 21} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT () "Dwarvish Stalwart" 24 25} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT 4 "Dwarvish Stalwart" 31 28} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT 4 "Dwarvish Stalwart" 28 21} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT 4 "Dwarvish Stalwart" 32 21} {GUARDIAN} {NO_UPKEEP}
{NOTRAIT_UNIT 4 "Dwarvish Stalwart" 24 25} {GUARDIAN} {NO_UPKEEP}
[/side]

[side]
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Northern_Rebirth/scenarios/02_02_Meeting_With_Dwarves.cfg
View file
Expand Up @@ -52,8 +52,8 @@
facing=se
shroud=yes

{NOTRAIT_UNIT () "Dwarvish Stalwart" 10 5} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT () "Dwarvish Stalwart" 6 11} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT 2 "Dwarvish Stalwart" 10 5} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT 2 "Dwarvish Stalwart" 6 11} {GUARDIAN} {FACING se}
[/side]

{PLACE_IMAGE items/box.png 16 8}
Expand Down
74 changes: 37 additions & 37 deletions data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
View file
Expand Up @@ -50,15 +50,15 @@
profile=portraits/Malifor.png
canrecruit=yes

{LOYAL_UNIT () Skeleton 29 8} {GUARDIAN}
{LOYAL_UNIT () Skeleton 29 10} {GUARDIAN}
{LOYAL_UNIT () Skeleton 31 7} {GUARDIAN}
{LOYAL_UNIT () Skeleton 31 11} {GUARDIAN}
{LOYAL_UNIT () Skeleton 33 8} {GUARDIAN}
{LOYAL_UNIT () Skeleton 33 10} {GUARDIAN}

{LOYAL_UNIT () "Skeleton Archer" 34 4} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 37 6} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 29 8} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 29 10} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 31 7} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 31 11} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 33 8} {GUARDIAN}
{LOYAL_UNIT 2 Skeleton 33 10} {GUARDIAN}

{LOYAL_UNIT 2 "Skeleton Archer" 34 4} {GUARDIAN}
{LOYAL_UNIT 2 "Skeleton Archer" 37 6} {GUARDIAN}
[/side]

[side]
Expand All @@ -75,14 +75,14 @@
name= _ "Thorin"
canrecruit=yes

{LOYAL_UNIT () Skeleton 11 22} {GUARDIAN}
{LOYAL_UNIT () Skeleton 11 24} {GUARDIAN}
{LOYAL_UNIT () Skeleton 16 25} {GUARDIAN}
{LOYAL_UNIT () Skeleton 4 26} {GUARDIAN}
{LOYAL_UNIT () Skeleton 8 26} {GUARDIAN}
{LOYAL_UNIT 3 Skeleton 11 22} {GUARDIAN}
{LOYAL_UNIT 3 Skeleton 11 24} {GUARDIAN}
{LOYAL_UNIT 3 Skeleton 16 25} {GUARDIAN}
{LOYAL_UNIT 3 Skeleton 4 26} {GUARDIAN}
{LOYAL_UNIT 3 Skeleton 8 26} {GUARDIAN}

{LOYAL_UNIT () "Skeleton Archer" 7 29} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 17 21} {GUARDIAN}
{LOYAL_UNIT 3 "Skeleton Archer" 7 29} {GUARDIAN}
{LOYAL_UNIT 3 "Skeleton Archer" 17 21} {GUARDIAN}
[/side]

[side]
Expand All @@ -99,15 +99,15 @@
name= _ "Herlin"
canrecruit=yes

{LOYAL_UNIT () Skeleton 33 32} {GUARDIAN}
{LOYAL_UNIT () Skeleton 34 35} {GUARDIAN}
{LOYAL_UNIT () Skeleton 24 29} {GUARDIAN}
{LOYAL_UNIT () Skeleton 28 28} {GUARDIAN}
{LOYAL_UNIT 4 Skeleton 33 32} {GUARDIAN}
{LOYAL_UNIT 4 Skeleton 34 35} {GUARDIAN}
{LOYAL_UNIT 4 Skeleton 24 29} {GUARDIAN}
{LOYAL_UNIT 4 Skeleton 28 28} {GUARDIAN}

{LOYAL_UNIT () "Skeleton Archer" 17 34} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 14 37} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 21 26} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 24 24} {GUARDIAN}
{LOYAL_UNIT 4 "Skeleton Archer" 17 34} {GUARDIAN}
{LOYAL_UNIT 4 "Skeleton Archer" 14 37} {GUARDIAN}
{LOYAL_UNIT 4 "Skeleton Archer" 21 26} {GUARDIAN}
{LOYAL_UNIT 4 "Skeleton Archer" 24 24} {GUARDIAN}
[/side]

[side]
Expand All @@ -124,13 +124,13 @@
name= _ "Fervin"
canrecruit=yes

{LOYAL_UNIT () Skeleton 27 18} {GUARDIAN}
{LOYAL_UNIT () Skeleton 28 21} {GUARDIAN}
{LOYAL_UNIT () Skeleton 37 20} {GUARDIAN}
{LOYAL_UNIT 5 Skeleton 27 18} {GUARDIAN}
{LOYAL_UNIT 5 Skeleton 28 21} {GUARDIAN}
{LOYAL_UNIT 5 Skeleton 37 20} {GUARDIAN}

{LOYAL_UNIT () "Skeleton Archer" 21 22} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 29 15} {GUARDIAN}
{LOYAL_UNIT () "Skeleton Archer" 33 15} {GUARDIAN}
{LOYAL_UNIT 5 "Skeleton Archer" 21 22} {GUARDIAN}
{LOYAL_UNIT 5 "Skeleton Archer" 29 15} {GUARDIAN}
{LOYAL_UNIT 5 "Skeleton Archer" 33 15} {GUARDIAN}
[/side]

[side]
Expand All @@ -145,14 +145,14 @@
user_team_name=_"Undead"
{FLAG_VARIANT undead}

{LOYAL_UNIT () Skeleton 9 9} {GUARDIAN}
{LOYAL_UNIT () Skeleton 12 7} {GUARDIAN}
{LOYAL_UNIT () Skeleton 18 7} {GUARDIAN}
{LOYAL_UNIT () Skeleton 18 9} {GUARDIAN}
{LOYAL_UNIT () Skeleton 24 7} {GUARDIAN}
{LOYAL_UNIT () Skeleton 24 9} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 9 9} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 12 7} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 18 7} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 18 9} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 24 7} {GUARDIAN}
{LOYAL_UNIT 6 Skeleton 24 9} {GUARDIAN}

{LOYAL_UNIT () "Skeleton Archer" 12 16} {GUARDIAN}
{LOYAL_UNIT 6 "Skeleton Archer" 12 16} {GUARDIAN}
[/side]

{STARTING_VILLAGES 1 5}
Expand Down
82 changes: 41 additions & 41 deletions data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
View file
Expand Up @@ -58,30 +58,30 @@

# These two have a role for 'sighted' events

{LOYAL_UNIT () Draug 26 13}
{LOYAL_UNIT 2 Draug 26 13}
[+unit]
role=Study Guard
ai_special=guardian
[/unit]

# Draug guards
{LOYAL_UNIT () Draug 20 10} {GUARDIAN}
{LOYAL_UNIT () Draug 20 12} {GUARDIAN}
{LOYAL_UNIT () Draug 24 14} {GUARDIAN}
{LOYAL_UNIT 2 Draug 20 10} {GUARDIAN}
{LOYAL_UNIT 2 Draug 20 12} {GUARDIAN}
{LOYAL_UNIT 2 Draug 24 14} {GUARDIAN}

{LOYAL_UNIT () Draug 23 6} {GUARDIAN}
{LOYAL_UNIT () Draug 24 3} {GUARDIAN}
{LOYAL_UNIT () Draug 29 3} {GUARDIAN}
{LOYAL_UNIT () Draug 30 9} {GUARDIAN}
{LOYAL_UNIT () Draug 35 8} {GUARDIAN}
{LOYAL_UNIT 2 Draug 23 6} {GUARDIAN}
{LOYAL_UNIT 2 Draug 24 3} {GUARDIAN}
{LOYAL_UNIT 2 Draug 29 3} {GUARDIAN}
{LOYAL_UNIT 2 Draug 30 9} {GUARDIAN}
{LOYAL_UNIT 2 Draug 35 8} {GUARDIAN}

# Revenants guards
{LOYAL_UNIT () Revenant 19 21} {GUARDIAN}
{LOYAL_UNIT () Revenant 19 26} {GUARDIAN}
{LOYAL_UNIT () Revenant 21 21} {GUARDIAN}
{LOYAL_UNIT () Revenant 21 26} {GUARDIAN}
{LOYAL_UNIT () Revenant 21 35} {GUARDIAN}
{LOYAL_UNIT () Revenant 19 35} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 19 21} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 19 26} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 21 21} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 21 26} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 21 35} {GUARDIAN}
{LOYAL_UNIT 2 Revenant 19 35} {GUARDIAN}
[+unit]
# Speaks during the starting event
role=starting_speaker
Expand Down Expand Up @@ -114,9 +114,9 @@
name= _ "Hettel"
canrecruit=yes

{LOYAL_UNIT () Revenant 33 31} {GUARDIAN}
{LOYAL_UNIT () Revenant 35 29} {GUARDIAN}
{LOYAL_UNIT () Revenant 36 33} {GUARDIAN}
{LOYAL_UNIT 3 Revenant 33 31} {GUARDIAN}
{LOYAL_UNIT 3 Revenant 35 29} {GUARDIAN}
{LOYAL_UNIT 3 Revenant 36 33} {GUARDIAN}
[/side]

# Dungeon guard
Expand All @@ -136,11 +136,11 @@
name= _ "Tervor"
canrecruit=yes

{LOYAL_UNIT () Revenant 3 32} {GUARDIAN}
{LOYAL_UNIT () Revenant 4 39} {GUARDIAN}
{LOYAL_UNIT () Revenant 9 36} {GUARDIAN}
{LOYAL_UNIT () Revenant 10 39} {GUARDIAN}
{LOYAL_UNIT () Revenant 13 37} {GUARDIAN}
{LOYAL_UNIT 4 Revenant 3 32} {GUARDIAN}
{LOYAL_UNIT 4 Revenant 4 39} {GUARDIAN}
{LOYAL_UNIT 4 Revenant 9 36} {GUARDIAN}
{LOYAL_UNIT 4 Revenant 10 39} {GUARDIAN}
{LOYAL_UNIT 4 Revenant 13 37} {GUARDIAN}
[/side]

# Treasury guards
Expand All @@ -160,20 +160,20 @@
name=_ "Author"
canrecruit=yes

{LOYAL_UNIT () Draug 15 23} {GUARDIAN}
{LOYAL_UNIT () Draug 11 23}
{LOYAL_UNIT 5 Draug 15 23} {GUARDIAN}
{LOYAL_UNIT 5 Draug 11 23}
[+unit]
role=Treasury Guard
ai_special=guardian
[/unit]

{LOYAL_UNIT () Revenant 5 19} {GUARDIAN}
{LOYAL_UNIT () Revenant 6 20} {GUARDIAN}
{LOYAL_UNIT () Revenant 7 16} {GUARDIAN}
{LOYAL_UNIT () Revenant 6 22} {GUARDIAN}
{LOYAL_UNIT () Revenant 9 15} {GUARDIAN}
{LOYAL_UNIT () Revenant 9 21} {GUARDIAN}
{LOYAL_UNIT () Revenant 15 20} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 5 19} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 6 20} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 7 16} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 6 22} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 9 15} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 9 21} {GUARDIAN}
{LOYAL_UNIT 5 Revenant 15 20} {GUARDIAN}
[/side]

# Study Guards
Expand All @@ -193,9 +193,9 @@
name= _ "Boblin"
canrecruit=yes

{LOYAL_UNIT () Revenant 26 21} {GUARDIAN}
{LOYAL_UNIT () Revenant 28 21} {GUARDIAN}
{LOYAL_UNIT () Revenant 31 16} {GUARDIAN}
{LOYAL_UNIT 6 Revenant 26 21} {GUARDIAN}
{LOYAL_UNIT 6 Revenant 28 21} {GUARDIAN}
{LOYAL_UNIT 6 Revenant 31 16} {GUARDIAN}
[/side]

[side]
Expand All @@ -214,12 +214,12 @@
name= _ "Antrasis"
canrecruit=yes

{LOYAL_UNIT () Revenant 7 7} {GUARDIAN}
{LOYAL_UNIT () Revenant 10 8} {GUARDIAN}
{LOYAL_UNIT () Revenant 14 10} {GUARDIAN}
{LOYAL_UNIT () Revenant 19 16} {GUARDIAN}
{LOYAL_UNIT () Revenant 22 18} {GUARDIAN}
{LOYAL_UNIT () Revenant 21 17} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 7 7} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 10 8} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 14 10} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 19 16} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 22 18} {GUARDIAN}
{LOYAL_UNIT 7 Revenant 21 17} {GUARDIAN}
[/side]

# Giant Spiders and Tentacles of the Deep
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
View file
Expand Up @@ -60,8 +60,8 @@
facing=se
# No shroud this time

{NOTRAIT_UNIT () "Dwarvish Stalwart" 10 5} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT () "Dwarvish Stalwart" 13 7} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT 2 "Dwarvish Stalwart" 10 5} {GUARDIAN} {FACING se}
{NOTRAIT_UNIT 2 "Dwarvish Stalwart" 13 7} {GUARDIAN} {FACING se}

[unit]
type=Dwarvish Steelclad
Expand Down
20 changes: 10 additions & 10 deletions data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
View file
Expand Up @@ -160,42 +160,42 @@
facing=se

# Place some combatants at various states of hp/xp
{NOTRAIT_UNIT () "Dwarvish Ulfserker" 28 8}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 28 8}
[+unit]
hitpoints=12
experience=40
facing=se
[/unit]

{NOTRAIT_UNIT () "Dwarvish Ulfserker" 24 7}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 24 7}
[+unit]
hitpoints=34
experience=8
facing=ne
[/unit]

{NOTRAIT_UNIT () "Dwarvish Ulfserker" 24 4}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 24 4}
[+unit]
hitpoints=28
experience=18
facing=sw
[/unit]

{NOTRAIT_UNIT () "Dwarvish Ulfserker" 23 2}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 23 2}
[+unit]
hitpoints=30
experience=16
facing=s
[/unit]

{NOTRAIT_UNIT () "Dwarvish Ulfserker" 30 7}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 30 7}
[+unit]
hitpoints=12
experience=16
facing=nw
[/unit]

{NOTRAIT_UNIT () "Dwarvish Ulfserker" 22 6}
{NOTRAIT_UNIT 2 "Dwarvish Ulfserker" 22 6}
[+unit]
hitpoints=9
experience=41
Expand All @@ -221,28 +221,28 @@

facing=nw

{NOTRAIT_UNIT () Troll 30 9}
{NOTRAIT_UNIT 3 Troll 30 9}
[+unit]
hitpoints=36
experience=14
facing=nw
[/unit]

{NOTRAIT_UNIT () "Young Ogre" 28 6}
{NOTRAIT_UNIT 3 "Young Ogre" 28 6}
[+unit]
hitpoints=6
experience=31
facing=se
[/unit]

{NOTRAIT_UNIT () "Young Ogre" 20 7}
{NOTRAIT_UNIT 3 "Young Ogre" 20 7}
[+unit]
hitpoints=12
experience=12
facing=ne
[/unit]

{NOTRAIT_UNIT () "Ogre" 23 3}
{NOTRAIT_UNIT 3 "Ogre" 23 3}
[+unit]
hitpoints=27
experience=8
Expand Down

0 comments on commit 58bb287

Please sign in to comment.