From 500cc212c4f113dc70533d4b74c2e61617f08b22 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Thu, 21 Mar 2024 08:41:53 +0100 Subject: item changes --- world/map/db/const-aegis.txt | 5 ++-- world/map/db/item_db.conf | 59 ++++++++++++++++++++++++---------------- world/map/db/item_db_generic.txt | 5 ++-- world/map/db/item_db_use.txt | 4 +-- world/map/db/mob_db.conf | 9 ------ world/map/db/mob_db_40_59.txt | 4 +-- world/map/db/mob_db_60_79.txt | 2 +- world/map/db/mob_db_over_150.txt | 2 +- 8 files changed, 48 insertions(+), 42 deletions(-) diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index a44f1c90..8e41ddd7 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -348,6 +348,7 @@ LoveLetter 5265 ThermalNapalm 5276 XmasTicket 5278 Carrot 5279 +Naftalin 5288 SilverOre 5292 CrystallizedDragonBlood 5293 PinkFlowerSeed 5295 @@ -364,7 +365,7 @@ BromenalDroplet 5318 ShadowPlantCrystalDust 5319 CopperOre 5327 CopperIngot 5328 -Naftalin 5331 +Charcoal 5332 LeatherShirt 523 DesertShirt 546 Turtleneck 564 @@ -948,13 +949,13 @@ MauveScroll 5144 JoyplimScroll 5145 XmasSeeds 5277 Tomato 5251 -YellowApple 5288 CrazyRum 5294 ManaDust 5309 EnlighteningElixir 5310 Honey 5312 IronShovel 5329 ShadowScroll 5330 +YellowApple 5331 CottonShorts 586 JeansShorts 610 CottonSkirt 632 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 19383648..c25a1dd3 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -5288,6 +5288,18 @@ item_db: ( noselltonpc: true } }, +{ + Id: 5288 + AegisName: "Naftalin" + Name: "Naphthalene" + Type: "IT_ETC" + Buy: 500 + Sell: 200 + Weight: 10 + Def: 0 + Refine: false + ViewSprite: 5288 +}, { Id: 5292 AegisName: "SilverOre" @@ -5578,16 +5590,16 @@ item_db: ( //Disabled: true // @TMWA }, { - Id: 5331 - AegisName: "Naftalin" - Name: "Naphthalene" + Id: 5332 + AegisName: "Charcoal" + Name: "Charcoal" Type: "IT_ETC" Buy: 500 Sell: 200 Weight: 10 Def: 0 Refine: false - ViewSprite: 5331 + ViewSprite: 5332 }, /* Chest Armor */ { @@ -14680,15 +14692,15 @@ item_db: ( AegisName: "GreenApple" Name: "GreenApple" Type: "IT_USABLE" - Buy: 20 - Sell: 5 + Buy: 25 + Sell: 6 Weight: 5 Def: 0 Slots: 0 Refine: false ViewSprite: 719 Script: <" - callfunc "itheal", 45, 0; + callfunc "itheal", 50, 0; "> }, { @@ -15886,22 +15898,6 @@ item_db: ( callfunc "itheal", 200, 5; "> }, -{ - Id: 5288 - AegisName: "YellowApple" - Name: "YellowApple" - Type: "IT_USABLE" - Buy: 30 - Sell: 7 - Weight: 10 - Def: 0 - Slots: 0 - Refine: false - ViewSprite: 5288 - Script: <" - callfunc "itheal", 55, 0; - "> -}, { Id: 5294 AegisName: "CrazyRum" @@ -15923,6 +15919,7 @@ item_db: ( //callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD, 40); //@TMWA //misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA "> + // TODO: betsanc of Crazy Rum can be chanceled with detsanc so add SC_PHYS_SHIELD_ITEM to prevent this }, { Id: 5309 @@ -16006,6 +16003,22 @@ item_db: ( //callfunc "UnreleasedScroll"; // @TMWA "> }, +{ + Id: 5331 + AegisName: "YellowApple" + Name: "YellowApple" + Type: "IT_USABLE" + Buy: 25 + Sell: 6 + Weight: 5 + Def: 0 + Slots: 0 + Refine: false + ViewSprite: 5331 + Script: <" + callfunc "itheal", 50, 0; + "> +}, /* Legs Armor */ { Id: 586 diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt index ed5e0b4b..36c46f43 100644 --- a/world/map/db/item_db_generic.txt +++ b/world/map/db/item_db_generic.txt @@ -263,6 +263,7 @@ //5276, ThermalNapalm, 3, 9999, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 5, {}, {} //5278, XmasTicket, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5279, Carrot, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} +5288, Naftalin, 3, 500, 200, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5292, SilverOre, 3, 1600, 800, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} //5293, CrystallizedDragonBlood,3, 0, 0, 1111, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} 5295, PinkFlowerSeed, 3, 0, 0, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} @@ -273,11 +274,11 @@ //5313, CrozeniteCrystal, 3, 0, 0, 555, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} 5314, GoldOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} //5315, GoldIngot, 3, 40000, 4400, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} -5316, BromenalOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} //ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} +5316, BromenalOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} //5317, BromenalIngot, 3, 30000, 3300, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} 5318, BromenalDroplet, 3, 15000, 1500, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} //5319, ShadowPlantCrystalDust, 3, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} 5327, CopperOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} //5328, CopperIngot, 3, 20000, 2200, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {} -5331, Naftalin, 3, 500, 200, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5332, Charcoal, 3, 500, 200, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 1543d5db..ff668722 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -36,7 +36,7 @@ 715, MountainSnakeEgg, 0, 80, 40, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 40, 0, 1;}, {} 716, GrassSnakeEgg, 0, 100, 50, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} 717, CaveSnakeEgg, 0, 60, 30, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 20, 0, 1;}, {} -719, GreenApple, 0, 20, 5, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 45, 0, 1;}, {} +719, GreenApple, 0, 25, 6, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} 733, PurificationPotion, 0, 0, 0, 15, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "usePurificationPotion";}, {} 736, WhiteCake, 0, 500, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 10, 0, 1;}, {} 737, ChocolateCake, 0, 550, 125, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 11, 0, 1;}, {} @@ -113,10 +113,10 @@ 5251, Tomato, 0, 40, 10, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "LovePotion";}, {} //5277, XmasSeeds, 0, 9999, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {heal 150, 0, 1;}, {} -5288, YellowApple, 0, 30, 7, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 55, 0, 1;}, {} 5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{} 5309, ManaDust, 0, 125, 50, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 35, 15, 1;}, {} 5310, EnlighteningElixir, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_MATKPOT, 60, 100;}, {} 5312, Honey, 0, 150, 75, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 50, 1;}, {} 5329, IronShovel, 0, 5000, 750, 210, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {getitem IronShovel, 1;}, {} 5330, ShadowScroll, 0, 5000, 1000, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} +5331, YellowApple, 0, 25, 6, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index b0c2a55c..6dadeb30 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -10267,21 +10267,12 @@ mob_db: ( MutationCount: 0 MutationStrength: 0 Drops: { -<<<<<<< HEAD Charcoal: 1000 Charcoal: 500 Charcoal: 250 Coal: 5000 Coal: 2500 Coal: 1250 -======= - Naftalin: 400 - Naftalin: 300 - Naftalin: 200 - Coal: 10000 - Coal: 5000 - Coal: 2500 ->>>>>>> 2bcac1ed (Coal Golem) IronOre: 500 IronPowder: 1200 } diff --git a/world/map/db/mob_db_40_59.txt b/world/map/db/mob_db_40_59.txt index eb410787..b9a735f0 100644 --- a/world/map/db/mob_db_40_59.txt +++ b/world/map/db/mob_db_40_59.txt @@ -17,8 +17,8 @@ 1164, ChristmasTree, ChristmasTree, 40, 12000, 0, 3647, 392, 2, 40, 40, 20, 40, 0, 30, 30, 30, 30, 30, 30, 9, 10, 1, 0, 10, 128, 190, 1500, 800, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1168, Floyd, Floyd, 40, 1500, 0, 555, 150, 3, 25, 50, 60, 5, 30, 10, 23, 30, 20, 40, 50, 9, 10, 1, 3, 12, 129, 800, 1975, 672, 480, 1245, 10, 521, 70, 1257, 5, 529, 150, 529, 800, 4015, 20, 704, 500, 704, 1000, 5290, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1180, MisterPrickel, MisterPrickel, 40, 4822, 0, 672, 111, 1, 250, 275, 23, 33, 0, 20, 40, 55, 1, 20, 30, 1, 12, 1, 3, 20, 129, 400, 1000, 452, 0, 501, 300, 502, 200, 613, 800, 613, 400, 569, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1195, SilverSlime, SilverSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 5290, 1000, 1226, 1, 4001, 200, 640, 200, 5327, 40, 5292, 300, 5292, 150, 5316, 20, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 +1195, SilverSlime, SilverSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 5290, 1000, 5290, 1000, 1226, 1, 4001, 200, 640, 200, 5327, 40, 5292, 300, 5292, 150, 5316, 20, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 1196, BromenalSlime, BromenalSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 792, 10, 794, 10, 796, 10, 4001, 200, 640, 200, 5327, 40, 5292, 30, 5316, 200, 5316, 100, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 1197, GoldSlime, GoldSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 1253, 11, 4001, 200, 640, 200, 5327, 40, 5292, 30, 5316, 20, 5314, 100, 5314, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 1198, IronSlime, IronSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 529, 5000, 529, 2500, 5329, 1, 4001, 200, 640, 2000, 640, 1000, 5327, 40, 5292, 30, 5316, 20, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 -1199, CoalSlime, CoalSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 5331, 200, 5331, 100, 4001, 2000, 4001, 1000, 640, 200, 5327, 40, 5292, 30, 5316, 20, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 +1199, CoalSlime, CoalSlime, 40, 600, 0, 200, 18, 1, 60, 90, 20, 30, 0, 20, 30, 10, 10, 30, 30, 9, 10, 1, 0, 11, 131, 1200, 1872, 672, 480, 5332, 1000, 5332, 500, 5332, 250, 4001, 2000, 4001, 1000, 640, 200, 5327, 40, 5292, 30, 5316, 20, 5314, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 diff --git a/world/map/db/mob_db_60_79.txt b/world/map/db/mob_db_60_79.txt index 37ce6ecb..33dbbaa2 100644 --- a/world/map/db/mob_db_60_79.txt +++ b/world/map/db/mob_db_60_79.txt @@ -2,7 +2,7 @@ //DO NOT EDIT IT DIRECTLY //Edit mob_db.conf instead! //ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, CRITDEF,STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop0id,Drop0%, Drop1id,Drop1%, Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Drop9id,Drop9%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength -1007, YellowSlime, YellowSlime, 60, 400, 0, 94, 9, 1, 35, 40, 2, 7, 0, 9, 6, 2, 1, 34, 1, 9, 10, 1, 0, 11, 131, 1400, 1800, 672, 480, 5288, 750, 534, 200, 519, 100, 501, 350, 502, 250, 522, 10, 640, 450, 4006, 20, 4001, 450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 +1007, YellowSlime, YellowSlime, 60, 400, 0, 94, 9, 1, 35, 40, 2, 7, 0, 9, 6, 2, 1, 34, 1, 9, 10, 1, 0, 11, 131, 1400, 1800, 672, 480, 5331, 750, 534, 200, 519, 100, 501, 350, 502, 250, 522, 10, 640, 450, 4006, 20, 4001, 450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 1008, RedSlime, RedSlime, 70, 450, 0, 130, 17, 1, 40, 45, 2, 7, 0, 12, 8, 2, 1, 25, 1, 9, 10, 1, 0, 11, 135, 1300, 1500, 672, 480, 1201, 300, 509, 110, 521, 200, 4003, 20, 525, 80, 535, 750, 528, 250, 531, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 1033, SeaSlime, SeaSlime, 70, 600, 0, 187, 13, 1, 30, 50, 3, 7, 0, 1, 25, 1, 0, 30, 30, 9, 10, 1, 0, 21, 131, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1040, Wisp, Wisp, 70, 9300, 0, 3725, 1210, 2, 215, 350, 0, 20, 0, 45, 12, 13, 15, 0, 45, 9, 10, 1, 0, 17, 137, 380, 2000, 672, 1500, 772, 1000, 703, 600, 703, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 diff --git a/world/map/db/mob_db_over_150.txt b/world/map/db/mob_db_over_150.txt index 3c9690f4..57795047 100644 --- a/world/map/db/mob_db_over_150.txt +++ b/world/map/db/mob_db_over_150.txt @@ -30,4 +30,4 @@ 1170, CrystalGolem, CrystalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 171, 320, 1000, 672, 50, 4002, 50, 4003, 50, 4004, 50, 4005, 50, 4006, 50, 4007, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1171, BlackCrystalGolem, BlackCrystalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 165, 320, 1000, 672, 50, 631, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1183, MobMoubootaur, MobMoubootaur, 220, 99999, 9999, 999999, 99999, 1, 400, 500, 99, 99, 0, 99, 60, 99, 30, 255, 255, 18, 18, 1, 6, 47, 165, 240, 872, 272, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1220, CoalGolem, CoalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 171, 320, 1000, 672, 50, 5331, 400, 5331, 300, 5331, 200, 4001, 10000, 4001, 5000, 4001, 2500, 640, 500, 704, 1200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1220, CoalGolem, CoalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 171, 320, 1000, 672, 50, 5332, 1000, 5332, 500, 5332, 250, 4001, 5000, 4001, 2500, 4001, 1250, 640, 500, 704, 1200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -- cgit v1.2.3-60-g2f50