diff options
| -rw-r--r-- | db/item_db.txt | 17 | ||||
| -rwxr-xr-x | npc/027-2_Caretakers_House/gy_inn_shops.txt | 12 | ||||
| -rw-r--r-- | npc/027-2_Caretakers_House/husband.txt | 3 | ||||
| -rw-r--r-- | npc/027-2_Caretakers_House/lover.txt | 2 |
4 files changed, 16 insertions, 18 deletions
diff --git a/db/item_db.txt b/db/item_db.txt index 5d9607fa..73fb8ec9 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -296,13 +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;}, {}, +784, ZombieNachos, Zombie Nachos, 0, 100, 30, 5, , , , , , 2, , , 0, , {itemheal 60, 0;}, {}, +785, LadyFingers, Lady Fingers, 0, 70, 25, 5, , , , , , 2, , , 0, , {itemheal 40, 0;}, {}, +786, JellAhh, Jell-Ahh, 0, 80, 30, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {}, +787, Snapple, Snapple, 0, 110, 55, 5, , , , , , 2, , , 0, , {itemheal 70, 0;}, {}, +788, BeetleJuice, Beetle Juice, 0, 80, 30, 5, , , , , , 2, , , 0, , {itemheal 50, 0;}, {}, +789, GutBuster, Gut Buster Ale, 0, 100, 30, 5, , , , , , 2, , , 0, , {itemheal 60, 0;}, {}, +790, BloodWine, Blood Wine, 0, 150, 50, 5, , , , , , 2, , , 0, , {itemheal 100, 0;}, {}, 791, YetiSkinShirt, Yeti Skin Shirt, 5, 20000, 10000, 20, , 12, , -12, 0, 2, 512, , 0, 0, {}, {}, , 792, BrassPlateBoots, Brass Plate Boots, 5, 8000, 500, 30, , 1, , -2, 0, 2, 64, , 0, 0, {}, {}, , 793, BrassPlateChest, Brass Plate Chest, 5, 100000, 3000, 2000, , 25, , -170, 0, 2, 512, , 0, 0, {}, {}, , @@ -313,8 +313,7 @@ 798, SorcererRobeRed, Sorcerer Robe Red, 5, 8000, 4000, 5, , 5, , 20, 0, 2, 512, , 0, 0, {}, {bonus bAgi, 1;}, , 799, MylarinDust, Mylarin Dust, 3, 10000, 5000, 3, , , , , , 2, , , 0, 0, {}, {} 800, BowlerHatBrown, Bowler Hat Brown, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} -801, PinkieHelmet, Pinkie Helmet, 5, 15000, 1500, 300, , 15, , -20, 0, 2, 256, , 0, 0, {}, {}, , - +801, PinkieHelmet, Pinkie Helmet, 5, 20000, 1500, 800, , 10, , -20, 0, 2, 256, , 0, 0, {}, {bonus bLuk, 1;} , // Add new entries above here. For dyed entries, add to the bottom of the 2000s. 1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, , , , , , , , , , , {}, {} diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt index 6d1ce909..1cf4eebf 100755 --- a/npc/027-2_Caretakers_House/gy_inn_shops.txt +++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt @@ -1,4 +1,4 @@ -// chef: function, +// chef: function, // barmaid: function, // shopkeeper: multiples and function, // magic undead shop: function, @@ -7,17 +7,17 @@ // 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,75,22,0 shop Chef 300,784:-1,785:-1,786:-1,787:-1 +027-2.gat,90,36,0 shop Barmaid 301,788:-1,789:-1,790:-1 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 +027-2.gat,56,99,0 shop Magic Undead Shop 304,501:-1,502:-1,518:100,567:-1,568:-1,631:1000,772:-1,773:-1,774:-1 +027-2.gat,106,22,0 shop Chief Barman 309,784:-1,785:-1,786:-1,787:-1,788:-1,789:-1,790:-1 // 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 ..."; diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt index 6b7432b6..03ac84a0 100644 --- a/npc/027-2_Caretakers_House/husband.txt +++ b/npc/027-2_Caretakers_House/husband.txt @@ -283,8 +283,7 @@ L_Apologize: mes "\"However, you are a great friend and did a lot for me. I want you to have this.\""; getinventorylist; if (@inventorylist_count == 100) goto L_Full_Inv; - //TODO: change it to different kind of bowlerhat - getitem "BowlerHat", 1; + getitem "BowlerHatBrown", 1; set @state, 7; callsub S_Update_Mask; close; diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt index be3a1abe..ee2f5833 100644 --- a/npc/027-2_Caretakers_House/lover.txt +++ b/npc/027-2_Caretakers_House/lover.txt @@ -171,7 +171,7 @@ L_Golb: mes "\"Good to see you back my friend. What did you find out?\""; if (@golbanez < 5) menu - "I'm still working on getting all the stuff he wants.",L_Close; + "I'm still working on doing all the stuff Golbanez wants me to do.",L_Close; menu "Now I know what happened. I'll tell you.",-, "I'm sorry to tell you, but this was all your fault.",-; |