[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/data scenarios/The_Rise_of_Wesnoth/A_Be...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data scenarios/The_Rise_of_Wesnoth/A_Be... |
|
Date: |
Wed, 23 Mar 2005 02:40:10 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/03/23 07:40:09
Modified files:
data/scenarios/The_Rise_of_Wesnoth: A_Beach.cfg
A_Final_Spring.cfg
A_Harrowing_Escape.cfg
A_New_Land.cfg
A_Spy_in_the_Woods.cfg
A_Summer_of_Storms.cfg
Clearwater_Port.cfg
Cursed_Isle.cfg
Elf_Lords.cfg
Fallen_Lich_Point.cfg
Peoples_in_Decline.cfg
Return_of_the_Fleet.cfg
Return_to_Oldwood.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg Sewer.cfg
Temple_of_the_Deep.cfg
The_Dragon.cfg The_Fall.cfg
The_Midlands.cfg
The_Oldwood.cfg
The_River_Road.cfg
The_Vanguard.cfg
Troll_Hole.cfg
trow-macros.cfg
data : utils.cfg
Log message:
Update Unit macros to support user descriptions, update TRoW to reflect
that, other minor changes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg.diff?tr1=1.26&tr2=1.27&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.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.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/A_New_Land.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.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/Cursed_Isle.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/Elf_Lords.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg.diff?tr1=1.34&tr2=1.35&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.32&tr2=1.33&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.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg.diff?tr1=1.26&tr2=1.27&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.27&tr2=1.28&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.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.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/Temple_of_the_Deep.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/The_Dragon.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/The_Fall.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg.diff?tr1=1.36&tr2=1.37&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.29&tr2=1.30&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.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg.diff?tr1=1.25&tr2=1.26&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.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.26 Sun Mar 20
23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg Wed Mar 23
07:40:09 2005
@@ -178,23 +178,8 @@
type=Giant Mudcrawler
[/filter]
- [unit]
- description=A Blob
- user_description= _ "A Blob"
- type=Mudcrawler
- side=2
- x={X}
- y={Y}
- [/unit]
-
- [unit]
- description=A Blob
- user_description= _ "A Blob"
- type=Mudcrawler
- side=3
- x={X}
- y={Y}
- [/unit]
+ {UNIT (Mudcrawler) () ( _ "") 2 ({X}) ({Y})}
+ {UNIT (Mudcrawler) () ( _ "") 3 ({X}) ({Y})}
#enddef
[event]
@@ -260,26 +245,26 @@
y=15,14,15,15,16,15
[/move_unit_fake]
- {UNIT (Naga Warrior) (Riaa) 2 6 15}
+ {UNIT (Naga Warrior) (Riaa) ( _ "Riaa") 2 6 15}
[message]
speaker=Riaa
message= _ "We must protect the Saurians we need the
metal!"
[/message]
- {UNIT (Naga Fighter) (Liabra) 3 5 15}
- {UNIT (Naga Fighter) (Brissal) 2 5 16}
+ {UNIT (Naga Fighter) (Liabra) ( _ "Liabra") 3 5 15}
+ {UNIT (Naga Fighter) (Brissal) ( _ "Brissal") 2 5 16}
#ifdef MEDIUM
- {UNIT (Naga Fighter) (Gaxmail) 3 4 14}
- {UNIT (Naga Fighter) (Griama) 2 4 16}
+ {UNIT (Naga Fighter) (Gaxmail) ( _ "Gaxmail") 3 4 14}
+ {UNIT (Naga Fighter) (Griama) ( _ "Gaxmail") 2 4 16}
#endif
#ifdef HARD
- {UNIT (Naga Fighter) (Gaxmail) 3 4 14}
- {UNIT (Naga Fighter) (Griama) 2 4 16}
- {UNIT (Naga Fighter) (Saxiala) 3 3 14}
- {UNIT (Naga Fighter) (Gaxmail) 2 3 17}
+ {UNIT (Naga Fighter) (Gaxmail) ( _ "Gaxmail") 3 4 14}
+ {UNIT (Naga Fighter) (Griama) ( _ "Griama") 2 4 16}
+ {UNIT (Naga Fighter) (Saxiala) ( _ "Saxiala") 3 3 14}
+ {UNIT (Naga Fighter) (Gaxmail) ( _ "Gaxmail") 2 3 17}
#endif
[/event]
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.41
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.41 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg Wed Mar
23 07:40:09 2005
@@ -212,10 +212,10 @@
y=29
[/recall]
- {GUARD_UNIT (Swordsman) (Southbay Guard) 2 19 33}
- {GUARD_UNIT (Swordsman) (Southbay Guard) 2 21 30}
- {GUARD_UNIT (Swordsman) (Southbay Guard) 2 28 24}
- {GUARD_UNIT (Swordsman) (Southbay Guard) 2 27 22}
+ {GUARD_UNIT (Swordsman) (Southbay Guard) ( _ "Southbay Guard")
2 19 33}
+ {GUARD_UNIT (Swordsman) (Southbay Guard) ( _ "Southbay Guard")
2 21 30}
+ {GUARD_UNIT (Swordsman) (Southbay Guard) ( _ "Southbay Guard")
2 28 24}
+ {GUARD_UNIT (Swordsman) (Southbay Guard) ( _ "Southbay Guard")
2 27 22}
[object]
#Thanks to Dave for helping me
@@ -333,7 +333,7 @@
y=21,20,20,19
[/move_unit_fake]
- {HERO (Merman Warrior) (Lord Typhon) 1 4 19}
+ {HERO (Merman Warrior) (Lord Typhon) ( _ "Lord Typhon") 1 4 19}
[message]
description=Lord Typhon
@@ -399,7 +399,7 @@
y=22,22,23,23
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) 5 42 23}
+ {UNIT (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) 5 42 24}
+ {UNIT (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) 5 43 24}
+ {UNIT (Death Knight) (Fool Prince) ( _ "Fool Prince") 5 43 24}
[message]
description=Lich-Lord Jevyan
@@ -448,18 +448,18 @@
y=24,23,23,22,22
[/move_unit_fake]
- {UNIT (Revenant) (Undead) 5 41 22}
- {UNIT (Bone Shooter) (Undead) 5 43 24}
+ {UNDEAD_UNIT (Revenant) 5 41 22}
+ {UNDEAD_UNIT (Bone Shooter) 5 43 24}
#ifdef NORMAL
- {UNIT (Chocobone) (Undead) 5 42 23}
- {UNIT (Chocobone) (Undead) 5 43 23}
+ {UNDEAD_UNIT (Chocobone) 5 42 23}
+ {UNDEAD_UNIT (Chocobone) 5 43 23}
#endif
#ifdef HARD
- {UNIT (Chocobone) (Undead) 5 42 23}
- {UNIT (Chocobone) (Undead) 5 43 23}
- {UNIT (Necrophage) (Undead) 5 44 23}
- {UNIT (Necrophage) (Undead) 5 44 22}
+ {UNDEAD_UNIT (Chocobone) 5 42 23}
+ {UNDEAD_UNIT (Chocobone) 5 43 23}
+ {UNDEAD_UNIT (Necrophage) 5 44 23}
+ {UNDEAD_UNIT (Necrophage) 5 44 22}
#endif
[kill]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.30
Sun Mar 20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg Wed Mar
23 07:40:09 2005
@@ -97,19 +97,19 @@
{PLACE_IMAGE (items/signpost.png) 23 38}
{PLACE_IMAGE (items/signpost.png) 13 7}
#ifdef EASY
- {GUARD_UNIT (Orcish Grunt) (Snagakhan) 2 17 37}
- {GUARD_UNIT (Orcish Grunt) (Knafakhan) 3 19 36}
+ {GUARD_UNIT (Orcish Grunt) (Snagakhan) ( _ "Snagakhan") 2 17 37}
+ {GUARD_UNIT (Orcish Grunt) (Knafakhan) ( _ "Knafakhan") 3 19 36}
#endif
#ifdef NORMAL
- {GUARD_UNIT (Orcish Warrior) (Snagakhan) 2 17 37}
- {GUARD_UNIT (Orcish Warrior) (Knafakhan) 3 19 36}
+ {GUARD_UNIT (Orcish Warrior) (Snagakhan) ( _ "Snagakhan") 2 17
37}
+ {GUARD_UNIT (Orcish Warrior) (Knafakhan) ( _ "Knafakhan") 3 19
36}
#endif
#ifdef HARD
- {GUARD_UNIT (Orcish Warrior) (Snagakhan) 2 17 37}
- {GUARD_UNIT (Orcish Warrior) (Knafakhan) 3 19 36}
- {GUARD_UNIT (Orcish Warrior) (Hoshnak) 2 6 23}
- {GUARD_UNIT (Orcish Warrior) (Gruumogth) 3 8 22}
+ {GUARD_UNIT (Orcish Warrior) (Snagakhan) ( _ "Snagakhan") 2 17
37}
+ {GUARD_UNIT (Orcish Warrior) (Knafakhan) ( _ "Knafakhan") 3 19
36}
+ {GUARD_UNIT (Orcish Warrior) (Hoshnak) ( _ "Hoshnak") 2 6 23}
+ {GUARD_UNIT (Orcish Warrior) (Gruumogth) ( _ "Gruumogth") 3 8
22}
#endif
[recall]
description=Lady Outlaw
@@ -168,7 +168,19 @@
message= _ "Who goes there?"
[/message]
- {HERO (Dwarvish Steelclad) (Burin the Lost) 1 8 5}
+ [unit]
+ description=Burin the Lost
+ user_description= _ "Burin the Lost"
+ side=1
+ type=Dwarvish Steelclad
+ unrenamable=yes
+ x=8
+ y=5
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_STRONG}
+ [/modifications]
+ [/unit]
[message]
speaker=Burin the Lost
@@ -331,7 +343,7 @@
side=3
amount=60
[/gold]
- {UNIT (Orcish Slayer) (Hashnak) 3 25 40}
+ {UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak")
3 25 40}
#else
[gold]
@@ -339,9 +351,9 @@
amount=90
[/gold]
- {UNIT (Orcish Slayer) (Hashnak) 3 25 40}
- {UNIT (Orcish Assassin) (Grork) 3 24 40}
- {UNIT (Orcish Assassin) (Vigdish) 3 26 40}
+ {UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak")
3 25 40}
+ {UNIT (Orcish Assassin) (Grork) ( _ "Grork") 3
24 40}
+ {UNIT (Orcish Assassin) (Vigdish) ( _
"Vigdish") 3 26 40}
#endif
[message]
@@ -393,16 +405,16 @@
amount=60
[/gold]
- {UNIT (Orcish Slayer) (Hashnak) 2 25 40}
+ {UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak")
2 25 40}
#else
[gold]
side=2
amount=90
[/gold]
- {UNIT (Orcish Slayer) (Hashnak) 2 25 40}
- {UNIT (Orcish Assassin) (Grork) 2 24 40}
- {UNIT (Orcish Assassin) (Vigdish) 2 26 40}
+ {UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak")
2 25 40}
+ {UNIT (Orcish Assassin) (Grork) ( _ "Grork") 2
24 40}
+ {UNIT (Orcish Assassin) (Vigdish) ( _
"Vigdish") 2 26 40}
#endif
[message]
speaker=Tan-Schmog
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.26
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.26 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg Wed Mar 23
07:40:09 2005
@@ -233,7 +233,7 @@
y=8.8.9.8,7
[/move_unit_fake]
- {UNIT (Elvish Shyde) (Lord Dionli) 2 28 7}
+ {UNIT (Elvish Shyde) (Lord Dionli) ( _ "Lord Dionli") 2 28 7}
[message]
description=Lord Dionli
@@ -282,7 +282,7 @@
y=15,15,15
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) 4 3 15}
+ {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 4 3 15}
[kill]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.24
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg Wed Mar
23 07:40:09 2005
@@ -59,7 +59,7 @@
name=prestart
{PLACE_IMAGE (items/pine2.png) 13 12}
- {HERO (Outlaw Queen) (Jessica in Hiding) 4 19 16}
+ {HERO (Outlaw Queen) (Jessica in Hiding) ( _ "Jessica in
Hiding") 4 19 16}
[teleport]
[filter]
@@ -74,7 +74,7 @@
y=21
[/hide_unit]
- {UNIT (Elvish Marshal) (Lord El'Isomithir) 4 13 14}
+ {UNIT (Elvish Marshal) (Lord El'Isomithir) ( _ "Lord
El'Isomithir") 4 13 14}
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.23
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.23
Sun Mar 20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg Wed Mar
23 07:40:09 2005
@@ -71,7 +71,7 @@
{STARTING_VILLAGES 1 6}
{STARTING_VILLAGES 2 6}
- {HERO (Warrior King) (King Eldaric IV) 1 28 15}
+ {HERO (Warrior King) (King Eldaric IV) ( _ "King Eldaric IV") 1
28 15}
[objectives]
side=1
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.42
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.43
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.42 Mon Mar
21 08:46:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg Wed Mar
23 07:40:09 2005
@@ -225,9 +225,9 @@
description=Minister Edmond
[/recall]
- {UNIT (Peasant) (Angry Farmer) 2 26 18}
- {UNIT (Peasant) (Angry Farmer) 2 28 19}
- {UNIT (Peasant) (Angry Farmer) 2 29 22}
+ {UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 26 18}
+ {UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 28 19}
+ {UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 29 22}
[objectives]
side=1
@@ -388,17 +388,17 @@
[/allow_recruit]
#ifdef EASY
- {UNIT (Sea Orc) (Rolo) 3 31 30}
+ {UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
#endif
#ifdef NORMAL
- {UNIT (Sea Orc) (Rolo) 3 31 30}
- {UNIT (Sea Orc) (Porbag) 3 30 31}
+ {UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
+ {UNIT (Sea Orc) (Porbag) ( _ "Porbag") 3 30 31}
#endif
#ifdef HARD
- {UNIT (Sea Orc) (Rolo) 3 31 30}
- {UNIT (Sea Orc) (Porbag) 3 30 31}
- {UNIT (Sea Orc) (Eriol) 3 27 33}
+ {UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
+ {UNIT (Sea Orc) (Porbag) ( _ "Porbag") 3 30 31}
+ {UNIT (Sea Orc) (Eriol) ( _ "Eriol") 3 27 33}
#endif
[/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.28 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Wed Mar 23
07:40:09 2005
@@ -150,6 +150,7 @@
speaker=unit
message= _ "She's. . . She's beautiful."
[/message]
+
[unit]
side=2
type=Vampire Lady
@@ -157,32 +158,16 @@
user_description= _ "Midnight Queen"
x={X}
y={Y}
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
- [unit]
- side=3
- type=Blood Bat
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=2
- type=Blood Bat
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=3
- type=Blood Bat
- x={X}
- y={Y}
- [/unit]
+ {UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
+ {UNDEAD_UNIT (Blood Bat) 2 ({X}) ({Y})}
+ {UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
+
#ifdef HARD
- [unit]
- side=2
- type=Blood Bat
- x={X}
- y={Y}
- [/unit]
+ {UNDEAD_UNIT (Blood Bat) 2 ({X}) ({Y})}
#endif
[message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.25 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg Wed Mar 23
07:40:09 2005
@@ -149,7 +149,7 @@
y=22
[/teleport]
- {UNIT (Elvish Marshal) (Lord El'Isomithir) 4 13 14}
+ {UNIT (Elvish Marshal) (Lord El'Isomithir) ( _ "Lord
El'Isomithir") 4 13 14}
[/event]
@@ -647,7 +647,7 @@
y=25,24,24
[/move_unit_fake]
- {HERO (Lieutenant) (Lt. Aethyr) 1 19 24}
+ {HERO (Lieutenant) (Lt. Aethyr) ( _ "Lt.
Aethyr") 1 19 24}
[message]
description=Lord Logalmier
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.34
Wed Mar 23 03:47:51 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg Wed Mar
23 07:40:09 2005
@@ -174,6 +174,9 @@
[status]
stone=on
[/status]
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
#enddef
@@ -186,6 +189,9 @@
[status]
stone=on
[/status]
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
#enddef
{STONE_SHOOTER 12 35}
@@ -534,7 +540,7 @@
y=1,2,3,3,4,4,5,6,7,7,8,9,10,10,11
[/move_unit_fake]
- {UNIT (Yeti) (Rarlg) 4 12 11}
+ {UNIT (Yeti) (Rarlg) ( _ "Rarlg") 4 12 11}
[message]
description=Rarlg
@@ -561,7 +567,7 @@
description=Rarlg
[/scroll_to_unit]
- {UNIT (Yeti) (Raul-Rarlg) 4 15 11}
+ {UNIT (Yeti) (Raul-Rarlg) ( _ "Raul-Rarlg") 4 15 11}
[/event]
[event]
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.32
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.32
Sun Mar 20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg Wed Mar
23 07:40:09 2005
@@ -247,7 +247,7 @@
{VARIABLE_OP xx1 random 14..19}
{VARIABLE_OP yy1 random 16..19}
- {UNIT (Sea Serpent) (Bitey the Serpent) 4 $xx1 $yy1}
+ {UNIT (Sea Serpent) (Bitey the Serpent) ( _ "Bitey the
Serpent") 4 $xx1 $yy1}
[message]
speaker=unit
@@ -292,7 +292,7 @@
y=1,2,2
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) 4 4 2}
+ {UNIT (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.36
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.36
Sun Mar 20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Wed Mar
23 07:40:09 2005
@@ -272,7 +272,7 @@
y=1,1,2
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) 2 28 2}
+ {UNIT (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) 2 25 2}
+ {UNIT (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord Jevyan")
2 25 2}
[message]
description=Lich-Lord Jevyan
@@ -305,17 +305,17 @@
y=2,2,1
[/move_unit_fake]
- {UNIT (Chocobone) (Undead Rider) 2 26 4}
- {UNIT (Chocobone) (Undead Rider) 2 27 4}
- {UNIT (Chocobone) (Undead Rider) 2 25 4}
+ {UNDEAD_UNIT (Chocobone) 2 26 4}
+ {UNDEAD_UNIT (Chocobone) 2 27 4}
+ {UNDEAD_UNIT (Chocobone) 2 25 4}
#ifdef NORMAL
- {UNIT (Chocobone) (Undead Rider) 2 28 3}
- {UNIT (Chocobone) (Undead Rider) 2 24 3}
+ {UNDEAD_UNIT (Chocobone) 2 28 3}
+ {UNDEAD_UNIT (Chocobone) 2 24 3}
#endif
#ifdef HARD
- {UNIT (Chocobone) (Undead Rider) 2 28 3}
- {UNIT (Chocobone) (Undead Rider) 2 24 3}
+ {UNDEAD_UNIT (Chocobone) 2 28 3}
+ {UNDEAD_UNIT (Chocobone) 2 24 3}
#endif
[message]
@@ -452,14 +452,14 @@
[/filter]
#No campaign is complete without a cuttlefish
- {UNIT (Cuttle Fish) (Cuttle Fish) 3 11 17}
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 3 11 17}
#ifdef NORMAL
- {UNIT (Cuttle Fish) (Cuttle Fish) 3 11 18}
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 3 11 18}
#endif
#ifdef HARD
- {UNIT (Cuttle Fish) (Cuttle Fish) 3 11 18}
- {UNIT (Cuttle Fish) (Cuttle Fish) 3 12 16}
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 3 11 18}
+ {UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 3 12 16}
#endif
[message]
description=Cuttle Fish
@@ -478,18 +478,18 @@
x=25-40
y=13-18
[/filter]
- {UNIT (Saurian Flanker) (Flixta) 4 34 15}
- {UNIT (Saurian Icecaster) (Bzz'Kza) 4 34 16}
- {UNIT (Saurian Soothsayer) (Tirasch) 4 33 16}
+ {UNIT (Saurian Flanker) (Flixta) ( _ "Flixta") 4 34 15}
+ {UNIT (Saurian Icecaster) (Bzz'Kza) ( _ "Bzz'Kza") 4 34 16}
+ {UNIT (Saurian Soothsayer) (Tirasch) ( _ "Tirasch") 4 33 16}
#ifdef NORMAL
- {UNIT (Saurian Skirmisher) (Kersezz) 4 35 15}
- {UNIT (Saurian Skirmisher) (Tarex) 4 33 15}
+ {UNIT (Saurian Skirmisher) (Kersezz) ( _ "Kersezz") 4 35 15}
+ {UNIT (Saurian Skirmisher) (Tarex) ( _ "Tarex") 4 33 15}
#endif
#ifdef HARD
- {UNIT (Saurian Skirmisher) (Zzalkz) 4 35 15}
- {UNIT (Saurian Skirmisher) (Amprixta) 4 34 16}
- {UNIT (Saurian Skirmisher) (Anexir) 4 33 15}
+ {UNIT (Saurian Skirmisher) (Zzalkz) ( _ "Zzalkz") 4 35 15}
+ {UNIT (Saurian Skirmisher) (Amprixta) ( _ "Amprixta") 4 34 16}
+ {UNIT (Saurian Skirmisher) (Anexir) ( _ "Anexir") 4 33 15}
#endif
[message]
description=Flixta
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.26
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg Wed Mar
23 07:40:09 2005
@@ -89,10 +89,10 @@
{PLACE_IMAGE (items/castle-ruins.png) 15 17}
{PLACE_IMAGE (items/castle-ruins.png) 15 16}
- {GUARD_UNIT (Wose) (Orofarn�) 4 14 13}
- {GUARD_UNIT (Wose) (Bolwuldelman) 4 19 14}
- {GUARD_UNIT (Wose) (Bregalad) 4 19 18}
- {GUARD_UNIT (Wose) (Dolmannumbil) 4 13 17}
+ {GUARD_UNIT (Wose) (Orofarn�) ( _ "Orofarn�") 4 14 13}
+ {GUARD_UNIT (Wose) (Bolwuldelman) ( _ "Bolwuldelman") 4 19 14}
+ {GUARD_UNIT (Wose) (Bregalad) ( _ "Bregalad") 4 19 18}
+ {GUARD_UNIT (Wose) (Dolmannumbil) ( _ "Dolmannumbil") 4 13 17}
[recall]
description=Burin the Lost
@@ -152,6 +152,7 @@
x=6
y=22
[/unit]
+
[if]
[variable]
name=have_lady
@@ -269,15 +270,9 @@
[kill]
description=Lady Outlaw
[/kill]
- [unit]
- description=Lady Jessica
- user_description= _ "Lady Jessica"
- type=Outlaw Princess
- unrenamable=yes
- side=1
- x=6
- y=22
- [/unit]
+
+ {HERO (Outlaw Princess) (Lady Jessica) ( _ "Lady Jessica") 1 6
22}
+
[scroll_to_unit]
description=Lady Jessica
[/scroll_to_unit]
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.27
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.27 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Wed Mar
23 07:40:09 2005
@@ -264,7 +264,7 @@
# y=1-45
#[/remove_shroud]
- {UNIT (Blood Bat) (Familiar) 2 40 39}
+ {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 2 40 39}
[set_variable]
name=num_orcs_alive
@@ -1005,7 +1005,7 @@
y=32,31,32,32,33,32
[/move_unit_fake]
- {UNIT (Naga Warrior) (Abraxas) 2 6 32}
+ {UNIT (Naga Warrior) (Abraxas) ( _ "Abraxas") 2 6 32}
[scroll_to_unit]
description=Abraxas
@@ -1016,19 +1016,19 @@
message= _ "It's the Haldric! Jevyan you never said you
came to destroy this monster. We will help you."
[/message]
- {UNIT (Naga Fighter) (Xamalia) 3 5 32}
- {UNIT (Naga Fighter) (Brissal) 2 5 33}
+ {UNIT (Naga Fighter) (Xamalia) ( _ "Xamalia") 3 5 32}
+ {UNIT (Naga Fighter) (Brissal) ( _ "Brissal") 2 5 33}
#ifdef MEDIUM
- {UNIT (Naga Fighter) (Saxiala) 3 4 31}
- {UNIT (Naga Fighter) (Liabra) 2 4 34}
+ {UNIT (Naga Fighter) (Saxiala) ( _ "Saxiala") 3 4 31}
+ {UNIT (Naga Fighter) (Liabra) ( _ "Liabra") 2 4 34}
#endif
#ifdef HARD
- {UNIT (Naga Fighter) (Saxiala) 3 4 31}
- {UNIT (Naga Fighter) (Liabra) 2 4 34}
- {UNIT (Naga Fighter) (Riaa) 3 3 31}
- {UNIT (Naga Fighter) (Griama) 2 3 35}
+ {UNIT (Naga Fighter) (Saxiala) ( _ "Saxiala") 3 4 31}
+ {UNIT (Naga Fighter) (Liabra) ( _ "Liabra") 2 4 34}
+ {UNIT (Naga Fighter) (Riaa) ( _ "Riaa") 3 3 31}
+ {UNIT (Naga Fighter) (Griama) ( _ "Griama") 2 3 35}
#endif
[allow_recruit]
@@ -1045,15 +1045,15 @@
[/message]
#ifdef EASY
- {UNIT (Skeleton) (Skeleton) 2 1 $yy1}
+ {UNDEAD_UNIT (Skeleton) 2 1 $yy1}
#endif
#ifdef NORMAL
- {UNIT (Skeleton Archer) (Skeleton Archer) 2 1 $yy1}
- {UNIT (Skeleton) (Skeleton) 2 1 $yy1}
+ {UNDEAD_UNIT (Skeleton Archer) 2 1 $yy1}
+ {UNDEAD_UNIT (Skeleton) 2 1 $yy1}
#endif
#ifdef HARD
- {UNIT (Revenant) (Revenant) 2 1 $yy1}
- {UNIT (Skeleton Archer) (Skeleton Archer) 2 1 $yy1}
+ {UNDEAD_UNIT (Revenant) 2 1 $yy1}
+ {UNDEAD_UNIT (Skeleton Archer) 2 1 $yy1}
#endif
[scroll_to_unit]
x=1
@@ -1073,16 +1073,16 @@
[/message]
#ifdef EASY
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
#endif
#ifdef NORMAL
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
#endif
#ifdef HARD
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
- {UNIT (Walking Corpse) (The Risen) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
#endif
[scroll_to_unit]
x=$xx1
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.29 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Wed Mar
23 07:40:09 2005
@@ -210,7 +210,7 @@
{VARIABLE_OP xx1 random 16..19}
{VARIABLE_OP yy1 random 23..30}
- {UNIT (Sea Serpent) (Chompey the Serpent) 2 $xx1 $yy1}
+ {UNIT (Sea Serpent) (Chompey the Serpent) ( _ "Chompey the
Serpent") 2 $xx1 $yy1}
[message]
speaker=unit
@@ -238,7 +238,7 @@
{VARIABLE_OP xx1 random 13..25}
{VARIABLE_OP yy1 random 7..8}
- {UNIT (Sea Serpent) (Scaly the Serpent) 2 $xx1 $yy1}
+ {UNIT (Sea Serpent) (Scaly the Serpent) ( _ "Scaly the
Serpent") 2 $xx1 $yy1}
[message]
speaker=unit
@@ -266,7 +266,7 @@
{VARIABLE_OP xx1 random 1..14}
{VARIABLE_OP yy1 random 12..13}
- {UNIT (Sea Serpent) (Toothey the Serpent) 2 $xx1 $yy1}
+ {UNIT (Sea Serpent) (Toothey the Serpent) ( _ "Toothey the
Serpent") 2 $xx1 $yy1}
[message]
speaker=unit
@@ -306,7 +306,7 @@
y=25,25,26
[/move_unit_fake]
- {UNIT (Blood Bat) (Familiar) 4 3 26}
+ {UNIT (Blood Bat) (Familiar) ( _ "Familiar") 4 3 26}
[message]
description=Familiar
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.33
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.34
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.33 Wed Mar 23
03:47:51 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg Wed Mar 23
07:40:09 2005
@@ -109,25 +109,25 @@
description=Minister Edmond
[/recall]
- {GUARD_UNIT (Giant Spider) (Spider) 2 2 6}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 3 5}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 24 18}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 20 15}
+ {GUARD_UNIT (Giant Spider) (Spider) ( _ "Spider") 2 2 6}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 5}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 24 18}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 20 15}
#ifdef NORMAL
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 12 7}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 16 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 29 20}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 14 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 2 5}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
#endif
#ifdef HARD
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 12 7}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 16 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 29 20}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 14 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 2 5}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 3 7}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 7}
#endif
[objectives]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.37
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.38
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.37
Wed Mar 23 03:47:51 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg Wed Mar
23 07:40:09 2005
@@ -60,28 +60,28 @@
name=prestart
#ifdef EASY
- {UNIT (Tentacle of the Deep) (Tentacle) 2 3 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 22 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 10 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 16 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 3 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 22 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 10 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 16 16}
#endif
#ifdef NORMAL
- {UNIT (Tentacle of the Deep) (Tentacle) 2 3 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 22 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 10 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 16 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 12 17}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 14 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 3 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 22 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 10 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 16 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 12 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 14 17}
#endif
#ifdef HARD
- {UNIT (Tentacle of the Deep) (Tentacle) 2 3 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 22 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 10 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 16 16}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 12 17}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 14 17}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 10 15}
- {UNIT (Tentacle of the Deep) (Tentacle) 2 16 15}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 3 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 22 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 10 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 16 16}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 12 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 14 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 10 15}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 16 15}
#endif
{PLACE_IMAGE (terrain/cave-floor1.png) 6 18}
{PLACE_IMAGE (terrain/cave-floor1.png) 20 18}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.28 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg Wed Mar 23
07:40:09 2005
@@ -293,23 +293,8 @@
type=Giant Mudcrawler
[/filter]
- [unit]
- description=A Blob
- user_description= _ "A Blob"
- type=Mudcrawler
- side=2
- x={X}
- y={Y}
- [/unit]
-
- [unit]
- description=A Blob
- user_description= _ "A Blob"
- type=Mudcrawler
- side=3
- x={X}
- y={Y}
- [/unit]
+ {UNIT (Mudcrawler) () ( _ "") 2 ({X}) ({Y})}
+ {UNIT (Mudcrawler) () ( _ "") 3 ({X}) ({Y})}
#enddef
[event]
@@ -364,7 +349,7 @@
numerical_equals=0
[/variable]
[then]
- {UNIT (Fire Dragon) (Shek'kahan) 5 20 27}
+ {UNIT (Fire Dragon) (Shek'kahan) ( _
"Shek'kahan") 5 20 27}
[set_variable]
name=dragon_awake
@@ -391,7 +376,7 @@
numerical_equals=0
[/variable]
[then]
- {UNIT (Fire Dragon) (Shek'kahan) 5 20 27}
+ {UNIT (Fire Dragon) (Shek'kahan) ( _
"Shek'kahan") 5 20 27}
[set_variable]
name=dragon_awake
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.26 Mon Mar
21 22:50:59 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg Wed Mar 23
07:40:09 2005
@@ -120,6 +120,9 @@
unrenamable=yes
x={X}
y={Y}
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
@@ -130,11 +133,11 @@
{STARTING_VILLAGES 2 7}
#ifdef EASY
- {GUARD_UNIT (Poacher) (Wesfolk) 2 11 20}
+ {GUARD_UNIT (Poacher) (Wesfolk) ( _ "Wesfolk") 2 11 20}
#else
- {GUARD_UNIT (Poacher) (Wesfolk) 2 11 20}
- {GUARD_UNIT (Poacher) (Wesfolk) 2 7 21}
- {GUARD_UNIT (Poacher) (Wesfolk) 2 9 22}
+ {GUARD_UNIT (Poacher) (Wesfolk) ( _ "Wesfolk") 2 11 20}
+ {GUARD_UNIT (Poacher) (Wesfolk) ( _ "Wesfolk") 2 7 21}
+ {GUARD_UNIT (Poacher) (Wesfolk) ( _ "Wesfolk") 2 9 22}
#endif
[recall]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.31 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg Wed Mar 23
07:40:09 2005
@@ -262,17 +262,17 @@
y=35,34,34,33
[/move_unit_fake]
- {UNIT (Goblin Knight) (Grilg) 3 11 33}
+ {UNIT (Goblin Knight) (Grilg) ( _ "Grilg") 3 11 33}
[message]
description=Grilg
message= _ "What? More humans here? Get them!"
[/message]
- {UNIT (Wolf Rider) (Rider) 3 10 33}
- {UNIT (Wolf Rider) (Rider) 3 12 33}
+ {UNIT (Wolf Rider) (Rider) ( _ "Rider") 3 10 33}
+ {UNIT (Wolf Rider) (Rider) ( _ "Rider") 3 12 33}
#ifdef HARD
- {UNIT (Goblin Pillager) (Rider) 3 11 34}
+ {UNIT (Goblin Pillager) (Rider) ( _ "Rider") 3 11 34}
#endif
[/event]
@@ -289,17 +289,17 @@
y=35,34,33
[/move_unit_fake]
- {UNIT (Orcish Slayer) (Vrogar) 4 36 33}
+ {UNIT (Orcish Slayer) (Vrogar) ( _ "Vrogar") 4 36 33}
[message]
description=Vrogar
message= _ "How'd they get behind us? I hate to miss
such tasty meat."
[/message]
- {UNIT (Orcish Assassin) (Assassin) 4 35 34}
- {UNIT (Orcish Assassin) (Assassin) 4 37 34}
+ {UNIT (Orcish Assassin) (Assassin) ( _ "Assassin") 4 35 34}
+ {UNIT (Orcish Assassin) (Assassin) ( _ "Assassin") 4 37 34}
#ifdef HARD
- {UNIT (Orcish Crossbowman) (Crossbow) 4 36 34}
+ {UNIT (Orcish Crossbowman) (Crossbow) ( _ "Crossbow") 4 36 34}
#endif
[/event]
@@ -353,7 +353,19 @@
y=15,16,16,16,16,16,15,15,14,14,14
[/move_unit_fake]
- {HERO (Knight) (Sir Ladoc) 1 30 14}
+ [unit]
+ description=Sir Ladoc
+ user_description= _ "Sir Ladoc"
+ side=1
+ type=Knight
+ unrenamable=yes
+ x=30
+ y=14
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_RESILIENT}
+ [/modifications]
+ [/unit]
[message]
description=Sir Ladoc
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.36
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.37
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.36 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg Wed Mar 23
07:40:09 2005
@@ -177,22 +177,22 @@
[/recall]
#ifdef EASY
- {GUARD_UNIT (Elder Wose) (Muldondindal) 4 10 18}
- {GUARD_UNIT (Elder Wose) (Landunwonbam) 4 16 13}
- {GUARD_UNIT (Elder Wose) (Bolwuldelman) 4 7 18}
- {GUARD_UNIT (Elder Wose) (Laffalialomdium) 4 24 7}
- {GUARD_UNIT (Elder Wose) (Wonrunmaldin) 4 16 22}
- {GUARD_UNIT (Elder Wose) (Lassemista) 4 23 6}
+ {GUARD_UNIT (Elder Wose) (Muldondindal) ( _ "Muldondindal") 4
10 18}
+ {GUARD_UNIT (Elder Wose) (Landunwonbam) ( _ "Landunwonbam") 4
16 13}
+ {GUARD_UNIT (Elder Wose) (Bolwuldelman) ( _ "Bolwuldelman") 4 7
18}
+ {GUARD_UNIT (Elder Wose) (Laffalialomdium) ( _
"Laffalialomdium") 4 24 7}
+ {GUARD_UNIT (Elder Wose) (Wonrunmaldin) ( _ "Wonrunmaldin") 4
16 22}
+ {GUARD_UNIT (Elder Wose) (Lassemista) ( _ "Lassemista") 4 23 6}
#endif
#ifdef NORMAL
- {GUARD_UNIT (Elder Wose) (Muldondindal) 4 10 18}
- {GUARD_UNIT (Elder Wose) (Landunwonbam) 4 16 13}
- {GUARD_UNIT (Elder Wose) (Bolwuldelman) 4 7 18}
- {GUARD_UNIT (Elder Wose) (Laffalialomdium) 4 24 7}
+ {GUARD_UNIT (Elder Wose) (Muldondindal) ( _ "Muldondindal") 4
10 18}
+ {GUARD_UNIT (Elder Wose) (Landunwonbam) ( _ "Landunwonbam") 4
16 13}
+ {GUARD_UNIT (Elder Wose) (Bolwuldelman) ( _ "Bolwuldelman") 4 7
18}
+ {GUARD_UNIT (Elder Wose) (Laffalialomdium) ( _
"Laffalialomdium") 4 24 7}
#endif
#ifdef HARD
- {GUARD_UNIT (Elder Wose) (Muldondindal) 4 10 18}
- {GUARD_UNIT (Elder Wose) (Landunwonbam) 4 16 13}
+ {GUARD_UNIT (Elder Wose) (Muldondindal) ( _ "Muldondindal") 4
10 18}
+ {GUARD_UNIT (Elder Wose) (Landunwonbam) ( _ "Landunwonbam") 4
16 13}
#endif
[objectives]
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.29
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.29 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg Wed Mar
23 07:40:09 2005
@@ -131,21 +131,21 @@
{PLACE_IMAGE (terrain/temple.png) 1 26}
{PLACE_IMAGE (terrain/temple.png) 5 12}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 26 4}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 32 27}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 4 17 35}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 26 4}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 27}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 17 35}
#ifdef NORMAL
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 13 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 32 31}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 4 9 34}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
#endif
#ifdef HARD
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 13 8}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 2 15 3}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 32 31}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 3 33 36}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 4 9 34}
- {GUARD_UNIT (Giant Scorpion) (Scorpion) 4 20 32}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 15 3}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 33 36}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
+ {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 20 32}
#endif
[recall]
description=Lady Outlaw
@@ -214,7 +214,7 @@
y=6
side=1
[/filter]
- {UNIT (Giant Scorpion) (Scorpion) 2 16 5}
+ {UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 16 5}
[/event]
[event]
@@ -224,7 +224,7 @@
y=25
side=1
[/filter]
- {UNIT (Giant Scorpion) (Scorpion) 3 10 27}
+ {UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 10 27}
[/event]
[event]
@@ -234,7 +234,7 @@
y=33
side=1
[/filter]
- {UNIT (Giant Scorpion) (Scorpion) 4 32 33}
+ {UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 32 33}
[/event]
#define TEMPLE_HELP X Y
@@ -257,6 +257,10 @@
unrenamable=yes
x={X}
y={Y}
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_STRONG}
+ [/modifications]
[/unit]
[message]
description=Minister Edmond
@@ -287,31 +291,12 @@
speaker=unit
message= _ "Hey, there's somebody hidden in the temple.
Ack! Hold there!"
[/message]
- [unit]
- side=2
- type=Vampire Bat
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=3
- type=Walking Corpse
- x={X}
- y={Y}
- [/unit]
- [unit]
- side=4
- type=Walking Corpse
- x={X}
- y={Y}
- [/unit]
+ {UNDEAD_UNIT (Vampire Bat) 2 ({X}) ({Y})}
+ {UNDEAD_UNIT (Walking Corpse) 3 ({X}) ({Y})}
+ {UNDEAD_UNIT (Walking Corpse) 4 ({X}) ({Y})}
+
#ifdef HARD
- [unit]
- side=2
- type=Ghost
- x={X}
- y={Y}
- [/unit]
+ {UNDEAD_UNIT (type=Ghost) 2 ({X}) ({Y})}
#endif
[/event]
#enddef
@@ -449,7 +434,19 @@
y=35,34,35,34,34,33
[/move_unit_fake]
- {HERO (Knight) (Sir Ruddry) 1 30 33}
+ [unit]
+ description=Sir Ruddry
+ user_description= _ "Sir Ruddry"
+ side=1
+ type=Knight
+ unrenamable=yes
+ x=30
+ y=33
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_RESILIENT}
+ [/modifications]
+ [/unit]
[scroll_to_unit]
description=Sir Ruddry
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.33
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.34
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.33 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Wed Mar 23
07:40:09 2005
@@ -351,17 +351,17 @@
description=Tan-Erirt
[/filter_second]
- {UNIT (Soul Shooter) (Rabbin) 2 1 28}
+ {UNIT (Soul Shooter) (Rabbin) ( _ "Rabbin") 2 1 28}
[message]
description=Rabbin
message= _ "You will be felled by my hand you useless
fleashbags!"
[/message]
- {UNIT (Chocobone) (Rider) 2 1 29}
- {UNIT (Chocobone) (Rider) 2 1 27}
+ {UNDEAD_UNIT (Chocobone) 2 1 29}
+ {UNDEAD_UNIT (Chocobone) 2 1 27}
#ifdef HARD
- {UNIT (Chocobone) (Rider) 2 2 28}
+ {UNDEAD_UNIT (Chocobone) 2 2 28}
#endif
[/event]
@@ -372,7 +372,7 @@
description=Tan-Gagar
[/filter_second]
- {UNIT (Draug) (General Kafka) 3 35 19}
+ {UNIT (Draug) (General Kafka) ( _ "General Kafka") 3 35 19}
[message]
description=General Kafka
@@ -385,11 +385,11 @@
message= _ "The only job of the dead is to remain dead.
Prepare to be reunited with the ground."
[/message]
- {UNIT (Chocobone) (Rider) 3 35 18}
- {UNIT (Chocobone) (Rider) 3 35 20}
+ {UNDEAD_UNIT (Chocobone) 3 35 18}
+ {UNDEAD_UNIT (Chocobone) 3 35 20}
#ifdef HARD
- {UNIT (Chocobone) (Rider) 3 35 17}
- {UNIT (Chocobone) (Rider) 3 35 21}
+ {UNDEAD_UNIT (Chocobone) 3 35 17}
+ {UNDEAD_UNIT (Chocobone) 3 35 21}
#endif
[/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.25 Sun Mar
20 23:56:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg Wed Mar 23
07:40:09 2005
@@ -149,19 +149,19 @@
{PLACE_IMAGE (terrain/rocks.png) 15 3}
{PLACE_IMAGE (terrain/rocks.png) 17 27}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 2 15 11}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 3 15 20}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 15 11}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 3 15 20}
#ifdef MEDIUM
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 4 11 15}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 5 19 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 4 11 15}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 5 19 17}
#endif
#ifdef HARD
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 4 11 15}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 5 19 17}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 2 11 17}
- {UNIT (Tentacle of the Deep) (Tentacle of the Deep) 3 19 15}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 4 11 15}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 5 19 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 11 17}
+ {UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 3 19 15}
#endif
{RANDOM 1..4}
@@ -174,11 +174,11 @@
[kill]
description=Erart
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 3 5 5}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3
5 5}
[kill]
description=Raol
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 2 25 5}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2
25 5}
[/then]
[/if]
[if]
@@ -190,11 +190,11 @@
[kill]
description=Raol
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 2 25 5}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2
25 5}
[kill]
description=Rilg
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 5 5 25}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5
5 25}
[/then]
[/if]
[if]
@@ -206,11 +206,11 @@
[kill]
description=Rilg
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 5 5 25}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5
5 25}
[kill]
description=Gulg
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 4 25 25}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4
25 25}
[/then]
[/if]
[if]
@@ -222,11 +222,11 @@
[kill]
description=Gulg
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 4 25 25}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4
25 25}
[kill]
description=Erart
[/kill]
- {GUARD_UNIT (Giant Spider) (Fang) 3 5 5}
+ {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3
5 5}
[/then]
[/if]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.11
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.12
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.11 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg Wed Mar 23
07:40:09 2005
@@ -23,27 +23,37 @@
[/command]
#enddef
-#define HERO TYPE DESC SIDE X Y
+#define HERO TYPE DESC UDESC SIDE X Y
[unit]
type={TYPE}
description={DESC}
+ user_description={UDESC}
side={SIDE}
x={X}
y={Y}
unrenamable=yes
+
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
-#define GUARD_UNIT TYPE DESC SIDE X Y
+#define GUARD_UNIT TYPE DESC UDESC SIDE X Y
[unit]
type={TYPE}
description={DESC}
+ user_description={UDESC}
side={SIDE}
x={X}
y={Y}
-
+
ai_special=guardian
+
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
[/unit]
#enddef
@@ -61,31 +71,43 @@
#ifdef EASY
[unit]
description=A Former Friend
+ user_description= _ "A Former Friend"
type=Walking Corpse
side=2
x={X}
y={Y}
moves=0
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
#endif
#ifdef NORMAL
[unit]
description=A Former Friend
+ user_description= _ "A Former Friend"
type=Soulless
side=2
x={X}
y={Y}
moves=0
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
#endif
#ifdef HARD
[unit]
description=A Former Friend
+ user_description= _ "A Former Friend"
type=Ghoul
side=2
x={X}
y={Y}
moves=0
+ [modifications]
+ {TRAIT_UNDEAD}
+ [/modifications]
[/unit]
#endif
#enddef
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.15 wesnoth/data/utils.cfg:1.16
--- wesnoth/data/utils.cfg:1.15 Wed Mar 23 03:45:35 2005
+++ wesnoth/data/utils.cfg Wed Mar 23 07:40:09 2005
@@ -173,14 +173,32 @@
#define MENU_IMG_TXT2 IMG TXT1 TXT2
"&"+{IMG}+"="+{TXT1}+"="+{TXT2}#enddef
-#define UNIT TYPE DESCRIPTION SIDE X Y
+#
+#USAGE {UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 1 1}
+#
+
+#define UNIT TYPE DESCRIPTION UDESCRIPTION SIDE X Y
[unit]
type={TYPE}
description={DESCRIPTION}
+ user_description={UDESCRIPTION}
+ side={SIDE}
+ x={X}
+ y={Y}
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
+#enddef
+
+#define UNDEAD_UNIT TYPE SIDE X Y
+ [unit]
+ type={TYPE}
side={SIDE}
x={X}
y={Y}
[modifications]
+ {TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
[/unit]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data scenarios/The_Rise_of_Wesnoth/A_Be...,
James Spencer <=