+++ /dev/null
-# q00water.txt
-
-# Created by Oscar Nelson
-
-# 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:50:0:0:0:2
-Q:18:Q:4:0:0:0:50:0:0:0:2
-
-# 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
-
-# Shallow water with Portuguese man-o-war
-F:a:SHALLOW_WATER:8:160
-
-# Shallow water with Ixitxachitl
-F:b:SHALLOW_WATER:8:220
-
-# Shallow water with giant octopus
-F:c:SHALLOW_WATER:8:266
-
-# Shallow water with hammerhead
-F:d:SHALLOW_WATER:8:292
-
-# Shallow water with electric eel
-F:e:SHALLOW_WATER:8:346
-
-# Deep water with Great white shark on no teleportation grid
-F:f:DEEP_WATER:12:386
-
-# Deep water with Vampiric ixitxachitl on no teleportation grid
-F:g:DEEP_WATER:12:406
-
-# Deep water with Giant squid on no teleportation grid
-F:h:DEEP_WATER:12:482
-
-# Deep water with Lesser kraken on no teleportation grid
-F:i:DEEP_WATER:12:740
-
-# Deep water with Greater kraken on no teleportation grid
-F:j:DEEP_WATER:12:775
-
-# Steel Helm on no teleportation grid
-F:A:SHALLOW_WATER:12:0:97
-
-# Metal Boots on no teleportation grid
-F:B:SHALLOW_WATER:12:0:93
-
-# Cesti on no teleportation grid
-F:C:SHALLOW_WATER:12:0:127
-
-# Blade of Chaos on no teleportation grid
-F:E:SHALLOW_WATER:12:0:36
-
-# Quest exit on no teleportation grid
-F:<:QUEST_EXIT:12
-
-# Dungeon
-D:XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:XXXXXXXXVVVVXXXXAWWWXXXXXXXX
-D:XXXXXXVdVVbVXXXXWWWWWWXXXXXX
-D:XXXXXXVVXXVVXXXXWWXXWWXXXXXX
-D:XXXXXVVXXXVVXXXXWWXXXWWXXXXX
-D:XXXVVaVVVVVVVWWWWgWWfWWWWXXX
-D:XXVVVVVVVeVVVWWWhWWWWWWWWWXX
-D:XXVVXXVVXXVVXXXXWWXXWiXXWWXX
-D:XVVVVVVVVVVVXXXXWWWWWWWWWWWX
-D:XVVaVVVVVVVVXXXXWWWWWWWWWWEX
-D:XXXXXXVVXXXXXXXXXXXXW<XXXXXX
-D:XVVVVVVVVVVcXXXXWgWWWWWWWWCX
-D:XVVcVVVVVeVVXXXXWWWWWWWWWWWX
-D:XXVVXXVVXXVVXXXXWWXXWjXXWWXX
-D:XXVVVVVdVVVVVWWWhWfWWWWfWWXX
-D:XXXVdVVVVVVVVWWWWWWWWWWWWXXX
-D:XXXXXVVXXXbVXXXXWWXXXWWXXXXX
-D:XXXXXXVVXXVbXXXXWWXXWWXXXXXX
-D:XXXXXXXVVeVVXXXXWWWWWXXXXXXX
-D:XXXXXXXXVVVVXXXXBWfWXXXXXXXX
-D:XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-# Starting position
-P:10:6
-
#?:[EQU $QUEST_NUMBER 17]
#%:q000lyeh.txt
-# Water Cave
-?:[EQU $QUEST_NUMBER 18]
-%:q00water.txt
+# Quest #18 was removed
# Doom Quest 1
?:[EQU $QUEST_NUMBER 19]
# 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
F:b:BUILDING_1:3:0:0:0:0:NONE:25
# Quest 25 rewarding, reward is Staff of Dispel Evil,
-# continue with quest 18
+# continue with quest 28
?:[EQU $QUEST25 3]
-F:b:BUILDING_1:3:0:0:0:0:NONE:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
F:!:FLOOR:3:0:320
-# Quest 25 finished, continue with quest 18
+# Quest 25 finished, continue with quest 28
?:[EQU $QUEST25 4]
-F:b:BUILDING_1:3:0:0:0:0:NONE:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
# Quest 25 failed, wait for the player to enter the castle
?:[EQU $QUEST25 5]
F:b:BUILDING_1:3:0:0:0:0:NONE:25
-# Quest 25 failed but done, continue with quest 18
+# Quest 25 failed but done, continue with quest 28
?:[EQU $QUEST25 6]
-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 Ring of Poison Resistance,
-# continue with quest 28
-?:[EQU $QUEST18 3]
-F:b:BUILDING_1:3:0:0:0:0:NONE:28
-F:!:FLOOR:3:0:143
-
-# Quest 18 finished, continue with quest 28
-?:[EQU $QUEST18 4]
F:b:BUILDING_1:3:0:0:0:0:NONE:28
?:1
D:#TTTTTTTTTTVVWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT------.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTT#
D:#TTTTTTTTTVWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-------.............................................................................----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTTTTWWWWTTTTTTTTTTTTTTTTTTTTTTTTT...............---------------------------------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
-D:#TTTTTTTTWWWWWWTyTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
+D:#TTTTTTTTWWWWWWTTTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTTVWWWWWWWW......TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTVWWWWWWWWWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT^^^^TTTTT#
D:#TTTTTTWWWWWWWWWWWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^TTT#
?:[EQU $LEAVING_QUEST 25]
P:43:72
-# Starting position when coming from quest 18
-?:[EQU $LEAVING_QUEST 18]
-P:56:17
-
# Starting position when coming from quest 27
?:[EQU $LEAVING_QUEST 27]
P:19:176
# 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 12 = grass
F:x:GRASS:3
?:[EQU $QUEST5 2]
F:b:BUILDING_1:3:0:0:0:0:NONE:5
-# Quest 5 rewarding, continue with quest 16
+# Quest 5 rewarding, continue with quest 27
# reward is cheaper *Identify* at the Library (see buildings)
?:[EQU $QUEST5 3]
-F:b:BUILDING_1:3:0:0:0:0:NONE:18
-
-# Quest 5 finished, continue with quest 16
-?:[EQU $QUEST5 4]
-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 Ring of Poison Resistance,
-# continue with quest 27
-?:[EQU $QUEST18 3]
F:b:BUILDING_1:3:0:0:0:0:NONE:27
-F:!:FLOOR:3:0:143
-# Quest 18 finished, continue with quest 27
-?:[EQU $QUEST18 4]
+# Quest 5 finished, continue with quest 27
+?:[EQU $QUEST5 4]
F:b:BUILDING_1:3:0:0:0:0:NONE:27
?:1
D:#TTTTTTTTTTVVWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT------.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTT#
D:#TTTTTTTTTVWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-------.............................................................................----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTTTTWWWWTTTTTTTTTTTTTTTTTTTTTTTTT...............---------------------------------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
-D:#TTTTTTTTWWWWWWTyTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
+D:#TTTTTTTTWWWWWWTTTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTTVWWWWWWWW......TTTTTTTTT.TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
D:#TTTTTTVWWWWWWWWWWV---TTTTTTTTTT.TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-T###TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTw^^^^TTTTT#
D:#TTTTTTWWWWWWWWWWWWv-TTTTTTTTTTT(TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-#####TTTTTTTTTTTTTTTTTTTTTTTTTT########TTTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^TTT#
?:[EQU $LEAVING_QUEST 7]
P:30:15
-# Starting position when coming from quest 18
-?:[EQU $LEAVING_QUEST 18]
-P:56:17
-
# Starting position when coming from quest 10
?:[EQU $LEAVING_QUEST 10]
P:58:19
#define H_VER_MAJOR 1
#define H_VER_MINOR 7
#define H_VER_PATCH 0
-#define H_VER_EXTRA 5
+#define H_VER_EXTRA 6
#define ANGBAND_2_8_1
/*** Terrain Feature Indexes (see "lib/edit/f_info.txt") ***/
#define OLD_FEAT_INVIS 0x02
#define OLD_FEAT_GLYPH 0x03
+#define OLD_FEAT_QUEST_ENTER 0x08
+#define OLD_FEAT_QUEST_EXIT 0x09
#define OLD_FEAT_MINOR_GLYPH 0x40
+#define OLD_FEAT_BLDG_1 0x81
#define OLD_FEAT_MIRROR 0xc3
+/* Old quests */
+#define OLD_QUEST_WATER_CAVE 18
+
+/* Quest constants */
+#define QUEST_OLD_CASTLE 27
+#define QUEST_ROYAL_CRYPT 28
+
/*
* Read the dungeon (old method)
*
}
}
+ /* Quest 18 was removed */
+ if (h_older_than(1, 7, 0, 6) && !vanilla_town)
+ {
+ for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
+ {
+ /* Access the cave */
+ c_ptr = &cave[y][x];
+
+ if ((c_ptr->special == OLD_QUEST_WATER_CAVE) && !dun_level)
+ {
+ if (c_ptr->feat == OLD_FEAT_QUEST_ENTER)
+ {
+ c_ptr->feat = feat_tree;
+ c_ptr->special = 0;
+ }
+ else if (c_ptr->feat == OLD_FEAT_BLDG_1)
+ {
+ c_ptr->special = lite_town ? QUEST_OLD_CASTLE : QUEST_ROYAL_CRYPT;
+ }
+ }
+ else if ((c_ptr->feat == OLD_FEAT_QUEST_EXIT) &&
+ (p_ptr->inside_quest == OLD_QUEST_WATER_CAVE))
+ {
+ c_ptr->feat = feat_up_stair;
+ c_ptr->special = 0;
+ }
+ }
+ }
+
/*** Objects ***/
/* Read the item count */
}
}
+ /* Quest 18 was removed */
+ if (h_older_than(1, 7, 0, 6) && !vanilla_town)
+ {
+ for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
+ {
+ /* Access the cave */
+ cave_type *c_ptr = &cave[y][x];
+
+ if ((c_ptr->special == OLD_QUEST_WATER_CAVE) && !dun_level)
+ {
+ if (c_ptr->feat == OLD_FEAT_QUEST_ENTER)
+ {
+ c_ptr->feat = feat_tree;
+ c_ptr->special = 0;
+ }
+ else if (c_ptr->feat == OLD_FEAT_BLDG_1)
+ {
+ c_ptr->special = lite_town ? QUEST_OLD_CASTLE : QUEST_ROYAL_CRYPT;
+ }
+ }
+ else if ((c_ptr->feat == OLD_FEAT_QUEST_EXIT) &&
+ (p_ptr->inside_quest == OLD_QUEST_WATER_CAVE))
+ {
+ c_ptr->feat = feat_up_stair;
+ c_ptr->special = 0;
+ }
+ }
+ }
+
/* Free the "template" array */
C_FREE(template, limit, cave_template_type);
}
/* Load quest status if quest is running */
- if (quest[i].status == QUEST_STATUS_TAKEN || (!z_older_than(10, 3, 14) && (quest[i].status == QUEST_STATUS_COMPLETED)) || (!z_older_than(11, 0, 7) && (i >= MIN_RANDOM_QUEST) && (i <= (MIN_RANDOM_QUEST+max_rquests_load))))
+ if ((quest[i].status == QUEST_STATUS_TAKEN) ||
+ (!z_older_than(10, 3, 14) && (quest[i].status == QUEST_STATUS_COMPLETED)) ||
+ (!z_older_than(11, 0, 7) && (i >= MIN_RANDOM_QUEST) && (i <= (MIN_RANDOM_QUEST + max_rquests_load))))
{
rd_s16b(&quest[i].cur_num);
rd_s16b(&quest[i].max_num);
}
}
+ /* Quest 18 was removed */
+ if (h_older_than(1, 7, 0, 6))
+ {
+ WIPE(&quest[OLD_QUEST_WATER_CAVE], quest_type);
+ quest[OLD_QUEST_WATER_CAVE].status = QUEST_STATUS_UNTAKEN;
+ }
+
/* Position in the wilderness */
rd_s32b(&p_ptr->wilderness_x);
rd_s32b(&p_ptr->wilderness_y);
}
}
+ /* Quest 18 was removed */
+ if (h_older_than(1, 7, 0, 6))
+ {
+ if (p_ptr->inside_quest == OLD_QUEST_WATER_CAVE)
+ {
+ dungeon_type = lite_town ? DUNGEON_ANGBAND : DUNGEON_GALGALS;
+ dun_level = 1;
+ p_ptr->inside_quest = 0;
+ }
+ }
+
#ifdef VERIFY_CHECKSUMS
OSDN Git Service
