Merge pull request #3332 from guilherme-gm/rebalance-ws

Mastersmith skill rebalance - 2018 patch/renewal

Author: MishimaHaruna

db/pre-re/skill_db.conf

@@ -15094,7 +15094,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
+	SkillData1: 180_000 // Duration of SC_OVERTHRUSTMAX (in milliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: 15

db/re/skill_db.conf

@@ -15194,7 +15194,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
+	SkillData1: 180_000 // Duration of SC_OVERTHRUSTMAX (in milliseconds)
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: 15

src/map/skill.c

@@ -2405,11 +2405,11 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl
 				if(sc->data[SC_GIANTGROWTH])
 					rate += 10;
 #ifndef RENEWAL
-				if(sc->data[SC_OVERTHRUST])
+				if(sc->data[SC_OVERTHRUST] != NULL)
 					rate += 10;
-#endif
-				if(sc->data[SC_OVERTHRUSTMAX])
+				if(sc->data[SC_OVERTHRUSTMAX] != NULL)
 					rate += 10;
+#endif
 			}
 			if( rate )
 				skill->break_equip(src, EQP_WEAPON, rate, BCT_SELF);