Author: shadowmaster
Date: Mon Nov 23 22:35:52 2009
New Revision: 39904
URL: http://svn.gna.org/viewcvs/wesnoth?rev=39904&view=rev
Log:
Remove the Undead trait from several custom bat units in TRoW; Undead is
not a race trait since many versions
Modified:
trunk/changelog
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/13_Peoples_in_Decline.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.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/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
trunk/players_changelog
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Nov 23 22:35:52 2009
@@ -15,6 +15,9 @@
* Fixed Bug #14768: made AI observe changes in allowed recruits, preventing
situations where AI does not recruit because it thinks that it can not do
so.
+ * Campaigns:
+ * The Rise of Wesnoth:
+ * Removed the undead trait from several custom bat units
* Graphics:
* New animations for the Chocobone.
* Change which Orc Grunt portrait appears is the default.
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=39904&r1=39903&r2=39904&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
Mon Nov 23 22:35:52 2009
@@ -280,7 +280,7 @@
speaker=unit
message= _ "Hey, there's somebody hidden in the temple. Ack! Hold
there!"
[/message]
- {LOYAL_UNDEAD_UNIT 2 (Vampire Bat) ({X}) ({Y})}
+ {LOYAL_UNIT 2 (Vampire Bat) ({X}) ({Y})}
{LOYAL_UNDEAD_UNIT 3 (Walking Corpse) ({X}) ({Y})}
{LOYAL_UNDEAD_UNIT 4 (Walking Corpse) ({X}) ({Y})}
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=39904&r1=39903&r2=39904&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
Mon Nov 23 22:35:52 2009
@@ -442,7 +442,7 @@
y=22,22,23,23
[/move_unit_fake]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 5 42 23}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 5 42 23}
[+unit]
facing=sw
[/unit]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
Mon Nov 23 22:35:52 2009
@@ -281,7 +281,7 @@
y=1,2,2
[/move_unit_fake]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 4 2}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 4 2}
# wmllint: recognize Familiar
# wmllint: directory spelling Neep
[message]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg Mon
Nov 23 22:35:52 2009
@@ -319,7 +319,7 @@
y=25,25,26
[/move_unit_fake]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 26}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 26}
# wmllint: recognize Familiar
[message]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg Mon Nov
23 22:35:52 2009
@@ -272,7 +272,7 @@
y=15,15,15
[/move_unit_fake]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 15}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 15}
[kill]
id=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=39904&r1=39903&r2=39904&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 Mon
Nov 23 22:35:52 2009
@@ -143,12 +143,12 @@
{UNDEAD_INTEL (Vampire Lady) (Midnight Queen) ( _ "Midnight Queen")
"unit_image" 2 ({X}) ({Y})}
# wmllint: recognize Midnight Queen
- {LOYAL_UNDEAD_UNIT 3 (Blood Bat) ({X}) ({Y})}
- {LOYAL_UNDEAD_UNIT 2 (Blood Bat) ({X}) ({Y})}
- {LOYAL_UNDEAD_UNIT 3 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNIT 3 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNIT 2 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNIT 3 (Blood Bat) ({X}) ({Y})}
#ifdef HARD
- {LOYAL_UNDEAD_UNIT 2 (Blood Bat) ({X}) ({Y})}
+ {LOYAL_UNIT 2 (Blood Bat) ({X}) ({Y})}
#endif
[message]
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=39904&r1=39903&r2=39904&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
Mon Nov 23 22:35:52 2009
@@ -265,7 +265,7 @@
y=1,1,2
[/move_unit_fake]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 2 28 2}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 2 28 2}
# wmllint: recognize Familiar
[move_unit_fake]
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=39904&r1=39903&r2=39904&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
Mon Nov 23 22:35:52 2009
@@ -263,7 +263,7 @@
# y=1-45
#[/remove_shroud]
- {UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 2 40 39}
+ {LIVING_INTEL (Dread Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 2 40 39}
# wmllint: recognize Familiar
[set_variable]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg Mon Nov 23
22:35:52 2009
@@ -81,6 +81,22 @@
[/unit]
#enddef
+#define LIVING_INTEL TYPE ID_STRING NAME_STRING PROFILE SIDE X Y
+ [unit]
+ type={TYPE}
+ id={ID_STRING}
+ name={NAME_STRING}
+ profile={PROFILE}
+ side={SIDE}
+ x={X}
+ y={Y}
+ random_traits=no
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
+#enddef
+
#define RISE_UP_RISE_UP X Y
[filter]
side=1
Modified: trunk/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=39904&r1=39903&r2=39904&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Mon Nov 23 22:35:52 2009
@@ -3,6 +3,10 @@
changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
Version 1.7.8+svn:
+ * Campaigns:
+ * The Rise of Wesnoth:
+ * Removed the Undead trait from several custom bat units.
+
* Graphics:
* New animations for the Chocobone.
* Change which Orc Grunt portrait appears is the default.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
