diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2023-11-08 02:48:47 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-11-08 02:48:47 +0000 |
| commit | 74684a3bb6b3794e46f979e1fbce56db46ad27f7 (patch) | |
| tree | 6ecc23d6f4df689bfe83bcf8e7897569a72a067d | |
| parent | 39cdba08be9a260339159397740959e8586d80e7 (diff) | |
| download | serverdata-74684a3bb6b3794e46f979e1fbce56db46ad27f7.tar.gz serverdata-74684a3bb6b3794e46f979e1fbce56db46ad27f7.tar.bz2 serverdata-74684a3bb6b3794e46f979e1fbce56db46ad27f7.tar.xz serverdata-74684a3bb6b3794e46f979e1fbce56db46ad27f7.zip | |
SC_MATKPOT
39 files changed, 227 insertions, 79 deletions
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index d5eb76ac..0e2141bd 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -928,6 +928,8 @@ JoyplimScroll 5145 XmasSeeds 5277 Tomato 5251 CrazyRum 5294 +ManaDust 5309 +EnlighteningElixir 5310 CottonShorts 586 JeansShorts 610 CottonSkirt 632 @@ -1171,3 +1173,4 @@ BlackCrystalGolem 1171 Bif 1172 MontBlanc 1173 Emo 1174 +MegaManaBug 1175 diff --git a/world/map/db/const.txt b/world/map/db/const.txt index 0612fedc..6a9bcba7 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -132,10 +132,11 @@ cOrange 7 cPurple 8 cDarkGreen 9 -sc_poison 132 -sc_slowpoison 14 -sc_raiseattackspeed0 37 -sc_raiseattackstrength 185 +SC_POISON 132 +SC_SLOWPOISON 14 +SC_SPEEDPOTION0 37 +SC_ATKPOT 185 +SC_MATKPOT 186 SC_SHEARED 194 SC_HIDE 194 SC_HALT_REGENERATE 195 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 22f5927c..9ee50411 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -14101,9 +14101,9 @@ item_db: ( AegisName: "PinkPetal" Name: "PinkPetal" Type: "IT_USABLE" - Buy: 100 + Buy: 125 Sell: 50 - Weight: 10 + Weight: 5 Def: 0 Slots: 0 Refine: false @@ -14119,7 +14119,7 @@ item_db: ( Type: "IT_USABLE" Buy: 125 Sell: 50 - Weight: 10 + Weight: 5 Def: 0 Slots: 0 Refine: false @@ -15540,6 +15540,38 @@ item_db: ( //misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA "> }, +{ + Id: 5309 + AegisName: "ManaDust" + Name: "ManaDust" + Type: "IT_USABLE" + Buy: 125 + Sell: 50 + Weight: 5 + Def: 0 + Slots: 0 + Refine: false + ViewSprite: 5309 + Script: <" + callfunc "itheal", 35, 15; + "> +}, +{ + Id: 5310 + AegisName: "EnlighteningElixir" + Name: "EnlighteningElixir" + Type: "IT_USABLE" + Buy: 500 + Sell: 250 + Weight: 10 + Def: 0 + Slots: 0 + Refine: false + ViewSprite: 5309 + Script: <" + callfunc("SC_Bonus", 60, SC_PLUSMAGICPOWER, 100); + "> +}, /* Legs Armor */ { diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index d63d75df..d7d51df1 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -20,11 +20,11 @@ 539, Beer, 0, 175, 87, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 541, BottleOfWater, 0, 200, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 250, 0, 1; getitem 540, 1;}, {} 562, ChickenLeg, 0, 250, 125, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 500, 0, 1;}, {} -565, PinkPetal, 0, 100, 50, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} -566, SmallMushroom, 0, 125, 50, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} +565, PinkPetal, 0, 125, 50, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} +566, SmallMushroom, 0, 125, 50, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} //ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} -567, IronPotion, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start sc_raiseattackstrength, 60, 60;}, {} -568, ConcentrationPotion, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start sc_raiseattackspeed0, 60, 30;}, {} +567, IronPotion, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_ATKPOT, 60, 60;}, {} +568, ConcentrationPotion, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_SPEEDPOTION0, 60, 30;}, {} 657, Orange, 0, 40, 10, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 60, 0, 1;}, {} 676, Steak, 0, 275, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 250, 0, 1;}, {} 684, TinyHealingPotion, 0, 25, 12, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 100, 0, 1;}, {} @@ -44,11 +44,11 @@ 739, AppleCake, 0, 600, 150, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 12, 0, 1;}, {} 743, Acorn, 0, 50, 10, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 3, 0, 1;}, {} //ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} -744, DilutedConcentrationPot,0, 250, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start sc_raiseattackspeed0, 30, 20;}, {} -745, DarkConcentrationPotion,0, 50, 25, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start sc_raiseattackspeed0, 10, 40; sc_start sc_poison, 50, 1;}, {} +744, DilutedConcentrationPot,0, 250, 100, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_SPEEDPOTION0, 30, 20;}, {} +745, DarkConcentrationPotion,0, 50, 25, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_SPEEDPOTION0, 10, 40; sc_start SC_POISON, 50, 1;}, {} 747, LacedChocolateCake, 0, 550, 125, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 11, 0, 1;}, {} 748, LacedOrangeCupcake, 0, 90, 45, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 100, 0, 1;}, {} -750, SlowPoisonPotion, 0, 500, 200, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 5, 0, 1; sc_start sc_slowpoison, 180, 100;}, {} +750, SlowPoisonPotion, 0, 500, 200, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 5, 0, 1; sc_start SC_SLOWPOISON, 180, 100;}, {} 784, ZombieNachos, 0, 100, 30, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 60, 0, 1;}, {} 785, LadyFingers, 0, 70, 25, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 40, 0, 1;}, {} 786, JellAhh, 0, 80, 30, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 50, 0, 1;}, {} @@ -112,4 +112,6 @@ 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;}, {} -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_raiseattackstrength, 60, 50; sc_start sc_raiseattackspeed0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{} +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 fc2917f5..aaf29201 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -1304,6 +1304,7 @@ mob_db: ( MutationStrength: 50 Drops: { IronPotion: 800 + EnlighteningElixir: 800 ConcentrationPotion: 800 Diamond: 50 } @@ -1596,6 +1597,8 @@ mob_db: ( RedApple: 500 EmptyBottle: 10 OrangeCupcake: 100 + CoinBag: 400 + SmallMushroom: 1000 SmallMushroom: 1000 } }, @@ -5515,6 +5518,7 @@ mob_db: ( Bone: 400 Skull: 300 IronPowder: 100 + EnlighteningElixir: 1200 GoldenTooth: 20 } }, @@ -5672,6 +5676,8 @@ mob_db: ( DarkCrystal: 40 Bloodstone: 700 DarkCrystal: 800 + EnlighteningElixir: 1600 + ManaDust: 10000 } }, { @@ -7571,6 +7577,7 @@ mob_db: ( DamageMotion: 480 Drops: { IronPotion: 800 + EnlighteningElixir: 800 ConcentrationPotion: 800 Diamond: 50 } @@ -7582,20 +7589,20 @@ mob_db: ( Lv: 100 Hp: 35000 Sp: 0 - Exp: 28970 - JExp: 1689 - AttackRange: 3 - Attack: [60, 80] - Def: 20 - Mdef: 20 + Exp: 88970 + JExp: 2689 + AttackRange: 4 + Attack: [220, 240] + Def: 77 + Mdef: 50 CriticalDef: 0 Stats: { - Str: 15 - Agi: 15 - Vit: 10 - Int: 15 - Dex: 95 - Luk: 50 + Str: 45 + Agi: 20 + Vit: 110 + Int: 150 + Dex: 255 + Luk: 110 } ViewRange: 14 ChaseRange: 16 @@ -7615,9 +7622,10 @@ mob_db: ( AttackMotion: 672 DamageMotion: 480 Drops: { - IronPotion: 800 - ConcentrationPotion: 800 - Diamond: 50 + IronPotion: 1600 + EnlighteningElixir: 1600 + ConcentrationPotion: 1600 + Diamond: 100 } }, { @@ -7938,4 +7946,54 @@ mob_db: ( LeatherGloves: 200 } }, +{ + Id: 1175 + SpriteName: "MegaManaBug" + Name: "MegaManaBug" + Lv: 111 + Hp: 675 + Sp: 0 + Exp: 275 + JExp: 40 + AttackRange: 1 + Attack: [60, 85] + Def: 3 + Mdef: 8 + CriticalDef: 0 + Stats: { + Str: 16 + Agi: 14 + Vit: 15 + Int: 20 + Dex: 30 + Luk: 30 + } + ViewRange: 9 + ChaseRange: 10 + Size: 1 + Race: 3 + Element: (2, 1) + Mode: { + CanMove: true + Assist: true + CanAttack: true + ChangeTargetMelee: true + ChangeTargetChase: true + } + MoveSpeed: 800 + AttackDelay: 1800 + AttackMotion: 672 + DamageMotion: 480 + MutationCount: 1 + MutationStrength: 60 + Drops: { + MaggotSlime: 1000 + BugLeg: 800 + RoastedMaggot: 400 + EmptyBottle: 10 + CoinBag: 400 + ManaDust: 1000 + ManaDust: 1000 + } +}, ) diff --git a/world/map/db/mob_db_20_39.txt b/world/map/db/mob_db_20_39.txt index f9c4e23d..4e27fde7 100644 --- a/world/map/db/mob_db_20_39.txt +++ b/world/map/db/mob_db_20_39.txt @@ -27,7 +27,7 @@ 1094, Reinboo, Reinboo, 35, 1100, 0, 275, 29, 2, 40, 75, 35, 5, 0, 15, 5, 15, 0, 40, 10, 2, 10, 1, 3, 10, 129, 600, 1872, 672, 480, 512, 1000, 736, 1200, 737, 1200, 738, 1200, 739, 1200, 869, 50, 4042, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30 1099, SleepingBandit, SleepingBandit, 20, 25, 0, 3, 1, 1, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 9, 10, 1, 1, 17, 0, 500, 1500, 672, 900, 4016, 800, 521, 200, 526, 500, 535, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1100, AzulSlime, AzulSlime, 20, 200, 0, 55, 10, 1, 80, 120, 10, 10, 0, 20, 30, 10, 10, 30, 20, 9, 10, 1, 0, 31, 131, 500, 1872, 672, 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, 0, 0, 0, 0, 0, 0, 1, 20 -1107, Bluepar, Bluepar, 30, 350, 0, 77, 8, 2, 7, 15, 0, 5, 0, 1, 1, 1, 0, 20, 25, 2, 10, 1, 3, 10, 133, 800, 1872, 672, 480, 567, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 +1107, Bluepar, Bluepar, 30, 350, 0, 77, 8, 2, 7, 15, 0, 5, 0, 1, 1, 1, 0, 20, 25, 2, 10, 1, 3, 10, 133, 800, 1872, 672, 480, 567, 800, 5310, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 1108, AngryFireGoblin, AngryFireGoblin, 30, 320, 0, 85, 12, 1, 25, 40, 0, 10, 0, 3, 3, 3, 2, 10, 50, 9, 10, 1, 3, 13, 133, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1113, Pollett, Pollett, 30, 500, 0, 100, 7, 1, 6, 10, 1, 5, 0, 1, 2, 1, 0, 20, 25, 9, 10, 1, 3, 10, 129, 800, 1600, 672, 480, 4026, 1000, 4023, 500, 700, 300, 862, 100, 1189, 400, 1189, 400, 1189, 400, 611, 500, 5260, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1131, ManaBug, ManaBug, 25, 300, 0, 52, 5, 2, 10, 17, 4, 6, 0, 1, 4, 1, 4, 5, 4, 2, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 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, 40 diff --git a/world/map/db/mob_db_80_99.txt b/world/map/db/mob_db_80_99.txt index 9ed56e02..fd198aaf 100644 --- a/world/map/db/mob_db_80_99.txt +++ b/world/map/db/mob_db_80_99.txt @@ -23,7 +23,7 @@ 1109, AngrySeaSlime, AngrySeaSlime, 80, 1200, 0, 505, 42, 1, 40, 70, 13, 17, 0, 3, 30, 3, 0, 35, 35, 9, 10, 1, 0, 21, 135, 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 1115, SeaSlimeMother, SeaSlimeMother, 90, 8000, 0, 3131, 900, 5, 100, 150, 10, 20, 0, 1, 15, 10, 10, 10, 10, 9, 10, 1, 0, 22, 175, 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, 2, 30 //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 -1116, UndeadWitch, UndeadWitch, 80, 4200, 0, 1875, 722, 3, 50, 110, 8, 31, 0, 15, 20, 10, 25, 50, 40, 9, 10, 1, 1, 17, 143, 550, 1500, 672, 700, 631, 1000, 775, 400, 776, 300, 704, 100, 5297, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1116, UndeadWitch, UndeadWitch, 80, 4200, 0, 1875, 722, 3, 50, 110, 8, 31, 0, 15, 20, 10, 25, 50, 40, 9, 10, 1, 1, 17, 143, 550, 1500, 672, 700, 631, 1000, 775, 400, 776, 300, 704, 100, 5310, 1200, 5297, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1118, GreenSlimeMother, GreenSlimeMother, 90, 8000, 0, 3550, 900, 5, 100, 150, 15, 20, 0, 20, 25, 20, 30, 20, 20, 9, 10, 1, 0, 11, 175, 1400, 1872, 672, 480, 502, 200, 4004, 20, 501, 100, 521, 250, 522, 200, 526, 500, 503, 500, 535, 750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1124, Wight, Wight, 90, 8000, 0, 9000, 1900, 2, 56, 294, 32, 15, 0, 28, 25, 15, 15, 50, 65, 3, 10, 1, 1, 17, 175, 340, 1400, 672, 950, 775, 100, 775, 140, 776, 150, 631, 50, 631, 500, 778, 250, 5297, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 -1125, ManaGhost, ManaGhost, 82, 8000, 0, 7500, 2400, 3, 150, 300, 23, 30, 0, 35, 15, 3, 50, 50, 40, 2, 10, 1, 1, 17, 131, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5110, 700, 631, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 +1125, ManaGhost, ManaGhost, 82, 8000, 0, 7500, 2400, 3, 150, 300, 23, 30, 0, 35, 15, 3, 50, 50, 40, 2, 10, 1, 1, 17, 131, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5110, 700, 631, 800, 5310, 1600, 5309, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt index bd76b195..59ceecca 100644 --- a/world/map/db/mob_db_over_100.txt +++ b/world/map/db/mob_db_over_100.txt @@ -5,7 +5,7 @@ 1009, BlackScorpion, BlackScorpion, 100, 600, 0, 500, 37, 1, 60, 100, 4, 6, 0, 16, 30, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 1000, 1500, 672, 480, 523, 150, 509, 100, 518, 800, 709, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50 1010, Snake, Snake, 115, 850, 0, 722, 56, 1, 75, 90, 4, 6, 0, 20, 11, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 900, 1300, 672, 480, 641, 150, 714, 400, 714, 400, 710, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1012, Spider, Spider, 125, 800, 0, 690, 115, 1, 70, 85, 4, 6, 0, 14, 13, 10, 10, 35, 10, 9, 10, 1, 0, 12, 143, 1000, 1500, 672, 480, 537, 500, 535, 100, 638, 20, 526, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1013, EvilMushroom, EvilMushroom, 110, 650, 0, 233, 35, 1, 65, 80, 4, 6, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 535, 500, 540, 10, 534, 100, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 +1013, EvilMushroom, EvilMushroom, 110, 650, 0, 233, 35, 1, 65, 80, 4, 6, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 535, 500, 540, 10, 534, 100, 526, 400, 566, 1000, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 1014, PinkFlower, PinkFlower, 115, 700, 0, 296, 40, 2, 70, 75, 0, 5, 0, 16, 12, 20, 20, 20, 50, 2, 10, 1, 3, 12, 128, 800, 800, 672, 480, 535, 100, 540, 10, 1199, 100, 526, 400, 565, 1000, 565, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50 1015, SantaSlime, SantaSlime, 120, 750, 0, 298, 58, 1, 75, 80, 2, 7, 0, 1, 20, 1, 0, 30, 30, 9, 10, 1, 0, 11, 129, 1500, 1872, 672, 480, 512, 800, 513, 700, 514, 600, 519, 500, 527, 400, 538, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10 1026, MountainSnake, MountainSnake, 130, 900, 0, 1024, 63, 1, 80, 125, 4, 6, 0, 20, 40, 10, 10, 35, 45, 9, 10, 1, 0, 10, 133, 1000, 1500, 672, 480, 532, 20, 641, 350, 715, 400, 715, 400, 711, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30 @@ -42,9 +42,10 @@ 1158, VoidMouboo, VoidMouboo, 100, 5000, 0, 1338, 16, 2, 50, 65, 60, 5, 0, 15, 5, 15, 0, 40, 10, 2, 10, 1, 3, 10, 129, 600, 1872, 672, 480, 660, 1000, 660, 500, 541, 750, 660, 50, 806, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30 1159, VoidScorpion, VoidScorpion, 110, 6000, 0, 1327, 37, 1, 60, 90, 4, 6, 0, 16, 30, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 700, 1700, 672, 480, 523, 150, 509, 100, 518, 800, 709, 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 1160, VoidShroom, VoidShroom, 110, 5500, 0, 1223, 30, 3, 70, 80, 4, 4, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 133, 550, 1700, 672, 480, 613, 600, 4007, 50, 567, 100, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1166, Snowman, Snowman, 100, 4200, 0, 2897, 689, 1, 60, 80, 5, 20, 0, 15, 25, 40, 15, 75, 30, 8, 10, 1, 3, 10, 133, 800, 1872, 672, 480, 567, 800, 568, 800, 4002, 50, 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 +1166, Snowman, Snowman, 100, 4200, 0, 2897, 689, 1, 60, 80, 5, 20, 0, 15, 25, 40, 15, 75, 30, 8, 10, 1, 3, 10, 133, 800, 1872, 672, 480, 567, 800, 5310, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 //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 -1167, SnowmanBoss, SnowmanBoss, 100, 35000, 0, 28970, 1689, 3, 60, 80, 20, 20, 0, 15, 15, 10, 15, 95, 50, 14, 16, 1, 3, 10, 165, 700, 1672, 672, 480, 567, 800, 568, 800, 4002, 50, 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 +1167, SnowmanBoss, SnowmanBoss, 100, 35000, 0, 88970, 2689, 4, 220, 240, 77, 50, 0, 45, 20, 110, 150, 255, 110, 14, 16, 1, 3, 10, 165, 700, 1672, 672, 480, 567, 1600, 5310, 1600, 568, 1600, 4002, 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 1169, CrystalSpider, CrystalSpider, 140, 1000, 0, 800, 200, 1, 80, 95, 8, 12, 0, 20, 15, 20, 11, 45, 30, 1, 1, 1, 0, 22, 139, 1000, 1500, 672, 480, 537, 500, 535, 100, 638, 20, 526, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 1173, MontBlanc, MontBlanc, 100, 65535, 0, 1, 1, 12, 30, 40, 20, 0, 255, 15, 10, 30, 5, 20, 10, 12, 12, 1, 3, 12, 164, 800, 800, 672, 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, 0, 0, 0, 0, 0, 0, 0, 0 1174, Emo, Emo, 129, 50150, 80, 500000, 1000, 2, 200, 350, 30, 60, 60, 70, 60, 100, 60, 90, 90, 40, 10, 1, 1, 21, 183, 250, 450, 672, 50, 528, 5000, 532, 200, 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 +1175, MegaManaBug, MegaManaBug, 111, 675, 0, 275, 40, 1, 60, 85, 3, 8, 0, 16, 14, 15, 20, 30, 30, 9, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 540, 10, 526, 400, 5309, 1000, 5309, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt index b235c5b4..217d1ae6 100644 --- a/world/map/npc/002-1/elanore.txt +++ b/world/map/npc/002-1/elanore.txt @@ -64,7 +64,7 @@ L_Return: if (@Q_status > @Q_STATUS_MAX) set @Q_status, @STATUS_INITIAL; callsub S_update_var; - if (sc_check(sc_poison)) goto L_CurePoison; + if (sc_check(SC_POISON)) goto L_CurePoison; if (BaseLevel > 20) goto L_NoHeal; set @TEMP,rand(4); if(@TEMP == 1) goto L_Heal2; @@ -582,8 +582,8 @@ L_CurePoison: mes "[Elanore the Healer]"; mes "\"Oh dear! That looks like poison; hang on...\""; mes "She performs a complicated gesture."; - sc_end(sc_poison); - sc_end(sc_slowpoison); + sc_end(SC_POISON); + sc_end(SC_SLOWPOISON); misceffect sfx_magic_life, strcharinfo(0); misceffect sfx_magic_life; next; diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt index b7425fb5..0ab700a7 100644 --- a/world/map/npc/004-5/_mobs.txt +++ b/world/map/npc/004-5/_mobs.txt @@ -13,3 +13,4 @@ 004-5,81,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms 004-5,80,38,8,2|monster|Thug|1119,2,100000ms,30000ms 004-5,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms +004-5,68,64,7,11|monster|EvilMushroom|1013,2,0ms,250ms diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt index e160e414..c6f05a7c 100644 --- a/world/map/npc/007-1/_mobs.txt +++ b/world/map/npc/007-1/_mobs.txt @@ -10,3 +10,4 @@ 007-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 007-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms 007-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms +007-1,78,81,10,5|monster|MegaManaBug|1175,2,0ms,250ms diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt index 74bfe8dc..d7c607d3 100644 --- a/world/map/npc/009-2/doctor.txt +++ b/world/map/npc/009-2/doctor.txt @@ -28,7 +28,7 @@ L_Next: L_Cure: mes "[Doctor]"; - if (sc_check(sc_poison)) + if (sc_check(SC_POISON)) goto L_CurePoison; mes "The doctor examines you briefly."; mes "\"Nonsense! You look fine and dandy to me. All you need is a bit more exercise and fresh fruit in your diet!\""; @@ -42,8 +42,8 @@ L_CurePoison: mes "\"Now hold still, this won't hurt a bit...\""; next; mes "[Doctor]"; - sc_end(sc_poison); - sc_end(sc_slowpoison); + sc_end(SC_POISON); + sc_end(SC_SLOWPOISON); mes "*Ouch!*"; mes "\"Next time, be more careful! Make sure to cook any meats before you eat them, and don't eat fish once it starts to smell.\""; goto L_Close; diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index efad521a..f43c4751 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -350,7 +350,7 @@ L_choosePut: L_m_hl_m_vn: //poison for 3 minutes - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; mes "You begin to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!"; next; mes "The nurse looks at you with a really worried look on her face. As you open your mouth to tell her that you feel alright, the content of your stomach finds its way out through your throat and on the floor."; @@ -360,7 +360,7 @@ L_m_hl_m_vn: L_m_hl_l_vn: //poison for 1 minute - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; mes "You feel the pain of the poison weaken. This seems promising. The thought that you might have been successful makes you feel enormously happy."; next; mes "But a few seconds later, you wonder what was the reason for your happiness."; @@ -381,7 +381,7 @@ L_m_hl_l_vn: L_hl_m_vn: // first poison for 10 minutes, player will die anyway - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; mes "You feel a sting in your stomach and your heart starts pounding loudly."; next; mes "The room is getting dark."; @@ -397,7 +397,7 @@ L_hl_m_vn: L_hl_l_vn: //poison for 1 minute - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; mes "The antidote seems to have no effect."; goto L_check_st; diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index 3dcfbc9a..bea4a4bf 100644 --- a/world/map/npc/009-2/shops.txt +++ b/world/map/npc/009-2/shops.txt @@ -15,7 +15,7 @@ 009-2,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2 // Potion Shop -009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1 +009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1 // General Store 009-2,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1 diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt index ff33b313..47d70561 100644 --- a/world/map/npc/009-7/shops.txt +++ b/world/map/npc/009-7/shops.txt @@ -1,3 +1,3 @@ -009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1 +009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1 009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1 diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index 7f102659..76a77f80 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -536,7 +536,7 @@ L_Close: } -010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1 +010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1 010-2,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1 diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt index 596c7194..0621a927 100644 --- a/world/map/npc/011-1/_mobs.txt +++ b/world/map/npc/011-1/_mobs.txt @@ -15,3 +15,5 @@ 011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms 011-1,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms 011-1,92,44,35,28|monster|Maggot|1002,10,30ms,0ms +011-1,117,89,8,7|monster|EvilMushroom|1013,2,0ms,250ms +011-1,38,95,9,7|monster|MegaManaBug|1175,2,0ms,250ms diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt index ade035dd..63e527ff 100644 --- a/world/map/npc/011-1/alchemist.txt +++ b/world/map/npc/011-1/alchemist.txt @@ -19,14 +19,15 @@ set @QUEST_GUESS_BASE, 4; set @CHOICE_IRON, 0; - set @CHOICE_CONCENTRATION, 1; - set @CHOICE_DYEING_INTRO, 2; - set @CHOICE_DYE, 3; - set @CHOICE_MONSTER_OIL, 4; - set @CHOICE_MANA_POTION, 5; - set @CHOICE_SULPHUR_POWDER, 6; - set @CHOICE_IRON_POWDER, 7; - set @CHOICE_ABORT, 8; + set @CHOICE_ENLIGHTENING, 1; + set @CHOICE_CONCENTRATION, 2; + set @CHOICE_DYEING_INTRO, 3; + set @CHOICE_DYE, 4; + set @CHOICE_MONSTER_OIL, 5; + set @CHOICE_MANA_POTION, 6; + set @CHOICE_SULPHUR_POWDER, 7; + set @CHOICE_IRON_POWDER, 8; + set @CHOICE_ABORT, 9; setarray @menuitems$, "", "", "", "", "", "", "", ""; set @c, 0; @@ -35,6 +36,10 @@ set @menuID[@c], @CHOICE_IRON; set @c, @c + 1; + set @menuitems$[@c], "Enlightening Elixir."; + set @menuID[@c], @CHOICE_ENLIGHTENING; + set @c, @c + 1; + set @menuitems$[@c], "Concentration potion."; set @menuID[@c], @CHOICE_CONCENTRATION; set @c, @c + 1; @@ -123,6 +128,8 @@ L_MenuItems: goto L_abort; if (@menuID[@menu] == @CHOICE_IRON) goto L_iron; + if (@menuID[@menu] == @CHOICE_ENLIGHTENING) + goto L_enlightening; if (@menuID[@menu] == @CHOICE_CONCENTRATION) goto L_concentration; if (@menuID[@menu] == @CHOICE_DYEING_INTRO) @@ -315,6 +322,27 @@ L_iron: getitem "IronPotion", @count; close; +L_enlightening: + set @COST_PER_ENLIGHTENING_ELIXIR, 2; + + mes "\" To make them, I'm going to need " + @COST_PER_ENLIGHTENING_ELIXIR + " Mana Dust per Enlightening Elixir. How many Enlightening Elixirs would you like?\""; + input @count; + + if (@count == 0) + close; + set @empty, countitem("ManaDust"); + + if (@empty < @count * @COST_PER_ENLIGHTENING_ELIXIR) + goto L_no_enlightening; + getinventorylist; + if (@inventorylist_count == 100 && countitem("EnlighteningElixir") == 0 && @empty > @count) + goto L_TooMany; + + delitem "ManaDust", @COST_PER_ENLIGHTENING_ELIXIR * @count; + getitem "EnlighteningElixir", @count; + close; + + L_concentration: set @COST_PER_CONCENTRATION_POTION, 2; @@ -339,6 +367,10 @@ L_no_iron: mes "\"You have to bring me 2 Small Mushrooms for each Iron Potion.\""; close; +L_no_enlightening: + mes "\"You have to bring me 2 Mana Dust for each Enlightening Elixir.\""; + close; + L_no_concentration: mes "\"You have to bring me 2 Pink Petals for each Concentration Potion.\""; close; diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index ad088eff..994e399d 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -380,7 +380,7 @@ OnPD: // Small damages misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0); heal -10, 0; - sc_start sc_poison, 1, 3; + sc_start SC_POISON, 1, 3; // Spawn mobs or get items set @halloween_rand, rand(0,100); // Seeds reward diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt index 6a6ea09d..cf054024 100644 --- a/world/map/npc/011-6/_mobs.txt +++ b/world/map/npc/011-6/_mobs.txt @@ -48,3 +48,5 @@ 011-6,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms 011-6,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms 011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms +011-6,267,175,10,8|monster|EvilMushroom|1013,2,0ms,250ms +011-6,186,175,8,8|monster|EvilMushroom|1013,2,0ms,250ms diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt index be05b580..14e3733a 100644 --- a/world/map/npc/012-1/_mobs.txt +++ b/world/map/npc/012-1/_mobs.txt @@ -11,6 +11,9 @@ 012-1,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms 012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms +012-1,0,0,0,0|monster|MegaManaBug|1175,33,100000ms,30000ms 012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms +012-1,139,96,9,8|monster|MegaManaBug|1175,2,0ms,250ms +012-1,111,97,11,6|monster|MegaManaBug|1175,2,0ms,250ms 012-1,66,145,11,5|monster|PinkFlower|1014,2,0ms,250ms 012-1,24,54,6,8|monster|PinkFlower|1014,2,0ms,250ms diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt index e9314763..d0dac10a 100644 --- a/world/map/npc/012-3/_mobs.txt +++ b/world/map/npc/012-3/_mobs.txt @@ -17,3 +17,5 @@ 012-3,165,106,17,18|monster|Moggun|1061,10,100000ms,30000ms 012-3,0,0,0,0|monster|Bat|1017,100,0ms,0ms 012-3,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms +012-3,55,57,56,49|monster|MegaManaBug|1175,8,100000ms,30000ms +012-3,53,140,46,34|monster|MegaManaBug|1175,16,100000ms,30000ms diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt index ca0b2b68..a453e35b 100644 --- a/world/map/npc/013-1/_mobs.txt +++ b/world/map/npc/013-1/_mobs.txt @@ -16,3 +16,4 @@ 013-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 013-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms 013-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms +013-1,98,90,9,6|monster|EvilMushroom|1013,2,0ms,250ms diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt index 8abab0ea..df3ee4cb 100644 --- a/world/map/npc/014-1/_mobs.txt +++ b/world/map/npc/014-1/_mobs.txt @@ -17,3 +17,5 @@ 014-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 014-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms 014-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms +014-1,33,75,7,8|monster|EvilMushroom|1013,2,0ms,250ms +014-1,87,24,9,10|monster|MegaManaBug|1175,2,0ms,250ms diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt index e012a95c..cf81caff 100644 --- a/world/map/npc/015-1/_mobs.txt +++ b/world/map/npc/015-1/_mobs.txt @@ -11,3 +11,4 @@ 015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms 015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms 015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms +015-1,27,26,11,6|monster|MegaManaBug|1175,2,0ms,250ms diff --git a/world/map/npc/016-2/_mobs.txt b/world/map/npc/016-2/_mobs.txt index 069b9d46..3391c146 100644 --- a/world/map/npc/016-2/_mobs.txt +++ b/world/map/npc/016-2/_mobs.txt @@ -1,3 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Gwendolyn's mobs +016-2,28,27,14,6|monster|MegaManaBug|1175,2,0ms,250ms diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt index f01c6a9c..66f99a6e 100644 --- a/world/map/npc/018-2/caul.txt +++ b/world/map/npc/018-2/caul.txt @@ -714,7 +714,7 @@ L_mopox_failed_hard: next; if (rand((Vit+Vit2)) < 40) - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; mes "[Brewing Mopox Cure]"; mes "Yeech. That smelled bad."; diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index a71210cc..ddae90b8 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -16,7 +16,7 @@ // Weapons shop 020-2,25,65,0|shop|Bracco|135,ArmorBreaker:*2,IronArrow:*1,Arrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1 // Potions shop -020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*6,MediumManaElixir:*6,LargeManaElixir:*6 +020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,SmallManaElixir:*6,MediumManaElixir:*6,LargeManaElixir:*6 // INN 020-2,111,23,0|script|Kane|120 diff --git a/world/map/npc/026-2/gy_inn_shops.txt b/world/map/npc/026-2/gy_inn_shops.txt index cbb6c674..18580dbd 100644 --- a/world/map/npc/026-2/gy_inn_shops.txt +++ b/world/map/npc/026-2/gy_inn_shops.txt @@ -34,7 +34,7 @@ close; } -026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1 +026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1 026-2,22,120,0|shop|Umfrey|302,BoneArrows:*1,ThornArrow:*1,ShockSweet:*1 // Bank and Storage diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt index 1ed99ac2..943fe8cb 100644 --- a/world/map/npc/029-1/rewards_master.txt +++ b/world/map/npc/029-1/rewards_master.txt @@ -6,7 +6,7 @@ if (tvis == 0) set tvis, 1; if (Mobpt < tvis) goto L_NotEnough; - setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal"; + setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal", "ManaDust"; mes "[Ishi the Rewards Master]"; mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\""; diff --git a/world/map/npc/029-2/alchemy.txt b/world/map/npc/029-2/alchemy.txt index 537d269c..f8f1c0dd 100644 --- a/world/map/npc/029-2/alchemy.txt +++ b/world/map/npc/029-2/alchemy.txt @@ -132,9 +132,10 @@ L_InitVars: setarray .recipes$[0], 0, "DilutedConcentrationPot", "DarkConcentrationPotion", "ConcentrationPotion", "CactusDrink", "CactusDrink", "CactusPotion", - "PinkPetal", "BottleOfWater", "ConcentrationPotion", + "MountainSnakeTongue", "BottleOfWater", "SlowPoisonPotion", "SmallMushroom", "BottleOfWater", "IronPotion", - "MountainSnakeTongue", "BottleOfWater", "SlowPoisonPotion"; + "ManaDust", "BottleOfWater", "EnlighteningElixir", + "PinkPetal", "BottleOfWater", "ConcentrationPotion"; set .rsize, getarraysize(.recipes$); end; } diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt index 7c09fd1d..c6dfa306 100644 --- a/world/map/npc/029-2/morgan.txt +++ b/world/map/npc/029-2/morgan.txt @@ -139,4 +139,4 @@ L_Close: close; } -029-2,113,59,0|shop|Zitoni|103,CactusDrink:*1,CactusPotion:*1,TinyManaElixir:*5,SmallManaElixir:*5 +029-2,113,59,0|shop|Zitoni|103,CactusDrink:*1,CactusPotion:*1,TinyManaElixir:*5,SmallManaElixir:*5,EnlighteningElixir:*1,ManaDust:*1 diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index 43dda09c..18b960aa 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -342,7 +342,7 @@ OnNewRound: if (!(@candor_oldx == @candor_x && @candor_oldy == @candor_y)) goto L_IdleCheckPassed; set @candor_idle_counter, @candor_idle_counter + 1; - sc_start sc_poison, 1, @candor_idle_counter*25; + sc_start SC_POISON, 1, @candor_idle_counter*25; heal ((MaxHp/100) * (-20 * @candor_idle_counter)), 0; message strcharinfo(0), "The evil energy of this place hurts you. You should keep moving!"; end; diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt index 23eba0b0..63b0cf2d 100644 --- a/world/map/npc/055-1/_mobs.txt +++ b/world/map/npc/055-1/_mobs.txt @@ -18,3 +18,4 @@ 055-1,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms 055-1,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms 055-1,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms +055-1,113,25,10,7|monster|PinkFlower|1014,2,0ms,250ms diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 87dfca4c..96005de3 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -16,7 +16,7 @@ set @discover_poisonous_pumpkin, 1; misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0); heal -15, 0; - sc_start sc_poison, 1, 4; + sc_start SC_POISON, 1, 4; if (rand(0,100) < 10) getitem "PumpkinSeeds", 1; @@ -46,7 +46,7 @@ L_HeavyPoison0: message strcharinfo(0), "Pumpkin : Ouch, this pumpkin is totally poisonous! Let's get away from them!"; misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0); heal -150,0; - sc_start sc_poison, 1, 60; + sc_start SC_POISON, 1, 60; goto L_Destroy; L_HeavyPoison1: @@ -54,7 +54,7 @@ L_HeavyPoison1: message strcharinfo(0), "Pumpkin : This is really awful! I should not touch them!"; misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0); heal -350,0; - sc_start sc_poison, 1, 120; + sc_start SC_POISON, 1, 120; goto L_Destroy; L_HeavyPoison2: diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt index 686b2172..4ecf0465 100644 --- a/world/map/npc/055-3/_mobs.txt +++ b/world/map/npc/055-3/_mobs.txt @@ -9,3 +9,4 @@ 055-3,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms 055-3,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms 055-3,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms +055-3,76,32,8,9|monster|EvilMushroom|1013,2,0ms,250ms diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt index de61bdf0..1ab584fd 100644 --- a/world/map/npc/099-5/boss.txt +++ b/world/map/npc/099-5/boss.txt @@ -260,7 +260,7 @@ OnFourthFall: //debugmes "FOURTH FALL"; // High Damage - if (sc_check(sc_raiseattackspeed0)) + if (sc_check(SC_SPEEDPOTION0)) goto OnFF01Y; goto OnFF01N; @@ -269,7 +269,7 @@ OnFF01Y: goto OnFF01N; OnFF01N: - if (sc_check(sc_raiseattackstrength)) + if (sc_check(SC_ATKPOT)) goto OnFF02Y; goto OnFF02N; @@ -307,7 +307,7 @@ OnFF05Y: goto OnFF05N; OnFF05N: - if (sc_check(sc_slowpoison)) + if (sc_check(SC_SLOWPOISON)) goto OnFF06Y; goto OnFF06N; @@ -326,7 +326,7 @@ OnMTBlissOblivion: misceffect 51, strcharinfo(0); misceffect 52, strcharinfo(0); // FIXME // Poison - sc_start sc_poison, 1, 80; + sc_start SC_POISON, 1, 80; // Adjust Map Mask if ($@DD5_DEFCON == 0) mapmask 1; @@ -1141,9 +1141,9 @@ L_DEFCON2: // DEFCON 3 - Potion Immunity L_DEFCON3: - if (sc_check(sc_raiseattackspeed0)) + if (sc_check(SC_SPEEDPOTION0)) set @dd5_dmg, 0; - if (sc_check(sc_raiseattackstrength)) + if (sc_check(SC_ATKPOT)) set @dd5_dmg, 0; goto L_Return; @@ -1213,7 +1213,7 @@ function|script|FinalExamAttack goto L_Return; // Assign attack speed delay - 300ms with pots, 600ms without - set @dd5_timer, if_then_else(sc_check(sc_raiseattackspeed0), gettimetick(0)+300, gettimetick(0)+600); + set @dd5_timer, if_then_else(sc_check(SC_SPEEDPOTION0), gettimetick(0)+300, gettimetick(0)+600); // Calculate HIT and CRIT rate set @dd5_crit, (rand(10000) < CRIT); @@ -1224,7 +1224,7 @@ function|script|FinalExamAttack set @dd5_dmg, ATK1+BASE_ATK; // Strength Potion - DMG +50% - if (sc_check(sc_raiseattackstrength)) + if (sc_check(SC_ATKPOT)) set @dd5_dmg, @dd5_dmg*15/10; // Boss defense diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index dc61790d..bbb7ac53 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -11,7 +11,7 @@ function|script|useShockSweet L_Change: setlook LOOK_HAIR_COLOR, (HC_WHITE - Class) + 1; message strcharinfo(0), "Gah! That was some strong stuff!"; - sc_start sc_poison, 1, 20; + sc_start SC_POISON, 1, 20; misceffect 15, strcharinfo(0); return; } diff --git a/world/map/npc/magic/level2-toxic-dart.txt b/world/map/npc/magic/level2-toxic-dart.txt index 6fde4545..ef621cbb 100644 --- a/world/map/npc/magic/level2-toxic-dart.txt +++ b/world/map/npc/magic/level2-toxic-dart.txt @@ -28,7 +28,7 @@ OnAttack: if (target(BL_ID, @target_id, 50) != 50) goto L_FreeRecast; // 0x20 | 0x02 | 0x10 void call("elt_damage", @phlexspell[0], @phlexspell[1], ELT_NEUTRAL, ELT_POISON, FX_NONE); if(@target_id != BL_ID && isloggedin(@target_id)) // this is a dirty trick to check if the target is a player - sc_start sc_poison, @phlexspell[4], @phlexspell[5], @target_id; + sc_start SC_POISON, @phlexspell[4], @phlexspell[5], @target_id; set @phlexspell[3], @phlexspell[3] - 1; goto L_FreeRecast; |