Author: esr
Date: Wed Feb 27 04:21:26 2008
New Revision: 24108
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24108&view=rev
Log:
UNDEAD_UNIT -> LOYAL_UNDEAD_UNIT. Because he old name was a bit misleading.
Also, change to the canonical order of arguments for unit generators.
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
trunk/data/core/macros/unit-utils.cfg
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
Wed Feb 27 04:21:26 2008
@@ -210,9 +210,9 @@
[scroll_to]
x,y=17,8
[/scroll_to]
- {UNDEAD_UNIT Ghoul 1 19 7}
- {UNDEAD_UNIT Ghoul 1 17 9}
- {UNDEAD_UNIT Ghoul 1 17 8}
+ {LOYAL_UNDEAD_UNIT 1 Ghoul 19 7}
+ {LOYAL_UNDEAD_UNIT 1 Ghoul 17 9}
+ {LOYAL_UNDEAD_UNIT 1 Ghoul 17 8}
{DIALOGUE_PV_SWAMP3}
[/event]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
Wed Feb 27 04:21:26 2008
@@ -318,10 +318,10 @@
[/modifications]
[/unit]
- {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
- {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) ({X}) ({Y})}
#ifdef HARD
- {UNDEAD_UNIT (Walking Corpse) 2 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) ({X}) ({Y})}
#endif
[message]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
Wed Feb 27 04:21:26 2008
@@ -665,9 +665,9 @@
name=gunshot.wav
[/sound]
#ifdef EASY
- {UNDEAD_UNIT (Skeleton) 3 13 2}
+ {LOYAL_UNDEAD_UNIT 3 (Skeleton) 13 2}
#else
- {UNDEAD_UNIT (Revenant) 3 13 2}
+ {LOYAL_UNDEAD_UNIT 3 (Revenant) 13 2}
#endif
[scroll_to_unit]
x=13
@@ -683,9 +683,9 @@
name=gunshot.wav
[/sound]
#ifdef HARD
- {UNDEAD_UNIT (Deathblade) 3 22 2}
+ {LOYAL_UNDEAD_UNIT 3 (Deathblade) 22 2}
#else
- {UNDEAD_UNIT (Skeleton) 3 22 2}
+ {LOYAL_UNDEAD_UNIT 3 (Skeleton) 22 2}
#endif
[scroll_to_unit]
x=22
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
Wed Feb 27 04:21:26 2008
@@ -447,7 +447,7 @@
[/message]
#define MORE_UNITS
- {UNDEAD_UNIT (Revenant) 4 23 28}
+ {LOYAL_UNDEAD_UNIT 4 (Revenant) 23 28}
#enddef
{MORE_UNITS}
@@ -503,7 +503,7 @@
{PLACE_IMAGE scenery/rubble.png 16 26}
- {UNDEAD_UNIT (Skeleton) 4 23 28}
+ {LOYAL_UNDEAD_UNIT 4 (Skeleton) 23 28}
[/event]
[event]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
Wed Feb 27 04:21:26 2008
@@ -273,12 +273,12 @@
speaker=unit
message= _ "Hey, there's somebody hidden in the temple. Ack! Hold
there!"
[/message]
- {UNDEAD_UNIT (Vampire Bat) 2 ({X}) ({Y})}
- {UNDEAD_UNIT (Walking Corpse) 3 ({X}) ({Y})}
- {UNDEAD_UNIT (Walking Corpse) 4 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Vampire Bat) ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 3 (Walking Corpse) ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 4 (Walking Corpse) ({X}) ({Y})}
#ifdef HARD
- {UNDEAD_UNIT (Ghost) 2 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Ghost) ({X}) ({Y})}
#endif
[/event]
#enddef
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
Wed Feb 27 04:21:26 2008
@@ -470,18 +470,18 @@
y=24,23,23,22,22
[/move_unit_fake]
- {UNDEAD_UNIT (Revenant) 5 41 22}
- {UNDEAD_UNIT (Bone Shooter) 5 43 24}
+ {LOYAL_UNDEAD_UNIT 5 (Revenant) 41 22}
+ {LOYAL_UNDEAD_UNIT 5 (Bone Shooter) 43 24}
#ifdef NORMAL
- {UNDEAD_UNIT (Chocobone) 5 42 23}
- {UNDEAD_UNIT (Chocobone) 5 43 23}
+ {LOYAL_UNDEAD_UNIT 5 (Chocobone) 42 23}
+ {LOYAL_UNDEAD_UNIT 5 (Chocobone) 43 23}
#endif
#ifdef HARD
- {UNDEAD_UNIT (Chocobone) 5 42 23}
- {UNDEAD_UNIT (Chocobone) 5 43 23}
- {UNDEAD_UNIT (Necrophage) 5 44 23}
- {UNDEAD_UNIT (Necrophage) 5 44 22}
+ {LOYAL_UNDEAD_UNIT 5 (Chocobone) 42 23}
+ {LOYAL_UNDEAD_UNIT 5 (Chocobone) 43 23}
+ {LOYAL_UNDEAD_UNIT 5 (Necrophage) 44 23}
+ {LOYAL_UNDEAD_UNIT 5 (Necrophage) 44 22}
#endif
[kill]
description=Familiar
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg Wed
Feb 27 04:21:26 2008
@@ -154,12 +154,12 @@
{UNDEAD_INTEL (Vampire Lady) (Midnight Queen) ( _ "Midnight Queen")
"unit_image" 2 ({X}) ({Y})}
# wmllint: recognize Midnight Queen
- {UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
- {UNDEAD_UNIT (Blood Bat) 2 ({X}) ({Y})}
- {UNDEAD_UNIT (Blood Bat) 3 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 3 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 3 (Blood Bat) ({X}) ({Y})}
#ifdef HARD
- {UNDEAD_UNIT (Blood Bat) 2 ({X}) ({Y})}
+ {LOYAL_UNDEAD_UNIT 2 (Blood Bat) ({X}) ({Y})}
#endif
[message]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg Wed
Feb 27 04:21:26 2008
@@ -357,10 +357,10 @@
message= _ "You will be felled by my hand, useless fleshbags!"
[/message]
- {UNDEAD_UNIT (Chocobone) 2 1 29}
- {UNDEAD_UNIT (Chocobone) 2 1 27}
-#ifdef HARD
- {UNDEAD_UNIT (Chocobone) 2 2 28}
+ {LOYAL_UNDEAD_UNIT 2 (Chocobone) 1 29}
+ {LOYAL_UNDEAD_UNIT 2 (Chocobone) 1 27}
+#ifdef HARD
+ {LOYAL_UNDEAD_UNIT 2 (Chocobone) 2 28}
#endif
[/event]
@@ -384,11 +384,11 @@
message= _ "The only job of the dead is to remain dead. Prepare to
be reunited with the ground."
[/message]
- {UNDEAD_UNIT (Chocobone) 3 35 18}
- {UNDEAD_UNIT (Chocobone) 3 35 20}
-#ifdef HARD
- {UNDEAD_UNIT (Chocobone) 3 35 17}
- {UNDEAD_UNIT (Chocobone) 3 35 21}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 35 18}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 35 20}
+#ifdef HARD
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 35 17}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 35 21}
#endif
[/event]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
Wed Feb 27 04:21:26 2008
@@ -310,17 +310,17 @@
y=2,2,1
[/move_unit_fake]
- {UNDEAD_UNIT (Chocobone) 2 26 4}
- {UNDEAD_UNIT (Chocobone) 2 27 4}
- {UNDEAD_UNIT (Chocobone) 2 25 4}
+ {LOYAL_UNDEAD_UNIT 4 (Chocobone) 2 26}
+ {LOYAL_UNDEAD_UNIT 4 (Chocobone) 2 27}
+ {LOYAL_UNDEAD_UNIT 4 (Chocobone) 2 25}
#ifdef NORMAL
- {UNDEAD_UNIT (Chocobone) 2 28 3}
- {UNDEAD_UNIT (Chocobone) 2 24 3}
-#endif
-
-#ifdef HARD
- {UNDEAD_UNIT (Chocobone) 2 28 3}
- {UNDEAD_UNIT (Chocobone) 2 24 3}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 2 28}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 2 24}
+#endif
+
+#ifdef HARD
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 2 28}
+ {LOYAL_UNDEAD_UNIT 3 (Chocobone) 2 24}
#endif
[message]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
Wed Feb 27 04:21:26 2008
@@ -1054,15 +1054,15 @@
[/message]
#ifdef EASY
- {UNDEAD_UNIT (Skeleton) 2 1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Skeleton) 1 $yy1}
#endif
#ifdef NORMAL
- {UNDEAD_UNIT (Skeleton Archer) 2 1 $yy1}
- {UNDEAD_UNIT (Skeleton) 2 1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Skeleton Archer) 1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Skeleton) 1 $yy1}
#endif
#ifdef HARD
- {UNDEAD_UNIT (Revenant) 2 1 $yy1}
- {UNDEAD_UNIT (Skeleton Archer) 2 1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Revenant) 1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Skeleton Archer) 1 $yy1}
#endif
[scroll_to_unit]
x=1
@@ -1082,16 +1082,16 @@
[/message]
#ifdef EASY
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
#endif
#ifdef NORMAL
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
#endif
#ifdef HARD
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
- {UNDEAD_UNIT (Walking Corpse) 2 $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
+ {LOYAL_UNDEAD_UNIT 2 (Walking Corpse) $xx1 $yy1}
#endif
[scroll_to_unit]
x=$xx1
Modified: trunk/data/core/macros/unit-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/unit-utils.cfg?rev=24108&r1=24107&r2=24108&view=diff
==============================================================================
--- trunk/data/core/macros/unit-utils.cfg (original)
+++ trunk/data/core/macros/unit-utils.cfg Wed Feb 27 04:21:26 2008
@@ -54,7 +54,7 @@
[/unit]
#enddef
-#define UNDEAD_UNIT TYPE SIDE X Y
+#define LOYAL_UNDEAD_UNIT SIDE TYPE X Y
# Create a unit with the Undead and Loyal traits.
[unit]
type={TYPE}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
