diff --git a/common/ruletypes.h b/common/ruletypes.h index 0567a5743..7ee004d1c 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -130,17 +130,17 @@ RULE_INT(Character, BaseRunSpeedCap, 158, "Base Run Speed Cap, on live it's 158% RULE_INT(Character, OrnamentationAugmentType, 20, "Ornamentation Augment Type") RULE_REAL(Character, EnvironmentDamageMulipliter, 1, "Multiplier for environmental damage like fall damage.") RULE_BOOL(Character, UnmemSpellsOnDeath, true, "Setting whether at death all memorized Spells are forgotten") -RULE_INT(Character, TradeskillUpAlchemy, 2, "Alchemy skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpBaking, 2, "Baking skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpBlacksmithing, 2, "Blacksmithing skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpBrewing, 3, "Brewing skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpFletching, 2, "Fletching skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpJewelcrafting, 2, "Jewelcrafting skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpMakePoison, 2, "Make Poison skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpPottery, 4, "Pottery skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpResearch, 1, "Research skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpTinkering, 2, "Tinkering skillup rate adjustment. Lower is faster") -RULE_INT(Character, TradeskillUpTailoring, 2, "Tailoring skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpAlchemy, 2.0, "Alchemy skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpBaking, 2.0, "Baking skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpBlacksmithing, 2.0, "Blacksmithing skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpBrewing, 3.0, "Brewing skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpFletching, 2.0, "Fletching skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpJewelcrafting, 2.0, "Jewelcrafting skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpMakePoison, 2.0, "Make Poison skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpPottery, 4.0, "Pottery skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpResearch, 1.0, "Research skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpTinkering, 2.0, "Tinkering skillup rate adjustment. Lower is faster") +RULE_REAL(Character, TradeskillUpTailoring, 2.0, "Tailoring skillup rate adjustment. Lower is faster") RULE_BOOL(Character, MarqueeHPUpdates, false, "Will show health percentage in center of screen if health lesser than 100%") RULE_INT(Character, IksarCommonTongue, 95, "Starting value for Common Tongue for Iksars") RULE_INT(Character, OgreCommonTongue, 95, "Starting value for Common Tongue for Ogres") diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 1d3f95be0..26bcb6843 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -947,37 +947,37 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { // Remember: skillup_modifier is (float). Lower is better switch(spec->tradeskill) { case EQ::skills::SkillFletching: - skillup_modifier = RuleI(Character, TradeskillUpFletching); + skillup_modifier = RuleR(Character, TradeskillUpFletching); break; case EQ::skills::SkillAlchemy: - skillup_modifier = RuleI(Character, TradeskillUpAlchemy); + skillup_modifier = RuleR(Character, TradeskillUpAlchemy); break; case EQ::skills::SkillJewelryMaking: - skillup_modifier = RuleI(Character, TradeskillUpJewelcrafting); + skillup_modifier = RuleR(Character, TradeskillUpJewelcrafting); break; case EQ::skills::SkillPottery: - skillup_modifier = RuleI(Character, TradeskillUpPottery); + skillup_modifier = RuleR(Character, TradeskillUpPottery); break; case EQ::skills::SkillBaking: - skillup_modifier = RuleI(Character, TradeskillUpBaking); + skillup_modifier = RuleR(Character, TradeskillUpBaking); break; case EQ::skills::SkillBrewing: - skillup_modifier = RuleI(Character, TradeskillUpBrewing); + skillup_modifier = RuleR(Character, TradeskillUpBrewing); break; case EQ::skills::SkillBlacksmithing: - skillup_modifier = RuleI(Character, TradeskillUpBlacksmithing); + skillup_modifier = RuleR(Character, TradeskillUpBlacksmithing); break; case EQ::skills::SkillResearch: - skillup_modifier = RuleI(Character, TradeskillUpResearch); + skillup_modifier = RuleR(Character, TradeskillUpResearch); break; case EQ::skills::SkillMakePoison: - skillup_modifier = RuleI(Character, TradeskillUpMakePoison); + skillup_modifier = RuleR(Character, TradeskillUpMakePoison); break; case EQ::skills::SkillTinkering: - skillup_modifier = RuleI(Character, TradeskillUpTinkering); + skillup_modifier = RuleR(Character, TradeskillUpTinkering); break; case EQ::skills::SkillTailoring: - skillup_modifier = RuleI(Character, TradeskillUpTailoring); + skillup_modifier = RuleR(Character, TradeskillUpTailoring); break; default: skillup_modifier = 2;