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

Address bug #12794.

Browse source
This commit is contained in:
Eric S. Raymond 2008-12-29 10:44:00 +00:00
parent 6cfd9588c7
commit 2eced3b63d
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
View file

@ -235,9 +235,9 @@ Use Elven Scouts and Linaera's power of teleportation to mount hit and run attac
[unstore_unit]
variable=linaera_jump
[/unstore_unit]
{GENERIC_UNIT 3 Mage 17 17}
{GENERIC_UNIT 3 Mage 16 18}
{GENERIC_UNIT 3 Mage 16 17}
{GENERIC_UNIT 3 Mage 17 17} {NO_UPKEEP}
{GENERIC_UNIT 3 Mage 16 18} {NO_UPKEEP}
{GENERIC_UNIT 3 Mage 16 17} {NO_UPKEEP}
[message]
id=Erlornas
message=_ "So you decided to accept the invitation. Good. Welcome, I am lord Erlornas of Wesmere. I find your presence here...surprising."
@ -270,6 +270,7 @@ Use Elven Scouts and Linaera's power of teleportation to mount hit and run attac
[/variable]
[then]
{VARIABLE linaeras_side[$i].canrecruit 0}
{VARIABLE linaeras_side[$i].upkeep loyal}
{VARIABLE linaeras_side[$i].overlays "misc/hero-icon.png"}
[/then]
[/if]

5
data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
View file

@ -157,6 +157,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
x="16"
y="18"
side="1"
upkeep=loyal
[/unit]
[move_unit_fake]
x="18,18,17,17"
@ -170,6 +171,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
x="17"
y="18"
side="1"
upkeep=loyal
[/unit]
[move_unit_fake]
x="18,18,17"
@ -183,6 +185,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
x="17"
y="19"
side="1"
upkeep=loyal
[/unit]
[move_unit_fake]
x="18,18,18"
@ -196,6 +199,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
x="18"
y="18"
side="1"
upkeep=loyal
[/unit]
[move_unit_fake]
x="18,18"
@ -209,6 +213,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
x="18"
y="19"
side="1"
upkeep=loyal
[/unit]
[message]
speaker="Lomarfel"

8
data/core/macros/unit-utils.cfg
View file

@ -170,6 +170,14 @@
[/unit]
#enddef
#define NO_UPKEEP
# Meant to be used as a suffix to a unit-generating macro call.
# Use this wheen you don't want to use up a traits slot.
[+unit]
upkeep=loyal
[/unit]
#enddef
#define RECALL_OR_CREATE TYPE ID_STRING
# A substitute for [recall] that works even when there's no-one to recall
# useful for testing scenarios out of order.