Author: zookeeper
Date: Fri Aug 29 11:59:42 2008
New Revision: 29074
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29074&view=rev
Log:
Removed some duplicate single unit id's.
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
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=29074&r1=29073&r2=29074&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
Fri Aug 29 11:59:42 2008
@@ -199,7 +199,7 @@
y=6
side=1
[/filter]
- {LOYAL_UNIT 2 (Giant Scorpion) 16 5 (Scorpion) ( _ "Scorpion")}
+ {LOYAL_UNIT 2 (Giant Scorpion) 16 5 () ( _ "Scorpion")}
[/event]
[event]
@@ -209,7 +209,7 @@
y=25
side=1
[/filter]
- {LOYAL_UNIT 3 (Giant Scorpion) 10 27 (Scorpion) ( _ "Scorpion")}
+ {LOYAL_UNIT 3 (Giant Scorpion) 10 27 () ( _ "Scorpion")}
[/event]
[event]
@@ -219,7 +219,7 @@
y=33
side=1
[/filter]
- {LOYAL_UNIT 4 (Giant Scorpion) 32 33 (Scorpion) ( _ "Scorpion")}
+ {LOYAL_UNIT 4 (Giant Scorpion) 32 33 () ( _ "Scorpion")}
[/event]
#define TEMPLE_HELP X Y
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg?rev=29074&r1=29073&r2=29074&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg Fri
Aug 29 11:59:42 2008
@@ -258,10 +258,10 @@
message= _ "What? More humans here? Get them!"
[/message]
- {LOYAL_UNIT 3 (Wolf Rider) 10 33 (Rider) ( _ "Rider")}
- {LOYAL_UNIT 3 (Wolf Rider) 12 33 (Rider) ( _ "Rider")}
+ {LOYAL_UNIT 3 (Wolf Rider) 10 33 () ( _ "Rider")}
+ {LOYAL_UNIT 3 (Wolf Rider) 12 33 () ( _ "Rider")}
#ifdef HARD
- {LOYAL_UNIT 3 (Goblin Pillager) 11 34 (Rider) ( _ "Rider")}
+ {LOYAL_UNIT 3 (Goblin Pillager) 11 34 () ( _ "Rider")}
#endif
[/event]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg?rev=29074&r1=29073&r2=29074&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
Fri Aug 29 11:59:42 2008
@@ -55,28 +55,28 @@
name=prestart
#ifdef EASY
- {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
#endif
#ifdef NORMAL
- {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
#endif
#ifdef HARD
- {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 10 15 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 16 15 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 10 15 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 16 15 () ( _ "Tentacle")}
#endif
{PLACE_IMAGE (terrain/cave/floor.png) 6 18}
{PLACE_IMAGE (terrain/cave/floor.png) 20 18}
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg?rev=29074&r1=29073&r2=29074&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
Fri Aug 29 11:59:42 2008
@@ -213,9 +213,9 @@
id=Minister Edmond
[/recall]
- {LOYAL_UNIT 2 (Peasant) 26 18 (Angry Farmer) ( _ "Angry Farmer")}
- {LOYAL_UNIT 2 (Peasant) 28 19 (Angry Farmer) ( _ "Angry Farmer")}
- {LOYAL_UNIT 2 (Peasant) 29 22 (Angry Farmer) ( _ "Angry Farmer")}
+ {LOYAL_UNIT 2 (Peasant) 26 18 () ( _ "Angry Farmer")}
+ {LOYAL_UNIT 2 (Peasant) 28 19 () ( _ "Angry Farmer")}
+ {LOYAL_UNIT 2 (Peasant) 29 22 () ( _ "Angry Farmer")}
# wmllint: recognize Angry Farmer
[objectives]
@@ -337,7 +337,7 @@
[event]
name=attack
[filter]
- id=Angry Farmer
+ type=Peasant
[/filter]
[message]
speaker=Angry Farmer
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg?rev=29074&r1=29073&r2=29074&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg Fri
Aug 29 11:59:42 2008
@@ -156,19 +156,19 @@
{PLACE_IMAGE (scenery/rubble.png) 15 3}
{PLACE_IMAGE (scenery/rubble.png) 17 27}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 15 11 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 3 (Tentacle of the Deep) 15 20 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 15 11 () ( _ "Tentacle")}
+ {LOYAL_UNIT 3 (Tentacle of the Deep) 15 20 () ( _ "Tentacle")}
#ifdef NORMAL
- {LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
+ {LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
#endif
#ifdef HARD
- {LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 2 (Tentacle of the Deep) 11 17 (Tentacle) ( _ "Tentacle")}
- {LOYAL_UNIT 3 (Tentacle of the Deep) 19 15 (Tentacle) ( _ "Tentacle")}
+ {LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
+ {LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
+ {LOYAL_UNIT 2 (Tentacle of the Deep) 11 17 () ( _ "Tentacle")}
+ {LOYAL_UNIT 3 (Tentacle of the Deep) 19 15 () ( _ "Tentacle")}
#endif
{RANDOM 1..4}
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=29074&r1=29073&r2=29074&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
Fri Aug 29 11:59:42 2008
@@ -464,18 +464,17 @@
[/filter]
#No campaign is complete without a cuttlefish
- {LOYAL_UNIT 3 (Cuttle Fish) 11 17 (Cuttle Fish) ( _ "Cuttle Fish")}
+ {LOYAL_UNIT 3 (Cuttle Fish) 11 17 () ( _ "Cuttle Fish")}
#ifdef NORMAL
- {LOYAL_UNIT 3 (Cuttle Fish) 11 18 (Cuttle Fish) ( _ "Cuttle Fish")}
-#endif
-
-#ifdef HARD
- {LOYAL_UNIT 3 (Cuttle Fish) 11 18 (Cuttle Fish) ( _ "Cuttle Fish")}
- {LOYAL_UNIT 3 (Cuttle Fish) 12 16 (Cuttle Fish) ( _ "Cuttle Fish")}
-#endif
- # wmllint: recognize Cuttle Fish
- [message]
- speaker=Cuttle Fish
+ {LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
+#endif
+
+#ifdef HARD
+ {LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
+ {LOYAL_UNIT 3 (Cuttle Fish) 12 16 () ( _ "Cuttle Fish")}
+#endif
+ [message]
+ type=Cuttle Fish
message= _ "Slurp, click, click, click!"
[/message]
[message]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
