[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Fi...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/11/01 08:44:01

Modified files:
        data/scenarios/The_Rise_of_Wesnoth: A_Final_Spring.cfg 
                                            A_New_Land.cfg 
                                            Rough_Landing.cfg 

Log message:
        Use Typhon portrait, Use new merfolk...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.21&tr2=1.22&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.10&tr2=1.11&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.15&tr2=1.16&r1=text&r2=text

Patches:
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.21 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.22
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.21  Sat Oct 
30 03:45:31 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg       Mon Nov 
 1 08:44:01 2004
@@ -313,16 +313,17 @@
        [event]
                name=turn 5
                [move_unit_fake]
-                       type=Triton
+                       type=Merman Warrior
                        x=1,2,3,4
                        y=21,20,20,19
                [/move_unit_fake]
 
-               {UNIT (Triton) (Lord Typhon) 1 4 19}
+               {UNIT (Merman Warrior) (Lord Typhon) 1 4 19}
 
                [message]
                        id=msgT11_10
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I come seeking the Crown Prince!"
                [/message]
                [message]
@@ -338,6 +339,7 @@
                [message]
                        id=msgT11_13
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Indeed it is. But where is the Prince?"
                [/message]
                [message]
@@ -348,6 +350,7 @@
                [message]
                        id=msgT11_15
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Under the same terms?"
                [/message]
                [message]
@@ -358,11 +361,12 @@
                [message]
                        id=msgT11_17
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Good. We need the steel for our own war in 
the deep. I formally place the might of the Merfolk at your disposal!"
                [/message]
 
                [allow_recruit]
-                       type=Merman
+                       type=Merman Fighter
                [/allow_recruit]
        [/event]
 
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.10 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.11
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.10      Fri Oct 
29 23:25:21 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg   Mon Nov  1 
08:44:01 2004
@@ -304,17 +304,19 @@
                [message]
                        id=msgT14_23a
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I must return to my people. You have kept 
your word, you may avail of my services in the future. The services of my 
people will remain at your disposal."
                [/message]
 #else
                [disallow_recruit]
                        side=1
-                       type=Merman
+                       type=Merman Fighter
                [/disallow_recruit]
 
                [message]
                        id=msgT14_23b
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I must return to my people. My warriors 
that fought by your side wish to remain with you. You have kept your word, you 
may avail of my services in the future."
                [/message]
 #endif
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.15 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.16
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.15   Tue Oct 
12 23:21:20 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg        Mon Nov 
 1 08:44:01 2004
@@ -168,6 +168,7 @@
                [message]
                        id=msgT13_3
                        description=Lord Typhon
+                       image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Be careful, these islands aren't safe. 
We're in Naga territory. But this is the only place to stop with soft sand 
beaches to make landfall. . . The Nagas like to scavenge metal from ships that 
they capture here."
                [/message]