From b9783d45aae91d656f51ee36aa12b0d55b80ae47 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 8 Apr 2022 09:48:47 -0300 Subject: General Nerf + Misc Changes (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I have a nerf gun and am not afraid of using it! * Nerf boss point gain in the crypt fights: -5 for Krukan, -10 for Razha and -15 for Terogan * **No nerf if** doing Kurkan and level < 90 * **No nerf if** doing Razha and level < 100 * **No nerf if** doing Terogan and level < 120 * _In future, there may be a new boss fight for level < 135 and for level < 150, but this is NYI._ * Nerf upmarmu. if your int is lower than agi, nerf applies by half the difference. If int is higher than agi, same formula, but it is a **boost**. * This is a nerf for EVERYTHING including mobs ─ Nerf MDEF for Poltergeist (-5), Lightning Ball (-15), The Lost (-10), Witch Guard (-20), JackO (-2), Zombie (-1), Fallen (-2), Terranite (-5), Reaper (-10), Nutcracker (-5), Swashbuckler (-2), Grenadier (-10), Anne (-5), and Tormenta (-20). * Also nerf General Razha cost in (-2 Eyes) * Change Terogan cost to be more consistent with exercised drop rates (Eyes <-> Ears) * Nerf Audsbel asked Grass Snake Tongues from 50 to 40 * Remove Wumpus Egg. * Add Tomato using Wumpus Egg former ID (usable, 200 HP) * Add three items archetypes for the upcoming CRC Day. Also adds Keshlam mobs to Evil Obelisk for 10kGP. _PS. Actually, 30 tongues for Audsbel would have worked but I prefer to be incremental and the exp would need some reviewing in this case._ --- world/map/db/item_db_chest.txt | 1 + world/map/db/item_db_generic.txt | 1 - world/map/db/item_db_offhand.txt | 1 + world/map/db/item_db_use.txt | 1 + world/map/db/item_db_weapon.txt | 1 + world/map/db/mob_db_80_99.txt | 8 ++++---- world/map/db/mob_db_over_100.txt | 20 ++++++++++---------- world/map/npc/011-1/auldsbel.txt | 6 +++--- world/map/npc/011-1/shops.txt | 2 +- world/map/npc/027-6/general_krukan.txt | 8 +++++++- world/map/npc/027-7/general_razha.txt | 10 ++++++++-- world/map/npc/027-8/general_terogan.txt | 12 +++++++++--- world/map/npc/035-2/shops.txt | 2 +- world/map/npc/functions/evil_obelisk.txt | 19 ++++++++++++++++++- world/map/npc/magic/level2-magic-knuckles.txt | 2 +- 15 files changed, 66 insertions(+), 28 deletions(-) diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt index 62669eac..1840e6cf 100644 --- a/world/map/db/item_db_chest.txt +++ b/world/map/db/item_db_chest.txt @@ -244,3 +244,4 @@ 5139, PurpleContributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {} 5140, DarkGreenContributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {} 5254, SaviorArmor, 5, 0, 0, 2000, 0, 24, 0, -90, 0, 2, 512, 0, 0, 0, {}, {bonus bDex, 1; bonus bMaxHP, 100;} +5286, RedArmor, 5, 0, 0, 2000, 0, 27, 0, -40, 0, 2, 512, 0, 0, 0, {}, {bonus bDex, 1; bonus bAgi, 1; bonus bMaxHP, 1500;} diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt index f956b469..dedc7cc2 100644 --- a/world/map/db/item_db_generic.txt +++ b/world/map/db/item_db_generic.txt @@ -248,7 +248,6 @@ 5223, BlueTicket, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 5224, PurpleTicket, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 5225, PinkTicket, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} -5251, WumpusEgg, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 5256, PVPCoin, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 5265, LoveLetter, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 5279, Carrot, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_offhand.txt b/world/map/db/item_db_offhand.txt index 1752315d..7ed9369c 100644 --- a/world/map/db/item_db_offhand.txt +++ b/world/map/db/item_db_offhand.txt @@ -5,3 +5,4 @@ 602, WoodenShield, 5, 10000, 2000, 1500, 0, 14, 0, -70, 0, 2, 32, 0, 0, 0, {}, {} 603, LeatherShield, 5, 2000, 1000, 1300, 0, 7, 0, -35, 0, 2, 32, 0, 0, 0, {}, {} 797, BromenalShield, 5, 40000, 3000, 2500, 0, 20, 0, -200, 0, 2, 32, 0, 0, 0, {}, {} +5285, DragonShield, 5, 40000, 3000, 2500, 0, 30, 0, -200, 0, 2, 32, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index e8d48654..12019781 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -100,4 +100,5 @@ 5235, TMWBirthdayGift, 0, 1000000, 50, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "TMWBirthdayGift";}, {} 5236, GumiCandy, 0, 10000, 250, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set Sex, if_then_else(Sex == 3, rand(0, 1), if_then_else(rand(0,1), 3, !Sex));}, {} 5237, CaramelCandy, 0, 700, 350, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 350, 0, 1;}, {} +5251, Tomato, 0, 700, 350, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "LovePotion";}, {} diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index 6f73d259..a9cbb199 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -64,3 +64,4 @@ //ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 5260, Snowball, 10, 1, 0, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {set @AmmoType, AMMO_XMAS; callfunc "CheckAmmo";} 5261, SnowLauncher, 4, 500, 50, 10, 20, 0, 3, 0, 0, 2, 2, 1, 1, 11, {}, {set @LauncherType, AMMO_XMAS; callfunc "CheckLauncher";} +5284, Revolver, 4, 1500000, 500000, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} diff --git a/world/map/db/mob_db_80_99.txt b/world/map/db/mob_db_80_99.txt index 40215b80..e9e61e00 100644 --- a/world/map/db/mob_db_80_99.txt +++ b/world/map/db/mob_db_80_99.txt @@ -4,18 +4,18 @@ 1028, Mouboo, Mouboo, 85, 1200, 0, 0, 16, 2, 30, 75, 65, 5, 15, 5, 15, 0, 40, 10, 2, 2, 1, 3, 20, 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, 1, 30 1043, Skeleton, Skeleton, 90, 6800, 0, 0, 1467, 1, 51, 284, 12, 10, 35, 18, 3, 8, 71, 65, 1, 1, 1, 0, 29, 175, 340, 1800, 672, 950, 775, 200, 775, 280, 776, 300, 631, 1000, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1044, LadySkeleton, LadySkeleton, 90, 5500, 0, 0, 957, 2, 73, 146, 31, 8, 20, 25, 15, 8, 43, 48, 1, 1, 1, 0, 29, 175, 650, 750, 672, 700, 775, 200, 775, 280, 776, 300, 631, 1000, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 -1047, Poltergeist, Poltergeist, 90, 9000, 0, 0, 1306, 3, 110, 150, 0, 20, 35, 0, 15, 15, 75, 50, 1, 1, 1, 0, 27, 137, 330, 740, 672, 400, 774, 1000, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 +1047, Poltergeist, Poltergeist, 90, 9000, 0, 0, 1306, 3, 110, 150, 0, 15, 35, 0, 15, 15, 75, 50, 1, 1, 1, 0, 27, 137, 330, 740, 672, 400, 774, 1000, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 1059, GCMaggot, GiantCaveMaggot, 90, 2000, 0, 0, 102, 2, 60, 80, 2, 7, 10, 10, 2, 1, 22, 1, 2, 2, 1, 0, 41, 133, 1000, 1872, 672, 480, 727, 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, 1, 25 1066, VampireBat, VampireBat, 80, 800, 0, 0, 9, 1, 55, 150, 10, 8, 8, 8, 1, 4, 20, 4, 6, 1, 1, 3, 24, 129, 800, 1872, 672, 480, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 5115, 3000, 754, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1069, Scythe, Scythe, 80, 3000, 0, 0, 617, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 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 -1070, BallLightning, BallLightning, 80, 300, 0, 0, 1, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 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 -1073, TheLost, TheLost, 83, 5000, 0, 8750, 2840, 5, 125, 150, 10, 70, 5, 40, 10, 70, 70, 40, 4, 9, 1, 1, 69, 141, 500, 2000, 672, 300, 5110, 500, 5110, 500, 631, 500, 566, 500, 778, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1070, BallLightning, BallLightning, 80, 300, 0, 0, 1, 1, 5, 10, 40, 50, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 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 +1073, TheLost, TheLost, 83, 5000, 0, 8750, 2840, 5, 125, 150, 10, 60, 5, 40, 10, 70, 70, 40, 4, 9, 1, 1, 69, 141, 500, 2000, 672, 300, 5110, 500, 5110, 500, 631, 500, 566, 500, 778, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1074, RedBone, RedBone, 90, 8000, 0, 9750, 3434, 2, 100, 330, 24, 30, 35, 25, 3, 50, 80, 75, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 4, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 1077, DrunkenSkeleton, DrunkenSkeleton, 90, 7200, 0, 0, 530, 1, 55, 284, 30, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 790, 300, 789, 280, 3003, 100, 3000, 50, 3009, 250, 3006, 400, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1078, TipsySkeleton, TipsySkeleton, 90, 7000, 0, 0, 493, 1, 60, 284, 33, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 787, 300, 788, 280, 3002, 100, 3000, 50, 3007, 400, 3010, 250, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1079, DrunkenLadySkeleton, DrunkenLadySkeleton, 90, 6000, 0, 0, 389, 2, 75, 146, 40, 8, 20, 20, 15, 8, 51, 48, 1, 1, 1, 0, 29, 137, 660, 750, 672, 700, 785, 300, 786, 280, 3001, 100, 3000, 50, 3010, 250, 3009, 250, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1097, SoulEater, SoulEater, 90, 6800, 0, 0, 1746, 1, 129, 354, 12, 10, 35, 18, 3, 8, 71, 65, 1, 1, 1, 0, 29, 175, 340, 1800, 672, 950, 778, 250, 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, 30 -1103, WitchGuard, WitchGuard, 84, 9742, 0, 0, 1060, 2, 200, 220, 25, 50, 90, 65, 45, 5, 120, 69, 1, 1, 1, 0, 89, 133, 290, 1200, 672, 30, 631, 2000, 631, 500, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 40 +1103, WitchGuard, WitchGuard, 84, 9742, 0, 0, 1060, 2, 200, 220, 25, 30, 90, 65, 45, 5, 120, 69, 1, 1, 1, 0, 89, 133, 290, 1200, 672, 30, 631, 2000, 631, 500, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 40 1104, DemonicMouboo, DemonicMouboo, 85, 800, 0, 0, 32, 2, 40, 70, 35, 15, 15, 5, 15, 0, 40, 10, 2, 2, 1, 3, 20, 133, 600, 1872, 672, 480, 660, 1000, 660, 500, 703, 750, 4004, 50, 806, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30 1109, AngrySeaSlime, AngrySeaSlime, 80, 1200, 0, 0, 42, 1, 40, 70, 13, 17, 3, 30, 3, 0, 35, 35, 1, 1, 1, 0, 41, 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 1115, SeaSlimeMother, SeaSlimeMother, 90, 8000, 0, 0, 900, 5, 100, 150, 10, 20, 1, 15, 10, 10, 10, 10, 1, 1, 1, 0, 44, 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, 2, 30 diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt index 607b6031..d2b1bdcb 100644 --- a/world/map/db/mob_db_over_100.txt +++ b/world/map/db/mob_db_over_100.txt @@ -5,16 +5,16 @@ 1013, EvilMushroom, EvilMushroom, 110, 650, 0, 0, 35, 1, 65, 80, 4, 6, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 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, 1, 60 1014, PinkFlower, PinkFlower, 115, 700, 0, 0, 40, 2, 70, 75, 0, 5, 16, 12, 20, 20, 20, 50, 2, 2, 1, 3, 22, 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, 2, 50 1015, SantaSlime, SantaSlime, 120, 750, 0, 0, 58, 1, 75, 80, 2, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 161, 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, 1, 10 -1022, JackO, JackO, 175, 10000, 0, 18130, 1241, 2, 100, 500, 40, 20, 105, 40, 85, 75, 105, 95, 1, 1, 1, 0, 20, 133, 250, 1500, 672, 480, 617, 300, 622, 400, 624, 400, 620, 400, 615, 300, 1203, 400, 1198, 10000, 616, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1022, JackO, JackO, 175, 10000, 0, 18130, 1241, 2, 100, 500, 40, 18, 105, 40, 85, 75, 105, 95, 1, 1, 1, 0, 20, 133, 250, 1500, 672, 480, 617, 300, 622, 400, 624, 400, 620, 400, 615, 300, 1203, 400, 1198, 10000, 616, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1023, FireSkull, FireSkull, 170, 5000, 0, 0, 721, 2, 75, 175, 35, 15, 40, 30, 30, 30, 35, 70, 1, 1, 1, 3, 23, 175, 600, 1600, 672, 480, 631, 1000, 701, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1024, PoisonSkull, PoisonSkull, 170, 5000, 0, 0, 721, 2, 75, 175, 35, 15, 40, 30, 30, 30, 35, 70, 1, 1, 1, 3, 25, 175, 600, 1600, 672, 480, 631, 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, 4, 20 1026, MountainSnake, MountainSnake, 130, 900, 0, 1024, 63, 1, 80, 125, 4, 6, 20, 40, 10, 10, 35, 45, 1, 1, 1, 0, 20, 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, 1, 30 1034, GrassSnake, GrassSnake, 140, 1000, 0, 1254, 103, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 500, 660, 1600, 641, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 40 -1036, Zombie, Zombie, 110, 12000, 0, 0, 1393, 2, 275, 355, 20, 15, 30, 15, 30, 3, 60, 40, 1, 1, 1, 0, 29, 133, 480, 1872, 672, 900, 631, 1000, 777, 700, 778, 500, 779, 200, 780, 150, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1036, Zombie, Zombie, 110, 12000, 0, 0, 1393, 2, 275, 355, 20, 14, 30, 15, 30, 3, 60, 40, 1, 1, 1, 0, 29, 133, 480, 1872, 672, 900, 631, 1000, 777, 700, 778, 500, 779, 200, 780, 150, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1042, Spectre, Spectre, 140, 6500, 0, 3978, 359, 3, 160, 220, 40, 0, 35, 70, 22, 15, 20, 70, 1, 1, 1, 0, 49, 137, 650, 1700, 800, 500, 773, 1000, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 -1045, Fallen, Fallen, 120, 10000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50 -1062, Terranite, Terranite, 110, 6000, 0, 0, 889, 1, 200, 300, 20, 40, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 4001, 600, 4004, 20, 4005, 20, 4007, 20, 763, 500, 640, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 -1068, Reaper, Reaper, 140, 40000, 0, 0, 156, 7, 200, 350, 30, 80, 100, 120, 70, 120, 100, 75, 1, 50, 1, 1, 89, 165, 500, 1200, 800, 300, 777, 1000, 775, 500, 776, 100, 1221, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1045, Fallen, Fallen, 120, 10000, 0, 7812, 1663, 2, 180, 430, 5, 18, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50 +1062, Terranite, Terranite, 110, 6000, 0, 0, 889, 1, 200, 300, 20, 35, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 4001, 600, 4004, 20, 4005, 20, 4007, 20, 763, 500, 640, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1068, Reaper, Reaper, 140, 40000, 0, 0, 156, 7, 200, 350, 30, 70, 100, 120, 70, 120, 100, 75, 1, 50, 1, 1, 89, 165, 500, 1200, 800, 300, 777, 1000, 775, 500, 776, 100, 1221, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1071, IceElement, IceElement, 100, 5000, 0, 0, 689, 3, 60, 200, 5, 20, 15, 25, 40, 15, 45, 30, 1, 1, 1, 0, 41, 135, 330, 740, 672, 400, 4026, 900, 537, 750, 568, 400, 543, 900, 544, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 1072, Yeti, Yeti, 100, 8500, 0, 0, 726, 2, 100, 400, 60, 15, 60, 5, 45, 15, 60, 32, 1, 1, 1, 0, 61, 135, 220, 1200, 672, 900, 4023, 700, 4024, 300, 4025, 400, 4027, 142, 4021, 800, 4022, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1075, Stalker, Stalker, 120, 20000, 0, 0, 4000, 2, 220, 500, 23, 30, 35, 15, 3, 50, 50, 50, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 @@ -23,10 +23,10 @@ 1102, Luvia, Luvia, 127, 48044, 60, 0, 12172, 5, 339, 364, 50, 92, 1, 29, 55, 255, 255, 255, 31, 30, 1, 0, 69, 181, 220, 1200, 672, 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, 0, 0 1106, WickedMushroom, WickedMushroom, 110, 550, 0, 0, 30, 1, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 800, 1800, 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, 1, 60 //ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength -1114, Nutcracker, Nutcracker, 110, 6000, 0, 0, 769, 1, 81, 281, 20, 42, 40, 20, 10, 5, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 569, 1000, 660, 750, 539, 750, 503, 250, 640, 200, 4004, 200, 4001, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1114, Nutcracker, Nutcracker, 110, 6000, 0, 0, 769, 1, 81, 281, 20, 37, 40, 20, 10, 5, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 569, 1000, 660, 750, 539, 750, 503, 250, 640, 200, 4004, 200, 4001, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1119, Thug, Thug, 170, 5000, 0, 0, 999, 1, 125, 250, 30, 6, 10, 10, 60, 10, 50, 70, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 764, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1120, Swashbuckler, Swashbuckler, 170, 5000, 0, 0, 999, 1, 75, 250, 23, 27, 20, 20, 40, 30, 90, 70, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 622, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1121, Grenadier, Grenadier, 170, 6000, 0, 0, 999, 6, 100, 200, 8, 60, 12, 10, 50, 60, 90, 70, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 765, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 +1120, Swashbuckler, Swashbuckler, 170, 5000, 0, 0, 999, 1, 75, 250, 23, 25, 20, 20, 40, 30, 90, 70, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 622, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 +1121, Grenadier, Grenadier, 170, 6000, 0, 0, 999, 6, 100, 200, 8, 50, 12, 10, 50, 60, 90, 70, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 765, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 1122, DreadPirateMarley, DreadPirateMarley, 180, 10000, 0, 0, 20000, 4, 175, 250, 38, 32, 10, 20, 40, 20, 90, 80, 1, 30, 1, 0, 2, 175, 400, 700, 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 1123, DreadPirateMarleyClone, DreadPirateMarleyClone, 150, 2000, 0, 0, 0, 4, 175, 250, 18, 22, 10, 40, 30, 20, 80, 40, 1, 30, 1, 0, 2, 175, 500, 1200, 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 1126, PsiBrain, PsiBrain, 100, 10000, 0, 0, 4000, 2, 220, 500, 23, 30, 35, 15, 3, 50, 50, 50, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5111, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 @@ -35,11 +35,11 @@ 1129, GeneralTerogan, GeneralTerogan, 140, 40000, 0, 0, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 5130, 1, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50 1130, Moonshroom, Moonshroom, 110, 550, 0, 0, 35, 4, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 800, 1800, 672, 480, 566, 500, 518, 500, 730, 300, 540, 100, 703, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 1132, LavaSlime, LavaSlime, 135, 4144, 0, 6000, 1111, 2, 105, 260, 75, 80, 30, 15, 35, 10, 70, 250, 1, 1, 1, 0, 43, 135, 900, 1300, 672, 100, 904, 10000, 703, 2500, 640, 1000, 701, 1000, 4001, 1000, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 -1133, Anne, Anne, 110, 12000, 0, 1100, 889, 1, 200, 300, 20, 40, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 380, 872, 672, 900, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1133, Anne, Anne, 110, 12000, 0, 1100, 889, 1, 200, 300, 20, 35, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 380, 872, 672, 900, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1134, SUSAN, SUSAN, 255, 696969, 0, 69000, 1400, 1, 0, 0, 69, 69, 69, 69, 69, 69, 69, 69, 1, 1, 1, 0, 29, 161, 1500, 1872, 672, 480, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1135, LovelyMaggot, LovelyMaggot, 1, 50, 0, 1, 1, 1, 69, 6969, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 200, 1872, 672, 480, 505, 400, 501, 70, 518, 200, 533, 75, 502, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 29, 131, 340, 1800, 672, 950, 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, 4, 20 -1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 90, 1, 32, 60, 255, 255, 255, 31, 30, 1, 0, 69, 181, 210, 1200, 672, 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, 0, 0 +1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 70, 1, 32, 60, 255, 255, 255, 31, 30, 1, 0, 69, 181, 210, 1200, 672, 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, 0, 0 //ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength 1138, ManaGuard, ManaGuardian, 180, 20000, 280, 27000, 5000, 2, 280, 324, 22, 67, 31, 22, 90, 127, 255, 95, 31, 30, 1, 0, 69, 181, 210, 1200, 672, 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, 0, 0 1139, Virus, Virus, 170, 5000, 0, 0, 721, 6, 45, 75, 37, 12, 30, 30, 20, 20, 25, 60, 1, 1, 1, 3, 25, 175, 600, 1872, 672, 480, 787, 500, 743, 1100, 5236, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt index d42b4492..8f19b4ec 100644 --- a/world/map/npc/011-1/auldsbel.txt +++ b/world/map/npc/011-1/auldsbel.txt @@ -914,16 +914,16 @@ L_Next7: L_c_quest_5: mes "[Auldsbel the Wizard]"; - mes "\"I do have another assignment for you, but this one will be tricky. I will need fifty grass snake tongues. I believe that this may be just enough life force to return the silkworm back to its original shape.\""; + mes "\"I do have another assignment for you, but this one will be tricky. I will need fourty grass snake tongues. I believe that this may be just enough life force to return the silkworm back to its original shape.\""; next; menu "Here they are.", L_Next8, "That's quite a challenge.", L_main_menu; L_Next8: - if (countitem ("GrassSnakeTongue") < 50) + if (countitem ("GrassSnakeTongue") < 40) goto L_c_quest_missing; - delitem "GrassSnakeTongue", 50; + delitem "GrassSnakeTongue", 40; set Zeny, Zeny + 10000; mes "[Auldsbel the Wizard]"; mes "\"Excellent! Here is 10,000 GP for you, and now let's see how this goes.\""; diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 1ccedec6..51c5762f 100644 --- a/world/map/npc/011-1/shops.txt +++ b/world/map/npc/011-1/shops.txt @@ -5,4 +5,4 @@ //################################################################################# // Shop -011-1,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 +011-1,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1,Tomato:*1 diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index 1c2ff95f..a685be16 100644 --- a/world/map/npc/027-6/general_krukan.txt +++ b/world/map/npc/027-6/general_krukan.txt @@ -200,8 +200,14 @@ OnReward: set @bonus, (BaseLevel/4); set DailyQuestBonus, DailyQuestBonus + @bonus; message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ; + if (BaseLevel < 90) goto L_Bonus; + set BOSS_POINTS, BOSS_POINTS + 20; + message strcharinfo(0), "You gain 20 Boss Points giving you a total of " + BOSS_POINTS + "."; + goto L_End; + +L_Bonus: set BOSS_POINTS, BOSS_POINTS + 25; - message strcharinfo(0), "You gain 25 Boss Points giving you a total of " + BOSS_POINTS + "."; + message strcharinfo(0), "You gain 20+5 Boss Points giving you a total of " + BOSS_POINTS + "."; goto L_End; L_End: diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt index f331d95c..137cb139 100644 --- a/world/map/npc/027-7/general_razha.txt +++ b/world/map/npc/027-7/general_razha.txt @@ -9,7 +9,7 @@ set @RAZHA_SOUL_REQ, 3; set @RAZHA_DISEASED_HEARTS_REQ, 5; - set @RAZHA_UNDEAD_EYE_REQ, 3; + set @RAZHA_UNDEAD_EYE_REQ, 1; set @RAZHA_UNDEAD_EAR_REQ, 2; set @minlevel, 70; @@ -204,8 +204,14 @@ OnReward: set @bonus, (BaseLevel/2); set DailyQuestBonus, DailyQuestBonus + @bonus; message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ; + if (BaseLevel < 100) goto L_Bonus; + set BOSS_POINTS, BOSS_POINTS + 40; + message strcharinfo(0), "You gain 40 Boss Points giving you a total of " + BOSS_POINTS + "."; + goto L_End; + +L_Bonus: set BOSS_POINTS, BOSS_POINTS + 50; - message strcharinfo(0), "You gain 50 Boss Points giving you a total of " + BOSS_POINTS + "."; + message strcharinfo(0), "You gain 40+10 Boss Points giving you a total of " + BOSS_POINTS + "."; goto L_End; L_End: diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt index 522b1eaa..f23bb5c8 100644 --- a/world/map/npc/027-8/general_terogan.txt +++ b/world/map/npc/027-8/general_terogan.txt @@ -9,8 +9,8 @@ set @TEROGAN_SOUL_REQ, 5; set @TEROGAN_ROTTEN_RAGS_REQ, 5; - set @TEROGAN_UNDEAD_EYE_REQ, 3; - set @TEROGAN_UNDEAD_EAR_REQ, 2; + set @TEROGAN_UNDEAD_EYE_REQ, 2; + set @TEROGAN_UNDEAD_EAR_REQ, 3; set @minlevel, 80; mes "[Tome]"; @@ -269,8 +269,14 @@ OnReward: set @bonus, (BaseLevel/2); set DailyQuestBonus, DailyQuestBonus + @bonus; message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ; + if (BaseLevel < 120) goto L_Bonus; + set BOSS_POINTS, BOSS_POINTS + 60; + message strcharinfo(0), "You gain 60 Boss Points giving you a total of " + BOSS_POINTS + "."; + goto L_End; + +L_Bonus: set BOSS_POINTS, BOSS_POINTS + 75; - message strcharinfo(0), "You gain 75 Boss Points giving you a total of " + BOSS_POINTS + "."; + message strcharinfo(0), "You gain 60+15 Boss Points giving you a total of " + BOSS_POINTS + "."; goto L_End; L_End: diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt index 85bd3e2b..64a7b8d2 100644 --- a/world/map/npc/035-2/shops.txt +++ b/world/map/npc/035-2/shops.txt @@ -1,6 +1,6 @@ // -035-2,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,CasinoCoins:*1 +035-2,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,Tomato:*1,CasinoCoins:*1 035-2,23,35,0|script|Bunkmaster Phict|212 { diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index dbfede0d..a5fe6e55 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -9,6 +9,7 @@ function|script|EvilObelisk set @cost_gy2, 3000; set @cost_skull, 2800; set @cost_snake, 2500; + set @cost_keshlam, 10000; menu "Don't pay it anything.", L_Close, @@ -16,7 +17,8 @@ function|script|EvilObelisk "Pay it " + @cost_gy1 + " gold.", L_GRAVEYARD1, "Pay it " + @cost_gy2 + " gold.", L_GRAVEYARD2, "Pay it " + @cost_skull + " gold.", L_SKULL, - "Pay it " + @cost_snake + " gold.", L_SNAKE; + "Pay it " + @cost_snake + " gold.", L_SNAKE, + "Pay it " + @cost_keshlam + " gold.", L_KESHLAM; L_JACKO: if (Zeny < @cost_jacko) @@ -78,6 +80,20 @@ L_SNAKE: set Zeny, Zeny - @cost_snake; goto L_Summon; +L_KESHLAM: + if (Zeny < @cost_keshlam) + goto L_NotEnough; + set @temp, rand(3); + if(@temp == 0) + set @mob_id, 1140; // Tengu + if(@temp == 1) + set @mob_id, 1141; // Sasquatch + if(@temp == 2) + set @mob_id, 1143; // Mana Slayer + set @mob_count, rand(1,3); + set Zeny, Zeny - @cost_keshlam; + goto L_Summon; + L_Summon: areamonster @map$, @x0, @y0, @x1, @y1, "", @mob_id, @mob_count; goto L_Close; @@ -92,6 +108,7 @@ L_Close: set @cost_gy2, 0; set @cost_skull, 0; set @cost_snake, 0; + set @cost_keshlam, 0; return; } diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt index acc3405d..5f10ba5f 100644 --- a/world/map/npc/magic/level2-magic-knuckles.txt +++ b/world/map/npc/magic/level2-magic-knuckles.txt @@ -17,7 +17,7 @@ BASE_ATK, // dmg ((@spellpower/10) + ((Dex * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels) (sqrt(300 - (Agi * 2)) + (5/2)), // delay - Agi, // dmg bonus + (Agi + Int) / 2, // dmg bonus (((BaseLevel/5) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str callfunc "magic_exp"; goto L_FreeRecast; -- cgit v1.2.3-60-g2f50