summaryrefslogtreecommitdiff
path: root/world/map/npc/048-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/048-2')
-rw-r--r--world/map/npc/048-2/bluesageConfig.txt8
-rw-r--r--world/map/npc/048-2/helperAccused.txt2
-rw-r--r--world/map/npc/048-2/helperBookpages1.txt2
-rw-r--r--world/map/npc/048-2/helperBookpages2.txt2
-rw-r--r--world/map/npc/048-2/helperBookpages3.txt2
-rw-r--r--world/map/npc/048-2/helperChief.txt2
-rw-r--r--world/map/npc/048-2/helperCleaning1.txt2
-rw-r--r--world/map/npc/048-2/helperCleaning2.txt2
-rw-r--r--world/map/npc/048-2/helperCleaning3.txt2
-rw-r--r--world/map/npc/048-2/helperCleaning4.txt2
-rw-r--r--world/map/npc/048-2/helperCleaning5.txt2
-rw-r--r--world/map/npc/048-2/helperJanitor.txt2
-rw-r--r--world/map/npc/048-2/helperMInk.txt2
-rw-r--r--world/map/npc/048-2/helperMReed.txt2
-rw-r--r--world/map/npc/048-2/helperMSilk.txt2
-rw-r--r--world/map/npc/048-2/helperMYetiClaw.txt2
-rw-r--r--world/map/npc/048-2/helperResting1.txt2
-rw-r--r--world/map/npc/048-2/helperResting2.txt2
-rw-r--r--world/map/npc/048-2/sageNikolai.txt4
-rw-r--r--world/map/npc/048-2/slimes.txt28
-rw-r--r--world/map/npc/048-2/traveler.txt2
-rw-r--r--world/map/npc/048-2/visitors.txt4
22 files changed, 40 insertions, 40 deletions
diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt
index 58c8e27b..0aeda5fc 100644
--- a/world/map/npc/048-2/bluesageConfig.txt
+++ b/world/map/npc/048-2/bluesageConfig.txt
@@ -51,7 +51,7 @@
// Bit 0: started the subquest
// Bit 1 - 7: each spawn point is unique and saved with a flag
--|script|#bluesageconfig|-1,
+-|script|#bluesageconfig|-1
{
end;
@@ -97,19 +97,19 @@ OnInit:
end;
}
-function|script|updateBlueSageBookPages|,
+function|script|updateBlueSageBookPages
{
set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageBookPages_MASK) | (@bookpages << $@Q_BlueSageBookPages_SHIFT));
return;
}
-function|script|updateBlueSageInvestigate|,
+function|script|updateBlueSageInvestigate
{
set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageInvestigate_MASK) | (@investigate << $@Q_BlueSageInvestigate_SHIFT));
return;
}
-function|script|blueSageNumberOfClearedNests|,
+function|script|blueSageNumberOfClearedNests
{
set @slimenests, 0;
if (QUEST_BlueSage & $@Q_BlueSageSlime0)
diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt
index 96a6060b..ec9b7da4 100644
--- a/world/map/npc/048-2/helperAccused.txt
+++ b/world/map/npc/048-2/helperAccused.txt
@@ -4,7 +4,7 @@
// Peetu is the person who caused the accident
// involved investigation subquest
-048-2.gat,25,135,0|script|Peetu|366,
+048-2.gat,25,135,0|script|Peetu|366
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperBookpages1.txt b/world/map/npc/048-2/helperBookpages1.txt
index 5d64ff5d..27ff12d8 100644
--- a/world/map/npc/048-2/helperBookpages1.txt
+++ b/world/map/npc/048-2/helperBookpages1.txt
@@ -4,7 +4,7 @@
// Ensio is one of the helpers working on sorting the bookpages, can take bookpages
// can give second hint about the visitor in investigation subquest
-048-2.gat,104,86,0|script|Ensio|365,
+048-2.gat,104,86,0|script|Ensio|365
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
diff --git a/world/map/npc/048-2/helperBookpages2.txt b/world/map/npc/048-2/helperBookpages2.txt
index a337dfd7..79be8539 100644
--- a/world/map/npc/048-2/helperBookpages2.txt
+++ b/world/map/npc/048-2/helperBookpages2.txt
@@ -4,7 +4,7 @@
// Henriikka is one of the helpers working on sorting the bookpages, sends the player to Ensio
// can be questioned as part of the investigation subquest, but doesn't give hints
-048-2.gat,94,86,0|script|Henriikka|363,
+048-2.gat,94,86,0|script|Henriikka|363
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
diff --git a/world/map/npc/048-2/helperBookpages3.txt b/world/map/npc/048-2/helperBookpages3.txt
index b3591abb..a4733060 100644
--- a/world/map/npc/048-2/helperBookpages3.txt
+++ b/world/map/npc/048-2/helperBookpages3.txt
@@ -4,7 +4,7 @@
// Teuvo is one of the helpers working on sorting the bookpages
// can give second hint about Peetu in investigation subquest
-048-2.gat,99,87,0|script|Teuvo|366,
+048-2.gat,99,87,0|script|Teuvo|366
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt
index 9705e937..a7fb2073 100644
--- a/world/map/npc/048-2/helperChief.txt
+++ b/world/map/npc/048-2/helperChief.txt
@@ -4,7 +4,7 @@
// Chief of the Blue Sage helpers
// involved in investigation subquest
-048-2.gat,146,26,0|script|Oskari|365,
+048-2.gat,146,26,0|script|Oskari|365
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperCleaning1.txt b/world/map/npc/048-2/helperCleaning1.txt
index 58a2f684..0bcea8d4 100644
--- a/world/map/npc/048-2/helperCleaning1.txt
+++ b/world/map/npc/048-2/helperCleaning1.txt
@@ -4,7 +4,7 @@
// Pyry works on cleaning the library, can start the slime subquest
// can give second hint about helper in investigation subquest
-048-2.gat,117,106,0|script|Pyry|365,
+048-2.gat,117,106,0|script|Pyry|365
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperCleaning2.txt b/world/map/npc/048-2/helperCleaning2.txt
index 7dc99811..1e39b184 100644
--- a/world/map/npc/048-2/helperCleaning2.txt
+++ b/world/map/npc/048-2/helperCleaning2.txt
@@ -4,7 +4,7 @@
// Nea works on cleaning the library
// can give second hint about helper in investigation subquest
-048-2.gat,123,87,0|script|Nea|363,
+048-2.gat,123,87,0|script|Nea|363
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperCleaning3.txt b/world/map/npc/048-2/helperCleaning3.txt
index 752a9db8..44a3ca07 100644
--- a/world/map/npc/048-2/helperCleaning3.txt
+++ b/world/map/npc/048-2/helperCleaning3.txt
@@ -4,7 +4,7 @@
// Arvo works on cleaning the library
// can give second hint about the visitor in investigation subquest
-048-2.gat,139,99,0|script|Arvo|366,
+048-2.gat,139,99,0|script|Arvo|366
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperCleaning4.txt b/world/map/npc/048-2/helperCleaning4.txt
index 3a4d1662..a11feae1 100644
--- a/world/map/npc/048-2/helperCleaning4.txt
+++ b/world/map/npc/048-2/helperCleaning4.txt
@@ -4,7 +4,7 @@
// Kristian works on cleaning the library
// can give second hint about the visitor in investigation subquest
-048-2.gat,131,119,0|script|Kristian|366,
+048-2.gat,131,119,0|script|Kristian|366
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperCleaning5.txt b/world/map/npc/048-2/helperCleaning5.txt
index 92cc1923..6470298e 100644
--- a/world/map/npc/048-2/helperCleaning5.txt
+++ b/world/map/npc/048-2/helperCleaning5.txt
@@ -4,7 +4,7 @@
// Mirjami is searching for some cleaning supplies
// can give second hint about visitor in investigation subquest
-048-2.gat,100,125,0|script|Mirjami|363,
+048-2.gat,100,125,0|script|Mirjami|363
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt
index 68466dbb..f62e9c0b 100644
--- a/world/map/npc/048-2/helperJanitor.txt
+++ b/world/map/npc/048-2/helperJanitor.txt
@@ -4,7 +4,7 @@
// Elias is the janitor of the mansion
// part of investigation subquest, gives initial hint on the visitor with the mask
-048-2.gat,40,41,0|script|Elias|365,
+048-2.gat,40,41,0|script|Elias|365
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
diff --git a/world/map/npc/048-2/helperMInk.txt b/world/map/npc/048-2/helperMInk.txt
index 0b101fb3..592df111 100644
--- a/world/map/npc/048-2/helperMInk.txt
+++ b/world/map/npc/048-2/helperMInk.txt
@@ -4,7 +4,7 @@
// Eevert asks for material to create inks for the illustrations in the new books
// can give second hint about Peetu in investigation subquest
-048-2.gat,95,103,0|script|Eevert|365,
+048-2.gat,95,103,0|script|Eevert|365
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @water_amount, 5;
diff --git a/world/map/npc/048-2/helperMReed.txt b/world/map/npc/048-2/helperMReed.txt
index 7988d97a..7fef1486 100644
--- a/world/map/npc/048-2/helperMReed.txt
+++ b/world/map/npc/048-2/helperMReed.txt
@@ -4,7 +4,7 @@
// Kullervo asks for Reed Bundles to create paper for repairing the books
// can give second hint about both Peetu and visitor in investigation subquest
-048-2.gat,104,78,0|script|Kullervo|366,
+048-2.gat,104,78,0|script|Kullervo|366
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @reed_amount, 20;
diff --git a/world/map/npc/048-2/helperMSilk.txt b/world/map/npc/048-2/helperMSilk.txt
index cda5054c..8b6b08a6 100644
--- a/world/map/npc/048-2/helperMSilk.txt
+++ b/world/map/npc/048-2/helperMSilk.txt
@@ -4,7 +4,7 @@
// Janika asks for Silk Cocoons for repairing the books
// can give second hint about visitor in investigation subquest
-048-2.gat,104,103,0|script|Janika|363,
+048-2.gat,104,103,0|script|Janika|363
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @silk_amount, 80;
diff --git a/world/map/npc/048-2/helperMYetiClaw.txt b/world/map/npc/048-2/helperMYetiClaw.txt
index 90b583a4..9d830439 100644
--- a/world/map/npc/048-2/helperMYetiClaw.txt
+++ b/world/map/npc/048-2/helperMYetiClaw.txt
@@ -4,7 +4,7 @@
// Santeri asks for Yeti Claws to make glue for repairing the books
// can give second hint about Peetu in investigation subquest
-048-2.gat,97,78,0|script|Santeri|366,
+048-2.gat,97,78,0|script|Santeri|366
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @claw_amount, 8;
diff --git a/world/map/npc/048-2/helperResting1.txt b/world/map/npc/048-2/helperResting1.txt
index 5ffd6f0f..e1425bc2 100644
--- a/world/map/npc/048-2/helperResting1.txt
+++ b/world/map/npc/048-2/helperResting1.txt
@@ -4,7 +4,7 @@
// Lenita is one of the helpers working on sorting the bookpages, but is currently having a break
// can give second hint about the visitor in investigation subquest
-048-2.gat,36,26,0|script|Lenita|363,
+048-2.gat,36,26,0|script|Lenita|363
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT);
diff --git a/world/map/npc/048-2/helperResting2.txt b/world/map/npc/048-2/helperResting2.txt
index a6b4873c..26ff2db6 100644
--- a/world/map/npc/048-2/helperResting2.txt
+++ b/world/map/npc/048-2/helperResting2.txt
@@ -4,7 +4,7 @@
// Miro is one of the helpers cleaning up the library, but it currently having a break
// can give second hint about the Peetu in investigation subquest
-048-2.gat,35,27,0|script|Miro|366,
+048-2.gat,35,27,0|script|Miro|366
{
set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt
index 5aa1b659..b396dbd9 100644
--- a/world/map/npc/048-2/sageNikolai.txt
+++ b/world/map/npc/048-2/sageNikolai.txt
@@ -3,7 +3,7 @@
// see bluesageConfig for detailed quest description
// Sage Nikolai gives hints about the different subquests and rewards
-048-2.gat,98,106,0|script|Nikolai|362,
+048-2.gat,98,106,0|script|Nikolai|362
{
set @halloween_npc_id, $@halloween_npc_nikolai;
callfunc "TrickOrTreat";
@@ -287,7 +287,7 @@ L_Close:
close;
}
-//048-2.gat,100,106,0|script|Debug|160,
+//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);
diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt
index 2318d1f0..dceaad7a 100644
--- a/world/map/npc/048-2/slimes.txt
+++ b/world/map/npc/048-2/slimes.txt
@@ -13,7 +13,7 @@
// @spawnSlimeX: Number of slimes killed by the character that triggered the spawn
// white slimes
-048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2,
+048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -46,7 +46,7 @@ L_End:
end;
}
-048-2.gat,181,95,0|script|#Slime0|32767,
+048-2.gat,181,95,0|script|#Slime0|32767
{
end;
@@ -102,7 +102,7 @@ L_ClearedPoint:
// white slimes
-048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2,
+048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -135,7 +135,7 @@ L_End:
end;
}
-048-2.gat,164,123,0|script|#Slime1|32767,
+048-2.gat,164,123,0|script|#Slime1|32767
{
end;
@@ -191,7 +191,7 @@ L_ClearedPoint:
// white slimes
-048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2,
+048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -224,7 +224,7 @@ L_End:
end;
}
-048-2.gat,198,115,0|script|#Slime2|32767,
+048-2.gat,198,115,0|script|#Slime2|32767
{
end;
@@ -280,7 +280,7 @@ L_ClearedPoint:
// white slimes
-048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2,
+048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -313,7 +313,7 @@ L_End:
end;
}
-048-2.gat,167,79,0|script|#Slime3|32767,
+048-2.gat,167,79,0|script|#Slime3|32767
{
end;
@@ -369,7 +369,7 @@ L_ClearedPoint:
// blue slimes
-048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2,
+048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -402,7 +402,7 @@ L_End:
end;
}
-048-2.gat,192,86,0|script|#Slime4|32767,
+048-2.gat,192,86,0|script|#Slime4|32767
{
end;
@@ -458,7 +458,7 @@ L_ClearedPoint:
// blue slimes
-048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2,
+048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -491,7 +491,7 @@ L_End:
end;
}
-048-2.gat,183,110,0|script|#Slime5|32767,
+048-2.gat,183,110,0|script|#Slime5|32767
{
end;
@@ -547,7 +547,7 @@ L_ClearedPoint:
// blue slimes
-048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2,
+048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2
{
set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
@@ -580,7 +580,7 @@ L_End:
end;
}
-048-2.gat,164,102,0|script|#Slime6|32767,
+048-2.gat,164,102,0|script|#Slime6|32767
{
end;
diff --git a/world/map/npc/048-2/traveler.txt b/world/map/npc/048-2/traveler.txt
index 3a95c499..89f3ac58 100644
--- a/world/map/npc/048-2/traveler.txt
+++ b/world/map/npc/048-2/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-048-2.gat,23,46,0|script|Drake the Traveler|103,
+048-2.gat,23,46,0|script|Drake the Traveler|103
{
set @NpcName$, "Drake";
set @NpcTravelBit, $@blue_sage_bit;
diff --git a/world/map/npc/048-2/visitors.txt b/world/map/npc/048-2/visitors.txt
index 8f43c941..4fc4b4ca 100644
--- a/world/map/npc/048-2/visitors.txt
+++ b/world/map/npc/048-2/visitors.txt
@@ -2,7 +2,7 @@
// author: Jenalya
// visitors that came to see the library and are now disappointed
-048-2.gat,46,44,0|script|Connor|150,
+048-2.gat,46,44,0|script|Connor|150
{
mes "[Connor]";
mes "\"Oh, hello. There was a big accident in the library! Most of the books were damaged or destroyed!\"";
@@ -14,7 +14,7 @@
close;
}
-048-2.gat,28,30,0|script|Parcival|153,
+048-2.gat,28,30,0|script|Parcival|153
{
mes "[Parcival]";
mes "\"Hello young one. Did you also come here to see the library?\"";