[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/Isle_of_th...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Isle_of_th... |
|
Date: |
Fri, 24 Dec 2004 00:23:15 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 04/12/24 05:04:21
Modified files:
data/maps/Heir_To_The_Throne: Isle_of_the_Damned
data/maps/The_Rise_of_Wesnoth: Cursed_Isle
data/scenarios/Heir_To_The_Throne: Isle_of_the_Damned.cfg
data/scenarios/The_Rise_of_Wesnoth: Cursed_Isle.cfg
Log message:
Make the Isle of the Damned look more Isleish, clean up the WML a bit
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle.diff?tr1=1.2&tr2=1.3&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.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned
diff -u wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned:1.3
wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned:1.4
--- wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned:1.3 Fri Oct 15
01:18:52 2004
+++ wesnoth/data/maps/Heir_To_The_Throne/Isle_of_the_Damned Fri Dec 24
05:04:21 2004
@@ -1,38 +1,40 @@
-sscssscccccccsssssssssscccggg
-ccgcccccmmmcmccssssssssscgRRg
-cgtggggggmmmmccssssssssssggRg
-fgfgCCCgctmmmffccccssssssssgs
-cfffC3Cggmmmmfffftcscssscssss
-sccffCggmmmmfffffffcccccc\css
-sscffrrmmmmmffrffffffccccgtcc
-sscccfrffmfffrrrfffffccccgggc
-sssscffrrftfrrrrfffffgtccgngd
-sssccggfrfffrfrffffffgcccn1nd
-sssscgffrfrrfffrrffffggccnnnd
-ssccggffrrffffffrffftffgcccdc
-ccggffrrffffffffrrrffffggtfcc
-ccgftfrfffffffrrfffrrfrfffffc
-gcgffffrrgffffrtfffffrfrrrffc
-gccggfffrggfggrffffffrffrtfcc
-ggcccccfdgggggrffffffrrrffccs
-g\sssccddddgdgrggggfgfffcccss
-ccsssccccdcdcddgddcgcgccccsss
-sssssccddcdccdddddcccccccccss
-ssssccccddddcdddccscscccccdcc
-gggggccccdddcdccccssssccddfdd
-gtfffggccddddccccssssscdfftfd
-fgfffggccccddcccsssssscddfffd
-ffffgtggccccccsssssssssccdddc
-ftfffggggcgcssssssssssscccccc
-fffffgggggggssssssssssccccccc
-Cffffffggtggsssssssscctcccccc
-2Cgfffffgggggssssssscggggcccc
-CCgfgfggggggsssssscc\gmmmcccc
-gggggggggggssssscsccggmmmggcc
-ggggggggtgssssssccggmmmmmggtc
-ggggggggggsssssssccggmmmggccs
-sssggggggsssssssssscggtggcsss
-sssgtggggssssssssssccgggccsss
-sssgggggsssssssssssscgccsssss
-ssssssssssssssssssssscsssssss
-sssssssssssssssssssssssssssss
+sssssssssssssssssssssssssssssssss
+ssscssssssssssssssssssssssscccccs
+scccccccscccccccccssssssscccgffcs
+scccgccccchhhchcccssssssssctwwfcs
+sccgtggggghhmmmhccscsssssscggwfcs
+scfgfgCCCgcthmhhfcccccsssscccfcss
+sscfffC3Cgghmmmhffftcccssssccccss
+sscccfggghgmmmhffffffcccssc\ccsss
+sssccffrrmhmmmhfrffffffcsccgtccss
+sssccccfhfhmhhhrrrfffffccccggfccs
+sssccccffrhhtfhrrrffwffgtccnnfdcs
+sssssccggfrfffrfrffffffgcccc1ndcs
+sssssccgffrfwwfffrrffffggcccncdcs
+ssscccggffrrffffffrffftffgcccdcss
+ssccggffrrffffffffrrrffffggtfccss
+scccgftfrfffwfffrrfffwwfrfffffcss
+scgcgffffrrgffffrtfffffrfrrrffcss
+scfccggfffrggfgwrffffffrffrtfccss
+scffcccccfdgggggrffffffrrrffccsss
+scfgcssccddddgdgrggggfgfffcccssss
+sscccssccccddddddgddcgcgccccsssss
+ssscscsccddwdwwdddddccccccccccscs
+ssccccccccddddwdddcccsssccccdcccs
+sscggggdcccwwdwdccccssssccddgddcs
+scctfffddwwddddccccssssccdgftfdcs
+sccgfffdwcwccddcccsssssccdggffdcs
+scfffftddwwcwccccssssssscccdddcss
+scftfffdddddwdcssssssssccccccccss
+sccCfgwggdwddgcssssssssccccccccss
+ssCCgfgwfgdtggcccssssscctccccssss
+sc2CCffwwfgggggccssssccggggcsssss
+scfgffgfggggggccsssscc\ghhmcccccs
+scgggggggggggccsssccccgfmmmggcccs
+scgggggwggtgccssssccggfhmhhfgtccs
+scggggwgggggccsssssccghmmhfgcccss
+sccccggggggccsssssssccggtggccssss
+sscccgtggggccssssssscccgwgccsssss
+ssscccgcgccccssssssssccgcccssssss
+ssssccccccccssssssssscccccsssssss
+sssssscscssssssssssssscscssssssss
Index: wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle
diff -u wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle:1.2
wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle:1.3
--- wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle:1.2 Thu Oct 14
21:21:57 2004
+++ wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle Fri Dec 24 05:04:21 2004
@@ -1,38 +1,40 @@
-scccssccccccccssssssssscccgff
-ccgcccccghgcgccssssssssscggff
-cgtgggggghhhhhccsssssssscgfgf
-fgfgCCCgcthmmhfccccssssscccgc
-cfffC2Cgghhmmhffftcccssscsccc
-cccffgghhmmmhffffffcccccccccs
-sscffgghmhmhhfgffffffccccgtcc
-sscccfgfhhhfffggfffffccc\gggc
-sssscfffgftffgggfffffgtccnnnd
-sssccggfffffffgffffffgcccn1nd
-sssccgffffggfffggffffggccdddd
-scccggffggffffffgffftffgcccdc
-ccggffggffffffffgffffffggtfcc
-ccgftfgfffffffggffffffgfffffc
-gcgffffgggffffgtfffffgfgggffc
-gccggfffgggfgggffffffgffgtfcc
-ggcccccfdggggggfffffffffffccs
-gccssccddddgdggggggfffffcccss
-ccsssccccdcdcddgddggggccccsss
-sssssccddcdccdddddccccccccccs
-ccccccccddddcdddccccscccccdcc
-gggggccccdddcdccccssssccdggdd
-gtfffggccddddccccssssscdgftfd
-fgfffggccccddcccsssssscddgfgd
-ffffgtggccccccsssssssscccdddc
-ftfffggggcgcssssssssssscccccc
-fffffgggggggccssssssscccccccc
-CCfffffggtggccsssssscctcccccc
-3Cgfffffgggggccssssscgghgcccc
-Cfgfgfggggggccccsscc\ghmhcccc
-ffgggggggggcccccccccgghmhggcc
-fffgggggtgcccscsccfffhhmhggtc
-ggggggggggccsssssccfffhhhgccc
-cccggggggccsssssssccfftggccss
-cscgtggggccssssssssccffgccsss
-cscgggggcccssssssssscgcccssss
-sscccccccssssssssssscccccssss
-sssssssssssssssssssscssscssss
+sssssssssssssssssssssssssssssssss
+ssscssssssssssssssssssssssscccccs
+scccccccscccccccccssssssscccgffcs
+scccgccccchhhchcccssssssssctwwfcs
+sccgtggggghhmmmhccscsssssscggwfcs
+scfgfgCCCgcthmhhfcccccsssscccfcss
+sscfffC3Cgghmmmhffftcccssssccccss
+sscccfggghfmmmhffffffcccssc\ccsss
+sssccffggmhmmmhfgffffffcsccgtccss
+sssccccfhfhmhhhfgffffffccccgffccs
+sssccccffghhtfhfffffwffgtccnnfdcs
+sssssccfffffffgfgfffffffcccc1ndcs
+sssssccfffgfwwfffgfffffggcccncdcs
+ssscccfgffgffffffffffftffgcccdcss
+ssccggffgffffffffffggffffggtfccss
+scccgftfffffwffffffffwwfffffffcss
+scgcgffffggfffffgtfffffgffffffcss
+scfccggffffgfffwgffffffgffgtfccss
+scffcccccfdgggfggffffffgggffccsss
+scfgcssccddddgdgfgffffgfffcccssss
+sscccssccccddddddgddcgcgccccsssss
+ssscscsccddwdwwdddddccccccccccscs
+ssccccccccddddwdddcccsssccccdcccs
+sscggggdcccwwdwdccccssssccddgddcs
+scctfffddwwddddccccssssccdfftfdcs
+sccgfffdwcwccddcccsssssccdggffdcs
+scfffftddwwcwccccssssssscccdddcss
+scftffffddddwdcssssssssccccccccss
+sccCfgwggdwddgcssssssssccccccccss
+ssCCgfgwffdtggcccssssscctccccssss
+sc2CCffwwffggggccssssccggggcsssss
+scfgfffffffgggccsssscc\ghhmcccccs
+scgggffffffggccsssccccgfmmmggcccs
+scgggggwggtgccssssccggfhmhhfgtccs
+scggggwgggggccsssssccghmmhfgcccss
+sccccgggffgccsssssssccggtggccssss
+sscccgtgfggccssssssscccgwgccsssss
+ssscccgcgccccssssssssccgcccssssss
+ssssccccccccssssssssscccccsssssss
+sssssscscssssssssssssscscssssssss
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.19
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.19
Fri Nov 5 23:18:22 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg Fri Dec
24 05:04:21 2004
@@ -27,21 +27,19 @@
{BIGMAP_ISLE_OF_THE_DAMNED}
- [item]
- x=6
- y=13
- image=terrain/temple.png
- [/item]
- [item]
- x=13
- y=17
- image=terrain/temple.png
- [/item]
- [item]
- x=10
- y=12
- image=terrain/temple.png
- [/item]
+ [story]
+ [part]
+ id=isledamn_1a
+ story= _ "But the voyage did not go as smoothly as had been
hoped. A storm blew up and bore down on the ship. Though all hands were on deck
working desperately, a sudden gust of wind flung Konrad overboard as he
attempted to secure the sails..."
+ background=campaigns/Heir_To_The_Throne/story/story9.png
+ [/part]
+ [part]
+ show_title=yes
+ id=isledamn_2a
+ story= _ "The mermen finally saved Konrad from the sea, but
were unable to get him back to the ship. With great effort though, they reached
a nearby island..."
+ background="maps/wesnoth.png"
+ [/part]
+ [/story]
[side]
description=Konrad
@@ -51,21 +49,8 @@
canrecruit=1
recruit=Thug,Poacher,Footpad
controller=human
- [unit]
- description=Kalba
- type=Merman
- side=1
- x=25
- y=10
- [/unit]
- [unit]
- description=Gnaba
- type=Merman
- side=1
- x=29
- y=12
- [/unit]
[/side]
+
[side]
description=Haf-Mal
type=Lich
@@ -78,6 +63,7 @@
[/ai]
{GOLD 80 140 200}
[/side]
+
[side]
description=Jarmal-Gorg
type=Lich
@@ -88,39 +74,100 @@
{GOLD 80 140 200}
[/side]
- [story]
- [part]
- id=isledamn_1a
- story= _ "But the voyage did not go as smoothly as had been
hoped. A storm blew up and bore down on the ship. Though all hands were on deck
working desperately, a sudden gust of wind flung Konrad overboard as he
attempted to secure the sails..."
- background=campaigns/Heir_To_The_Throne/story/story9.png
- [/part]
- [part]
- show_title=yes
- id=isledamn_2a
- story= _ "The mermen finally saved Konrad from the sea, but
were unable to get him back to the ship. With great effort though, they reached
a nearby island..."
- background="maps/wesnoth.png"
- [/part]
- [/story]
[event]
- name=start
+ name=prestart
- #reset gold held to 100
- [store_gold]
- side=1
- variable=isle_damned_starting_gold
- [/store_gold]
- {VARIABLE_OP isle_damned_starting_gold multiply -1}
- [gold]
- side=1
- amount=$isle_damned_starting_gold
- [/gold]
- [gold]
- side=1
- amount=100
- [/gold]
- {VARIABLE_OP isle_damned_starting_gold multiply -1}
+ [item]
+ x=11
+ y=13
+ image=terrain/temple.png
+ [/item]
+ [item]
+ x=10
+ y=17
+ image=terrain/temple.png
+ [/item]
+ [item]
+ x=9
+ y=15
+ image=terrain/temple.png
+ [/item]
+
+ [unit]
+ description=Kalba
+ type=Merman
+ side=1
+ x=27
+ y=12
+ [/unit]
+ [unit]
+ description=Gnaba
+ type=Merman
+ side=1
+ x=31
+ y=14
+ [/unit]
+
+ #reset gold held to 100
+ [store_gold]
+ side=1
+ variable=isle_damned_starting_gold
+ [/store_gold]
+ {VARIABLE_OP isle_damned_starting_gold multiply -1}
+ [gold]
+ side=1
+ amount=$isle_damned_starting_gold
+ [/gold]
+ [gold]
+ side=1
+ amount=100
+ [/gold]
+ {VARIABLE_OP isle_damned_starting_gold multiply -1}
+ [disallow_recruit]
+ side=1
+ type=Elvish Fighter
+ [/disallow_recruit]
+ [disallow_recruit]
+ side=1
+ type=Elvish Archer
+ [/disallow_recruit]
+ [disallow_recruit]
+ side=1
+ type=Elvish Scout
+ [/disallow_recruit]
+ [disallow_recruit]
+ side=1
+ type=Elvish Shaman
+ [/disallow_recruit]
+ [disallow_recruit]
+ side=1
+ type=Horseman
+ [/disallow_recruit]
+ [disallow_recruit]
+ side=1
+ type=Mage
+ [/disallow_recruit]
+
+ [unit]
+ description=Urlaf
+ type=Outlaw
+ side=1
+ x=21
+ y=12
+ [/unit]
+
+ [hide_unit]
+ x=21
+ y=12
+ description=Urlaf
+ [/hide_unit]
+
+ [/event]
+
+ [event]
+ name=start
[message]
description=Konrad
id=isledamn_3
@@ -141,42 +188,18 @@
id=isledamn_6
message= _ "There are still some bands of humans hiding on the
island, my lord. If you recruit some of them to help, we might have some hope
of holding off the undead hordes!"
[/message]
- [unit]
+
+ [unhide_unit]
+ x=21
+ y=12
description=Urlaf
- type=Outlaw
- side=1
- x=18
- y=10
- [/unit]
+ [/unhide_unit]
[message]
description=Urlaf
id=isledamn_7
message= _ "Maybe we can make a deal! Help us defeat those evil
creatures!"
[/message]
- [disallow_recruit]
- side=1
- type=Elvish Fighter
- [/disallow_recruit]
- [disallow_recruit]
- side=1
- type=Elvish Archer
- [/disallow_recruit]
- [disallow_recruit]
- side=1
- type=Elvish Scout
- [/disallow_recruit]
- [disallow_recruit]
- side=1
- type=Elvish Shaman
- [/disallow_recruit]
- [disallow_recruit]
- side=1
- type=Horseman
- [/disallow_recruit]
- [disallow_recruit]
- side=1
- type=Mage
- [/disallow_recruit]
+
[/event]
[event]
@@ -293,12 +316,12 @@
numerical_equals=1
[/variable]
[then]
- {MOREMIRMU_TRAP 13 17}
- {XAKAE_TRAP 10 12}
+ {MOREMIRMU_TRAP 11 13}
+ {XAKAE_TRAP 10 17}
[/then]
[else]
- {MOREMIRMU_TRAP 10 12}
- {XAKAE_TRAP 13 17}
+ {MOREMIRMU_TRAP 10 17}
+ {XAKAE_TRAP 11 13}
[/else]
[/if]
@@ -308,8 +331,8 @@
name=moveto
[filter]
side=1
- x=6
- y=13
+ x=9
+ y=15
[/filter]
[message]
id=msg4_11
@@ -323,6 +346,7 @@
[filter]
description=Moremirmu
[/filter]
+
[message]
id=msg4_moredie
speaker=unit
@@ -338,14 +362,14 @@
[command]
[move_unit_fake]
type=Galleon
- x=23,23,23,23,23,24
- y=1,2,3,4,5,5
+ x=33,32,31,30,29,28,27
+ y=7,7,8,7,7,7,8
[/move_unit_fake]
[/command]
[command]
[item]
- x=24
- y=5
+ x=27
+ y=8
image=galleon.png
[/item]
[/command]
@@ -385,43 +409,6 @@
side=1
type=Footpad
[/disallow_recruit]
-
-# [message]
-# description=Banditboss
-# id=isledamn_8
-# message= _ "Hey boss! Can we go with you? We are sick of this
awfull island."
-# [/message]
-# [message]
-# id=isledamm_9
-# description=Konrad
-# message= _ "Hmm...I have to consider this..."
-# [option]
-# id=accept_bandits
-# message= _ "Yes, on board!."
-# [/option]
-# [option]
-# id=reject_bandits
-# message= _ "I'm not truly trust in you, bandits are
treacherous."
-# [command]
-# [message]
-# description=Banditboss
-# message= _ ""
-# [/message]
-# [kill]
-# type=Thug
-# [/kill]
-# [kill]
-# type=Poacher
-# [/kill]
-# [kill]
-# type=Outlaw
-# [/kill]
-# [kill]
-# type=Bandit
-# [/kill]
-# [/command]
-# [/option]
-# [/message]
#enddef
#define ISLE_RESTORE_GOLD
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.17
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.18
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.17 Sun Nov
7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Fri Dec 24
05:04:21 2004
@@ -84,8 +84,8 @@
[/ai]
[ai]
[protect_location]
- x=11
- y=14
+ x=13
+ y=16
radius=10
value=10
[/protect_location]
@@ -119,8 +119,8 @@
[/ai]
[ai]
[protect_location]
- x=11
- y=14
+ x=13
+ y=16
radius=10
value=10
[/protect_location]
@@ -129,7 +129,7 @@
{scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg}
- #define TEMP_LOOT X Y
+#define TEMP_LOOT X Y
[event]
name=moveto
[filter]
@@ -241,11 +241,11 @@
{STARTING_VILLAGES 2 12}
{STARTING_VILLAGES 3 12}
- {PUT_IMG (terrain/temple.png) 10 12}
- {PUT_IMG (terrain/temple.png) 8 13}
- {PUT_IMG (terrain/temple.png) 10 15}
+ {PUT_IMG (terrain/temple.png) 11 13}
+ {PUT_IMG (terrain/temple.png) 10 17}
+ {PUT_IMG (terrain/temple.png) 9 15}
- {OBJ_POTION_HOLY 27 22 (holy_water1)}
+ {OBJ_POTION_HOLY 29 24 (holy_water1)}
[set_variable]
name=queen_awake
@@ -278,13 +278,13 @@
numerical_equals=1
[/variable]
[then]
- {TEMP_LOOT 10 12}
+ {TEMP_LOOT 11 13}
#ifdef EASY
- {TEMP_LOOT 8 13}
+ {TEMP_LOOT 10 17}
#else
- {TEMP_EMPTY 8 13}
+ {TEMP_EMPTY 10 17}
#endif
- {TEMP_QUEEN 10 15}
+ {TEMP_QUEEN 9 15}
[/then]
[/if]
[if]
@@ -293,13 +293,13 @@
numerical_equals=2
[/variable]
[then]
- {TEMP_LOOT 8 13}
+ {TEMP_LOOT 10 17}
#ifdef EASY
- {TEMP_LOOT 10 15}
+ {TEMP_LOOT 9 15}
#else
- {TEMP_EMPTY 10 15}
+ {TEMP_EMPTY 9 15}
#endif
- {TEMP_QUEEN 10 12}
+ {TEMP_QUEEN 11 13}
[/then]
[/if]
[if]
@@ -308,49 +308,23 @@
numerical_equals=3
[/variable]
[then]
- {TEMP_LOOT 10 15}
+ {TEMP_LOOT 9 15}
#ifdef EASY
- {TEMP_LOOT 10 12}
+ {TEMP_LOOT 11 13}
#else
- {TEMP_EMPTY 10 12}
+ {TEMP_EMPTY 11 13}
#endif
- {TEMP_QUEEN 8 13}
+ {TEMP_QUEEN 10 17}
[/then]
[/if]
{CLEAR_VARIABLE random}
#ifdef EASY
- {OBJ_POTION_HOLY 26 24 (holy_water2)}
+ {OBJ_POTION_HOLY 28 26 (holy_water2)}
#endif
[/event]
-##ifdef EASY
-# [event]
-# name=moveto
-# [filter]
-# side=1
-# x=26
-# y=24
-# [/filter]
-#
-# [removeitem]
-# [/removeitem]
-# [/event]
-##endif
-#
-# [event]
-# name=moveto
-# [filter]
-# side=1
-# x=27
-# y=22
-# [/filter]
-#
-# [removeitem]
-# [/removeitem]
-# [/event]
-
[event]
name=start
[message]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Isle_of_th...,
James Spencer <=