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