summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-04-25 22:43:35 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2012-04-25 22:43:35 +0200
commit74abccedfe5146b64df7a53e3287deb97bcf788a (patch)
treedcffc6686d4e2a8bd745f9384a5f27d9e5b5e070
parentdbd2ea1bb30c0bf051411bb2a24e56d633c8c029 (diff)
downloadserverdata-74abccedfe5146b64df7a53e3287deb97bcf788a.tar.gz
serverdata-74abccedfe5146b64df7a53e3287deb97bcf788a.tar.bz2
serverdata-74abccedfe5146b64df7a53e3287deb97bcf788a.tar.xz
serverdata-74abccedfe5146b64df7a53e3287deb97bcf788a.zip
Prepare Blue Sage quest for release:
- open warp from 034-1 to 046-1 by running the converter, submodule pointer updated - remove debug npc
m---------client-data0
-rw-r--r--world/map/npc/034-1/_warps.txt1
-rw-r--r--world/map/npc/048-2/sageNikolai.txt32
3 files changed, 17 insertions, 16 deletions
diff --git a/client-data b/client-data
-Subproject 72545ca12be73b5dfd55c0cf3b02fe40858e03b
+Subproject c55108925ca9ab58451dbfcaa09d3ff59e67e11
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 2adb0abf..9c0acf36 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -4,3 +4,4 @@
034-1.gat,160,20|warp|To Snow Field|-1,0,033-1.gat,23,19
034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
+034-1.gat,95,18|warp|ToHighlands1|0,-1,046-1.gat,95,116
diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt
index b0027d8f..4b794a7d 100644
--- a/world/map/npc/048-2/sageNikolai.txt
+++ b/world/map/npc/048-2/sageNikolai.txt
@@ -274,19 +274,19 @@ L_Close:
close;
}
-048-2.gat,100,106,0|script|Debug|160,{
- set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
- set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
- set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-
- mes "QUEST_BlueSage: " + QUEST_BlueSage;
- mes "investigate: " + @investigate;
- mes "slimes: " + @slimes;
- mes "bookpages: " + @bookpages;
- menu
- "reset quest",-,
- "close",L_Close;
- set QUEST_BlueSage, 0;
-L_Close:
- close;
-}
+//048-2.gat,100,106,0|script|Debug|160,{
+// set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
+// set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
+// set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
+//
+// mes "QUEST_BlueSage: " + QUEST_BlueSage;
+// mes "investigate: " + @investigate;
+// mes "slimes: " + @slimes;
+// mes "bookpages: " + @bookpages;
+// menu
+// "reset quest",-,
+// "close",L_Close;
+// set QUEST_BlueSage, 0;
+//L_Close:
+// close;
+//}