General Nerf + Misc Changes (#608)

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._

8 files changed, 48 insertions, 13 deletions

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;