Update test

src/server/game/Entities/Player/Player.cpp

@@ -12051,6 +12051,10 @@ InventoryResult Player::CanUseAmmo(uint32 item) const
         if (HasAura(46699))
             return EQUIP_ERR_BAG_FULL6;
 
+        // Requires No Ammo
+        if (HasAura(81101))
+            return EQUIP_ERR_BAG_FULL6;
+
         return EQUIP_ERR_OK;
     }
     return EQUIP_ERR_ITEM_NOT_FOUND;
@@ -27171,3 +27175,60 @@ GameClient* Player::GetGameClient() const
 {
     return GetSession()->GetGameClient();
 }
+
+// Wahl des Klassenmounts noch inaktiv -> Zum aktivieren /**/ entfernen
+/*
+uint8 Player::GetMostPointsTalentTree() const
+{
+    uint32 active_spec = GetActiveSpec();
+
+    std::unordered_map<uint32, uint32> spec_data;
+
+    for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
+    {
+        TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
+
+        if (!talentInfo)
+            continue;
+
+        TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TabID);
+
+        if (!talentTabInfo)
+            continue;
+
+        if ((GetClassMask() & talentTabInfo->ClassMask) == 0)
+            continue;
+
+        uint8 currentTalentRank = 0;
+        for (int8 rank = MAX_TALENT_RANK - 1; rank >= 0; --rank)
+        {
+            // skip non-existing talent ranks
+            if (talentInfo->SpellRank[rank] == 0)
+                continue;
+
+            SpellInfo const* _spellEntry = sSpellMgr->GetSpellInfo(talentInfo->SpellRank[rank]);
+            if (!_spellEntry)
+                continue;
+
+            // if he doesn't have the talent skip
+            if (!HasTalent(talentInfo->SpellRank[rank], active_spec))
+                continue;
+
+            currentTalentRank = rank + 1;
+            spec_data[talentTabInfo->ID] += currentTalentRank;
+        }
+    }
+
+    std::pair<uint32, uint32> max_spec = { 0, 0 };
+    for (const auto& [spec_id, talent_count] : spec_data)
+    {
+        if (talent_count > max_spec.second)
+        {
+            max_spec.first = spec_id;
+            max_spec.second = talent_count;
+        }
+    }
+
+    return max_spec.first;
+}
+*/

src/server/game/Entities/Player/Player.h

@@ -2199,6 +2199,9 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
 
         std::string GetDebugInfo() const override;
 
+        // Wahl des Klassenmounts noch inaktiv -> Zu Aktivieren // entfernen
+        // uint8 GetMostPointsTalentTree() const;
+
         /*****************************************************************/
         /***                        NPCBOT SYSTEM                      ***/
         /*****************************************************************/

src/server/game/Entities/Unit/Unit.cpp

@@ -12944,6 +12944,52 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const
             break;
     }
 
