[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/data/scenarios Heir_To_The_Throne/A_Cho...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data/scenarios Heir_To_The_Throne/A_Cho... |
|
Date: |
Thu, 24 Mar 2005 05:18:38 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/03/24 10:18:38
Modified files:
data/scenarios/Heir_To_The_Throne: A_Choice_Must_Be_Made.cfg
Bay_of_Pearls.cfg
Blackwater_Port.cfg
Crossroads.cfg
Dwarven_Doors.cfg
Elves_Besieged.cfg
Ford_of_Abez.cfg
Gryphon_Mountain.cfg
Hasty_Alliance.cfg
Home_Clan.cfg
Home_North_Elves.cfg
Isle_of_Anduin.cfg
Isle_of_the_Damned.cfg
Mountain_Pass.cfg
Muff_Malal_Peninsula.cfg
Plunging_Into_the_Darkness.cfg
Princess_of_Wesnoth.cfg
Return_to_Wesnoth.cfg
The_Lost_General.cfg
The_Siege_of_Elensefar.cfg
Valley_of_Death.cfg
Valley_of_Statues.cfg
data/scenarios/The_Rise_of_Wesnoth: A_Final_Spring.cfg
A_New_Land.cfg
Cursed_Isle.cfg
Peoples_in_Decline.cfg
Return_of_the_Fleet.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg
The_Fall.cfg
The_River_Road.cfg
The_Vanguard.cfg
trow-macros.cfg
Log message:
Big & invasive, but tested: Switch HttT to the UNIT & ITEM macros,
macro tweaks to TRoW. If it doesn't pay upkeep it's now loyal. if it was
missing a (user_)description it's now not (Unless its undead). Caught a few
unrenamable cases as well. Send 'command' tags screaming into hell.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.19
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.19
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg Thu Mar
24 10:18:37 2005
@@ -114,19 +114,17 @@
[event]
name=start
- [command]
- [recall]
+
+ [recall]
description=Delfador
- [/recall]
- [recall]
+ [/recall]
+ [recall]
description=Li'sar
- [/recall]
- [recall]
+ [/recall]
+ [recall]
description=Kalenz
- [/recall]
- [/command]
+ [/recall]
- [command]
[if]
[variable]
name=scepter
@@ -198,9 +196,7 @@
[/message]
[/else]
[/if]
- [/command]
- [command]
[message]
description=Kalenz
message= _ "I can tell where we are. That is the river
that is known as Longlier to men, called Arkan-thoria in my people's ancient
tongue. The home of my people lies to the east."
@@ -237,7 +233,6 @@
description=Delfador
message= _ "So, we must choose. To the north past the
Orcs, where lie the ancient snow plains of the Elves, or to the south, beyond
the armies of the Walking Dead where the dreaded swamps await."
[/message]
- [/command]
[/event]
[event]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.27
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.28
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.27 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Thu Mar 24
10:18:37 2005
@@ -99,11 +99,7 @@
[/recall]
#the ship they came on.
- [item]
- x=2
- y=34
- image=galleon.png
- [/item]
+ {PLACE_IMAGE galleon.png 2 34}
[unit]
type=Orcish Archer
@@ -113,6 +109,9 @@
x=16
y=18
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Naga Fighter
@@ -122,6 +121,9 @@
y=10
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Naga Fighter
@@ -131,65 +133,28 @@
y=10
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
{OBJ_TRIDENT_STORM 5 4 bop_stormtrident}
#when certain villages are entered, Mermen are rescued
- [item]
- x=4
- y=38
- image=merman-fighter.png
- [/item]
- [item]
- x=4
- y=38
- image=misc/cage.png
- [/item]
-
- [item]
- x=7
- y=35
- image=merman-fighter.png
- [/item]
- [item]
- x=7
- y=35
- image=misc/cage.png
- [/item]
-
- [item]
- x=11
- y=33
- image=merman-fighter.png
- [/item]
- [item]
- x=11
- y=33
- image=misc/cage.png
- [/item]
-
- [item]
- x=19
- y=23
- image=merman-fighter.png
- [/item]
- [item]
- x=19
- y=23
- image=misc/cage.png
- [/item]
-
- [item]
- x=3
- y=10
- image=merman-fighter.png
- [/item]
- [item]
- x=3
- y=10
- image=misc/cage.png
- [/item]
+ {PLACE_IMAGE merman-fighter.png 4 38}
+ {PLACE_IMAGE misc/cage.png 4 38}
+
+ {PLACE_IMAGE merman-fighter.png 7 35}
+ {PLACE_IMAGE misc/cage.png 7 35}
+
+ {PLACE_IMAGE merman-fighter.png 11 33}
+ {PLACE_IMAGE misc/cage.png 11 33}
+
+ {PLACE_IMAGE merman-fighter.png 19 23}
+ {PLACE_IMAGE misc/cage.png 19 23}
+
+ {PLACE_IMAGE merman-fighter.png 3 10}
+ {PLACE_IMAGE misc/cage.png 3 10}
[/event]
[event]
@@ -250,13 +215,7 @@
[event]
name=turn 4
- [unit]
- type=Sea Orc
- description=Bugg
- side=2
- x=16
- y=18
- [/unit]
+ {UNIT (Sea Orc) (Bugg) ( _ "Bugg") 2 16 18}
[message]
description=Bugg
@@ -284,16 +243,6 @@
[/message]
[/event]
-#define MERMAN DESC X Y
- [unit]
- type=Merman Fighter
- description={DESC}
- side=1
- x={X}
- y={Y}
- [/unit]
-#enddef
-
[event]
name=moveto
@@ -306,12 +255,12 @@
y=23
[/filter]
- {MERMAN (Gwaba) 19 23}
- {MERMAN (Nepba) 19 23}
- {MERMAN (Triram) 19 23}
+ {UNIT (Merman Fighter) (Gwaba) ( _ "Gwaba") 1 19 23}
+ {UNIT (Merman Fighter) (Nepba) ( _ "Nepba") 1 19 23}
+ {UNIT (Merman Fighter) (Triram) ( _ "Triram") 1 29 23}
#ifdef EASY
- {MERMAN (Mriram) 19 23}
+ {UNIT (Merman Fighter) (Mriram) ( _ "Mriram") 1 29 23}
#endif
[message]
description=Gwaba
@@ -330,13 +279,14 @@
y=33
[/filter]
- {MERMAN (Mabooa) 11 33}
+ {UNIT (Merman Fighter) (Mabooa) ( _ "Mabooa") 1 11 33}
+
#ifdef EASY
- {MERMAN (Earooa) 11 33}
- {MERMAN (Nethuns) 11 33}
+ {UNIT (Merman Fighter) (Earooa) ( _ "Earooa") 1 11 33}
+ {UNIT (Merman Fighter) (Nethuns) ( _ "Nethuns") 1 11 33}
#endif
#ifdef NORMAL
- {MERMAN (Gwoama) 11 33}
+ {UNIT (Merman Fighter) (Gwoama) ( _ "Gwoama") 1 11 33}
#endif
[message]
description=Mabooa
@@ -355,10 +305,10 @@
y=35
[/filter]
- {MERMAN (Kaba) 7 35}
+ {UNIT (Merman Fighter) (Kaba) ( _ "Kaba") 1 7 35}
#ifdef EASY
- {MERMAN (Kwabao) 7 35}
+ {UNIT (Merman Fighter) (Kwabao) ( _ "Kwabao") 1 7 35}
#endif
[message]
@@ -378,11 +328,11 @@
side=1
[/filter]
- {MERMAN (Gwimli) 4 38}
- {MERMAN (Jarla) 4 38}
+ {UNIT (Merman Fighter) (Gwimli) ( _ "Gwimli") 1 4 38}
+ {UNIT (Merman Fighter) (Jarla) ( _ "Jarla") 1 4 38}
#ifdef EASY
- {MERMAN (Gwarloa) 4 38}
+ {UNIT (Merman Fighter) (Gwarloa) ( _ "Gwarloa") 1 4 38}
#endif
[message]
description=Gwimli
@@ -401,17 +351,16 @@
y=10
[/filter]
- {MERMAN (Heldaga) 3 10}
- {MERMAN (Apalala) 3 10}
- {MERMAN (Oceanus) 3 10}
+ {UNIT (Merman Fighter) (Heldaga) ( _ "Heldaga") 1 3 10}
+ {UNIT (Merman Fighter) (Apalala) ( _ "Apalala") 1 3 10}
+ {UNIT (Merman Fighter) (Oceanus) ( _ "Oceanus") 1 3 10}
#ifdef NORMAL
- {MERMAN (Tini) 3 10}
+ {UNIT (Merman Fighter) (Tini) ( _ "Tini") 1 3 10}
#endif
#ifdef EASY
- {MERMAN (Elcmar) 3 10}
- {MERMAN (Aigaion) 3 10}
- {MERMAN (Labuna) 3 10}
+ {UNIT (Merman Fighter) (Elcmar) ( _ "Elcmar") 1 3 10}
+ {UNIT (Merman Fighter) (Aigaion) ( _ "Aigaion") 1 3 10}
#endif
[message]
@@ -450,6 +399,12 @@
y=40
description=Delfador
type=Elder Mage
+ user_description= _ "Delfador"
+ unrenamable=yes
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_INTELLIGENT}
+ [/modifications]
[/unit]
[message]
description=Delfador
@@ -515,13 +470,9 @@
description=Delfador
message= _ "Safe journey to you,
Konrad. Until we meet again!"
[/message]
- [/command]
- [command]
[kill]
description=Delfador
[/kill]
- [/command]
- [command]
[endlevel]
result=victory
next_scenario=Muff_Malals_Peninsula
@@ -537,13 +488,9 @@
description=Delfador
message= _ "Safe voyage to you then,
Konrad. May the weather be fair."
[/message]
- [/command]
- [command]
[kill]
description=Delfador
[/kill]
- [/command]
- [command]
[endlevel]
result=victory
next_scenario=Isle_of_the_Damned
@@ -607,6 +554,12 @@
y=40
description=Delfador
type=Elder Mage
+ user_description= _ "Delfador"
+ unrenamable=yes
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_INTELLIGENT}
+ [/modifications]
[/unit]
[/command]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.27
wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.28
--- wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.27 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg Thu Mar
24 10:18:37 2005
@@ -112,6 +112,9 @@
user_description= _ "Veocyn"
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Swordsman
@@ -121,6 +124,9 @@
user_description= _ "Yran"
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Haldiel
@@ -129,6 +135,9 @@
x=23
y=24
side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[recall]
@@ -212,50 +221,74 @@
[unit]
type=Horseman
description=Yredd
+ user_description= _ "Yredd"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Horseman
description=Tarcyn
+ user_description= _ "Tarcyn"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Horseman
description=Syryn
+ user_description= _ "Syryn"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Knight
description=Cicyn
+ user_description= _ "Cicyn"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Knight
description=Ginvan
+ user_description= _ "Ginvan"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Knight
description=Simyr
+ user_description= _ "Simyr"
x=35
y=6
ai_special=guardian
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[endlevel]
result=victory
@@ -273,11 +306,9 @@
x=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25
y=2,2,2,2,2,2,2,2,2, 2, 2, 1, 1, 1, 2, 2, 3, 2, 3, 3, 3, 3, 3,
3, 3
[/move_unit_fake]
- [item]
- x=25
- y=3
- image=galleon.png
- [/item]
+
+ {PLACE_IMAGE galleon.png 25 3}
+
[message]
description=Delfador
message= _ "We should embark now."
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.30
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.31
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.30 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg Thu Mar 24
10:18:37 2005
@@ -100,10 +100,7 @@
[/side]
#signs at the crossroads for decoration
- [item]
- x,y=16,16
- image=items/signpost.png
- [/item]
+ {PLACE_IMAGE items/signpost.png 16 16}
[event]
name=start
@@ -157,12 +154,9 @@
x=12,12,11
y=14,13,13
[/move_unit_fake]
- [unit]
- side=1
- type=Elvish Archer
- description=Niodien
- x,y=11,13
- [/unit]
+
+ {UNIT (Elvish Archer) (Niodien) ( _ "Niodien") 1 11 13}
+
[message]
description=Niodien
message= _ "Stay on the path! The hills here are not safe!"
@@ -180,12 +174,9 @@
x=4,5,5
y=16,16,15
[/move_unit_fake]
- [unit]
- side=1
- type=Elvish Fighter
- description=Loflar
- x,y=5,15
- [/unit]
+
+ {UNIT (Elvish Fighter) (Loflar) ( _ "Loflar") 1 5 15}
+
[message]
description=Loflar
message= _ "Beware the hills! There are many Orcs in hiding,
preparing to ambush you!"
@@ -233,23 +224,38 @@
y=$trapy{NUM}
[/filter]
[unit]
+ description=Orcish Archer
+ user_description= _ "Orcish Archer"
side=2
x=$trapx{NUM}
y=$trapy{NUM}
type=Orcish Archer
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Orcish Grunt
+ user_description= _ "Orcish Grunt"
side=2
x=$trapx{NUM}
y=$trapy{NUM}
type=Orcish Grunt
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#ifdef HARD
[unit]
+ description=Orcish Archer
+ user_description= _ "Orcish Archer"
side=2
x=$trapx{NUM}
y=$trapy{NUM}
type=Orcish Archer
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#endif
[print]
@@ -278,29 +284,49 @@
y=$trapy{NUM}
[/filter]
[unit]
+ description=Wolf Rider
+ user_description= _ "Wolf Rider"
side=3
x=$trapx{NUM}
y=$trapy{NUM}
type=Wolf Rider
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Troll Whelp
+ user_description= _ "Troll Whelp"
side=3
x=$trapx{NUM}
y=$trapy{NUM}
type=Troll Whelp
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Orcish Archer
+ user_description= _ "Orcish Archer"
side=3
x=$trapx{NUM}
y=$trapy{NUM}
type=Orcish Archer
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#ifdef HARD
[unit]
+ description=Troll Whelp
+ user_description= _ "Troll Whelp"
side=3
x=$trapx{NUM}
y=$trapy{NUM}
type=Troll Whelp
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#endif
[print]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.22
wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.22 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg Thu Mar 24
10:18:37 2005
@@ -41,42 +41,9 @@
[/objectives]
[/event]
- [item]
- x=14
- y=3
- image=terrain/dwarven-doors.png
- [/item]
- [item]
- x=25
- y=2
- image=terrain/mine.png
- [/item]
- [item]
- x=10
- y=26
- image=terrain/castle-ruins.png
- [/item]
- [item]
- x=10
- y=27
- image=terrain/castle-ruins.png
- [/item]
- [item]
- x=11
- y=27
- image=terrain/castle-ruins.png
- [/item]
- [item]
- x=17
- y=21
- image=terrain/castle-ruins.png
- [/item]
- [item]
- x=5
- y=34
- image=terrain/castle-ruins.png
- [/item]
-
+ {PLACE_IMAGE terrain/dwarven-doors.png 14 3}
+ {PLACE_IMAGE terrain/mine.png 25 2}
+
[side]
type=Commander
description=Konrad
@@ -181,7 +148,6 @@
y=2
[/filter]
- [command]
[message]
description=Konrad
message= _ "This old mine seems to be connected to the
main tunnels."
@@ -194,19 +160,16 @@
description=Delfador
message= _ "There is no time for idle chatter or delay
of any kind. Onward!"
[/message]
- [/command]
- [command]
+
[set_variable]
name=killed_enemies
value=false
[/set_variable]
- [/command]
- [command]
+
[endlevel]
result=victory
bonus=yes
[/endlevel]
- [/command]
[/event]
[event]
@@ -227,22 +190,10 @@
[event]
name=victory
- [command]
- [unit]
- side=2
- description=Li'sar
- type=Princess
- x=8
- y=44
- [/unit]
+ {UNIT (Princess) (Li'sar) ( _ "Li'sar") 2 8 44}
#define LISAR_GUARD_DOORS
- [unit]
- side=2
- type=Royal Guard
- x=8
- y=44
- [/unit]
+ {UNIT (Royal Guard) (Royal Guard) ( _ "Royal Guard") 2 8 44}
#enddef
{LISAR_GUARD_DOORS}
@@ -256,7 +207,6 @@
description=Li'sar
message= _ "Whew! We make our way through the dangerous fog of
the mountains, and now there is all this chaos before us! Come on, men! We must
make it to the mines, which lie ahead of us!"
[/message]
- [/command]
[/event]
@@ -280,12 +230,9 @@
x=10-15
y=10-15
[/filter]
- [unit]
- side=4
- type=Cuttle Fish
- x=13
- y=13
- [/unit]
+
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 4 13 13}
+
[message]
description=Cuttle Fish
message= _ "Ruarrrrr!!!"
@@ -424,13 +371,9 @@
numerical_equals=1
[/variable]
[then]
- [unit]
- side=1
- type=Bandit
- description=Uncle Somf
- x=18
- y=24
- [/unit]
+
+ {UNIT (Bandit) (Uncle Somf) ( _ "Uncle Somf") 1 18 24}
+
[message]
description=Uncle Somf
message= _ "Haw! My niece's friends are mine
friends too"
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.29
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.30
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.29 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg Thu Mar
24 10:18:37 2005
@@ -66,6 +66,10 @@
side=1
x=19
y=23
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_INTELLIGENT}
+ [/modifications]
[/unit]
[ai]
village_value=0.0
@@ -268,12 +272,8 @@
[/message]
[/event]
- [item]
- x=1
- y=1
- image=items/signpost.png
- [/item]
-
+ {PLACE_IMAGE items/signpost.png 1 1}
+
[event]
name=moveto
[filter]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.22
wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.22 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg Thu Mar 24
10:18:37 2005
@@ -139,10 +139,15 @@
#define FORD_GUARD X Y
[unit]
type=Royal Guard
+ description=Royal Guard
+ user_description= _ "Royal Guard"
ai_special=guardian
x={X}
y={Y}
side=2
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
@@ -151,7 +156,6 @@
{FORD_GUARD 7 27}
{FORD_GUARD 6 28}
- {FORD_GUARD 6 28}
{FORD_GUARD 6 25}
{FORD_GUARD 4 25}
{FORD_GUARD 3 27}
@@ -270,54 +274,40 @@
[event]
name=turn 5
- [command]
- [unit]
- side=4
- type=Sea Serpent
- x=1
- y=15
- [/unit]
+
+ {UNIT (Sea Serpent) (Sea Serpent) ( _ "Sea Serpent") 4 1 15}
#define SEA_CREATURE
- [unit]
- side=4
- type=Cuttle Fish
- x=1
- y=15
- [/unit]
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 4 1 15}
#enddef
- {SEA_CREATURE}
- {SEA_CREATURE}
- {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
#ifdef NORMAL
- {SEA_CREATURE}
- {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
#endif
#ifdef HARD
- {SEA_CREATURE}
- {SEA_CREATURE}
- {SEA_CREATURE}
- {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
+ {SEA_CREATURE}
#endif
- [/command]
-
- [command]
- [message]
+ [message]
type=Sea Serpent
message= _ "Ruaarrrrrrrr!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Konrad
message= _ "What is that?"
- [/message]
- [message]
+ [/message]
+ [message]
description=Kalenz
message= _ "Creatures of the deep are upon us! This may
be very dangerous. Be quick! We must get to the other side with all haste!"
- [/message]
- [/command]
+ [/message]
[/event]
#moving Konrad to the other shore
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.20
wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.20 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg Thu Mar
24 10:18:37 2005
@@ -41,29 +41,13 @@
{BIGMAP_GRYPHON_MOUNTAIN}
- [item]
- x=10
- y=14
- image=terrain/nest-empty.png
- [/item]
-
- [item]
- x=16
- y=16
- image=terrain/nest-empty.png
- [/item]
-
- [item]
- x=12
- y=18
- image=terrain/nest-empty.png
- [/item]
-
- [item]
- x=13
- y=16
- image=terrain/nest-full.png
- [/item]
+ {PLACE_IMAGE terrain/nest-empty.png 10 14}
+
+ {PLACE_IMAGE terrain/nest-empty.png 16 16}
+
+ {PLACE_IMAGE terrain/nest-empty.png 12 18}
+
+ {PLACE_IMAGE terrain/nest-full.png 13 16}
[side]
@@ -114,32 +98,9 @@
description=Kalenz
[/recall]
- [unit]
- description=Graak
- user_description= _ "Graak"
- type=Sleeping Gryphon
- side=3
- x=12
- y=18
- [/unit]
-
- [unit]
- description=Grook
- user_description= _ "Grook"
- type=Sleeping Gryphon
- side=3
- x=16
- y=16
- [/unit]
-
- [unit]
- description=Gruak
- user_description= _ "Gruak"
- type=Sleeping Gryphon
- side=3
- x=10
- y=14
- [/unit]
+ {UNIT (Sleeping Gryphon) (Graak) ( _ "Graak") 3 12 18}
+ {UNIT (Sleeping Gryphon) (Grook) ( _ "Grook") 3 16 16}
+ {UNIT (Sleeping Gryphon) (Gruak) ( _ "Gruak") 3 10 14}
[/event]
[event]
@@ -254,73 +215,42 @@
[/message]
[/event]
-
- [event]
- name=attack
- [filter_second]
+ [event]
+ name=attack
+ [filter_second]
description=Graak
[/filter_second]
- [command]
- [kill]
- description=Graak
- [/kill]
- [/command]
-
- [command]
- [unit]
- description=Rampant Graak
- type=Gryphon
- side=3
- x=12
- y=18
- [/unit]
- [/command]
+ [kill]
+ description=Graak
+ [/kill]
+
+ {UNIT (Gryphon) (Rampant Graak) ( _ "Rampant Graak") 3 12 18}
[/event]
- [event]
- name=attack
- [filter_second]
+ [event]
+ name=attack
+ [filter_second]
description=Grook
[/filter_second]
- [command]
- [kill]
- description=Grook
- [/kill]
- [/command]
-
- [command]
- [unit]
- description=Rampant Grook
- type=Gryphon
- side=3
- x=16
- y=16
- [/unit]
- [/command]
+ [kill]
+ description=Grook
+ [/kill]
+
+ {UNIT (Gryphon) (Rampant Grook) ( _ "Rampant Grook") 3 16 16}
[/event]
[event]
- name=attack
+ name=attack
[filter_second]
description=Gruak
[/filter_second]
- [command]
- [kill]
- description=Gruak
- [/kill]
- [/command]
-
- [command]
- [unit]
- description=Rampant Gruak
- type=Gryphon
- side=3
- x=10
- y=14
- [/unit]
- [/command]
+ [kill]
+ description=Gruak
+ [/kill]
+
+ {UNIT (Gryphon) (Rampant Gruak) ( _ "Rampant Gruak") 3 10 14}
[/event]
{scenarios/Heir_To_The_Throne/deaths.cfg}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.21
wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.22
--- wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.21 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg Thu Mar
24 10:18:37 2005
@@ -91,103 +91,95 @@
[event]
name=start
#hide Li'sar until she arrives
- [command]
- [hide_unit]
+ [hide_unit]
x=12
y=18
- [/hide_unit]
- [/command]
+ [/hide_unit]
- [command]
- [recall]
+ [recall]
description=Delfador
- [/recall]
- [recall]
+ [/recall]
+ [recall]
description=Kalenz
- [/recall]
+ [/recall]
- [message]
+ [message]
description=Konrad
message= _ "Where are we? Which way now? I am tired of
this darkness!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Delfador
message= _ "I am not sure of the way. Let me think for
a moment."
- [/message]
- [/command]
+ [/message]
#Li'sar arrives
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Princess
x=15,14,13,12
y=17,18,19,18
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
- [command]
- [unhide_unit]
- [/unhide_unit]
- [/command]
+ [unhide_unit]
+ [/unhide_unit]
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Royal Guard
x=15,14,13,12,11
y=18,18,18,17,18
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
- [command]
- [unit]
- type=Royal Guard
- side=2
- x=11
- y=18
- facing=reverse
- [/unit]
- [/command]
+ [unit]
+ type=Royal Guard
+ description=Royal Guard
+ user_description= _ "Royal Guard"
+ side=2
+ x=11
+ y=18
+ facing=reverse
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Royal Guard
x=15,14,13,12,11
y=18,18,19,18,19
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
- [command]
- [unit]
- type=Royal Guard
- side=2
- x=11
- y=19
- facing=reverse
- [/unit]
- [/command]
+ [unit]
+ type=Royal Guard
+ description=Royal Guard
+ user_description= _ "Royal Guard"
+ side=2
+ x=11
+ y=19
+ facing=reverse
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
- [command]
- [message]
+ [message]
description=Li'sar
message= _ "En garde!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Konrad
message= _ "What in the world are you doing here?"
- [/message]
- [message]
+ [/message]
+ [message]
description=Li'sar
message= _ "Tracking you down, of course! You have
escaped me for the last time!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Delfador
message= _ "Foolish girl! We are in the deepest of
caverns, probably surrounded by all manner of creatures, and you still want to
fight us? You will bring us all to ruin!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Li'sar
message= _ "Don't try to trick me! I know why you have
come here! But I will put an end to you and your treason here. Then I will get
the Scepter, and return to the daylight again!"
- [/message]
- [/command]
+ [/message]
#change the music to being frantic as lots of orcs arrive
[music]
@@ -195,105 +187,75 @@
[/music]
#define HASTY_TROLL X Y
- [command]
- [unit]
- side=3
- type=Troll
- x={X}
- y={Y}
- [/unit]
- [/command]
+ {UNIT (Troll) (Troll) ( _ "Troll") 3 ({X}) ({Y})}
#enddef
#alot of enemies arrive
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Troll
x=13,12,11
y=16,16,16
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_TROLL 11 16}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Troll
x=13,13
y=16,17
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_TROLL 13 17}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Troll
x=15,14
y=18,18
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_TROLL 14 18}
#define HASTY_GOBLIN_KNIGHT X Y
- [command]
- [unit]
- side=3
- type=Goblin Knight
- x={X}
- y={Y}
- [/unit]
- [/command]
+ {UNIT (Goblin Knight) (Goblin Knight) ( _ "Goblin Knight") 3
({X}) ({Y})}
#enddef
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Goblin Knight
x=4,5,6
y=13,14,14
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_GOBLIN_KNIGHT 6 14}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Goblin Knight
x=3,4,5
y=16,16,16
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_GOBLIN_KNIGHT 5 16}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Goblin Knight
x=8,8
y=21,20
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_GOBLIN_KNIGHT 8 20}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Troll
x=3,4,5
y=14,14,15
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_TROLL 5 15}
- [command]
- [move_unit_fake]
+ [move_unit_fake]
type=Troll
x=5,5,6
y=13,14,15
- [/move_unit_fake]
- [/command]
+ [/move_unit_fake]
{HASTY_TROLL 6 15}
@@ -304,67 +266,65 @@
{HASTY_TROLL 17 14}
{HASTY_TROLL 13 10}
- [command]
- [message]
+ [message]
type=Goblin Knight
message= _ "Surprise! Die, you sun-lovers!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Kalenz
message= _ "Now we are surrounded! Do you still want to
fight us, Princess? Surely that would lead to doom for us all!"
- [/message]
- [message]
+ [/message]
+ [message]
description=Li'sar
message= _ "I see we have little choice but to help
each other. Let us fight together until we return to the surface. Agreed?"
- [/message]
- [message]
+ [/message]
+ [message]
description=Konrad
message= _ "Very well, I promise that you will reach
the surface again, or we shall all perish together, Princess."
- [/message]
- [message]
+ [/message]
+ [message]
description=Li'sar
message= _ "But once we escape from this hole, I have a
score to settle with you!"
- [/message]
- [/command]
+ [/message]
[/event] #end of start event
[event]
name=victory
- [command]
- [message]
+
+ [message]
description=Konrad
message= _ "Well, we have helped each other survive so
far, Princess. Now let's continue together. What do you say?"
- [/message]
- [message]
+ [/message]
+ [message]
description=Li'sar
message= _ "Yes. We agreed to help each other get out
of these pits alive, did we not? Let us continue to pool our resources. Here is
my purse, full of gold."
- [/message]
- [message]
+ [/message]
+ [message]
speaker=narrator
message= _ "You receive 200 pieces of gold!"
- [/message]
- [/command]
+ [/message]
- [command]
- [gold]
+ [gold]
side=1
amount=200
- [/gold]
- [/command]
+ [/gold]
- [command]
- [message]
+ [message]
description=Konrad
message= _ "Thank you, Princess. Come, men. Let us find
the Scepter!"
- [/message]
- [/command]
+ [/message]
#add Li'sar to the recall list
[unit]
side=1
description=Li'sar
+ user_description= _ "Li'sar"
+ unrenamable=yes
type=Princess
experience=74
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[/event]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.22
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.22 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg Thu Mar 24
10:18:37 2005
@@ -169,14 +169,7 @@
[/side]
#define KNIGHT SIDE X Y
- [unit]
- type=Knight
- description=A Knight
- user_description= _ "A Knight"
- side={SIDE}
- x={X}
- y={Y}
- [/unit]
+ {UNIT (Knight) (A Knight) ( _ "A Knight") ({SIDE}) ({X}) ({Y})}
#enddef
#define SPEECH
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.18
wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.19
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.18 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg Thu Mar
24 10:18:37 2005
@@ -229,6 +229,9 @@
x=9
y=14
facing=reverse
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[message]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.25
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.26
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.25 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg Thu Mar
24 10:18:38 2005
@@ -133,11 +133,8 @@
x=33,33,33,33,33,33,32,32,32,32,31
y=1,2,3,4,5,6,7,8,9,10,11
[/move_unit_fake]
- [item]
- x=31
- y=11
- image=galleon.png
- [/item]
+
+ {PLACE_IMAGE galleon.png 31 11}
#move Konrad out of the ship and onto the keep
[move_unit_fake]
@@ -203,13 +200,9 @@
x,y=21,10
side=1
[/filter]
- [unit]
- type=Mage
- side=1
- description=Elrian
- user_description= _ "Elrian"
- x,y=20,9
- [/unit]
+
+ {UNIT (Mage) (Elrian) ( _ "Elrian") 1 20 9}
+
[message]
speaker=unit
message= _ "I found someone hiding in the village!"
@@ -239,7 +232,11 @@
y=35
type=Arch Mage
description=Seimus
+ user_description= _ "Seimus"
side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[message]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.30
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.31
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.30
Sun Mar 20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg Thu Mar
24 10:18:38 2005
@@ -95,38 +95,12 @@
[event]
name=prestart
- [item]
- x=11
- y=13
- image=terrain/temple.png
- [/item]
- [item]
- x=10
- y=17
- image=terrain/temple.png
- [/item]
- [item]
- x=9
- y=15
- image=terrain/temple.png
- [/item]
-
- [unit]
- description=Kalba
- user_description= _ "Kalba"
- type=Merman Fighter
- side=1
- x=27
- y=12
- [/unit]
- [unit]
- description=Gnaba
- user_description= _ "Gnaba"
- type=Merman Fighter
- side=1
- x=31
- y=14
- [/unit]
+ {PLACE_IMAGE terrain/temple.png 11 13}
+ {PLACE_IMAGE terrain/temple.png 10 17}
+ {PLACE_IMAGE terrain/temple.png 9 15}
+
+ {UNIT (Merman Fighter) (Kalba) ( _ "Kalba") 1 27 12}
+ {UNIT (Merman Fighter) (Gnaba) ( _ "Gnaba") 1 31 14}
#reset gold held to 100
[store_gold]
@@ -200,14 +174,8 @@
x=20,20,21
y=10,11,12
[/move_unit_fake]
- [unit]
- description=Urlaf
- user_description= _ "Urlaf"
- type=Outlaw
- side=1
- x=21
- y=12
- [/unit]
+
+ {UNIT (Outlaw) (Urlaf) ( _ "Urlaf") 1 21 12}
[message]
description=Urlaf
@@ -257,6 +225,7 @@
increase_attacks=2
[/effect]
[/object]
+ {TRAIT_LOYAL}
[/modifications]
[/unit]
#set the variable to say the Moremirmu is alive
@@ -283,34 +252,26 @@
speaker=unit
message= _ "Looks like there is somebody hidden in the temple."
[/message]
+
[unit]
- description=Xakae
- user_description= _ "Xakae"
- side=2
- type=Revenant
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=2
- type=Walking Corpse
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=2
- type=Walking Corpse
- x={X}
- y={Y}
+ type=Revenant
+ description=Xakae
+ user_description= _ "Xakae"
+ side=2
+ x={X}
+ y={Y}
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
+
+ {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
+ {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
#ifdef HARD
- [unit]
- side=2
- type=Walking Corpse
- x={X}
- y={Y}
- [/unit]
+ {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
#endif
+
[message]
description=Xakae
message= _ "Surprise! Searching for Mages, and all I get is
these foul humans!"
@@ -368,20 +329,15 @@
[/event]
#define ISLE_GALLEON_ARRIVE
- [command]
- [move_unit_fake]
+
+ [move_unit_fake]
type=Galleon
x=33,32,31,30,29,28,27
y=7,7,8,7,7,7,8
- [/move_unit_fake]
- [/command]
- [command]
- [item]
- x=27
- y=8
- image=galleon.png
- [/item]
- [/command]
+ [/move_unit_fake]
+
+ {PLACE_IMAGE galleon.png 27 8}
+
[allow_recruit]
side=1
type=Elvish Fighter
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.19
wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.19 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg Thu Mar 24
10:18:38 2005
@@ -155,33 +155,13 @@
y=28
side=1
[/filter]
- [unit]
- type=Dwarvish Lord
- description=Stalrag
- user_description= _ "Stalrag"
- x=6
- y=28
- side=1
- [/unit]
- [unit]
- type=Dwarvish Berserker
- x=4
- y=33
- side=1
- [/unit]
- [unit]
- type=Dwarvish Berserker
- x=4
- y=33
- side=1
- [/unit]
+
+ {UNIT (Dwarvish Lord) (Stalrag) ( _ "Stalrag") 1 6 28}
+
+ {UNIT (Dwarvish Berserker) (Gomdrsil) ( _ "Gomdrsil") 1 4 33}
+ {UNIT (Dwarvish Berserker) (Duldurus) ( _ "Duldurus") 1 4 33}
#ifdef EASY
- [unit]
- type=Dwarvish Berserker
- x=4
- y=34
- side=1
- [/unit]
+ {UNIT (Dwarvish Berserker) (Peldril) ( _ "Peldril") 1 4 33}
#endif
[message]
description=Stalrag
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.23
wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.24
--- wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.23
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg Thu Mar
24 10:18:38 2005
@@ -84,17 +84,9 @@
[event]
name=prestart
- [item]
- x=8
- y=2
- image=items/signpost.png
- [/item]
-
- [item]
- x=5
- y=1
- image=misc/foot-left-n.png
- [/item]
+
+ {PLACE_IMAGE items/signpost.png 8 2}
+ {PLACE_IMAGE misc/foot-left-n.png 5 1}
[role]
type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish
Hero,Knight,Elvish Rider,Elvish Outrider,Paladin,Mage,White Mage,Red Mage
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.18
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.19
---
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.18
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
Thu Mar 24 10:18:38 2005
@@ -65,6 +65,10 @@
y=36
side=2
ai_special=guardian
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Blood Bat
@@ -72,6 +76,10 @@
y=31
side=2
ai_special=guardian
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Blood Bat
@@ -79,6 +87,10 @@
y=32
side=2
ai_special=guardian
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
type=Blood Bat
@@ -86,14 +98,13 @@
y=25
side=2
ai_special=guardian
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
- [unit]
- type=Giant Spider
- x=16
- y=40
- side=2
- [/unit]
+ {UNIT (Giant Spider) (Hywyn) ( _ "Hywyn") 2 16 40}
[/side]
[side]
@@ -107,74 +118,124 @@
team_name=good
[unit]
- type=Dwarvish Fighter
+ description=Dwarvish Guardsman
+ user_description= _ "Dwarvish Guardsman"
+ type=Dwarvish Guardsman
x=15
y=22
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Dwarvish Fighter
+ user_description= _ "Dwarvish Fighter"
type=Dwarvish Fighter
x=10
y=22
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
- type=Dwarvish Fighter
+ description=Dwarvish Guardsman
+ user_description= _ "Dwarvish Guardsman"
+ type=Dwarvish Guardsman
x=13
y=20
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Dwarvish Fighter
+ user_description= _ "Dwarvish Fighter"
type=Dwarvish Fighter
x=11
y=20
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
- type=Dwarvish Fighter
+ description=Dwarvish Guardsman
+ user_description= _ "Dwarvish Guardsman"
+ type=Dwarvish Guardsman
x=13
y=19
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Dwarvish Fighter
+ user_description= _ "Dwarvish Fighter"
type=Dwarvish Fighter
x=11
y=19
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
- type=Dwarvish Fighter
+ description=Dwarvish Guardsman
+ user_description= _ "Dwarvish Guardsman"
+ type=Dwarvish Guardsman
x=8
y=20
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Dwarvish Fighter
+ user_description= _ "Dwarvish Fighter"
type=Dwarvish Fighter
x=17
y=19
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
- type=Dwarvish Fighter
+ description=Dwarvish Guardsman
+ user_description= _ "Dwarvish Guardsman"
+ type=Dwarvish Guardsman
x=15
y=16
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
+ description=Dwarvish Fighter
+ user_description= _ "Dwarvish Fighter"
type=Dwarvish Fighter
x=9
y=16
side=3
ai_special=guardian
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[/side]
@@ -235,187 +296,155 @@
y=10-21
x=1-100
[/filter]
- [command]
+
[message]
description=Geldar
message= _ "Who are these that approach? Surface-dwellers! On
your guard, men!"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "We come in peace, friends. We come in peace!"
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "Oh, do you? I see that you are accompanied by
Elves. Can we Dwarves not live in peace without the treacherous Elves coming to
bother us?"
[/message]
- [/command]
- [command]
+
[message]
description=Kalenz
message= _ "Why such harsh words, Dwarf? Elves have never done
you any harm."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "'Never done us any harm?' Why I was there myself,
when the Elves did not come to honor our alliance. Many Dwarves were
slaughtered, and you cowardly Elves did nothing to help!"
[/message]
- [/command]
- [command]
+
[message]
description=Kalenz
message= _ "You go too far! I am Kalenz, a mighty Elvish lord!
How dare such as you, snivelling in his tunnel, call me a coward?"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "Peace, friends! Peace! The evil Orcs roam the lands
above us, we must not fight among ourselves."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "Very well! Explain your presence here then, human.
Who are you? Why have you risked life and limb to come to Knalga, home of the
Dwarves?"
[/message]
- [/command]
- [command]
+
[message]
description=Konrad
message= _ "Well, we...we..."
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "We have come so that an heir may claim his
inheritance, that a king may claim his throne. We seek the Scepter of Fire."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "The Scepter of Fire? Are you out of your minds?
Surely you speak in jest!"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "We jest not, friend. We seek the Scepter of Fire.
We seek the help of the Dwarves in finding it. But know that we will find it,
whether you help us or not."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "Your speech is like that of a fool. No-one even
knows if the Scepter of Fire exists. And who is this heir, this king that you
speak of?"
[/message]
- [/command]
- [command]
+
[message]
description=Konrad
message= _ "I am, sir."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "You? Ha ha! This boy that stands before me is the
king of Wesnoth? Ha ha! I haven't had such a laugh in a long time. And who are
you, old man?"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "I am Delfador, Delfador the Great, Arch Mage to
King Garard, and Protector of his heir."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "You...you are Delfador? I saw Delfador when I was
but a young Dwarf, and I will tell you, old man, you are not Delfador. Men!
Take these liars out of my sight. Delfador perished many years ago."
[/message]
- [/command]
#the flash of Delfador's lightning bolt
- [command]
[scroll_to_unit]
description=Delfador
[/scroll_to_unit]
- [/command]
- [command]
+
[sound]
name=lightning.wav
[/sound]
- [/command]
- [command]
+
[colour_adjust]
red=100
green=100
blue=100
[/colour_adjust]
- [/command]
- [command]
+
[delay]
time=10
[/delay]
- [/command]
- [command]
+
[colour_adjust]
red=0
green=0
blue=0
[/colour_adjust]
- [/command]
- [command]
[message]
description=Delfador
message= _ "I am Delfador the Great! Any who dare oppose me
shall perish!"
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "You...you really are Delfador! But we had news that
you were dead, years ago!"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "They thought I was dead. They hoped I was dead. Yet
still I live."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "And you really think that you can find the Scepter
of Fire?"
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "Yes, I do. If you help us, friend, all the
treasures of Knalga that we find are yours. We want only the Scepter. It will
be dangerous. Make no mistake about that: Dwarves will be killed, perhaps many
Dwarves. But surely it is better than hiding from the Orcs like worms."
[/message]
- [/command]
- [command]
+
[message]
description=Geldar
message= _ "You are right, friend. I will put my best men at
your disposal. We know not where the Scepter is though. Legend says it is
hidden in the eastern tunnels."
[/message]
- [/command]
- [command]
+
[message]
description=Delfador
message= _ "Then to the eastern tunnels we shall go!"
[/message]
- [/command]
- [command]
+
[endlevel]
result=continue
[/endlevel]
- [/command]
[/event]
#a secret passage
@@ -439,11 +468,7 @@
[/event]
#a chest of treasure behind the secret passage
- [item]
- image=misc/chest.png
- x=9
- y=39
- [/item]
+ {PLACE_IMAGE misc/chest.png 9 39}
[event]
name=moveto
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.33
wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.34
--- wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.33
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg Thu Mar
24 10:18:38 2005
@@ -129,10 +129,7 @@
value=0
[/set_variable]
- [item]
- x,y=4,41
- image=terrain/mine.png
- [/item]
+ {PLACE_IMAGE terrain/mine.png 4 41}
[recall]
description=Delfador
@@ -152,55 +149,39 @@
[event]
name=start
[message]
- speaker=narrator
- message= _ "On the road to Knalga, the party was opposed by the
forces of Asheviere."
+ speaker=narrator
+ message= _ "On the road to Knalga, the party was
opposed by the forces of Asheviere."
[/message]
[message]
- description=Li'sar
- message= _ "The Queen has sent me to stop you, you impostor!"
+ description=Li'sar
+ message= _ "The Queen has sent me to stop you, you
impostor!"
[/message]
[message]
- role=Advisor
- message= _ "That's the princess, Li'sar. The daughter of the
Queen, and her successor!"
+ role=Advisor
+ message= _ "That's the princess, Li'sar. The daughter
of the Queen, and her successor!"
[/message]
[message]
- description=Konrad
- message= _ "I'm no impostor. It seems that your mother has lied
to you."
+ description=Konrad
+ message= _ "I'm no impostor. It seems that your mother
has lied to you."
[/message]
[message]
- description=Li'sar
- image="portraits/Heir_To_The_Throne/lisar.png"
- message= _ "This is treason! Your lies will perish with you!"
+ description=Li'sar
+ image="portraits/Heir_To_The_Throne/lisar.png"
+ message= _ "This is treason! Your lies will perish with
you!"
[/message]
[message]
- description=Delfador
- message= _ "There is no use in reasoning. She will understand
only one thing. To arms!"
+ description=Delfador
+ message= _ "There is no use in reasoning. She will
understand only one thing. To arms!"
[/message]
[/event]
[event]
name=turn 5
- [unit]
- description=Jibb
- user_description= _ "Jibb"
- type=Lieutenant
- side=2
- x,y=27,12
- [/unit]
- [unit]
- description=Monry
- user_description= _ "Monry"
- type=Swordsman
- side=2
- x,y=27,12
- [/unit]
- [unit]
- description=Gleran
- user_description= _ "Gleran"
- type=Swordsman
- side=2
- x,y=27,12
- [/unit]
+
+ {UNIT (Lieutenant) (Jibb) ( _ "Jibb") 2 27 12}
+ {UNIT (Swordsman) (Monry) ( _ "Monry") 2 27 12}
+ {UNIT (Swordsman) (Gleran) ( _ "Gleran") 2 27 12}
+
[message]
description=Li'sar
message= _ "This is taking too much time, I had best call some
reinforcements!"
@@ -208,27 +189,10 @@
[/event]
[event]
name=turn 10
- [unit]
- description=Rogerus
- user_description= _ "Rogerus"
- type=Lieutenant
- side=2
- x,y=27,12
- [/unit]
- [unit]
- description=Rurcyn
- user_description= _ "Rurcyn"
- type=Swordsman
- side=2
- x,y=27,12
- [/unit]
- [unit]
- description=Blyr
- user_description= _ "Blyr"
- type=Swordsman
- side=2
- x,y=27,12
- [/unit]
+ {UNIT (Lieutenant) (Rogerus) ( _ "Rogerus") 2 27 12}
+ {UNIT (Swordsman) (Rurcyn) ( _ "Rurcyn") 2 27 12}
+ {UNIT (Swordsman) (Blyr) ( _ "Blyr") 2 27 12}
+
[message]
description=Li'sar
message= _ "Maybe I was not using enough forces..."
@@ -345,46 +309,18 @@
y=41,42,42,41,40
[/move_unit_fake]
- [unit]
- type=Duelist
- description=Ronry
- user_description= _ "Ronry"
- side=2
- x=6
- y=40
- [/unit]
+ {UNIT (Duelist) (Ronry) ( _ "Ronry") 2 6 40}
[scroll_to_unit]
x=6
y=40
[/scroll_to_unit]
#ifdef NORMAL
- [unit]
- type=Fencer
- description=Ligwyn
- user_description= _ "Ligwyn"
- side=2
- x=6
- y=41
- [/unit]
+ {UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 6 41}
#endif
#ifdef HARD
- [unit]
- type=Fencer
- description=Ligwyn
- user_description= _ "Ligwyn"
- side=2
- x=6
- y=41
- [/unit]
- [unit]
- type=Fencer
- description=Owaryn
- user_description= _ "Owaryn"
- side=2
- x=5
- y=42
- [/unit]
+ {UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 6 41}
+ {UNIT (Fencer) (Owaryn) ( _ "Owaryn") 2 5 42}
#endif
[message]
@@ -426,14 +362,7 @@
name=dagger-swish.wav
[/sound]
- [unit]
- type=Duelist
- description=Ronry
- user_description= _ "Ronry"
- side=2
- x=4
- y=41
- [/unit]
+ {UNIT (Duelist) (Ronry) ( _ "Ronry") 2 4 41}
[scroll_to_unit]
x=4
@@ -445,33 +374,13 @@
image="portraits/Heir_To_The_Throne/lisar.png"
message= _ "You've discovered my ploy! It doesn't
matter, I'll still rout you!"
[/message]
+
#ifdef NORMAL
- [unit]
- type=Fencer
- description=Ligwyn
- user_description= _ "Ligwyn"
- side=2
- x=4
- y=41
- [/unit]
+ {UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 4 41}
#endif
#ifdef HARD
- [unit]
- type=Fencer
- description=Ligwyn
- user_description= _ "Ligwyn"
- side=2
- x=4
- y=41
- [/unit]
- [unit]
- type=Fencer
- description=Owaryn
- user_description= _ "Owaryn"
- side=2
- x=4
- y=41
- [/unit]
+ {UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 4 41}
+ {UNIT (Fencer) (Owaryn) ( _ "Owaryn") 2 4 41}
#endif
[message]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.20
wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.20
Sun Mar 20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg Thu Mar
24 10:18:38 2005
@@ -143,25 +143,10 @@
description=Malatus
message= _ "These intruders are stronger than we expected. Call
in the reinforcements!"
[/message]
- [unit]
- type=Halbardier
- side=4
- x=32
- y=37
- [/unit]
- [unit]
- type=Halbardier
- description=Dacayan
- side=4
- x=33
- y=37
- [/unit]
- [unit]
- type=Halbardier
- side=4
- x=34
- y=37
- [/unit]
+
+ {UNIT (Halbardier) (Dacayan) ( _ "Dacayan") 4 33 37}
+ {UNIT (Halbardier) (Ceomyr) ( _ "Ceomyr") 4 32 37}
+ {UNIT (Halbardier) (Gwellyn) ( _ "Gwellyn") 4 34 37}
#a little attempt at comic relief
[message]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.17 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg Thu Mar
24 10:18:38 2005
@@ -88,26 +88,10 @@
team_name=evil
[/side]
- [item]
- x=27
- y=22
- image=items/signpost.png
- [/item]
- [item]
- x=28
- y=25
- image=terrain/rocks.png
- [/item]
- [item]
- x=26
- y=24
- image=terrain/rocks.png
- [/item]
- [item]
- x=27
- y=24
- image=terrain/rocks.png
- [/item]
+ {PLACE_IMAGE items/signpost.png 27 22}
+ {PLACE_IMAGE terrain/rocks.png 28 25}
+ {PLACE_IMAGE terrain/rocks.png 26 24}
+ {PLACE_IMAGE terrain/rocks.png 27 24}
[event]
name=start
@@ -147,14 +131,9 @@
y=24
side=1
[/filter]
- [unit]
- description=Burlin
- user_description= _ "Burlin"
- type=Dwarvish Fighter
- side=2
- x=17
- y=24
- [/unit]
+
+ {UNIT (Dwarvish Fighter) (Burlin) ( _ "Burlin") 2 17 24}
+
[message]
description=Burlin
message= _ "My uncle's family drowned after the orcs flooded
that cavern..."
@@ -206,21 +185,16 @@
y=26
letter=u
[/terrain]
- [item]
- x=28
- y=26
- image=terrain/rocks.png
- [/item]
+
+ {PLACE_IMAGE terrain/rocks.png 28 26}
+
[terrain]
x=26
y=25
letter=u
[/terrain]
- [item]
- x=26
- y=25
- image=terrain/rocks.png
- [/item]
+
+ {PLACE_IMAGE terrain/rocks.png 26 25}
#just in case that the player wait until the other end is open
to catch him alone
[unit]
@@ -236,6 +210,10 @@
side=4
x=23
y=29
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
#ifdef EASY
@@ -250,6 +228,10 @@
side=4
x=23
y=29
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[/event]
@@ -316,18 +298,13 @@
message= _ "Remember me, do you? Aye. I was the king's finest
general, sent down to these pits to retrieve the Scepter. But the Orcs trapped
me and my men in this cavern, to starve to death. The Dwarves were no help,
leaving me to die. Now I will get revenge on you all!"
[/message]
-#define UNDEAD_UNIT
- [unit]
- type=Revenant
- side=4
- x=23
- y=29
- [/unit]
+#define MORE_UNITS
+ {UNDEAD_UNIT (Revenant) 4 23 29}
#enddef
- {UNDEAD_UNIT}
- {UNDEAD_UNIT}
- {UNDEAD_UNIT}
+ {MORE_UNITS}
+ {MORE_UNITS}
+ {MORE_UNITS}
[/event]
[event]
@@ -353,45 +330,31 @@
name=turn 20
#define TREMOR
- [command]
- [scroll]
+ [scroll]
x=5
y=0
- [/scroll]
- [/command]
- [command]
- [delay]
+ [/scroll]
+ [delay]
time=10
- [/delay]
- [/command]
- [command]
- [scroll]
+ [/delay]
+ [scroll]
x=-10
y=0
- [/scroll]
- [/command]
- [command]
- [delay]
+ [/scroll]
+ [delay]
time=10
- [/delay]
- [/command]
- [command]
- [scroll]
+ [/delay]
+ [scroll]
x=0
y=5
- [/scroll]
- [/command]
- [command]
- [delay]
+ [/scroll]
+ [delay]
time=10
- [/delay]
- [/command]
- [command]
- [scroll]
+ [/delay]
+ [scroll]
x=0
y=-10
- [/scroll]
- [/command]
+ [/scroll]
#enddef
{TREMOR}
@@ -408,51 +371,19 @@
y=26
letter=u
[/terrain]
- [item]
- x=15
- y=26
- image=terrain/rocks.png
- [/item]
+
+ {PLACE_IMAGE terrain/rocks.png 15 26}
+
[terrain]
x=16
y=26
letter=u
[/terrain]
- [item]
- x=16
- y=26
- image=terrain/rocks.png
- [/item]
- [unit]
- type=Skeleton
- side=4
- x=23
- y=29
- [/unit]
-
- [/event]
- #a chest
- #[item]
- #image=misc/chest.png
- #x=9
- #y=39
- #[/item]
-
- #[event]
- #name=moveto
- # [filter]
- # x=9
- # y=39
- # side=1
- # [/filter]
- # [message]
- # speaker=unit
- # message= _ "There is no gold in the chest, only dust and a bat!"
- # [/message]
- # [removeitem]
- # [/removeitem]
- #[/event]
+ {PLACE_IMAGE terrain/rocks.png 16 26}
+
+ {UNDEAD_UNIT (Skeleton) 4 23 29}
+ [/event]
{scenarios/Heir_To_The_Throne/deaths.cfg}
[/scenario]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.32
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.33
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.32
Tue Mar 22 05:38:53 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
Thu Mar 24 10:18:38 2005
@@ -173,27 +173,39 @@
[/move_unit_fake]
[unit]
description=Reglok
+ user_description= _ "Reglok"
type=Rogue
side=1
x=23
y=40
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gelgar
+ user_description= _ "Gelgar"
type=Thief
side=1
x=22
y=39
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gamlel
+ user_description= _ "Gamlel"
type=Thief
side=1
x=24
y=40
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[redraw]
@@ -324,27 +336,39 @@
#create units
[unit]
description=Reglok
+ user_description= _ "Reglok"
type=Rogue
side=1
x=7
y=30
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gelgar
+ user_description= _ "Gelgar"
type=Thief
side=1
x=6
y=30
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gamlel
+ user_description= _ "Gamlel"
type=Thief
side=1
x=6
y=31
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#create terrain
[terrain]
@@ -389,34 +413,50 @@
#create units
[unit]
description=Reglok
+ user_description= _ "Reglok"
type=Rogue
side=1
x=16
y=22
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gelgar
+ user_description= _ "Gelgar"
type=Thief
side=1
x=14
y=22
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Gamlel
+ user_description= _ "Gamlel"
type=Thief
side=1
x=20
y=23
gender=male
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[unit]
description=Darglen
+ user_description= _ "Darglen"
type=Thief
side=1
x=18
y=23
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#dialog
[message]
@@ -456,19 +496,28 @@
[unit]
description=Delfador
+ user_description= _ "Delfador"
unrenamable=yes
type=Elder Mage
x=24
y=16
side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_INTELLIGENT}
+ [/modifications]
[/unit]
[unit]
description=Kalenz
+ user_description= _ "Kalenz"
unrenamable=yes
type=Elvish Lord
x=22
y=16
side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[redraw]
@@ -584,19 +633,9 @@
name=gunshot.wav
[/sound]
#ifdef HARD
- [unit]
- type=Revenant
- side=3
- x=13
- y=2
- [/unit]
+ {UNDEAD_UNIT (Revenant) 3 13 2}
#else
- [unit]
- type=Skeleton
- side=3
- x=13
- y=2
- [/unit]
+ {UNDEAD_UNIT (Skeleton) 3 13 2}
#endif
[scroll_to_unit]
x=13
@@ -612,19 +651,9 @@
name=gunshot.wav
[/sound]
#ifdef HARD
- [unit]
- type=Revenant
- side=3
- x=22
- y=1
- [/unit]
+ {UNDEAD_UNIT (Revenant) 3 22 1}
#else
- [unit]
- type=Skeleton
- side=3
- x=22
- y=1
- [/unit]
+ {UNDEAD_UNIT (Skeleton) 3 22 1}
#endif
[scroll_to_unit]
x=22
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.25
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.26
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.25 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg Thu Mar
24 10:18:38 2005
@@ -242,34 +242,14 @@
side=1
x=20
y=48
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
- [unit]
- description=Heldra
- user_description= _ "Heldra"
- type=White Mage
- side=1
- x=20
- y=48
- [/unit]
-
- [unit]
- description=Marcus
- user_description= _ "Marcus"
- type=White Mage
- side=1
- x=20
- y=48
- [/unit]
-
- [unit]
- description=Haldar
- user_description= _ "Haldar"
- type=White Mage
- side=1
- x=20
- y=48
- [/unit]
+ {UNIT (White Mage) (Heldra) ( _ "Heldra") 1 20
48}
+ {UNIT (White Mage) (Marcus) ( _ "Marcus") 1 20
48}
+ {UNIT (White Mage) (Haldar) ( _ "Haldar") 1 20
48}
[message]
description=Moremirmu
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.16
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.17
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.16
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg Thu Mar
24 10:18:38 2005
@@ -108,11 +108,8 @@
{BIGMAP_VALLEY_OF_STATUES}
# Monster in cave
- [item]
- x=7
- y=33
- image=terrain/mine.png
- [/item]
+ {PLACE_IMAGE terrain/mine.png 7 33}
+
[event]
name=moveto
[filter]
@@ -120,12 +117,8 @@
x=3-12
y=30-36
[/filter]
- [unit]
- side=3
- x=7
- y=33
- type=Yeti
- [/unit]
+
+ {UNIT (Yeti) (A Yeti) ( _ "A Yeti") 3 7 33}
[/event]
# Warning to player
@@ -218,37 +211,52 @@
#define STONE_GRUNT X Y
[unit]
+ description=Orcish Grunt
+ user_description= _ "Orcish Grunt"
side=4
type=Orcish Grunt
x={X}
y={Y}
- [status]
+ [status]
stone=on
- [/status]
+ [/status]
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
#define STONE_GOBLIN_KNIGHT X Y
[unit]
+ description=Goblin Knight
+ user_description= _ "Goblin Knight"
side=4
type=Goblin Knight
x={X}
y={Y}
- [status]
+ [status]
stone=on
- [/status]
+ [/status]
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
#define STONE_TROLL X Y
[unit]
+ description=Troll
+ user_description= _ "Troll"
side=4
type=Troll
x={X}
y={Y}
- [status]
+ [status]
stone=on
- [/status]
+ [/status]
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
@@ -345,11 +353,8 @@
[/event]
#Where the player has to move to to undo the cockatrice's power
- [item]
- x=25
- y=56
- image=terrain/temple.png
- [/item]
+
+ {PLACE_IMAGE terrain/temple.png 25 56}
[event]
name=moveto
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.42
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.43
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.42 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg Thu Mar
24 10:18:38 2005
@@ -399,7 +399,7 @@
y=22,22,23,23
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 5 42 23}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 5 42 23}
[move_unit_fake]
type=Ancient Lich
@@ -407,7 +407,7 @@
y=22,22,23,23,24
[/move_unit_fake]
- {UNIT (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord Jevyan")
5 42 24}
+ {UNDEAD_INTEL (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord
Jevyan") 5 42 24}
[message]
description=Lich-Lord Jevyan
@@ -418,7 +418,7 @@
message= _ "You monster! You've betrayed our people- -
to ally yourself with these Orcs?!"
[/message]
- {UNIT (Death Knight) (Fool Prince) ( _ "Fool Prince") 5 43 24}
+ {UNDEAD_INTEL (Death Knight) (Fool Prince) ( _ "Fool Prince") 5
43 24}
[message]
description=Lich-Lord Jevyan
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.27 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg Thu Mar 24
10:18:38 2005
@@ -282,7 +282,7 @@
y=15,15,15
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 4 3 15}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 4 3 15}
[kill]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.29 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Thu Mar 24
10:18:38 2005
@@ -151,17 +151,8 @@
message= _ "She's. . . She's beautiful."
[/message]
- [unit]
- side=2
- type=Vampire Lady
- description=Midnight Queen
- user_description= _ "Midnight Queen"
- x={X}
- y={Y}
- [modifications]
- {TRAIT_UNDEAD}
- [/modifications]
- [/unit]
+ {UNDEAD_INTEL (Vampire Lady) (Midnight Queen) ( _ "Midnight
Queen") 2 ({X}) ({Y})}
+
{UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
{UNDEAD_UNIT (Blood Bat) 2 ({X}) ({Y})}
{UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.33
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.34
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.33
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg Thu Mar
24 10:18:38 2005
@@ -292,7 +292,7 @@
y=1,2,2
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 4 4 2}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 4 4 2}
[message]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.37
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.38
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.37
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Thu Mar
24 10:18:38 2005
@@ -272,7 +272,7 @@
y=1,1,2
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 2 28 2}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 2 28 2}
[move_unit_fake]
type=Ancient Lich
@@ -280,7 +280,7 @@
y=1,2,2
[/move_unit_fake]
- {UNIT (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord Jevyan")
2 25 2}
+ {UNDEAD_INTEL (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord
Jevyan") 2 25 2}
[message]
description=Lich-Lord Jevyan
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.28 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Thu Mar
24 10:18:38 2005
@@ -264,7 +264,7 @@
# y=1-45
#[/remove_shroud]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 2 40 39}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 2 40 39}
[set_variable]
name=num_orcs_alive
@@ -482,30 +482,24 @@
#define JEVGOLD
#ifdef EASY
- [command]
- [gold]
- side=2
- amount=40
- [/gold]
- [/command]
+ [gold]
+ side=2
+ amount=40
+ [/gold]
#endif
#ifdef NORMAL
- [command]
- [gold]
- side=2
- amount=80
- [/gold]
- [/command]
+ [gold]
+ side=2
+ amount=80
+ [/gold]
#endif
#ifdef HARD
- [command]
- [gold]
- side=2
- amount=120
- [/gold]
- [/command]
+ [gold]
+ side=2
+ amount=120
+ [/gold]
#endif
#enddef
@@ -830,6 +824,9 @@
x=22
y=23
moves=0
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[message]
@@ -893,6 +890,9 @@
x=42
y=17
moves=0
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[message]
@@ -956,6 +956,9 @@
x=41
y=39
moves=0
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
[message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.30 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Thu Mar
24 10:18:38 2005
@@ -306,7 +306,7 @@
y=25,25,26
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 4 3 26}
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") 4 3 26}
[message]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.27 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg Thu Mar 24
10:18:38 2005
@@ -115,8 +115,8 @@
#ifdef HARD
type=Heavy Infantryman
#endif
- description=Guard
- user_description= _ "Guard"
+ description=Eldaric's Guard
+ user_description= _ "Eldaric's Guard"
unrenamable=yes
x={X}
y={Y}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.30 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg Thu Mar
24 10:18:38 2005
@@ -309,20 +309,8 @@
x={X}
y={Y}
[/filter]
- [command]
- [gold]
- side=1
- amount=50
- [/gold]
- [/command]
-
- [command]
- [message]
- speaker=narrator
- message= _ "You find treasure worth 50 pieces of gold
in the temple"
- [/message]
- [/command]
-
+
+ {LOOT 50 1}
[/event]
#enddef
@@ -517,5 +505,5 @@
message= _ "We have run out of time. . . We'll be
trapped in this swamp when winter arrives!"
[/message]
[/event]
-
+
[/scenario]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.35
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.36
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.35 Wed Mar
23 09:04:33 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Thu Mar 24
10:18:38 2005
@@ -350,8 +350,8 @@
[filter_second]
description=Tan-Erirt
[/filter_second]
-
- {UNIT (Soul Shooter) (Rabbin) ( _ "Rabbin") 2 1 28}
+
+ {UNDEAD_INTEL (Soul Shooter) (Rabbin) ( _ "Rabbin") 2 1 28}
[message]
description=Rabbin
@@ -371,9 +371,9 @@
#The Forest Orc
description=Tan-Gagar
[/filter_second]
-
- {UNIT (Draug) (General Kafka) ( _ "General Kafka") 3 35 19}
-
+
+ {UNDEAD_INTEL (Draug) (General Kafka) ( _ "General Kafka") 3 35
19}
+
[message]
description=General Kafka
message= _ "Never trust the living to do the job of the
undead. Prepare to meet the inevitable!"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.12
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.13
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.12 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg Thu Mar 24
10:18:38 2005
@@ -5,22 +5,19 @@
#LOOT
#GUARD_UNIT
#HERO
+#UNDEAD_INTEL
#RISE_UP_RISE_UP
#define LOOT AMOUNT SIDE
- [command]
- [gold]
- side={SIDE}
- amount={AMOUNT}
- [/gold]
- [/command]
-
- [command]
- [message]
- speaker=narrator
- message= _ "You retrieve {AMOUNT} pieces of gold."
- [/message]
- [/command]
+ [gold]
+ side={SIDE}
+ amount={AMOUNT}
+ [/gold]
+
+ [message]
+ speaker=narrator
+ message= _ "You retrieve {AMOUNT} pieces of gold."
+ [/message]
#enddef
#define HERO TYPE DESC UDESC SIDE X Y
@@ -57,6 +54,21 @@
[/unit]
#enddef
+#define UNDEAD_INTEL TYPE DESCRIPTION UDESCRIPTION SIDE X Y
+ [unit]
+ type={TYPE}
+ description={DESCRIPTION}
+ user_description={UDESCRIPTION}
+ side={SIDE}
+ x={X}
+ y={Y}
+ [modifications]
+ {TRAIT_UNDEAD}
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
+#enddef
+
#define RISE_UP_RISE_UP X Y
[filter]
side=1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data/scenarios Heir_To_The_Throne/A_Cho...,
James Spencer <=