summaryrefslogtreecommitdiff
path: root/world/map/npc/027-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/027-2')
-rw-r--r--world/map/npc/027-2/_mobs.txt22
-rw-r--r--world/map/npc/027-2/alacrius.txt2
-rw-r--r--world/map/npc/027-2/barman.txt2
-rw-r--r--world/map/npc/027-2/caretaker.txt4
-rw-r--r--world/map/npc/027-2/cerhan.txt2
-rw-r--r--world/map/npc/027-2/crying_child.txt2
-rw-r--r--world/map/npc/027-2/diary.txt2
-rw-r--r--world/map/npc/027-2/door.txt4
-rw-r--r--world/map/npc/027-2/evil_guard.txt4
-rw-r--r--world/map/npc/027-2/golbenez.txt2
-rw-r--r--world/map/npc/027-2/gy_inn_shops.txt14
-rw-r--r--world/map/npc/027-2/headless_man.txt2
-rw-r--r--world/map/npc/027-2/husband.txt2
-rw-r--r--world/map/npc/027-2/innkeeper.txt2
-rw-r--r--world/map/npc/027-2/lover.txt2
-rw-r--r--world/map/npc/027-2/testnpcs.txt8
-rw-r--r--world/map/npc/027-2/thurston.txt2
-rw-r--r--world/map/npc/027-2/werewolf.txt2
18 files changed, 40 insertions, 40 deletions
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index f2c20606..0ba82765 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Graveyard Indoor mobs
-027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
-027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
-027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000,30000,Mob027-2::On1066
-027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
+027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
+027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-2::On1066
+027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
-027-2.gat,0,0,0|script|Mob027-2|-1,
+027-2.gat,0,0,0|script|Mob027-2|-1
{
end;
diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt
index c29e2758..2ca331a4 100644
--- a/world/map/npc/027-2/alacrius.txt
+++ b/world/map/npc/027-2/alacrius.txt
@@ -1,7 +1,7 @@
// Author: wushin
//Starts Crypt Quest
-027-2.gat,122,105,0|script|Alacrius|313,
+027-2.gat,122,105,0|script|Alacrius|313
{
mes "[Alacrius]";
mes "\"Hello, I'm Alacrius. \"";
diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt
index a3ad69c2..de367df3 100644
--- a/world/map/npc/027-2/barman.txt
+++ b/world/map/npc/027-2/barman.txt
@@ -1,4 +1,4 @@
-027-2.gat,103,22,0|script|Bennet|310,
+027-2.gat,103,22,0|script|Bennet|310
{
mes "[Bennet]";
mes "\"Hi there, stranger! My name is Bennet, the bartender here.\"";
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index c10db6fe..b4e3eee5 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -2,7 +2,7 @@
// TODO: add dialog/code for giving more letters
// Airlia supports receiving an infinate number of letters
-027-2.gat,24,25,0|script|Caretaker|159,
+027-2.gat,24,25,0|script|Caretaker|159
{
set @halloween_npc_id, $@halloween_npc_caretaker;
callfunc "TrickOrTreat";
@@ -109,7 +109,7 @@ L_Give_New_Letter_Real:
L_Close:
close;
}
-027-2.gat,28,22,0|script|Joan|409,
+027-2.gat,28,22,0|script|Joan|409
{
mes "[Joan]";
mes "...";
diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index fa6c9ebc..3abe2e2f 100644
--- a/world/map/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-027-2.gat,70,77,0|script|Cerhan|311,
+027-2.gat,70,77,0|script|Cerhan|311
{
mes "[Cerhan]";
mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index d84432cc..7428cb1f 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -2,7 +2,7 @@
// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
// Jenalya: some changes about variables (setting to zero if only used locally, naming)
-027-2.gat,50,92,0|script|Aldred|314,
+027-2.gat,50,92,0|script|Aldred|314
{
// Crying Child subquest
// Variable states:
diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt
index d4f4b4ab..4fb2716d 100644
--- a/world/map/npc/027-2/diary.txt
+++ b/world/map/npc/027-2/diary.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-027-2.gat,26,97,0|script|#Diary|400,
+027-2.gat,26,97,0|script|#Diary|400
{
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
diff --git a/world/map/npc/027-2/door.txt b/world/map/npc/027-2/door.txt
index 08513582..146b4940 100644
--- a/world/map/npc/027-2/door.txt
+++ b/world/map/npc/027-2/door.txt
@@ -1,4 +1,4 @@
-027-2.gat,25,100,0|script|#DoorIn|45,1,1,
+027-2.gat,25,100,0|script|#DoorIn|45,1,1
{
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
@@ -16,7 +16,7 @@ L_Warp:
}
// TODO replace this with a plain warp
-027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1,
+027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1
{
warp "027-2.gat", 23, 98;
end;
diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt
index c7aeae98..aa4ee55e 100644
--- a/world/map/npc/027-2/evil_guard.txt
+++ b/world/map/npc/027-2/evil_guard.txt
@@ -1,4 +1,4 @@
-027-2.gat,100,43,0|script|Blackwin|316,
+027-2.gat,100,43,0|script|Blackwin|316
{
mes "...";
next;
@@ -12,7 +12,7 @@
close;
}
-027-2.gat,112,37,0|script|Forwin|316,
+027-2.gat,112,37,0|script|Forwin|316
{
mes "[Evil Guard]";
mes "\"" + strcharinfo(0) + "...\"";
diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 9d7bdb3a..2f93ea33 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -9,7 +9,7 @@
// state 6: wants jackOsouls, random chance of 1/50 to success, small amount of exp for fail
// state 7: done
-027-2.gat,39,91,0|script|Golbenez|307,
+027-2.gat,39,91,0|script|Golbenez|307
{
set @Graveyard_Inn_MASK, NIBBLE_4_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_4_SHIFT;
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 2a829ec1..c51ca747 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -7,12 +7,12 @@
// banker: function
-027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos :-1,LadyFingers :-1,JellAhh :-1,Snapple :-1
-027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice :-1,GutBuster :-1,BloodWine :-1
-027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows :-1,ShockSweet :-1
-027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink :-1,CactusPotion :-1,BugLeg :-1,SmallMushroom :-1,IronPotion :-1,ConcentrationPotion :-1,HardSpike :-1,DarkCrystal :-1,Root :-1,WispPowder :-1,SpectrePowder :-1,PoltergeistPowder :-1
+027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*1,LadyFingers:*1,JellAhh:*1,Snapple:*1
+027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*1,GutBuster:*1,BloodWine:*1
+027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*1,ShockSweet:*1
+027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1
-027-2.gat,106,22,0|script|Edwin|309,
+027-2.gat,106,22,0|script|Edwin|309
{
set @npcname$, "Edwin";
@@ -24,7 +24,7 @@
}
// Inn
-027-2.gat,107,39,0|script|Barbara Grey|320,
+027-2.gat,107,39,0|script|Barbara Grey|320
{
set @npcname$, "Barbara Grey";
set @cost, 1000;
@@ -38,7 +38,7 @@
}
// Bank and Storage
-027-2.gat,88,22,0|script|J.P. Morbid|321,
+027-2.gat,88,22,0|script|J.P. Morbid|321
{
callfunc "ClearVariables";
set @npcname$, "J.P. Morbid";
diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index 747b6c2d..9bc60192 100644
--- a/world/map/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
@@ -5,7 +5,7 @@
// state 2: items delivered, return for reward and followup story
// state 3: quest completed
-027-2.gat,22,76,0|script|Thurstan|318,
+027-2.gat,22,76,0|script|Thurstan|318
{
if (Sex == 0) set @madamsir$, "Madam";
if (Sex == 1) set @madamsir$, "Sir";
diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt
index 8f0236b1..01524a84 100644
--- a/world/map/npc/027-2/husband.txt
+++ b/world/map/npc/027-2/husband.txt
@@ -9,7 +9,7 @@
// state 6: is set in reid, gives as reward a special bowler hat
// state 7: done
-027-2.gat,22,84,0|script|Hamond|319,
+027-2.gat,22,84,0|script|Hamond|319
{
set @Graveyard_Inn_MASK, NIBBLE_3_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT;
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index 81feae3b..a1b4c7a5 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -13,7 +13,7 @@
// state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin)
// state 11: done, can ask about mylarin dust again
-027-2.gat,104,39,0|script|Reid's Ghost|315,
+027-2.gat,104,39,0|script|Reid's Ghost|315
{
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt
index 7105dfab..17714b71 100644
--- a/world/map/npc/027-2/lover.txt
+++ b/world/map/npc/027-2/lover.txt
@@ -9,7 +9,7 @@
// state 6: waiting for youl, if @golbanez >= 7 got it, giving sorcerer robe
// state 7: done
-027-2.gat,43,73,0|script|Savaric|317,
+027-2.gat,43,73,0|script|Savaric|317
{
set @Graveyard_Inn_MASK, NIBBLE_1_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_1_SHIFT;
diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt
index 88d762e3..bed6f3be 100644
--- a/world/map/npc/027-2/testnpcs.txt
+++ b/world/map/npc/027-2/testnpcs.txt
@@ -1,6 +1,6 @@
//several NPCs in the Reid's Inn
-027-2.gat,80,34,0|script|Lovers|303,
+027-2.gat,80,34,0|script|Lovers|303
{
mes "You see a man and a woman holding each other very tight.";
next;
@@ -12,7 +12,7 @@
close;
}
-027-2.gat,75,29,0|script|Archibald|306,
+027-2.gat,75,29,0|script|Archibald|306
{
//the broken grammar is intentional
mes "[Archibald]";
@@ -22,7 +22,7 @@
close;
}
-027-2.gat,77,40,0|script|Darnel|308,
+027-2.gat,77,40,0|script|Darnel|308
{
set @drunker, rand(4);
if (@drunker == 0) goto L_0;
@@ -52,7 +52,7 @@ L_Close:
close;
}
-027-2.gat,110,23,0|script|Nigel|312,
+027-2.gat,110,23,0|script|Nigel|312
{
mes "[Nigel]";
mes "\"Ohh... My head is killing me! I have to stop "
diff --git a/world/map/npc/027-2/thurston.txt b/world/map/npc/027-2/thurston.txt
index 0778c7ec..3dfcffd7 100644
--- a/world/map/npc/027-2/thurston.txt
+++ b/world/map/npc/027-2/thurston.txt
@@ -1,6 +1,6 @@
// Vampire Bat Wings Daily
-027-2.gat,100,105,0|script|Thurston|302,
+027-2.gat,100,105,0|script|Thurston|302
{
set @dq_level, 60;
set @dq_cost, 45;
diff --git a/world/map/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt
index 1438393a..94790afd 100644
--- a/world/map/npc/027-2/werewolf.txt
+++ b/world/map/npc/027-2/werewolf.txt
@@ -1,6 +1,6 @@
// author: Jenalya
-027-2.gat,118,23,0|script|Wolfgang|305,
+027-2.gat,118,23,0|script|Wolfgang|305
{
set @Graveyard_Inn_MASK, NIBBLE_5_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_5_SHIFT;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 08:20:14 +0000