Core/Misc: Rename _2 skillline definitions to _CLASSIC

Port From (https://github.com/TrinityCore/TrinityCore/commit/79be716e632507d6474b980c0ce092b4f5ae66ba)
This commit is contained in:
hondacrx
2023-02-12 01:13:52 -05:00
parent d8cdf211ea
commit b460536e35
3 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -360,7 +360,7 @@ namespace Framework.Constants
case LockType.LumberMill: case LockType.LumberMill:
return SkillType.Logging; return SkillType.Logging;
case LockType.ClassicHerbalism: case LockType.ClassicHerbalism:
return SkillType.Herbalism2; return SkillType.ClassicHerbalism;
case LockType.OutlandHerbalism: case LockType.OutlandHerbalism:
return SkillType.OutlandHerbalism; return SkillType.OutlandHerbalism;
case LockType.NorthrendHerbalism: case LockType.NorthrendHerbalism:
@@ -376,7 +376,7 @@ namespace Framework.Constants
case LockType.KulTiranHerbalism: case LockType.KulTiranHerbalism:
return SkillType.KulTiranHerbalism; return SkillType.KulTiranHerbalism;
case LockType.ClassicMining: case LockType.ClassicMining:
return SkillType.Mining2; return SkillType.ClassicMining;
case LockType.OutlandMining: case LockType.OutlandMining:
return SkillType.OutlandMining; return SkillType.OutlandMining;
case LockType.NorthrendMining: case LockType.NorthrendMining:
+11 -11
View File
@@ -210,7 +210,7 @@ namespace Framework.Constants
CataclysmBlacksmithing = 2474, CataclysmBlacksmithing = 2474,
NorthrendBlacksmithing = 2475, NorthrendBlacksmithing = 2475,
OutlandBlacksmithing = 2476, OutlandBlacksmithing = 2476,
Blacksmithing2 = 2477, ClassicBlacksmithing = 2477,
KulTiranAlchemy = 2478, KulTiranAlchemy = 2478,
LegionAlchemy = 2479, LegionAlchemy = 2479,
DraenorAlchemy = 2480, DraenorAlchemy = 2480,
@@ -218,7 +218,7 @@ namespace Framework.Constants
CataclysmAlchemy = 2482, CataclysmAlchemy = 2482,
NorthrendAlchemy = 2483, NorthrendAlchemy = 2483,
OutlandAlchemy = 2484, OutlandAlchemy = 2484,
Alchemy2 = 2485, ClassicAlchemy = 2485,
KulTiranEnchanting = 2486, KulTiranEnchanting = 2486,
LegionEnchanting = 2487, LegionEnchanting = 2487,
DraenorEnchanting = 2488, DraenorEnchanting = 2488,
@@ -234,7 +234,7 @@ namespace Framework.Constants
CataclysmEngineering = 2503, CataclysmEngineering = 2503,
NorthrendEngineering = 2504, NorthrendEngineering = 2504,
OutlandEngineering = 2505, OutlandEngineering = 2505,
Engineering2 = 2506, ClassicEngineering = 2506,
KulTiranInscription = 2507, KulTiranInscription = 2507,
LegionInscription = 2508, LegionInscription = 2508,
DraenorInscription = 2509, DraenorInscription = 2509,
@@ -242,7 +242,7 @@ namespace Framework.Constants
CataclysmInscription = 2511, CataclysmInscription = 2511,
NorthrendInscription = 2512, NorthrendInscription = 2512,
OutlandInscription = 2513, OutlandInscription = 2513,
Inscription2 = 2514, ClassicInscription = 2514,
KulTiranJewelcrafting = 2517, KulTiranJewelcrafting = 2517,
LegionJewelcrafting = 2518, LegionJewelcrafting = 2518,
DraenorJewelcrafting = 2519, DraenorJewelcrafting = 2519,
@@ -250,7 +250,7 @@ namespace Framework.Constants
CataclysmJewelcrafting = 2521, CataclysmJewelcrafting = 2521,
NorthrendJewelcrafting = 2522, NorthrendJewelcrafting = 2522,
OutlandJewelcrafting = 2523, OutlandJewelcrafting = 2523,
Jewelcrafting2 = 2524, ClassicJewelcrafting = 2524,
KulTiranLeatherworking = 2525, KulTiranLeatherworking = 2525,
LegionLeatherworking = 2526, LegionLeatherworking = 2526,
DraenorLeatherworking = 2527, DraenorLeatherworking = 2527,
@@ -258,7 +258,7 @@ namespace Framework.Constants
CataclysmLeatherworking = 2529, CataclysmLeatherworking = 2529,
NorthrendLeatherworking = 2530, NorthrendLeatherworking = 2530,
OutlandLeatherworking = 2531, OutlandLeatherworking = 2531,
Leatherworking2 = 2532, ClassicLeatherworking = 2532,
KulTiranTailoring = 2533, KulTiranTailoring = 2533,
LegionTailoring = 2534, LegionTailoring = 2534,
DraenorTailoring = 2535, DraenorTailoring = 2535,
@@ -266,7 +266,7 @@ namespace Framework.Constants
CataclysmTailoring = 2537, CataclysmTailoring = 2537,
NorthrendTailoring = 2538, NorthrendTailoring = 2538,
OutlandTailoring = 2539, OutlandTailoring = 2539,
Tailoring2 = 2540, ClassicTailoring = 2540,
KulTiranCooking = 2541, KulTiranCooking = 2541,
LegionCooking = 2542, LegionCooking = 2542,
DraenorCooking = 2543, DraenorCooking = 2543,
@@ -274,7 +274,7 @@ namespace Framework.Constants
CataclysmCooking = 2545, CataclysmCooking = 2545,
NorthrendCooking = 2546, NorthrendCooking = 2546,
OutlandCooking = 2547, OutlandCooking = 2547,
Cooking2 = 2548, ClassicCooking = 2548,
KulTiranHerbalism = 2549, KulTiranHerbalism = 2549,
LegionHerbalism = 2550, LegionHerbalism = 2550,
DraenorHerbalism = 2551, DraenorHerbalism = 2551,
@@ -282,7 +282,7 @@ namespace Framework.Constants
CataclysmHerbalism = 2553, CataclysmHerbalism = 2553,
NorthrendHerbalism = 2554, NorthrendHerbalism = 2554,
OutlandHerbalism = 2555, OutlandHerbalism = 2555,
Herbalism2 = 2556, ClassicHerbalism = 2556,
KulTiranSkinning = 2557, KulTiranSkinning = 2557,
LegionSkinning = 2558, LegionSkinning = 2558,
DraenorSkinning = 2559, DraenorSkinning = 2559,
@@ -290,7 +290,7 @@ namespace Framework.Constants
CataclysmSkinning = 2561, CataclysmSkinning = 2561,
NorthrendSkinning = 2562, NorthrendSkinning = 2562,
OutlandSkinning = 2563, OutlandSkinning = 2563,
Skinning2 = 2564, ClassicSkinning = 2564,
KulTiranMining = 2565, KulTiranMining = 2565,
LegionMining = 2566, LegionMining = 2566,
DraenorMining = 2567, DraenorMining = 2567,
@@ -298,7 +298,7 @@ namespace Framework.Constants
CataclysmMining = 2569, CataclysmMining = 2569,
NorthrendMining = 2570, NorthrendMining = 2570,
OutlandMining = 2571, OutlandMining = 2571,
Mining2 = 2572, ClassicMining = 2572,
KulTiranFishing = 2585, KulTiranFishing = 2585,
LegionFishing = 2586, LegionFishing = 2586,
DraenorFishing = 2587, DraenorFishing = 2587,
+3 -3
View File
@@ -1279,7 +1279,7 @@ namespace Game.Entities
switch (SkillId) switch (SkillId)
{ {
case SkillType.Herbalism: case SkillType.Herbalism:
case SkillType.Herbalism2: case SkillType.ClassicHerbalism:
case SkillType.OutlandHerbalism: case SkillType.OutlandHerbalism:
case SkillType.NorthrendHerbalism: case SkillType.NorthrendHerbalism:
case SkillType.CataclysmHerbalism: case SkillType.CataclysmHerbalism:
@@ -1291,7 +1291,7 @@ namespace Game.Entities
case SkillType.Inscription: case SkillType.Inscription:
return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, grayLevel, greenLevel, yellowLevel) * (int)Multiplicator, gathering_skill_gain); return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, grayLevel, greenLevel, yellowLevel) * (int)Multiplicator, gathering_skill_gain);
case SkillType.Skinning: case SkillType.Skinning:
case SkillType.Skinning2: case SkillType.ClassicSkinning:
case SkillType.OutlandSkinning: case SkillType.OutlandSkinning:
case SkillType.NorthrendSkinning: case SkillType.NorthrendSkinning:
case SkillType.CataclysmSkinning: case SkillType.CataclysmSkinning:
@@ -1304,7 +1304,7 @@ namespace Game.Entities
else else
return UpdateSkillPro(SkillId, (int)(SkillGainChance(SkillValue, grayLevel, greenLevel, yellowLevel) * Multiplicator) >> (int)(SkillValue / WorldConfig.GetIntValue(WorldCfg.SkillChanceSkinningSteps)), gathering_skill_gain); return UpdateSkillPro(SkillId, (int)(SkillGainChance(SkillValue, grayLevel, greenLevel, yellowLevel) * Multiplicator) >> (int)(SkillValue / WorldConfig.GetIntValue(WorldCfg.SkillChanceSkinningSteps)), gathering_skill_gain);
case SkillType.Mining: case SkillType.Mining:
case SkillType.Mining2: case SkillType.ClassicMining:
case SkillType.OutlandMining: case SkillType.OutlandMining:
case SkillType.NorthrendMining: case SkillType.NorthrendMining:
case SkillType.CataclysmMining: case SkillType.CataclysmMining: