Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Update SkillLine and LockType definitions (Dragonflight)

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0748986835deb03d37e88ec637aa5d27b2269540)
This commit is contained in:
hondacrx
2023-03-13 02:55:46 -04:00
parent 138d0d2ed4
commit 383ca52a00
3 changed files with 96 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/CliDBConst.cs
+24 -5
View File
@@ -1644,17 +1644,36 @@ namespace Framework.Constants
DraenorMining = 45, DraenorMining = 45,
LegionMining = 46, LegionMining = 46,
KulTiranMining = 47, KulTiranMining = 47,
Skinning2 = 48, LegionSkinning = 48,
Open2 = 149, OpenItem = 149,
Foraging = 150, Foraging = 150,
JellyDeposit = 152, JellyDeposit = 152,
ShadowlandHerbalism = 153, ShadowlandsHerbalism = 153,
ShadowlandMining = 155, ShadowlandsMining = 155,
CovenantNightFae = 157, CovenantNightFae = 157,
CovenantVenthyr = 158, CovenantVenthyr = 158,
CovenantKyrian = 159, CovenantKyrian = 159,
CovenantNecrolord = 160, CovenantNecrolord = 160,
ProfessionEngineering = 161 Engineering = 161,
DragonIslesHerbalism = 162,
Mining2 = 163,
ElusiveHerbalism = 166,
ElusiveMining = 167,
Enchanting = 169,
DragonIslesTreasure = 170,
DragonIslesAlchemy25 = 172,
DragonIslesBlacksmithing25 = 173,
DragonIslesEnchanting25 = 174,
DragonIslesEngineering25 = 175,
DragonIslesHerbalism25 = 176,
DragonIslesInscription25 = 177,
DragonIslesJewelcrafting25 = 178,
DragonIslesLeatherworking25 = 179,
DragonIslesMining25 = 180,
DragonIslesSkinning25 = 181,
DragonIslesTailoring25 = 182,
OpenKneelingPlant = 186,
DragonIslesMining = 188
} }
public enum MapTypes : byte public enum MapTypes : byte
Source/Framework/Constants/SharedConst.cs
+48 -50
View File
@@ -314,6 +314,7 @@ namespace Framework.Constants
return SpellSchools.Normal; return SpellSchools.Normal;
} }
public static SkillType SkillByQuestSort(int sort) public static SkillType SkillByQuestSort(int sort)
{ {
switch ((QuestSort)sort) switch ((QuestSort)sort)
@@ -343,57 +344,54 @@ namespace Framework.Constants
} }
return SkillType.None; return SkillType.None;
} }
public static SkillType SkillByLockType(LockType locktype)
public static SkillType SkillByLockType(LockType locktype) => locktype switch
{ {
switch (locktype) LockType.Herbalism or LockType.ElusiveHerbalism => SkillType.Herbalism,
{ LockType.Mining or LockType.Mining2 or LockType.ElusiveMining => SkillType.Mining,
case LockType.Herbalism: LockType.Fishing => SkillType.Fishing,
return SkillType.Herbalism; LockType.Inscription => SkillType.Inscription,
case LockType.Mining: LockType.Archaeology => SkillType.Archaeology,
return SkillType.Mining; LockType.LumberMill => SkillType.Logging,
case LockType.Fishing: LockType.Skinning => SkillType.Skinning,
return SkillType.Fishing; LockType.ClassicHerbalism => SkillType.ClassicHerbalism,
case LockType.Inscription: LockType.OutlandHerbalism => SkillType.OutlandHerbalism,
return SkillType.Inscription; LockType.NorthrendHerbalism => SkillType.NorthrendHerbalism,
case LockType.Archaeology: LockType.CataclysmHerbalism => SkillType.CataclysmHerbalism,
return SkillType.Archaeology; LockType.PandariaHerbalism => SkillType.PandariaHerbalism,
case LockType.LumberMill: LockType.DraenorHerbalism => SkillType.DraenorHerbalism,
return SkillType.Logging; LockType.LegionHerbalism => SkillType.LegionHerbalism,
case LockType.ClassicHerbalism: LockType.KulTiranHerbalism => SkillType.KulTiranHerbalism,
return SkillType.ClassicHerbalism; LockType.ClassicMining => SkillType.ClassicMining,
case LockType.OutlandHerbalism: LockType.OutlandMining => SkillType.OutlandMining,
return SkillType.OutlandHerbalism; LockType.NorthrendMining => SkillType.NorthrendMining,
case LockType.NorthrendHerbalism: LockType.CataclysmMining => SkillType.CataclysmMining,
return SkillType.NorthrendHerbalism; LockType.PandariaMining => SkillType.PandariaMining,
case LockType.CataclysmHerbalism: LockType.DraenorMining => SkillType.DraenorMining,
return SkillType.CataclysmHerbalism; LockType.LegionMining => SkillType.LegionMining,
case LockType.PandariaHerbalism: LockType.KulTiranMining => SkillType.KulTiranMining,
return SkillType.PandariaHerbalism; LockType.LegionSkinning => SkillType.LegionSkinning,
case LockType.DraenorHerbalism: LockType.ShadowlandsHerbalism => SkillType.ShadowlandsHerbalism,
return SkillType.DraenorHerbalism; LockType.ShadowlandsMining => SkillType.ShadowlandsMining,
case LockType.LegionHerbalism: LockType.CovenantNightFae => SkillType.CovenantNightFae,
return SkillType.LegionHerbalism; LockType.CovenantVenthyr => SkillType.CovenantVenthyr,
case LockType.KulTiranHerbalism: LockType.CovenantKyrian => SkillType.CovenantKyrian,
return SkillType.KulTiranHerbalism; LockType.CovenantNecrolord => SkillType.CovenantNecrolord,
case LockType.ClassicMining: LockType.Engineering => SkillType.Engineering,
return SkillType.ClassicMining; LockType.DragonIslesHerbalism or LockType.DragonIslesHerbalism25 => SkillType.DragonIslesHerbalism,
case LockType.OutlandMining: LockType.Enchanting => SkillType.Enchanting,
return SkillType.OutlandMining; LockType.DragonIslesAlchemy25 => SkillType.DragonIslesAlchemy,
case LockType.NorthrendMining: LockType.DragonIslesBlacksmithing25 => SkillType.DragonIslesBlacksmithing,
return SkillType.NorthrendMining; LockType.DragonIslesEnchanting25 => SkillType.DragonIslesEnchanting,
case LockType.CataclysmMining: LockType.DragonIslesEngineering25 => SkillType.DragonIslesEngineering,
return SkillType.CataclysmMining; LockType.DragonIslesInscription25 => SkillType.DragonIslesInscription,
case LockType.PandariaMining: LockType.DragonIslesJewelcrafting25 => SkillType.DragonIslesJewelcrafting,
return SkillType.PandariaMining; LockType.DragonIslesLeatherworking25 => SkillType.DragonIslesLeatherworking,
case LockType.DraenorMining: LockType.DragonIslesSkinning25 => SkillType.DragonIslesSkinning,
return SkillType.DraenorMining; LockType.DragonIslesTailoring25 => SkillType.DragonIslesTailoring,
case LockType.LegionMining: LockType.DragonIslesMining or LockType.DragonIslesMining25 => SkillType.DragonIslesMining,
return SkillType.LegionMining; _ => SkillType.None
case LockType.KulTiranMining: };
return SkillType.KulTiranMining;
}
return SkillType.None;
}
public static bool IsValidLocale(Locale locale) public static bool IsValidLocale(Locale locale)
{ {
Source/Framework/Constants/Spells/SkillConst.cs
+24 -1
View File
@@ -306,7 +306,7 @@ namespace Framework.Constants
CataclysmFishing = 2589, CataclysmFishing = 2589,
NorthrendFishing = 2590, NorthrendFishing = 2590,
OutlandFishing = 2591, OutlandFishing = 2591,
Fishing2 = 2592, ClassicFishing = 2592,
RacialDarkIronDwarf = 2597, RacialDarkIronDwarf = 2597,
RacialMagHarOrc = 2598, RacialMagHarOrc = 2598,
PetLizard = 2703, PetLizard = 2703,
@@ -320,6 +320,10 @@ namespace Framework.Constants
RacialZandalariTroll = 2721, RacialZandalariTroll = 2721,
RacialKulTiran = 2723, RacialKulTiran = 2723,
AzeritePower = 2727, AzeritePower = 2727,
CovenantKyrian = 2730,
CovenantVenthyr = 2731,
CovenantNightFae = 2732,
CovenantNecrolord = 2733,
MountEquipement = 2734, MountEquipement = 2734,
ShadowlandsAlchemy = 2750, ShadowlandsAlchemy = 2750,
ShadowlandsBlacksmithing = 2751, ShadowlandsBlacksmithing = 2751,
@@ -344,9 +348,28 @@ namespace Framework.Constants
PetMammoth = 2805, PetMammoth = 2805,
PetCourser = 2806, PetCourser = 2806,
PetCamel = 2807, PetCamel = 2807,
RacialDracthyr = 2808,
Evoker = 2810,
StygiaCrafting = 2811, StygiaCrafting = 2811,
LanguageCypher = 2817, LanguageCypher = 2817,
PhotoformSynthesis = 2819, PhotoformSynthesis = 2819,
ArcanaManipulation = 2821,
DragonIslesBlacksmithing = 2822,
DragonIslesAlchemy = 2823,
DragonIslesCooking = 2824,
DragonIslesEnchanting = 2825,
DragonIslesFishing = 2826,
DragonIslesEngineering = 2827,
DragonIslesInscription = 2828,
DragonIslesJewelcrafting = 2829,
DragonIslesLeatherworking = 2830,
DragonIslesTailoring = 2831,
DragonIslesHerbalism = 2832,
DragonIslesMining = 2833,
DragonIslesSkinning = 2834,
Crafting = 2846,
TuskarrFishingGear = 2847,
PetLesserDragonkin = 2850
} }
public enum SkillState public enum SkillState