From 81fc5b84a962855fafccb6baef68c1f8d40d4410 Mon Sep 17 00:00:00 2001 From: gumi Date: Sun, 11 Mar 2018 18:10:17 -0400 Subject: add Gwyneth --- client-data | 2 +- world/map/db/item_db_generic.txt | 5 +++++ world/map/db/item_db_use.txt | 13 ++++++++----- world/map/npc/014-1/_import.txt | 1 + world/map/npc/014-1/goop.txt | 1 + 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 world/map/npc/014-1/goop.txt diff --git a/client-data b/client-data index 0be0593a..b3fb5f32 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 0be0593ace54d7477c4a1846c44c0f8d59a842bb +Subproject commit b3fb5f32a8f5fe96506433b07b58165a839fa1af diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt index 5b9903e9..ed3ae2ba 100644 --- a/world/map/db/item_db_generic.txt +++ b/world/map/db/item_db_generic.txt @@ -235,3 +235,8 @@ 5127, JarofOwnBlood, 3, 200, 100, 375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 1197, SkeletonCharm, 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} //ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} +5211, ActivatedSulphur, 3, 3000, 5, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} +5212, FairTradeSoil, 3, 500, 23, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} +5215, FreeRangeMoss, 3, 830, 20, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} +5216, JadeEgg, 3, 938, 250, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} +5217, RawAir, 3, 1999, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 65acd000..2b58cdcb 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -83,14 +83,17 @@ 1252, Cherry, 0, 50, 25, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 50, 0, 1;}, {} 1253, GoldenDeliciousApple, 0, 1000, 500, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 200, 0, 1;}, {} 1258, Honey, 0, 100, 80, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 45, 0, 1;}, {} -1280, Scissors, 0, 1000, 500, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useScissors";}, {} -1281, ShockSweet, 0, 1000, 500, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useShockSweet";}, {} -3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "rubberBat";}, {} +1280, Scissors, 0, 1000, 500, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useScissors";}, {} +1281, ShockSweet, 0, 1000, 500, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useShockSweet";}, {} +3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "rubberBat";}, {} 3006, TonoriDelight, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 2, 1;}, {} 3007, Marshmallow, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {} 3009, JellySkull, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {} 3010, CandyPumpkin, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {} -4035, PickledBeets, 0, 100, 50, 150, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "usePickledBeets";}, {} +4035, PickledBeets, 0, 100, 50, 150, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "usePickledBeets";}, {} 4036, RoastedAcorn, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 15, 0, 1;}, {} -5126, MTJarofOwnBlood, 0, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {heal -250, 0;getitem 5127, 1;}, {} +5126, MTJarofOwnBlood, 0, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {heal -250, 0;getitem 5127, 1;}, {} //ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} +5210, GrassFedTofu, 0, 50, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal -10, -2, 1;}, {} +5213, VeganWater, 0, 200, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 250, 0, 1;getitem 540, 1;}, {} +5214, LactoseFreeAcorn, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 15, 0, 1;}, {} diff --git a/world/map/npc/014-1/_import.txt b/world/map/npc/014-1/_import.txt index cde43724..5f4b392d 100644 --- a/world/map/npc/014-1/_import.txt +++ b/world/map/npc/014-1/_import.txt @@ -4,5 +4,6 @@ map: 014-1 npc: npc/014-1/_mobs.txt npc: npc/014-1/_nodes.txt npc: npc/014-1/_warps.txt +npc: npc/014-1/goop.txt npc: npc/014-1/mapflags.txt npc: npc/014-1/wedding-officiator.txt diff --git a/world/map/npc/014-1/goop.txt b/world/map/npc/014-1/goop.txt new file mode 100644 index 00000000..09f27626 --- /dev/null +++ b/world/map/npc/014-1/goop.txt @@ -0,0 +1 @@ +014-1,90,101,0|shop|Gwyneth|188,GrassFedTofu:*100,Honey:*100,ActivatedSulphur:*100,VeganWater:*100,FairTradeSoil:*100,LactoseFreeAcorn:*100,RawAir:*1000,FreeRangeMoss:*100,JadeEgg:*300 -- cgit v1.2.3-70-g09d2