[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/Bay_o...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data/scenarios Heir_To_The_Throne/Bay_o... |
|
Date: |
Tue, 08 Feb 2005 17:01:14 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/02/08 22:01:14
Modified files:
data/scenarios/Heir_To_The_Throne: Bay_of_Pearls.cfg
Isle_of_the_Damned.cfg
Muff_Malal_Peninsula.cfg
The_Siege_of_Elensefar.cfg
data/scenarios/The_Rise_of_Wesnoth: A_Beach.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg
Log message:
Make TRoW & HttT use the new Nagas & Merfolk. Step one in obsoleting
the old units.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.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/Isle_of_the_Damned.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/Muff_Malal_Peninsula.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_Siege_of_Elensefar.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/A_Beach.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/Rise_of_Wesnoth.cfg.diff?tr1=1.22&tr2=1.23&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.25&tr2=1.26&r1=text&r2=text
Patches:
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.22
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.22 Sat Jan
29 12:28:06 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Tue Feb 8
22:01:13 2005
@@ -41,7 +41,7 @@
description=Dwaba-Kukai
side=2
canrecruit=1
- recruit=Vampire Bat,Naga
+ recruit=Vampire Bat,Naga Fighter
[ai]
recruitment_pattern=scout,fighter
{ATTACK_DEPTH 3 4 5}
@@ -96,7 +96,7 @@
ai_special=guardian
[/unit]
[unit]
- type=Naga
+ type=Naga Fighter
description=Xnamas
x=2
y=10
@@ -104,7 +104,7 @@
side=2
[/unit]
[unit]
- type=Naga
+ type=Naga Fighter
description=Inalai
x=4
y=10
@@ -118,7 +118,7 @@
[item]
x=4
y=38
- image=merman.png
+ image=merman-fighter.png
[/item]
[item]
x=4
@@ -129,7 +129,7 @@
[item]
x=7
y=35
- image=merman.png
+ image=merman-fighter.png
[/item]
[item]
x=7
@@ -140,7 +140,7 @@
[item]
x=11
y=33
- image=merman.png
+ image=merman-fighter.png
[/item]
[item]
x=11
@@ -151,7 +151,7 @@
[item]
x=19
y=23
- image=merman.png
+ image=merman-fighter.png
[/item]
[item]
x=19
@@ -162,7 +162,7 @@
[item]
x=3
y=10
- image=merman.png
+ image=merman-fighter.png
[/item]
[item]
x=3
@@ -265,7 +265,7 @@
#define MERMAN DESC X Y
[unit]
- type=Merman
+ type=Merman Fighter
description={DESC}
side=1
x={X}
@@ -403,7 +403,7 @@
[event]
name=victory
[allow_recruit]
- type=Merman
+ type=Merman Fighter
[/allow_recruit]
[/event]
@@ -413,7 +413,7 @@
message= _ "At last, we have freed the mermen. Go back to the
ocean and live in peace."
[/message]
[role]
- type=Triton,Merman
+ type=Merman Fighter,Merman Warrior,Merman Triton,Merman Hoplite
role=ThankfulMerman
[/role]
[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.25
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.26
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.25
Sat Jan 29 12:02:06 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg Tue Feb
8 22:01:13 2005
@@ -98,14 +98,14 @@
[unit]
description=Kalba
- type=Merman
+ type=Merman Fighter
side=1
x=27
y=12
[/unit]
[unit]
description=Gnaba
- type=Merman
+ type=Merman Fighter
side=1
x=31
y=14
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.20
wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.20
Mon Jan 31 06:08:42 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg Tue Feb
8 22:01:13 2005
@@ -34,7 +34,7 @@
side=1
canrecruit=1
controller=human
- recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish
Shaman,Merman
+ recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish
Shaman,Merman Fighter
enemy=2
[/side]
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.25
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.26
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.25
Sat Jan 29 12:02:06 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
Tue Feb 8 22:01:13 2005
@@ -37,7 +37,7 @@
side=1
canrecruit=1
controller=human
- recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish
Shaman,Merman
+ recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish
Shaman,Merman Fighter
team_name=elves
[/side]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.23
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.23 Tue Feb 1
12:57:49 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg Tue Feb 8
22:01:14 2005
@@ -59,9 +59,9 @@
{INCOME 2 4 8}
team_name=Liz
#ifdef EASY
- recruit=Naga, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler,Saurian Tribalist
+ recruit=Naga Fighter, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler,Saurian Tribalist
#else
- recruit=Naga, Saurian Skirmisher, Mudcrawler, Giant Mudcrawler,
Saurian Ambusher, Giant Scorpion,Saurian Tribalist,Saurian Icecaster
+ recruit=Naga Fighter, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler, Saurian Ambusher, Giant Scorpion,Saurian Tribalist,Saurian Icecaster
#endif
[ai]
#{NO_SCOUTS}
@@ -81,9 +81,9 @@
{INCOME 2 4 8}
team_name=Liz
#ifdef EASY
- recruit=Naga, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler,Saurian Tribalist
+ recruit=Naga Fighter, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler,Saurian Tribalist
#else
- recruit=Naga, Saurian Skirmisher, Mudcrawler, Giant Mudcrawler,
Saurian Ambusher, Giant Scorpion,Saurian Tribalist,Saurian Soothsayer
+ recruit=Naga Fighter, Saurian Skirmisher, Mudcrawler, Giant
Mudcrawler, Saurian Ambusher, Giant Scorpion,Saurian Tribalist,Saurian
Soothsayer
#endif
[ai]
#{NO_SCOUTS}
@@ -239,31 +239,31 @@
[/filter]
[move_unit_fake]
- type=Sea Hag
+ type=Naga Warrior
x=1,2,3,4,5,6
y=15,14,15,15,16,15
[/move_unit_fake]
- {UNIT (Sea Hag) (Riaa) 2 6 15}
+ {UNIT (Naga Warrior) (Riaa) 2 6 15}
[message]
speaker=Riaa
message= _ "We must protect the Saurians we need the
metal!"
[/message]
- {UNIT (Naga) (Liabra) 3 5 15}
- {UNIT (Naga) (Brissal) 2 5 16}
+ {UNIT (Naga Fighter) (Liabra) 3 5 15}
+ {UNIT (Naga Fighter) (Brissal) 2 5 16}
#ifdef MEDIUM
- {UNIT (Naga) (Gaxmail) 3 4 14}
- {UNIT (Naga) (Griama) 2 4 16}
+ {UNIT (Naga Fighter) (Gaxmail) 3 4 14}
+ {UNIT (Naga Fighter) (Griama) 2 4 16}
#endif
#ifdef HARD
- {UNIT (Naga) (Gaxmail) 3 4 14}
- {UNIT (Naga) (Griama) 2 4 16}
- {UNIT (Naga) (Saxiala) 3 3 14}
- {UNIT (Naga) (Gaxmail) 2 3 17}
+ {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}
#endif
[/event]
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.22
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.23
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.22 Tue Feb
1 12:57:49 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Tue Feb
8 22:01:14 2005
@@ -967,12 +967,12 @@
[event]
name=turn 10
[move_unit_fake]
- type=Sea Hag
+ type=Naga Warrior
x=1,2,3,4,5,6
y=32,31,32,32,33,32
[/move_unit_fake]
- {UNIT (Sea Hag) (Abraxas) 2 6 32}
+ {UNIT (Naga Warrior) (Abraxas) 2 6 32}
[scroll_to_unit]
description=Abraxas
@@ -983,23 +983,23 @@
message= _ "It's the Haldric! Jevyan you never said you
came to destroy this monster. We will help you."
[/message]
- {UNIT (Naga) (Xamalia) 3 5 32}
- {UNIT (Naga) (Brissal) 2 5 33}
+ {UNIT (Naga Fighter) (Xamalia) 3 5 32}
+ {UNIT (Naga Fighter) (Brissal) 2 5 33}
#ifdef MEDIUM
- {UNIT (Naga) (Saxiala) 3 4 31}
- {UNIT (Naga) (Liabra) 2 4 34}
+ {UNIT (Naga Fighter) (Saxiala) 3 4 31}
+ {UNIT (Naga Fighter) (Liabra) 2 4 34}
#endif
#ifdef HARD
- {UNIT (Naga) (Saxiala) 3 4 31}
- {UNIT (Naga) (Liabra) 2 4 34}
- {UNIT (Naga) (Riaa) 3 3 31}
- {UNIT (Naga) (Griama) 2 3 35}
+ {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}
#endif
[allow_recruit]
- type=Naga
+ type=Naga Fighter
side=3
[/allow_recruit]
[/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.25 Sat Jan
22 02:42:19 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Tue Feb
8 22:01:14 2005
@@ -47,7 +47,7 @@
[/side]
[side]
- type=Sea Hag
+ type=Naga Warrior
description=Abraxas
side=2
canrecruit=1
@@ -55,9 +55,9 @@
{INCOME 2 4 8}
team_name=Naga
#ifdef EASY
- recruit=Naga
+ recruit=Naga Fighter
#else
- recruit=Naga, Vampire Bat
+ recruit=Naga Fighter, Vampire Bat
#endif
[ai]
{NO_SCOUTS}
@@ -69,7 +69,7 @@
[/side]
[side]
- type=Sea Hag
+ type=Naga Warrior
description=Xamalia
side=3
canrecruit=1
@@ -77,9 +77,9 @@
{INCOME 2 4 8}
team_name=Naga
#ifdef EASY
- recruit=Naga
+ recruit=Naga Fighter
#else
- recruit=Naga, Vampire Bat
+ recruit=Naga Fighter, Vampire Bat
#endif
[ai]
{NO_SCOUTS}
@@ -91,7 +91,7 @@
[/side]
[side]
- type=Sea Hag
+ type=Naga Warrior
description=Gaxmail
side=4
canrecruit=1
@@ -99,9 +99,9 @@
{INCOME 2 4 8}
team_name=Naga
#ifdef EASY
- recruit=Naga
+ recruit=Naga Fighter
#else
- recruit=Naga, Vampire Bat
+ recruit=Naga Fighter, Vampire Bat
#endif
[ai]
{NO_SCOUTS}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data/scenarios Heir_To_The_Throne/Bay_o...,
James Spencer <=