From c4a7acb6d1768d5c25af3504b5a8d6acfaf5e500 Mon Sep 17 00:00:00 2001
From: N0ctrnl <kurt@Gilpin.info>
Date: Wed, 25 Mar 2015 12:04:03 -0500
Subject: [PATCH] Update tradeskills.cpp

---
 zone/tradeskills.cpp | 53 +++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp
index 07ae6d2a5..15cf45e20 100644
--- a/zone/tradeskills.cpp
+++ b/zone/tradeskills.cpp
@@ -848,24 +848,41 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 	// Some tradeskills are more eqal then others. ;-)
 	// If you want to customize the stage1 success rate do it here.
 	// Remember: skillup_modifier is (float). Lower is better
-	switch(spec->tradeskill) {
-	case SkillFletching:
-	case SkillAlchemy:
-	case SkillJewelryMaking:
-	case SkillPottery:
-		skillup_modifier = 4;
-		break;
-	case SkillBaking:
-	case SkillBrewing:
-		skillup_modifier = 3;
-		break;
-	case SkillResearch:
-		skillup_modifier = 1;
-		break;
-	default:
-		skillup_modifier = 2;
-		break;
-	}
+        switch(spec->tradeskill) {
+        case SkillFletching:
+                skillup_modifier = RuleI(Character, TradeskillUpFletching);
+                break;
+        case SkillAlchemy:
+                skillup_modifier = RuleI(Character, TradeskillUpAlchemy);
+                break;
+        case SkillJewelryMaking:
+                skillup_modifier = RuleI(Character, TradeskillUpJewelcrafting);
+                break;
+        case SkillPottery:
+                skillup_modifier = RuleI(Character, TradeskillUpPottery);
+                break;
+        case SkillBaking:
+                skillup_modifier = RuleI(Character, TradeskillUpBaking);
+                break;
+        case SkillBrewing:
+                skillup_modifier = RuleI(Character, TradeskillUpBrewing);
+                break;
+        case SkillBlacksmithing:
+                skillup_modifier = RuleI(Character, TradeskillUpBlacksmithing);
+                break;
+        case SkillResearch:
+                skillup_modifier = RuleI(Character, TradeskillUpResearch);
+                break;
+        case SkillMakePoison:
+                skillup_modifier = RuleI(Character, TradeskillUpMakePoison);
+                break;
+        case SkillTinkering:
+                skillup_modifier = RuleI(Character, TradeskillUpTinkering);
+                break;
+        default:
+                skillup_modifier = 2;
+                break;
+        }
 
 	// Some tradeskills take the higher of one additional stat beside INT and WIS
 	// to determine the skillup rate. Additionally these tradeskills do not have an