summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2024-03-09 11:41:17 +0100
committerHoraK-FDF <horak-fdf@web.de>2024-04-14 11:16:47 +0200
commit6d0f4c0bdf4933c516f1c22406d40e3ad385e64a (patch)
tree3e7e3873d3578da3c7bff8c32095303dcb70ca1d
parente586e59dd796b34a8d10e5de61dfe8444ef84e27 (diff)
downloadserverdata-6d0f4c0bdf4933c516f1c22406d40e3ad385e64a.tar.gz
serverdata-6d0f4c0bdf4933c516f1c22406d40e3ad385e64a.tar.bz2
serverdata-6d0f4c0bdf4933c516f1c22406d40e3ad385e64a.tar.xz
serverdata-6d0f4c0bdf4933c516f1c22406d40e3ad385e64a.zip
Naphtalene to Yellow Apple
Diffstat
-rw-r--r--world/map/db/const-aegis.txt3
-rw-r--r--world/map/db/item_db.conf40
-rw-r--r--world/map/db/item_db_generic.txt4
-rw-r--r--world/map/db/item_db_use.txt1
-rw-r--r--world/map/db/mob_db.conf1
-rw-r--r--world/map/db/mob_db_40_59.txt2
-rw-r--r--world/map/db/mob_db_60_79.txt2
7 files changed, 36 insertions, 17 deletions
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index ea6e1e8d..a44f1c90 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -348,7 +348,6 @@ LoveLetter 5265
ThermalNapalm 5276
XmasTicket 5278
Carrot 5279
-Naftalin 5288
SilverOre 5292
CrystallizedDragonBlood 5293
PinkFlowerSeed 5295
@@ -365,6 +364,7 @@ BromenalDroplet 5318
ShadowPlantCrystalDust 5319
CopperOre 5327
CopperIngot 5328
+Naftalin 5331
LeatherShirt 523
DesertShirt 546
Turtleneck 564
@@ -948,6 +948,7 @@ MauveScroll 5144
JoyplimScroll 5145
XmasSeeds 5277
Tomato 5251
+YellowApple 5288
CrazyRum 5294
ManaDust 5309
EnlighteningElixir 5310
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 3047bd63..19383648 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -5289,18 +5289,6 @@ item_db: (
}
},
{
- Id: 5288
- AegisName: "Naftalin"
- Name: "Naphthalene"
- Type: "IT_ETC"
- Buy: 0
- Sell: 0
- Weight: 1
- Def: 0
- Refine: false
- ViewSprite: 5288
-},
-{
Id: 5292
AegisName: "SilverOre"
Name: "Silver Ore"
@@ -5589,6 +5577,18 @@ item_db: (
}
//Disabled: true // @TMWA
},
+{
+ Id: 5331
+ AegisName: "Naftalin"
+ Name: "Naphthalene"
+ Type: "IT_ETC"
+ Buy: 500
+ Sell: 200
+ Weight: 10
+ Def: 0
+ Refine: false
+ ViewSprite: 5331
+},
/* Chest Armor */
{
Id: 523
@@ -15887,6 +15887,22 @@ item_db: (
">
},
{
+ 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"
Name: "Crazy Rum"
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index c159791c..ed5e0b4b 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -263,7 +263,6 @@
//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, 0, 0, 1, 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, {}, {}
@@ -274,10 +273,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, {}, {}
-//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, {}, {}
+//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
//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, {}, {}
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 902eb25f..1543d5db 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -113,6 +113,7 @@
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;}, {}
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index cc590a4d..0dacc317 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -5759,6 +5759,7 @@ mob_db: (
MutationCount: 1
MutationStrength: 20
Drops: {
+ YellowApple: 750
OrangeCupcake: 200
CherryCake: 100
CactusDrink: 350
diff --git a/world/map/db/mob_db_40_59.txt b/world/map/db/mob_db_40_59.txt
index feb0aeb8..eb410787 100644
--- a/world/map/db/mob_db_40_59.txt
+++ b/world/map/db/mob_db_40_59.txt
@@ -21,4 +21,4 @@
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, 5288, 200, 5288, 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, 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
diff --git a/world/map/db/mob_db_60_79.txt b/world/map/db/mob_db_60_79.txt
index cd6f5fe2..37ce6ecb 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, 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, 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, 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
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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-05-18 05:58:02 +0000