diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 167 | ||||
-rw-r--r-- | db/quest_db.conf | 4 | ||||
-rw-r--r-- | maps/re/014-5-1.mcache | bin | 0 -> 82 bytes | |||
-rw-r--r-- | npc/014-5-1/_import.txt | 3 | ||||
-rw-r--r-- | npc/014-5-1/_warps.txt | 3 | ||||
-rw-r--r-- | npc/014-5/sagratha.txt | 16 | ||||
-rw-r--r-- | npc/_import.txt | 1 |
8 files changed, 111 insertions, 84 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 62172fbe3..a047b8f15 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -83,6 +83,7 @@ map_list: ( "014-2", "014-3", "014-4", + "014-5-1", "014-5", "015-1", "015-2", diff --git a/db/map_index.txt b/db/map_index.txt index 4386d38db..2bbceb10b 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -80,86 +80,87 @@ 014-2 80 014-3 81 014-4 82 -014-5 83 -015-1 84 -015-2 85 -015-3 86 -015-4 87 -015-5 88 -015-6 89 -015-7 90 -016-1 91 -016-6 92 -016-7 93 -017-1 94 -017-2-1 95 -017-2-2 96 -017-2 97 -017-3 98 -017-4 99 -017-5 100 -017-6 101 -017-7 102 -017-8 103 -018-1-1 104 -018-1 105 -018-2-1 106 -018-2-2 107 -018-2-3 108 -018-2-4 109 -018-2-5 110 -018-2 111 -018-3 112 -018-4-1 113 -018-4-2 114 -018-4 115 -018-5-0 116 -018-5-1 117 -018-5-2 118 -018-5-3 119 -018-5-boss 120 -018-5 121 -019-1-1 122 -019-1 123 -019-2 124 -019-3 125 -019-4-1 126 -019-4 127 -020-1 128 -020-2 129 -020-3 130 -020-4 131 -020-5 132 -020-6 133 -020-7-1 134 -020-7 135 -021-1 136 -021-2 137 -021-3 138 -021-4 139 -022-1 140 -023-1 141 -023-2 142 -024-1 143 -024-10 144 -024-11 145 -024-12 146 -024-13 147 -024-14 148 -024-15 149 -024-2 150 -024-3 151 -024-4 152 -024-5 153 -024-6 154 -024-7 155 -024-8 156 -024-9 157 -boss 158 -botcheck 159 -guilds 160 -sec_pri 161 -soren-2 162 -soren 163 -test 164 -testbg 165 +014-5-1 83 +014-5 84 +015-1 85 +015-2 86 +015-3 87 +015-4 88 +015-5 89 +015-6 90 +015-7 91 +016-1 92 +016-6 93 +016-7 94 +017-1 95 +017-2-1 96 +017-2-2 97 +017-2 98 +017-3 99 +017-4 100 +017-5 101 +017-6 102 +017-7 103 +017-8 104 +018-1-1 105 +018-1 106 +018-2-1 107 +018-2-2 108 +018-2-3 109 +018-2-4 110 +018-2-5 111 +018-2 112 +018-3 113 +018-4-1 114 +018-4-2 115 +018-4 116 +018-5-0 117 +018-5-1 118 +018-5-2 119 +018-5-3 120 +018-5-boss 121 +018-5 122 +019-1-1 123 +019-1 124 +019-2 125 +019-3 126 +019-4-1 127 +019-4 128 +020-1 129 +020-2 130 +020-3 131 +020-4 132 +020-5 133 +020-6 134 +020-7-1 135 +020-7 136 +021-1 137 +021-2 138 +021-3 139 +021-4 140 +022-1 141 +023-1 142 +023-2 143 +024-1 144 +024-10 145 +024-11 146 +024-12 147 +024-13 148 +024-14 149 +024-15 150 +024-2 151 +024-3 152 +024-4 153 +024-5 154 +024-6 155 +024-7 156 +024-8 157 +024-9 158 +boss 159 +botcheck 160 +guilds 161 +sec_pri 162 +soren-2 163 +soren 164 +test 165 +testbg 166 diff --git a/db/quest_db.conf b/db/quest_db.conf index 330adfb7a..f69c70c86 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -297,6 +297,10 @@ quest_db: ( Id: 103 Name: "HurnscaldQuest_Khafar" }, +{ + Id: 104 + Name: "HurnscaldQuest_Sagratha" +}, // ID 111 to 130: Nivalis Quests { diff --git a/maps/re/014-5-1.mcache b/maps/re/014-5-1.mcache Binary files differnew file mode 100644 index 000000000..3fe4db5f5 --- /dev/null +++ b/maps/re/014-5-1.mcache diff --git a/npc/014-5-1/_import.txt b/npc/014-5-1/_import.txt new file mode 100644 index 000000000..488faeb05 --- /dev/null +++ b/npc/014-5-1/_import.txt @@ -0,0 +1,3 @@ +// Map 014-5-1: Forgotten Hut +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/014-5-1/_warps.txt", diff --git a/npc/014-5-1/_warps.txt b/npc/014-5-1/_warps.txt new file mode 100644 index 000000000..0d236b1c6 --- /dev/null +++ b/npc/014-5-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 014-5-1: Forgotten Hut warps +014-5-1,33,45,0 warp #014-5-1_33_45 0,0,014-5,122,138 diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index 54d601e38..be4704116 100644 --- a/npc/014-5/sagratha.txt +++ b/npc/014-5/sagratha.txt @@ -5,10 +5,11 @@ // Sagratha's House Door 014-5,122,137,0 script Sagratha Door NPC_HIDDEN,0,0,{ + .@q=getq(HurnscaldQuest_Sagratha); end; L_Magicless: - npctalk3 l("A mild magic barrier prevents you from entering."); + npctalk3 l("A light magic barrier prevents you from entering."); dispbottom l("If I only knew some magic..."); end; @@ -22,6 +23,13 @@ L_Lockpick: mes ""; if (@menu == 1) { + /* + if (getq(HurnscaldQuest_InjuriedMouboo) == 2)) { + mesn strcharinfo(0); + mesc l("Nobody answers."); + mes ""; + } + */ mesn l("Sagratha"); mesq l("No, I don't need monster repellent nor anything! Go away!"); close; @@ -75,9 +83,15 @@ L_Lockpick: } close; +L_Open: + warp "014-5-1", 33, 44; + dispbottom l("For some reason, the door was not locked today..."); + close; + OnTouch: if (!MAGIC_LVL) goto L_Magicless; goto L_Lockpick; + if (getq(HurnscaldQuest_InjuriedMouboo) == 3) goto L_Open; end; } diff --git a/npc/_import.txt b/npc/_import.txt index 6e071fd89..60c7b0381 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -82,6 +82,7 @@ @include "npc/014-2/_import.txt" @include "npc/014-3/_import.txt" @include "npc/014-4/_import.txt" +@include "npc/014-5-1/_import.txt" @include "npc/014-5/_import.txt" @include "npc/015-1/_import.txt" @include "npc/015-2/_import.txt" |