Skip to content

Commit

Permalink
DM: Use unit macros
Browse files Browse the repository at this point in the history
  • Loading branch information
sigurdfdragon authored and GregoryLundberg committed Nov 30, 2017
1 parent 7aa5260 commit da996c6
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 321 deletions.
16 changes: 2 additions & 14 deletions data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
Expand Up @@ -265,27 +265,15 @@ But as Delfador’s meditation deepened, and the woses sank into their timeless
x=21,21,22,23,24,24
y=8,9,9,10,10,11
[/move_unit_fake]
[unit]
type=Goblin Knight
id=Gurbash
facing=sw
side=3
x,y=24,11
[/unit]
{NAMED_UNIT 3 (Goblin Knight) 24 11 Gurbash _"Gurbash" (facing=sw)}

[move_unit_fake]
type=Orcish Warrior
side=3
x=21,21,22,23
y=8,9,9,10
[/move_unit_fake]
[unit]
type=Orcish Warrior
id=Pruark
facing=sw
side=3
x,y=23,10
[/unit]
{NAMED_UNIT 3 (Orcish Warrior) 23 10 Pruark _"Pruark" (facing=sw)}

[redraw]
[/redraw]
Expand Down
Expand Up @@ -229,13 +229,7 @@
y=$move_from[0].y,$next_to_delf.y
[/move_unit_fake]

[unit]
id=Rorthin
name= _ "Rorthin"
type=Ghost
side=3
x,y=$next_to_delf.x,$next_to_delf.y
[/unit]
{NAMED_UNIT 3 (Ghost) $next_to_delf.x $next_to_delf.y Rorthin _"Rorthin" ()}

[message]
speaker=Rorthin
Expand Down Expand Up @@ -407,18 +401,8 @@
x=8
y=4
[/filter]
[unit]
type=Skeleton
id=Rattles
name=_"Rattles"
side=2
x,y=$x1,$y1
[/unit]
[unit]
type=Skeleton
side=2
x,y=$x1,$y1
[/unit]
{NAMED_UNIT 2 (Skeleton) $x1 $y1 Rattles _"Rattles" ()}
{UNIT 2 (Skeleton) $x1 $y1 ()}
[message]
speaker=Rattles
message=_"Do you serve Iliah-Malal, living man?"
Expand Down Expand Up @@ -450,18 +434,8 @@
x=10
y=3
[/filter]
[unit]
type=Skeleton
id=Bones
name=_"Bones"
side=2
x,y=$x1,$y1
[/unit]
[unit]
type=Skeleton
side=2
x,y=$x1,$y1
[/unit]
{NAMED_UNIT 2 (Skeleton) $x1 $y1 Bones _"Bones" ()}
{UNIT 2 (Skeleton) $x1 $y1 ()}
[message]
speaker=Bones
message=_"Iliah-Malal commands your death!"
Expand Down
Expand Up @@ -176,39 +176,21 @@
x=1,2,3,4,5,6,7
y=1,1,2,2,3,3,4
[/move_unit_fake]
[unit]
type=Thug
id=Vobryn
facing=se
side=2
x,y=7,4
[/unit]
{NAMED_UNIT 2 (Thug) 7 4 Vobryn _"Vobryn" (facing=se)}
[move_unit_fake]
type=Dark Adept
side=2
x=1,2,2,3,3,4,5,6
y=1,1,2,3,4,4,5,5
[/move_unit_fake]
[unit]
type=Dark Adept
id=Tur
facing=se
side=2
x,y=6,5
[/unit]
{NAMED_UNIT 2 (Dark Adept) 6 5 Tur _"Tur" (facing=se)}
[move_unit_fake]
type=Thug
side=2
x=1,2,3,4,4,5,6
y=1,1,2,2,3,4,4
[/move_unit_fake]
[unit]
type=Thug
id=Meorraent
facing=se
side=2
x,y=6,4
[/unit]
{NAMED_UNIT 2 (Thug) 6 4 Meorraent _"Meorraent" (facing=se)}
{MODIFY_UNIT (id=Iliah-Malal) facing se}

[message]
Expand Down
140 changes: 16 additions & 124 deletions data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
Expand Up @@ -165,6 +165,7 @@
message= _ "This forest looks quiet — too quiet. Proceed carefully, I don’t like this at all."
[/message]
[/event]

[event]
name=turn 2
[lift_fog]
Expand All @@ -188,62 +189,15 @@
message= _ "We should try to go west. I sense things are worse on the eastern front."
[/message]
[/event]

