Merge water-cave branch into trunk.

diff --git a/lib/edit/q00water.txt b/lib/edit/q00water.txt
new file mode 100644 (file)
index 0000000..87bd4c2
--- /dev/null
+++ b/lib/edit/q00water.txt
@@ -0,0 +1,141 @@
+# q00water.txt
+
+# Created by Oscar Nelson
+# Changed by dis-
+
+# Number:Name
+Q:$18:N:Water Cave
+Q:18:N:¸Ð¤Îƶ·¢
+
+# type:num_mon:cur_num:max_num:level:r_index:k_idx
+Q:$18:Q:4:0:0:0:35:0:0:0:6
+Q:18:Q:4:0:0:0:35:0:0:0:6
+
+# Description for quest
+?:[LEQ $QUEST18 2]
+Q:$18:T:A tunnel opening has recently been exposed on
+Q:$18:T:the shore of our lake. Please investigate and
+Q:$18:T:discover what is inside. Be careful! The
+Q:$18:T:tunnel entrance does not appear to be very
+Q:$18:T:stable.
+Q:18:T:ºÇ¶á¸Ð¤Î¶á¤¯¤Ëƶ·¢¤ÎÆþ¸ý¤¬¸½¤ì¤Þ¤·¤¿¡£¤É¤¦¤«Ãæ¤òÄ´¤Ù¤Æ²¿¤¬¤¢¤ë¤«¸«¤Æ
+Q:18:T:¤­¤Æ²¼¤µ¤¤¡£¤¿¤À¤·¡¢Æ¶·¢¤ÎÆþ¸ý¤Ï¤¢¤Þ¤ê°ÂÄꤷ¤Æ¤Ê¤¤¤è¤¦¤Ê¤Î¤Ç
+Q:18:T:µ¤¤ò¤Ä¤±¤Æ²¼¤µ¤¤¡ª
+?:1
+
+# Description for quest reward
+?:[EQU $QUEST18 3]
+Q:$18:T:We have closed the tunnel to prevent anybody from
+Q:$18:T:getting trapped in the cavern. Please accept the
+Q:$18:T:gift that awaits you outside as an reward for your
+Q:$18:T:help.
+Q:18:T:¿Í¡¹¤¬Æ¶·¢¤Ë´Ö°ã¤Ã¤ÆÆþ¤é¤Ê¤¤¤è¤¦¤Ë¥È¥ó¥Í¥ë¤òÊĺ¿¤·¤Æ¤ª¤­¤Þ¤·¤¿¡£
+Q:18:T:¤É¤¦¤¾³°¤Ë¤¢¤ë²æ¡¹¤«¤é¤Î£ʪ¤ò¼õ¤±¤È¤Ã¤Æ²¼¤µ¤¤¡£
+?:1
+
+# Description for quest failed
+?:[EQU $QUEST18 5]
+Q:$5:T:It seems like this task was too difficult for you.
+Q:5:T:¤³¤Î»Å»ö¤Ï¤¢¤Ê¤¿¤Ë¤ÏÆñ¤·¤«¤Ã¤¿¤è¤¦¤Ç¤¹¤Í¡£
+?:1
+
+# Shallow water with Portuguese man-o-war
+F:a:DEEP_WATER:12:160
+
+# Shallow water with Ixitxachitl
+F:b:DEEP_WATER:12:220
+
+# Shallow water with giant octopus
+F:c:DEEP_WATER:12:266
+
+# Shallow water with hammerhead
+F:d:SHALLOW_WATER:12:292
+
+# Deep water with electric eel
+F:e:DEEP_WATER:12:346
+
+# Deep water with Great white shark
+F:f:DEEP_WATER:12:386
+
+# Deep water with Vampiric ixitxachitl
+F:g:DEEP_WATER:12:406
+
+# Deep water with Giant squid
+F:h:DEEP_WATER:12:482
+
+# Deep water with Lesser kraken
+F:i:DEEP_WATER:12:740
+
+# Deep water with Greater kraken on Potion of Augmentation
+F:j:DEEP_WATER:12:775:418
+
+# Deep water with Seahorse
+F:k:DEEP_WATER:12:443
+
+# Shallow water with SwordFish with Object 10 levels out of depth
+F:l:SHALLOW_WATER:12:88:*10
+
+# Shallow water with Shrieker
+F:m:SHALLOW_WATER:12:40
+
+# Deep water with Deep pubble
+F:n:DEEP_WATER:12:944
+
+# Deep water with Small Kraken
+F:o:DEEP_WATER:12:903
+
+# Steel Helm
+F:A:SHALLOW_WATER:12:0:97
+
+# Metal Boots
+F:B:SHALLOW_WATER:12:0:93
+
+# Cesti
+F:C:SHALLOW_WATER:12:0:127
+
+# Blade of Chaos
+F:E:SHALLOW_WATER:12:0:36
+
+# Object 10 levels out of depth on no-tele Shallow water 
+F:O:SHALLOW_WATER:12:0:*10
+
+# MAGMA VEIN
+F:#:MAGMA_VEIN:12
+
+#RUBBLE
+F:%:RUBBLE:12
+
+# no-tele Shallow water
+F:.:SHALLOW_WATER:12
+
+# no-tele Deep water
+F:~:DEEP_WATER:12
+
+# no-tele Quest exit
+F:<:QUEST_EXIT:12
+
+# Dungeon
+D:XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+D:XXVVVh%#o#~XOX~~~~XhXX<k~~XX
+D:X.XXXX#.X%X%XkXXXX~X~XXXXX~X
+D:XX.hX.X....~XXXX~nX%~#~Xh~XX
+D:X.XX%....f....~~~~f~~~~XXX~X
+D:X.X..a..#.....~~~~~#~~g~~X~X
+D:X.XX...#...c.XX~c~~~#~~~XX~X
+D:X.#...#...#.XmmX~#~~~#~~~X~X
+D:XX.#.f...#.XmVVmX~#~~~f~#nXX
+D:XnX.#...d.Xm%mm%mX~e~~~#~X~X
+D:XXX#.##..XmVmllmVmX~~##~#XXX
+D:XnX.#...d.Xm%mm%mX~e~~~#~XnX
+D:XX.#.f...#.XmVVmX~#~~~f~#~XX
+D:X.#...#...#.XmmX~#~~~#~~~X~X
+D:X.XX...#...#.XX~c~~~#~~~XX~X
+D:X.X..b..#.....~~~~~#~~g~~X~X
+D:X.XX%....f....~~~~f~~~~XXX~X
+D:XX.hX.n.....XXX%X~X~~X~Xh~XX
+D:X.XXXXX.XXXXXXEn%X%X~%XXXX~X
+D:XX.OOkX#o~~n%CXjXnXh#XiAB%XX
+D:XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+# Starting position
+P:1:2

