[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Bay_of_Pea...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Bay_of_Pea... |
|
Date: |
Tue, 21 Dec 2004 15:23:36 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 04/12/21 19:58:30
Modified files:
data/maps/Heir_To_The_Throne: Bay_of_Pearls
data/scenarios/Heir_To_The_Throne: Bay_of_Pearls.cfg
Log message:
Make the Bay of Pearls face the correct direction, make the WML a
little more sane, & killed the last of the nameless Mermen
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls
diff -u wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls:1.3
wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls:1.4
--- wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls:1.3 Fri Oct 15
01:18:52 2004
+++ wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls Tue Dec 21 19:58:30 2004
@@ -1,39 +1,40 @@
-hhhhhhhhgggtgggggggggggggdcccdn
-hhhhhggggggggggggggggggggdctcd1
-hhhgggtggggggggtgggggtgggdcccdn
-hhggggggggggggggggggggdddccccdg
-hhgggggggggggggggggddddcccsssdd
-hggggggggggtggggddddccccZcssssd
-hgggggggggggggdddcccccscccsssss
-ggggggggggggdddcccscZcsssssssss
-ggggggggggdddccssssssssssssssss
-gtggggtgdddccccssssssssssssssss
-gggggggddcccccccsssssssssssssss
-ggggggddcccccZcssssssssssssssss
-ggggggdcccccccccsssssssssssssss
-ggggtddcccccccccsssssssssssssss
-gggggdcccZdcccccsssssssssssssss
-ggggddcsccccccccsssssssssssssss
-ggggdccscccccccccssssssssssssss
-ggggdcssscccZcccccsssssssssssss
-ggtgdcssssccccccccsssssssssssss
-gggdccsssssccccccccssssssssssss
-ccgdcsssssscccddd/cssssssssssss
-cccccssssssscdgCggccsssssssssss
-gtgdcsssssscdgC2Cccccssssssssss
-gggdccssssscdgCCCgtccssssssssss
-gCCddcsssssscddCgggcsssssssssss
-C3Cgdccssssssccggt\csssssssssss
-CCCgddcsssssssctg\ccsssssssssss
-gggtgdcssssssssccccssssssssssss
-gggggdccsssssssssssssssssssssss
-gggggddcsssssssssssssssssssssss
-ggggggdccssssssssssssssssssssss
-fgggggddcssssssssssssssssssssss
-fggggggdccsssssssssssssssssssss
-ftgggggddcsssssssssssssssssssss
-ffggggggdccssssssssssssssssssss
-ffggggggddcssssssssssssssssssss
-ffgggggggdcssssssssssssssssssss
-fffgggtggdcssssssssssssssssssss
-fffffggggdcssssssssssssssssssss
+sssssssssssssssssssscdggggfffff
+sssssssssssssssssssscdggggfgfff
+sssssssssssssssssssscdggtgggfff
+sssssssssssssssssssscdgggggggff
+ssssssssssssssssssssccdggggggff
+ssssssssssssssssssssccddgggggtf
+ssssssssssssssssssssscddggggggf
+sssssssssssssssssssssscdggggggf
+ssssssssssssssssssssssccdgggggf
+ssssssssssssssssssssssccddggggg
+ssssssssssssssssssssssscddggggg
+ssssssssssssscscsssssssscdgtggg
+ssssssssssscc\ctsssssssscdgggCg
+ssssssssssscctggccssssssccdgC3C
+sssssssssssc\ggCcdssssssccddCCC
+ssssssssssscgggCdgccssssscddCgg
+sssssssssscctcC2Cgdcsssssscdgtg
+sssssssssscccgCCCddsssssssccgcg
+ssssssssssssc/gdgcccsssssscdccc
+ssssssssssssccdcdcccsssssccdggc
+ssssssssssssccccccccsssssccgggg
+ssssssssssssscccccccccssscdgtgg
+ssssssssssssssccccZcccssscdgggg
+sssssssssssssscccccccccscddgggg
+sssssssssssssssccccccZcccddgggg
+ssssssssssssssscccccdccccdggggg
+ssssssssssssssscccccccccdgtgggg
+sssssssssssssssscZcccccddgggggg
+sssssssssssssssccccccccddgggggg
+sssssssssssssssscccccddggggggtg
+sssssssssssssssscccddgdgtgggggg
+ssssssssscscscsccddgdgggggggggg
+ccssscscscZcsccddgdgggggggggggg
+ccssscccsccdcddgdggtggggggggggh
+ddcsscZccdcddgdgggggggggggggghh
+ddccsccddgdgggggggggggggggggghh
+gdcccddgdtgggggtggggggggggggghh
+ndctcdggggggggggggggggggtgghhhh
+1dcccdgggggggggggggtggghghhhhhh
+ndcccdggggggggggggggggghhhhhhhh
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.16
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.17
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.16 Mon Nov
1 19:43:05 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Tue Dec 21
19:58:30 2004
@@ -49,50 +49,121 @@
[/ai]
team_name=orcs
{GOLD 60 90 170}
+ [/side]
+
+ [side]
+ race=Orcs2
+ type=Orcish Warrior
+ description=Managa'Gwin
+ recruit=Wolf Rider,Orcish Warrior,Troll Whelp,Orcish Archer
+ side=3
+ canrecruit=1
+ {GOLD 130 180 250}
+ team_name=orcs
+ [/side]
+
+ {STARTING_VILLAGES 3 20}
+ {STARTING_VILLAGES 2 10}
+
+ [event]
+ name=prestart
+ [recall]
+ description=Delfador
+ [/recall]
+
+ #the ship they came on.
+ [item]
+ x=2
+ y=34
+ image=galleon.png
+ [/item]
[unit]
type=Orcish Archer
description=Bugg
side=2
x=16
- y=22
+ y=18
ai_special=guardian
[/unit]
[unit]
type=Naga
- x=28
- y=28
+ description=Xnamas
+ x=2
+ y=10
ai_special=guardian
side=2
[/unit]
[unit]
type=Naga
- x=30
- y=28
+ description=Inalai
+ x=4
+ y=10
ai_special=guardian
side=2
[/unit]
- [/side]
- [side]
- race=Orcs2
- type=Orcish Warrior
- description=Managa'Gwin
- recruit=Wolf Rider,Orcish Warrior,Troll Whelp,Orcish Archer
- side=3
- canrecruit=1
- {GOLD 130 180 250}
- team_name=orcs
- [/side]
+ {OBJ_TRIDENT_STORM 5 4 bop_stormtrident}
- {STARTING_VILLAGES 3 20}
- {STARTING_VILLAGES 2 10}
+ #when certain villages are entered, Mermen are rescued
+ [item]
+ x=4
+ y=38
+ image=merman.png
+ [/item]
+ [item]
+ x=4
+ y=38
+ image=misc/cage.png
+ [/item]
+
+ [item]
+ x=7
+ y=35
+ image=merman.png
+ [/item]
+ [item]
+ x=7
+ y=35
+ image=misc/cage.png
+ [/item]
+
+ [item]
+ x=11
+ y=33
+ image=merman.png
+ [/item]
+ [item]
+ x=11
+ y=33
+ image=misc/cage.png
+ [/item]
+
+ [item]
+ x=19
+ y=23
+ image=merman.png
+ [/item]
+ [item]
+ x=19
+ y=23
+ image=misc/cage.png
+ [/item]
+
+ [item]
+ x=3
+ y=10
+ image=merman.png
+ [/item]
+ [item]
+ x=3
+ y=10
+ image=misc/cage.png
+ [/item]
+ [/event]
[event]
name=start
- [recall]
- description=Delfador
- [/recall]
[message]
id=msg3_1
description=Konrad
@@ -115,20 +186,6 @@
[/kill]
[/event]
- #when certain villages are entered, Mermen are rescued
-
- [item]
- x=13
- y=18
- image=merman.png
- [/item]
-
- [item]
- x=13
- y=18
- image=misc/cage.png
- [/item]
-
#comic relief with Bugg becoming a 'sea orc'
[event]
name=turn 3
@@ -175,7 +232,7 @@
description=Bugg
side=2
x=16
- y=22
+ y=18
[/unit]
[message]
@@ -208,6 +265,16 @@
[/message]
[/event]
+#define MERMAN DESC X Y
+ [unit]
+ type=Merman
+ description={DESC}
+ side=1
+ x={X}
+ y={Y}
+ [/unit]
+#enddef
+
[event]
name=moveto
@@ -216,41 +283,16 @@
[filter]
side=1
- x=13
- y=18
+ x=19
+ y=23
[/filter]
- [unit]
- description=Gwaba
- side=1
- type=Merman
- x=13
- y=18
- [/unit]
-
- [unit]
- description=Nepba
- side=1
- type=Merman
- x=13
- y=18
- [/unit]
+ {MERMAN (Gwaba) 19 23}
+ {MERMAN (Nepba) 19 23}
+ {MERMAN (Triram) 19 23}
- [unit]
- description=Triram
- side=1
- type=Merman
- x=13
- y=18
- [/unit]
#ifdef EASY
- [unit]
- description=Mriram
- side=1
- type=Merman
- x=13
- y=18
- [/unit]
+ {MERMAN (Mriram) 19 23}
#endif
[message]
id=msg3_12
@@ -259,18 +301,6 @@
[/message]
[/event]
- [item]
- x=21
- y=8
- image=merman.png
- [/item]
-
- [item]
- x=21
- y=8
- image=misc/cage.png
- [/item]
-
[event]
name=moveto
[removeitem]
@@ -278,40 +308,17 @@
[filter]
side=1
- x=21
- y=8
+ x=11
+ y=33
[/filter]
- [unit]
- description=Mabooa
- side=1
- type=Merman
- x=21
- y=8
- [/unit]
+ {MERMAN (Mabooa) 11 33}
#ifdef EASY
- [unit]
- description=Earooa
- side=1
- type=Merman
- x=21
- y=8
- [/unit]
- [unit]
- side=1
- type=Merman
- x=21
- y=8
- [/unit]
+ {MERMAN (Earooa) 11 33}
+ {MERMAN (Nethuns) 11 33}
#endif
#ifdef NORMAL
- [unit]
- description=Gwoama
- side=1
- type=Merman
- x=21
- y=8
- [/unit]
+ {MERMAN (Gwoama) 11 33}
#endif
[message]
id=msg3_13
@@ -320,18 +327,6 @@
[/message]
[/event]
- [item]
- x=25
- y=6
- image=merman.png
- [/item]
-
- [item]
- x=25
- y=6
- image=misc/cage.png
- [/item]
-
[event]
name=moveto
[removeitem]
@@ -339,26 +334,16 @@
[filter]
side=1
- x=25
- y=6
+ x=7
+ y=35
[/filter]
- [unit]
- description=Kaba
- side=1
- type=Merman
- x=24
- y=6
- [/unit]
+ {MERMAN (Kaba) 7 35}
+
#ifdef EASY
- [unit]
- description=Kwabao
- side=1
- type=Merman
- x=25
- y=6
- [/unit]
+ {MERMAN (Kwabao) 7 35}
#endif
+
[message]
id=msg3_14
description=Kaba
@@ -366,75 +351,30 @@
[/message]
[/event]
- [item]
- x=28
- y=2
- image=merman.png
- [/item]
-
- [item]
- x=28
- y=2
- image=misc/cage.png
- [/item]
-
[event]
name=moveto
[removeitem]
[/removeitem]
[filter]
- x=28
- y=2
+ x=4
+ y=38
side=1
[/filter]
- [unit]
- description=Gwimli
- x=28
- y=2
- side=1
- type=Merman
- [/unit]
+ {MERMAN (Gwimli) 4 38}
+ {MERMAN (Jarla) 4 38}
- [unit]
- description=Jarla
- x=28
- y=2
- side=1
- type=Merman
- [/unit]
#ifdef EASY
- [unit]
- description=Gwarloa
- side=1
- type=Merman
- x=28
- y=2
- [/unit]
+ {MERMAN (Gwarloa) 4 38}
#endif
[message]
id=msg3_15
description=Gwimli
- message= _ "Thank you for rescuing us! Now we can help you
fight the evil Orcs!
-The main cage where they keep most of the mermen is in the south-east!"
+ message= _ "Thank you for rescuing us! Now we can help you
fight the evil Orcs! The main cage where they keep most of the mermen is in the
south-east!"
[/message]
[/event]
- {OBJ_TRIDENT_STORM 26 35 bop_stormtrident}
-
- [item]
- x=29
- y=29
- image=merman.png
- [/item]
-
- [item]
- x=29
- y=29
- image=misc/cage.png
- [/item]
-
[event]
name=moveto
[removeitem]
@@ -442,38 +382,21 @@
[filter]
side=1
- x=29
- y=29
+ x=3
+ y=10
[/filter]
- [unit]
- description=Heldaga
- side=1
- type=Merman
- x=29
- y=29
- [/unit]
-
-#define MERMAN_29_29
- [unit]
- description=Gwelda
- side=1
- type=Merman
- x=29
- y=29
- [/unit]
-#enddef
-
- {MERMAN_29_29}
- {MERMAN_29_29}
+ {MERMAN (Heldaga) 3 10}
+ {MERMAN (Apalala) 3 10}
+ {MERMAN (Oceanus) 3 10}
#ifdef NORMAL
- {MERMAN_29_29}
+ {MERMAN (Tini) 3 10}
#endif
#ifdef EASY
- {MERMAN_29_29}
- {MERMAN_29_29}
- {MERMAN_29_29}
+ {MERMAN (Elcmar) 3 10}
+ {MERMAN (Aigaion) 3 10}
+ {MERMAN (Labuna) 3 10}
#endif
[message]
@@ -483,13 +406,6 @@
[/message]
[/event]
- #the ship they came on.
- [item]
- x=30
- y=7
- image=galleon.png
- [/item]
-
#if victorious, the player can henceforth recruit mermen
[event]
name=victory
@@ -519,8 +435,8 @@
message= _ "Now where is Delfador? I hope he's safe!"
[/message]
[unit]
- x=18
- y=1
+ x=14
+ y=40
description=Delfador
type=Elder Mage
[/unit]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Bay_of_Pea...,
James Spencer <=