Some nerfs players asked me to do, regarding splash, options, and drops

Well, some of these don't count as nerfs but whatever.

6 files changed, 17 insertions, 7 deletions

diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
index 193017e2f..b9eaa2ce1 100644
--- a/conf/map/battle/drops.conf
+++ b/conf/map/battle/drops.conf
@@ -153,7 +153,7 @@ drops_by_luk: 0
 // BETA PATCH: 100 luck and 4% drop rate (Std): 12% Drop Rate (3x more)
 // BETA PATCH: With only 50 luck you'll have double drop rates for everything
 // BETA PATCH: Each luck adds 1.65% drop rates - 2x at 60 and 3x at 121
-drops_by_luk2: 165
+drops_by_luk2: 160
 
 // Whether or not Marine Spheres and Floras summoned by Alchemist drop items?
 // This setting has three available values:
diff --git a/db/constants.conf b/db/constants.conf
index 3a5de2d65..20814d94d 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2437,8 +2437,9 @@ constants_db: {
 	PCBLOCK_HARD: 255   // Move+Attack+Skill+Item+Chat+Immune+SitStand+Commands
 	PCBLOCK_SOFT: 47    // Move+Attack+Skill+Item+Immune
 	CRAFT_MAXLV1: 200   // Moubootaur cap
-	CRAFT_MAXLV2: 100   // Monster King cap
-	CRAFT_MAXLV3: 50    // Fires of Steam cap
+	CRAFT_MAXLV2: 150   // Monster King cap
+	CRAFT_MAXLV3: 100   // Fires of Steam cap
+	CRAFT_MAXLV4: 50    // Town Siege cap
 	BCONFN_SPAWN: 70
 	BCONFD_SPAWN: 100
 	BCONFN_MOBHP: 95 // TODO: Maybe we don't want this constant? (ie. variable)
diff --git a/db/item_options.conf b/db/item_options.conf
index 542ca4097..7b1b314b0 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -1055,7 +1055,7 @@ item_options_db: (
 {
 	Id: 187
 	Name: "IOPT_SPLASHDAMAGE"
-	Script: <" bonus(bSplashAddRange, getequippedoptioninfo(IT_OPT_VALUE)); bonus(bAtkRate, -20); ">
+	Script: <" bonus(bSplashAddRange, getequippedoptioninfo(IT_OPT_VALUE)); bonus(bAtkRate, -20); bonus2(bExpAddRace, RC_All, -3); bonus(bCrit, -1); ">
 },
 {
 	Id: 188
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index cb0249191..b721e0963 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8864,6 +8864,7 @@ item_db: (
 	Script: <"
 		bonus bSplashAddRange, 1; // Stackable!
 		bonus bAtkRate, -15; // The canon value is -20%
+		//bonus2(bExpAddRace, RC_All, -3); // Lower EXP Gain
 	">
 	OnUnequipScript: <"
 		callfunc "item_consumption", 2303;
diff --git a/npc/craft/options.txt b/npc/craft/options.txt
index ce0658617..689b677b4 100644
--- a/npc/craft/options.txt
+++ b/npc/craft/options.txt
@@ -410,8 +410,13 @@ function	script	csys_Multiplier	{
 // Use getiteminfo before
 // csys_ArmorFix( item{, perfect=False} )
 function	script	csys_ArmorFix	{
+    // Calculate the rare bonus chance
+    if (playerattached())
+        .@chance = limit(5, (1+CRAFTSYS[CRGROUP_FINAL]) / 2, 30);
+    else
+        .@chance = 5;
     // Rare bonus
-    if (rand2(100) >= 5 && !getarg(1, false))
+    if (rand2(100) >= .@chance && !getarg(1, false))
         array_remove(@csys_attr, IOPT_SPLASHDAMAGE);
 
     // Sublevel
@@ -1115,10 +1120,12 @@ function	script	csysGUI_RaiseOpt	{
     // Check the current skill cap
     if ($GAME_STORYLINE >= 5)
         .@mx = CRAFT_MAXLV1;
-    else if ($GAME_STORYLINE >= 4)
+    else if ($FIRESOFSTEAM >= 10)
         .@mx = CRAFT_MAXLV2;
-    else
+    else if ($GAME_STORYLINE >= 4)
         .@mx = CRAFT_MAXLV3;
+    else
+        .@mx = CRAFT_MAXLV4;
     // Check if you can upgrade the skill
     if (csysGUI_OptReq(.@sk)) {
         if (.@lv > .@mx) {
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index f8334cdc5..399d6ed97 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -1330,6 +1330,7 @@ function	script	HUB_PCBonus	{
     }
     if (PCBONUS & PCB_SPLASHMASTER) {
         bonus bSplashRange, 1;
+        //bonus2 bExpAddRace, RC_All, -2; // Nullify the EXP bonus?
     }
     if (PCBONUS & PCB_RANGEMASTER) {
         bonus bAtkRange, 1;