diff --git a/lib/edit/q_info.txt b/lib/edit/q_info.txt
index 3438494..ae3313a 100644 (file)
--- a/lib/edit/q_info.txt
+++ b/lib/edit/q_info.txt
@@ -71,7 +71,10 @@
 #?:[EQU $QUEST_NUMBER 17]
 #%:q000lyeh.txt
 
-# Quest #18 was removed
+# Quest #18 was returned!
+# Water Cave
+?:[EQU $QUEST_NUMBER 18]
+%:q00water.txt
 
 # Doom Quest 1
 ?:[EQU $QUEST_NUMBER 19]

diff --git a/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
index baf9027..9af4f96 100644 (file)
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -14,6 +14,9 @@ F:@:FLOOR:3
 # Default for Quest 1 = entrance is tree
 F:z:TREE:3
 
+# Default for Quest 18 = entrance is tree
+F:y:TREE:3
+
 # Default for Quest 25 = entrance is stone
 F:x:PERMANENT:3
 
@@ -119,21 +122,50 @@ F:b:BUILDING_1:3:0:0:0:0:NONE:14
 F:b:BUILDING_1:3:0:0:0:0:NONE:14
 
 # Quest 14 rewarding, reward is a Small Metal Shield,
-# continue with quest 25
+# continue with quest 18
 ?:[EQU $QUEST14 3]
-F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
 F:!:FLOOR:3:0:130
 
 ?:[AND [EQU $QUEST14 3] [EQU $CLASS BeastMaster Cavalry Ninja] ]
-F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
 F:!:FLOOR:3:0:126
 
-# Continue with quest 25
+# Continue with quest 18
 ?:[EQU $QUEST14 4]
-F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
 
 ?:1
 
+############### Quest 18 - Water Cave ###############
+
+# Quest 18 assigned, entrance is quest entrance
+?:[EQU $QUEST18 1]
+F:y:QUEST_ENTER:3:0:0:0:0:NONE:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 completed
+?:[EQU $QUEST18 2]
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 rewarding, reward is Potion of Experience
+# continue with quest 25
+?:[EQU $QUEST18 3]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:!:FLOOR:3:0:244
+
+# Quest 18 finished, continue with quest 25
+?:[EQU $QUEST18 4]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+
+# Quest 18 failed, wait for the player to enter the castle
+?:[EQU $QUEST18 5]
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 failed but done, continue with quest 25
+?:[EQU $QUEST18 6]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+?:1
 
 ############### Quest 25 - Haunted House ###############
 
@@ -516,7 +548,7 @@ D:#TTTTTTTTTTTTTTWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WWWWWWWWWWWWWWWW
 D:#TTTTTTTTTTVVWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT------.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTT#
 D:#TTTTTTTTTVWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-------.............................................................................----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTTTTWWWWTTTTTTTTTTTTTTTTTTTTTTTTT...............---------------------------------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
-D:#TTTTTTTTWWWWWWTTTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
+D:#TTTTTTTTWWWWWWTyTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTTVWWWWWWWW......TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTVWWWWWWWWWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT^^^^TTTTT#
 D:#TTTTTTWWWWWWWWWWWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^TTT#
@@ -544,6 +576,10 @@ P:33:131
 ?:[EQU $LEAVING_QUEST 1]
 P:34:177
 
+# Starting position when coming from quest 18
+?:[EQU $LEAVING_QUEST 18]
+P:56:17
+
 # Starting position when coming from quest 25
 ?:[EQU $LEAVING_QUEST 25]
 P:43:72