+    if (Player const* player = ToPlayer())
+    {
+        switch (form)
+        {
+            case FORM_DIREBEAR:
+            case FORM_BEAR:
+        {
+                if (player->HasAura(81139))
+                    return 32984; // Display ID
+                else if (player->HasAura(81141))
+                    return 32985; // Display ID
+                else if (player->HasAura(81143))
+                    return 32986; // Display ID
+                else if (player->HasAura(81145))
+                    return 32987; // Display ID
+                else if (player->HasAura(81147))
+                    return 32988; // Display ID
+                else if (player->HasAura(81149))
+                    return 32989; // Display ID
+                else if (player->HasAura(81151))
+                    return 32990; // Display ID
+                else if (player->HasAura(81153))
+                    return 32991; // Display ID
+                else if (player->HasAura(81155))
+                    return 32992; // Display ID
+                else if (player->HasAura(81157))
+                    return 32993; // Display ID
+                else if (player->HasAura(81159))
+                    return 32994; // Display ID
+                else if (player->HasAura(81161))
+                    return 32995; // Display ID
+                else if (player->HasAura(81163))
+                    return 32996; // Display ID
+                else if (player->HasAura(81165))
+                    return 32997; // Display ID
+                else if (player->HasAura(81167))
+                    return 32998; // Display ID
+                else if (player->HasAura(81169))
+                    return 32999; // Display ID
+                break;
+        }
+        default:
+            break;
+        }
+    }
+
     if (Player const* player = ToPlayer())
     {
         switch (form)

src/server/game/Spells/Auras/SpellAuraEffects.cpp

@@ -2607,6 +2607,90 @@ void AuraEffect::HandleAuraModSkill(AuraApplication const* aurApp, uint8 mode, b
 /****************************/
 /***       MOVEMENT       ***/
 /****************************/
+/* Wahl des Klassenmounts -> zum aktivieren ** entfernen
+enum ClassSpec
+{
+    MAGE_ARCANE = 81,
+    MAGE_FIRE = 41,
+    MAGE_FROST = 61,
+
+    WARRIOR_ARMS = 161,
+    WARRIOR_FURY = 164,
+    WARRIOR_PROTECTION = 163,
+
+    ROGUE_ASSASSINATION = 182,
+    ROGUE_COMBAT = 181,
+    ROGUE_SUBTLETY = 183,
+
+    PRIEST_DISCIPLINE = 201,
+    PRIEST_HOLY = 202,
+    PRIEST_SHADOW = 203,
+
+    SHAMAN_ELEMENTAL = 5,
+    SHAMAN_ENHANCEMENT = 7,
+    SHAMAN_RESTORATION = 6,
+
+    DRUID_BALANCE = 27,
+    DRUID_FERAL = 25,
+    DRUID_RESTORATION = 26,
+
+    WARLOCK_AFFLICTION = 46,
+    WARLOCK_DEMONOLOGY = 47,
+    WARLOCK_DESTRUCTION = 45,
+
+    HUNTER_BEAST_MASTERY = 105,
+    HUNTER_MARKSMANSHIP = 107,
+    HUNTER_SURVIVAL = 106,
+
+    PALADIN_HOLY = 126,
+    PALADIN_PROTECTION = 127,
+    PALADIN_RETRIBUTION = 125,
+
+    DEATH_KNIGHT_BLOOD = 142,
+    DEATH_KNIGHT_FROST = 143,
+    DEATH_KNIGHT_UNHOLY = 144
+};
+
+void UpdateCustomMountDisplayId(Unit* target, uint32& creatureEntry)
+{
+    if (!target->ToPlayer())
+        return;
+
+    const uint32 active_spec = target->ToPlayer()->GetMostPointsTalentTree();
+
+    if (target->HasAura(75620))
+    {
+
+        switch (active_spec)
+        {
+        case MAGE_ARCANE:
+            creatureEntry = 32637;
+            break;
+        case MAGE_FROST:
+            creatureEntry = 28531;
+            break;
+        case MAGE_FIRE:
+            creatureEntry = 40165;
+            break;
+        }
+    }
+    else if (target->HasAura(81240) || target->HasAura(81241) || target->HasAura(81242) || target->HasAura(81201))
+    {
+        switch (active_spec)
+        {
+        case WARLOCK_AFFLICTION:
+            creatureEntry = 100575;
+            break;
+        case WARLOCK_DESTRUCTION:
+            creatureEntry = 100579;
+            break;
+        case WARLOCK_DEMONOLOGY:
+            creatureEntry = 100580;
+            break;
+        }
+    }
+}
+*/
 
 void AuraEffect::HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bool apply) const
 {
@@ -2630,6 +2714,9 @@ void AuraEffect::HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bo
                 creatureEntry = 15665;
         }
 
+        // Wahl des Klassenmounts -> zum aktivieren // Entfernen
+        // UpdateCustomMountDisplayId(target, creatureEntry);
+
         if (CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(creatureEntry))
         {
             if (GetMiscValueB() > 0) // Choose proper modelid
@@ -4494,6 +4581,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
                     if (target->GetTypeId() == TYPEID_PLAYER)
                         target->ToPlayer()->RemoveAmmo();      // not use ammo and not allow use
                     break;
+                case 81101:                                     // Requires No Ammo
+                    if (target->GetTypeId() == TYPEID_PLAYER)
+                        target->ToPlayer()->RemoveAmmo();      // not use ammo and not allow use
+                    break;
             }
         }
         // AT REMOVE

src/server/game/Spells/Spell.cpp

@@ -4494,6 +4494,11 @@ void Spell::UpdateSpellCastDataAmmo(WorldPackets::Spells::SpellAmmo& ammo)
                     ammoDisplayID = 5996;                   // normal arrow
                     ammoInventoryType = INVTYPE_AMMO;
                 }
+                else if (m_caster->ToPlayer()->HasAura(81101))      // Requires No Ammo
+                {
+                    ammoDisplayID = 5996;                   // normal arrow
+                    ammoInventoryType = INVTYPE_AMMO;
+                }
             }
         }
     }

src/server/game/Spells/SpellMgr.cpp

@@ -3474,6 +3474,25 @@ void SpellMgr::LoadSpellInfoCorrections()
         65917, // Magic Rooster
         71342, // Big Love Rocket
         72286, // Invincible
+        80933, // Bunny Mount
+	    80938, // FOX Mount
+	    80943, // HAND Mount
+        80990, // Blue Phönix
+        80995, // Orange Phönix
+        81000, // Katzenmount
+        81183, // Palamount Blau
+        81184, // Palamount Purple
+        81185, // Palamount Rot
+        81186, // Palamount Gelb
+        81187, // Jägermount Blau
+        81188, // Jägermount Grün
+        81189, // Jägermount Orange
+        81190, // Priestermount Diszi
+        81191, // Priestermount Holy
+        81192, // Priestermount Shatten
+        81201, // Hexenmeistermount Grün
+        81202, // Hexenmeistermount Rot
+        81203, // Hexenmeistermount Shatten
         74856, // Blazing Hippogryph
         75614, // Celestial Steed
         75973  // X-53 Touring Rocket
@@ -4957,6 +4976,12 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(5); // 40yd
     });
 
+    // CUSTOM: DK BOSS SCOURGE AURA
+    ApplySpellFix({ 60023 }, [](SpellInfo* spellInfo)
+        {
+            spellInfo->AttributesEx &= ~SPELL_ATTR1_CANT_TARGET_SELF;
+        });
+
     for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i)
     {
         SpellInfo* spellInfo = mSpellInfoMap[i];