Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Remove unsupported classes

Browse Source
This commit is contained in:
funjoker
2025-05-14 10:37:15 +02:00
parent 86d21d26e7
commit 7cbcf93646
6 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/DataStores/DB2Stores.cpp
View File

@@ -2237,8 +2237,6 @@ int32 DB2Manager::GetNumTalentsAtLevel(uint32 level, Classes playerClass)
{
case CLASS_DEATH_KNIGHT:
return numTalentsAtLevel->NumTalentsDeathKnight;
case CLASS_DEMON_HUNTER:
return numTalentsAtLevel->NumTalentsDemonHunter;
default:
return numTalentsAtLevel->NumTalents;
}

4
src/server/game/DataStores/GameTables.h
View File

@@ -321,8 +321,6 @@ inline float GetGameTableColumnForClass(T const* row, int32 class_)
return row->Mage;
case CLASS_WARLOCK:
return row->Warlock;
case CLASS_MONK:
return row->Monk;
case CLASS_DRUID:
return row->Druid;
default:
@@ -354,8 +352,6 @@ inline float GetSpellScalingColumnForClass(GtSpellScalingEntry const* row, int32
return row->Mage;
case CLASS_WARLOCK:
return row->Warlock;
case CLASS_MONK:
return row->Monk;
case CLASS_DRUID:
return row->Druid;
case -1:

2
src/server/game/Entities/Player/CollectionMgr.cpp
View File

@@ -577,7 +577,7 @@ uint32 const PlayerClassByArmorSubclass[MAX_ITEM_SUBCLASS_ARMOR] =
{
CLASSMASK_ALL_PLAYABLE, //ITEM_SUBCLASS_ARMOR_MISCELLANEOUS
(1 << (CLASS_PRIEST - 1)) | (1 << (CLASS_MAGE - 1)) | (1 << (CLASS_WARLOCK - 1)), //ITEM_SUBCLASS_ARMOR_CLOTH
(1 << (CLASS_ROGUE - 1)) | (1 << (CLASS_MONK - 1)) | (1 << (CLASS_DRUID - 1)) | (1 << (CLASS_DEMON_HUNTER - 1)), //ITEM_SUBCLASS_ARMOR_LEATHER
(1 << (CLASS_ROGUE - 1)) | (1 << (CLASS_DRUID - 1)), //ITEM_SUBCLASS_ARMOR_LEATHER
(1 << (CLASS_HUNTER - 1)) | (1 << (CLASS_SHAMAN - 1)), //ITEM_SUBCLASS_ARMOR_MAIL
(1 << (CLASS_WARRIOR - 1)) | (1 << (CLASS_PALADIN - 1)) | (1 << (CLASS_DEATH_KNIGHT - 1)), //ITEM_SUBCLASS_ARMOR_PLATE
CLASSMASK_ALL_PLAYABLE, //ITEM_SUBCLASS_ARMOR_BUCKLER

2
src/server/game/Entities/Player/Player.cpp
View File

@@ -23773,7 +23773,7 @@ void Player::LearnSkillRewardedSpells(uint32 skillId, uint32 skillValue, Races r
// riding special cases
if (skillId == SKILL_RIDING)
{
if (GetClassMask() & ((1 << (CLASS_DEATH_KNIGHT - 1)) | (1 << (CLASS_DEMON_HUNTER - 1)))
if (GetClassMask() & ((1 << (CLASS_DEATH_KNIGHT - 1)))
&& (ability->Spell == SPELL_APPRENTICE_RIDING || ability->Spell == SPELL_JOURNEYMAN_RIDING))
requiredLevel = 0;
}

10
src/server/game/Miscellaneous/SharedDefines.h
View File

@@ -154,11 +154,7 @@ enum Classes : uint8
CLASS_SHAMAN = 7, // TITLE Shaman
CLASS_MAGE = 8, // TITLE Mage
CLASS_WARLOCK = 9, // TITLE Warlock
CLASS_MONK = 10, // TITLE Monk
CLASS_DRUID = 11, // TITLE Druid
CLASS_DEMON_HUNTER = 12, // TITLE Demon Hunter
CLASS_EVOKER = 13, // TITLE Evoker
CLASS_ADVENTURER = 14 // TITLE Adventurer
};
// max+1 for player class
@@ -174,10 +170,7 @@ enum Classes : uint8
(1<<(CLASS_SHAMAN-1)) | \
(1<<(CLASS_MAGE-1)) | \
(1<<(CLASS_WARLOCK-1)) | \
(1<<(CLASS_MONK-1)) | \
(1<<(CLASS_DRUID-1)) | \
(1<<(CLASS_DEMON_HUNTER-1)) | \
(1<<(CLASS_EVOKER-1)))
(1<<(CLASS_DRUID-1)))
enum PlayerSpecializations : uint8
{
@@ -5543,7 +5536,6 @@ constexpr uint8 ClassByQuestSort(int32 QuestSort)
case QUEST_SORT_PRIEST: return CLASS_PRIEST;
case QUEST_SORT_DRUID: return CLASS_DRUID;
case QUEST_SORT_DEATH_KNIGHT: return CLASS_DEATH_KNIGHT;
case QUEST_SORT_DEMON_HUNTER: return CLASS_DEMON_HUNTER;
}
return 0;
}

12
src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp
View File

@@ -40,11 +40,7 @@ TC_API_EXPORT EnumText EnumUtils<Classes>::ToString(Classes value)
case CLASS_SHAMAN: return { "CLASS_SHAMAN", "Shaman", "" };
case CLASS_MAGE: return { "CLASS_MAGE", "Mage", "" };
case CLASS_WARLOCK: return { "CLASS_WARLOCK", "Warlock", "" };
case CLASS_MONK: return { "CLASS_MONK", "Monk", "" };
case CLASS_DRUID: return { "CLASS_DRUID", "Druid", "" };
case CLASS_DEMON_HUNTER: return { "CLASS_DEMON_HUNTER", "Demon Hunter", "" };
case CLASS_EVOKER: return { "CLASS_EVOKER", "Evoker", "" };
case CLASS_ADVENTURER: return { "CLASS_ADVENTURER", "Adventurer", "" };
default: throw std::out_of_range("value");
}
}
@@ -66,11 +62,7 @@ TC_API_EXPORT Classes EnumUtils<Classes>::FromIndex(size_t index)
case 6: return CLASS_SHAMAN;
case 7: return CLASS_MAGE;
case 8: return CLASS_WARLOCK;
case 9: return CLASS_MONK;
case 10: return CLASS_DRUID;
case 11: return CLASS_DEMON_HUNTER;
case 12: return CLASS_EVOKER;
case 13: return CLASS_ADVENTURER;
default: throw std::out_of_range("index");
}
}
@@ -89,11 +81,7 @@ TC_API_EXPORT size_t EnumUtils<Classes>::ToIndex(Classes value)
case CLASS_SHAMAN: return 6;
case CLASS_MAGE: return 7;
case CLASS_WARLOCK: return 8;
case CLASS_MONK: return 9;
case CLASS_DRUID: return 10;
case CLASS_DEMON_HUNTER: return 11;
case CLASS_EVOKER: return 12;
case CLASS_ADVENTURER: return 13;
default: throw std::out_of_range("value");
}
}