[event]
name=turn 8
[unit]
id=Nameless
name=_ "Nameless"
type=Spectre
facing=sw
side=2
x=51
y=1
[/unit]
[unit]
id=Hraul
name=_ "Hraul"
type=Spectre
facing=sw
side=2
x=51
y=2
[/unit]
[unit]
id=Atrag
name=_ "Atrag"
type=Draug
facing=sw
side=2
x=51
y=3
[/unit]
[unit]
id=Horr
name=_ "Horr"
type=Banebow
facing=sw
side=2
x=51
y=4
[/unit]
[unit]
id=Nfrigt
name=_ "Nfrigt"
type=Nightgaunt
facing=sw
side=2
x=50
y=4
[/unit]
[unit]
id=Rkrin
name=_ "Rkrin"
type=Revenant
facing=sw
side=2
x=50
y=3
[/unit]
{NAMED_UNIT 2 (Spectre) 51 1 Nameless _"Nameless" (facing=sw)}
{NAMED_UNIT 2 (Spectre) 51 2 Hraul _"Hraul" (facing=sw)}
{NAMED_UNIT 2 (Draug) 51 3 Atrag _"Atrag" (facing=sw)}
{NAMED_UNIT 2 (Banebow) 51 4 Horr _"Horr" (facing=sw)}
{NAMED_UNIT 2 (Nightgaunt) 50 4 Nfrigt _"Nfrigt" (facing=sw)}
{NAMED_UNIT 2 (Revenant) 50 3 Rkrin _"Rkrin" (facing=sw)}

[role]
side=2,3,4
Expand All @@ -267,60 +221,12 @@

[event]
name=turn 11
[unit]
id=Haunt
name=_ "Haunt"
type=Spectre
facing=sw
side=2
x=51
y=16
[/unit]
[unit]
id=Gdal
name=_ "Gdal"
type=Spectre
facing=sw
side=2
x=51
y=17
[/unit]
[unit]
id=Oltr
name=_ "Oltr"
type=Draug
facing=sw
side=2
x=50
y=16
[/unit]
[unit]
id=Orbl
name=_ "Orbl"
type=Deathblade
facing=sw
side=2
x=50
y=17
[/unit]
[unit]
id=Nifigt
name=_ "Nifigt"
type=Nightgaunt
facing=sw
side=2
x=49
y=16
[/unit]
[unit]
id=Dert
name=_ "Dert"
type=Deathblade
facing=sw
side=2
x=49
y=17
[/unit]
{NAMED_UNIT 2 (Spectre) 51 16 Haunt _"Haunt" (facing=sw)}
{NAMED_UNIT 2 (Spectre) 51 17 Gdal _"Gdal" (facing=sw)}
{NAMED_UNIT 2 (Draug) 50 16 Oltr _"Oltr" (facing=sw)}
{NAMED_UNIT 2 (Deathblade) 50 17 Orbl _"Orbl" (facing=sw)}
{NAMED_UNIT 2 (Nightgaunt) 49 16 Nifigt _"Nifigt" (facing=sw)}
{NAMED_UNIT 2 (Deathblade) 49 17 Dert _"Dert" (facing=sw)}

[role]
side=2,3,4
Expand Down Expand Up @@ -429,22 +335,8 @@
# do not allow an elvish victory before Delfador shows up
# TODO maybe we should do this in a more deterministic way...
[then]
[unit]
id=Krumful
name=_ "Krumful"
type=Draug
side=2
x=42
y=3
[/unit]
[unit]
id=Unhul
name=_ "Unhul"
type=Spectre
side=2
x=42
y=2
[/unit]
{NAMED_UNIT 2 (Draug) 42 3 Krumful _"Krumful" (facing=sw)}
{NAMED_UNIT 2 (Spectre) 42 2 Unhul _"Unhul" (facing=sw)}
[/then]
[/if]
[/event]
Expand Down
Expand Up @@ -441,65 +441,12 @@

{MATERIALIZE_ILIAH_MALAL}

[unit]
id=Samun
name=_ "Samun"
type=Draug
facing=sw
side=3
x=17
y=2
[/unit]

[unit]
id=Skoogal
name=_ "Skoogal"
type=Banebow
facing=sw
side=3
x=15
y=1
[/unit]

[unit]
id=Skulrag
name=_ "Skulrag"
type=Deathblade
facing=sw
side=3
x=16
y=1
[/unit]

[unit]
id=Idthom
name=_ "Idthom"
type=Nightgaunt
facing=sw
side=3
x=18
y=2
[/unit]

[unit]
id=Hyvrun
name=_ "Hyvrun"
type=Chocobone
facing=sw
side=3
x=14
y=1
[/unit]

[unit]
id=Blud
name=_ "Blud"
type=Blood Bat
facing=sw
side=3
x=12
y=1
[/unit]
{NAMED_UNIT 3 (Draug) 17 2 Samun _"Samun" (facing=sw)}
{NAMED_UNIT 3 (Banebow) 15 1 Skoogal _"Skoogal" (facing=sw)}
{NAMED_UNIT 3 (Deathblade) 16 1 Skulrag _"Skulrag" (facing=sw)}
{NAMED_UNIT 3 (Nightgaunt) 18 2 Idthom _"Idthom" (facing=sw)}
{NAMED_UNIT 3 (Chocobone) 14 1 Hyvrun _"Hyvrun" (facing=sw)}
{NAMED_UNIT 3 (Blood Bat) 12 1 Blud _"Blud" (facing=sw)}

[message]
id=Iliah-Malal
Expand Down

0 comments on commit da996c6

Please sign in to comment.