summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/item_db.txt7
-rwxr-xr-xnpc/027-2_Caretakers_House/gy_inn_shops.txt70
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt219
3 files changed, 153 insertions, 143 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index e12b812f..51d601d5 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -296,6 +296,13 @@
//781, WitchDoctorsMask, Witch Doctor's Mask, , , , , , , , , , , , , , , {}, {}
782, ForestArmor, Forest Armor, 5, 3000, 1500, 40, , 10, , -20, 0, 2, 512, , 0, 0, {}, {bonus bDex, 3;}
783, ValentineDress, Valentine Dress, 5, 100000, 50000, 35, , 15, , 3, 0, 2, 512, , 0, 0, {}, {}
+784, ZombieNachos, Zombie Nachos, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+785, LadyFingers, Lady Fingers, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+786, JellAhh, Jell-Ahh, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+787, Snapple, Snapple, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+788, BeetleJuice, Beetle Juice, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+789, GutBuster, Gut Buster Ale, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
+790, BloodWine, Blood Wine, 0, 10, 5, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {},
1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, , , , , , , , , , , {}, {}
1199, Arrow, Arrow, 10, 3, 1, 1, 25, 0, 0, , 0, 2, 32768, , , , {}, {}
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index af6b2d39..6d1ce909 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -1,35 +1,35 @@
-// chef: function,
-// barmaid: function,
-// shopkeeper: multiples and function,
-// magic undead shop: function,
-// chief barman: function,
-// receptionist: function,
-// banker: function
-
-
-027-2.gat,75,22,0 shop Chef 300,519:100
-027-2.gat,90,36,0 shop Barmaid 301,519:100,533:150,534:90,562:500,676:200
-027-2.gat,93,22,0 shop Shopkeeper 302,586:1000,524:1600,544:10000,632:10000,528:1000,735:1
-027-2.gat,56,99,0 shop Magic Undead Shop 304,501:50
-027-2.gat,106,22,0 shop Chief Barman 309,539:175,567:500,568:500
-
-// Inn
-027-2.gat,107,39,0 script Bloody Receptionist 320,{
- set @npcName$, "Barbara Grey";
- set @cost, 1000;
-
- mes "[" + @npcName$ + "]";
- mes "\"Don't be shy darling.";
- mes "\"Come on in and have a nice long ... long slumber ...";
- next;
- callfunc "Inn";
- close;
-}
-
-// Bank and Storage
-027-2.gat,88,22,0 script Undead Banker 321,{
- set @npcName$, "J.P. Morbid";
- callfunc "Banker";
- close;
-}
-
+// chef: function,
+// barmaid: function,
+// shopkeeper: multiples and function,
+// magic undead shop: function,
+// chief barman: function,
+// receptionist: function,
+// banker: function
+
+
+027-2.gat,75,22,0 shop Chef 300,784:100,785:100,786:100,787:100
+027-2.gat,90,36,0 shop Barmaid 301,788:100,789:100,790:100
+027-2.gat,93,22,0 shop Shopkeeper 302,586:1000,524:1600,544:10000,632:10000,528:1000,735:1
+027-2.gat,56,99,0 shop Magic Undead Shop 304,501:50
+027-2.gat,106,22,0 shop Chief Barman 309,784:100,785:100,786:100,787:100
+
+// Inn
+027-2.gat,107,39,0 script Bloody Receptionist 320,{
+ set @npcName$, "Barbara Grey";
+ set @cost, 1000;
+
+ mes "[" + @npcName$ + "]";
+ mes "\"Don't be shy darling.";
+ mes "\"Come on in and have a nice long ... long slumber ...";
+ next;
+ callfunc "Inn";
+ close;
+}
+
+// Bank and Storage
+027-2.gat,88,22,0 script Undead Banker 321,{
+ set @npcName$, "J.P. Morbid";
+ callfunc "Banker";
+ close;
+}
+
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index 9cd452c6..38f961c3 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -1,108 +1,111 @@
-// Temporary placing of all non shop npcs
-// A proper break down of files will need to be done later
-
-// drunk lover: quest,
-// werewolf: gambling,
-// chef's helper: simple dialog,
-// horn mage: golbenez,
-// drunker: simple dialog,
-// barman: crafting related,
-// swordguy: weapon master,
-// ghost from dead drunk: simple dialog,
-// crying child: I don't know,
-// Innkeeper's ghost: quest,
-// evil guard: simple dialog,
-// hangman: quest,
-// headless: quest or simple dialog,
-// lightman: quest,
-
-
-027-2.gat,80,34,0 script Drunk Lover 303,{
- end;
-}
-
-027-2.gat,118,23,0 script Werewolf 305,{
- mes "debug for the lovetriangle quest";
- menu
- "reset reid", -,
- "leave", L_Close;
-
- set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
- set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
-
- set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
- set @state, 0;
- callsub S_Update_Mask;
-
-L_Close:
- close;
-
-S_Update_Mask:
- set QUEST_Graveyard_Inn,
- (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
- | (@state << @Graveyard_Inn_SHIFT);
- return;
-}
-
-027-2.gat,75,29,0 script Archibald 306,{
- end;
-}
-
-027-2.gat,77,40,0 script Drunker 308,{
- set @drunker, rand(4);
- if (@drunker == 0) goto L_0;
- if (@drunker == 1) goto L_1;
- if (@drunker == 2) goto L_2;
- if (@drunker == 3) goto L_3;
- end;
-L_0:
- mes "[Ghost Drunker]";
- mes "\"zzzZZZzzz...\"";
- close;
-L_1:
- mes "[Ghost Drunker]";
- mes "\"Ish that a Zzombee?...\"";
- close;
-L_2:
- mes "[Ghost Drunker]";
- mes "\"Auuu... Hiccup... Don't byte mee... \"";
- close;
-L_3:
- mes "[Ghost Drunker]";
- mes "\"Moar Bearr...Pleash!\"";
- close;
-}
-
-027-2.gat,103,22,0 script Barman 310,{
- end;
-}
-
-027-2.gat,70,77,0 script Cerhan 311,{
- end;
-}
-
-027-2.gat,110,23,0 script Ghost Drunker 312,{
- mes "[Ghost Drunker]";
- mes "\"Ohh... My head is killing me! I have to stop drinking too much or I will lose my job... But being a waiter... oh I can't resist a drink or two!\"";
- close;
-}
-
-027-2.gat,39,91,0 script Golbenez 307,{
- end;
-}
-
-027-2.gat,100,43,0 script Evil Guard 316,{
- end;
-}
-
-027-2.gat,43,73,0 script Hanged Lover 317,{
- end;
-}
-
-027-2.gat,24,77,0 script Headless Man 318,{
- end;
-}
-
-027-2.gat,22,84,0 script Lantern Man 319,{
- end;
-}
+// Temporary placing of all non shop npcs
+// A proper break down of files will need to be done later
+
+// drunk lover: quest,
+// werewolf: gambling,
+// chef's helper: simple dialog,
+// horn mage: golbenez,
+// drunker: simple dialog,
+// barman: crafting related,
+// swordguy: weapon master,
+// ghost from dead drunk: simple dialog,
+// crying child: I don't know,
+// Innkeeper's ghost: quest,
+// evil guard: simple dialog,
+// hangman: quest,
+// headless: quest or simple dialog,
+// lightman: quest,
+
+
+027-2.gat,80,34,0 script Drunk Lover 303,{
+ end;
+}
+
+027-2.gat,118,23,0 script Werewolf 305,{
+ mes "debug for the lovetriangle quest";
+ menu
+ "reset reid", -,
+ "leave", L_Close;
+
+ set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
+ set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
+
+ set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+ set @state, 0;
+ callsub S_Update_Mask;
+ close;
+
+L_Close:
+ close;
+
+S_Update_Mask:
+ set QUEST_Graveyard_Inn,
+ (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
+ | (@state << @Graveyard_Inn_SHIFT);
+ return;
+}
+
+027-2.gat,75,29,0 script Archibald 306,{
+ end;
+}
+
+027-2.gat,77,40,0 script Drunker 308,{
+ set @drunker, rand(4);
+ if (@drunker == 0) goto L_0;
+ if (@drunker == 1) goto L_1;
+ if (@drunker == 2) goto L_2;
+ if (@drunker == 3) goto L_3;
+ end;
+L_0:
+ mes "[Ghost Drunker]";
+ mes "\"zzzZZZzzz...\"";
+ close;
+L_1:
+ mes "[Ghost Drunker]";
+ mes "\"Ish that a Zzombee?...\"";
+ close;
+L_2:
+ mes "[Ghost Drunker]";
+ mes "\"Auuu... Hiccup... Don't byte mee... \"";
+ close;
+L_3:
+ mes "[Ghost Drunker]";
+ mes "\"Moar Bearr...Pleash!\"";
+ close;
+}
+
+027-2.gat,103,22,0 script Barman 310,{
+ end;
+}
+
+027-2.gat,70,77,0 script Cerhan 311,{
+ end;
+}
+
+027-2.gat,110,23,0 script Ghost Drunker 312,{
+ mes "[Ghost Drunker]";
+ mes "\"Ohh... My head is killing me! I have to stop "
+ + "drinking too much or I will lose my job... But "
+ + "being a waiter... oh I can't resist a drink or two!\"";
+ close;
+}
+
+027-2.gat,39,91,0 script Golbenez 307,{
+ end;
+}
+
+027-2.gat,100,43,0 script Evil Guard 316,{
+ end;
+}
+
+027-2.gat,43,73,0 script Hanged Lover 317,{
+ end;
+}
+
+027-2.gat,24,77,0 script Headless Man 318,{
+ end;
+}
+
+027-2.gat,22,84,0 script Lantern Man 319,{
+ end;
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 04:37:07 +0000