Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

Author: github-actions[bot]

src/common/Utilities/TypeList.h

@@ -0,0 +1,132 @@
+/*
+ * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TypeList_h__
+#define TypeList_h__
+
+#include <cstddef>
+#include <utility>
+
+namespace Acore
+{
+    /**
+     * @brief Provide an empty tag type containing the specified @p Ts.
+     *
+     * @tparam Ts The types in this list.
+     */
+    template <typename... Ts>
+    struct type_list { };
+
+    namespace Impl
+    {
+        template <typename T>
+        inline constexpr bool is_type_list = false;
+
+        template <typename... Ts>
+        inline constexpr bool is_type_list<type_list<Ts...>> = true;
+
+        template <typename List>
+        struct list_size;
+
+        template <typename... Ts>
+        struct list_size<type_list<Ts...>>
+        {
+            static constexpr std::size_t value = sizeof...(Ts);
+        };
+
+        template <typename... Ts, typename Func>
+        constexpr void for_each(type_list<Ts...>, Func&& f)
+        {
+            (f.template operator()<Ts>(), ...);
+        }
+
+        template <typename... Ts, typename Pred>
+        constexpr std::size_t count_if(type_list<Ts...>, Pred pred)
+        {
+            return ((pred.template operator()<Ts>() ? std::size_t{1} : std::size_t{0}) + ... + std::size_t{0});
+        }
+
+        template <typename... Ts, typename Pred>
+        constexpr bool any_of(type_list<Ts...>, Pred pred)
+        {
+            return (false || ... || pred.template operator()<Ts>());
+        }
+    }
+
+    /**
+     * @brief Satisfied only by Acore::type_list specializations.
+     *
+     * Constrains the public list operations so they are viable only for an
+     * actual type_list.
+     */
+    template <typename T>
+    concept AnyTypeList = Impl::is_type_list<T>;
+
+    /**
+     * @brief The number of types in the specified @p List.
+     *
+     * @tparam List A type_list specialization.
+     */
+    template <AnyTypeList List>
+    inline constexpr std::size_t size_v = Impl::list_size<List>::value;
+
+    /**
+     * @brief Invoke the specified @p f once for each type in the specified
+     *        @p List, in declaration order.
+     *
+     * @tparam List A type_list specialization.
+     * @tparam Func The type of the callable.
+     * @param  f    The callable to invoke.
+     */
+    template <AnyTypeList List, typename Func>
+    constexpr void for_each(Func&& f)
+    {
+        Impl::for_each(List{}, std::forward<Func>(f));
+    }
+
+    /**
+     * @brief Return the number of types in the specified @p List for which the
+     *        specified @p pred returns true.
+     *
+     * @tparam List A type_list specialization.
+     * @tparam Pred The type of the predicate.
+     * @param  pred The predicate to evaluate.
+     * @return The number of matching types.
+     */
+    template <AnyTypeList List, typename Pred>
+    constexpr std::size_t count_if(Pred pred)
+    {
+        return Impl::count_if(List{}, pred);
+    }
+
+    /**
+     * @brief Return true if the specified @p pred returns true for any type in
+     *        the specified @p List, and false otherwise.
+     *
+     * @tparam List A type_list specialization.
+     * @tparam Pred The type of the predicate.
+     * @param  pred The predicate to evaluate.
+     * @return True if any type matches, and false otherwise.
+     */
+    template <AnyTypeList List, typename Pred>
+    constexpr bool any_of(Pred pred)
+    {
+        return Impl::any_of(List{}, pred);
+    }
+}
+
+#endif // TypeList_h__

src/server/apps/worldserver/worldserver.conf.dist

@@ -2262,6 +2262,15 @@ SpellQueue.Window = 400
 
 Achievement.RealmFirstKillWindow = 60
 
+#
+#    Achievement.RealmFirstRaceLimitOnePerCharacter
+#        Description: Limit 'Realm First!' race achievements to one per character. Prevents abuse
+#                     of the race/faction change service to obtain multiple achievements.
+#        Default:     1 - (Enabled)
+#                     0 - (Disabled)
+
+Achievement.RealmFirstRaceLimitOnePerCharacter = 1
+
 #
 ###################################################################################################
 

src/server/game/Achievements/AchievementMgr.cpp

@@ -1837,14 +1837,17 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
         if (sAchievementMgr->IsRealmCompleted(achievement))
             return false;
 
-        // A character may only have 1 race-specific 'Realm First!' achievement
-        // prevent clever use of the race/faction change service to obtain multiple 'Realm First!' achievements
-        constexpr std::array<uint32, 9> raceSpecificRealmFirstAchievements { 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413 };
-        bool isRaceSpecific = std::ranges::find(raceSpecificRealmFirstAchievements, achievement->ID) != std::ranges::end(raceSpecificRealmFirstAchievements);
-        if (isRaceSpecific)
-            for (uint32 raceAchievementId : raceSpecificRealmFirstAchievements)
-                if (raceAchievementId != achievement->ID && HasAchieved(raceAchievementId))
-                    return false;
+        if (sWorld->getBoolConfig(CONFIG_ACHIEVEMENT_REALM_FIRST_RACE_LIMIT_ONE_PER_CHARACTER))
+        {
+            // A character may only have 1 race-specific 'Realm First!' achievement
+            // prevent clever use of the race/faction change service to obtain multiple 'Realm First!' achievements
+            constexpr std::array<uint32, 9> raceSpecificRealmFirstAchievements { 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413 };
+            bool isRaceSpecific = std::ranges::find(raceSpecificRealmFirstAchievements, achievement->ID) != std::ranges::end(raceSpecificRealmFirstAchievements);
+            if (isRaceSpecific)
+                for (uint32 raceAchievementId : raceSpecificRealmFirstAchievements)
+                    if (raceAchievementId != achievement->ID && HasAchieved(raceAchievementId))
+                        return false;
+        }
     }
 
     // pussywizard: progress will be deleted after getting the achievement (optimization)

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

@@ -13954,45 +13954,45 @@ InventoryResult Player::CanEquipUniqueItem(ItemTemplate const* itemProto, uint8
     return EQUIP_ERR_OK;
 }
 
+static constexpr float   FALL_DMG_EQU_SLOPE         = 0.018f;
+static constexpr float   FALL_DMG_EQU_INTERCEPT     = -0.2426f;
+static constexpr float   MIN_FALL_DMG_DIST          = 13.48f;       // Minimum fall distance that deals damage
+// 13.48 can be calculated by resolving damageperc to 0 in the fall damage equation below, and assuming safe_fall reduction = 0
+
+static constexpr uint32  SPELL_GUST_OF_WIND         = 43621;
+static constexpr uint32  SPELL_DIVINE_PROTECTION    = 498;
+
 void Player::HandleFall(MovementInfo const& movementInfo)
 {
     // calculate total z distance of the fall
     float z_diff = m_lastFallZ - movementInfo.pos.GetPositionZ();
 
     //Players with low fall distance, Feather Fall or physical immunity (charges used) are ignored
-    // 14.57 can be calculated by resolving damageperc formula below to 0
-    if (z_diff >= 14.57f && !isDead() && !IsGameMaster() && !GetCommandStatus(CHEAT_GOD) &&
+    if (z_diff >= MIN_FALL_DMG_DIST && !isDead() && !IsGameMaster() && !GetCommandStatus(CHEAT_GOD) &&
             !HasHoverAura() && !HasFeatherFallAura() &&
             !HasFlyAura())
     {
         //Safe fall, fall height reduction
         int32 safe_fall = GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);
 
-        float damageperc = 0.018f * (z_diff - safe_fall) - 0.2426f;
+        float damageperc = FALL_DMG_EQU_SLOPE * (z_diff - safe_fall) + FALL_DMG_EQU_INTERCEPT;
         uint32 original_health = GetHealth(), final_damage = 0;
 
         if (damageperc > 0 && !IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_NORMAL))
         {
             uint32 damage = (uint32)(damageperc * GetMaxHealth() * sWorld->getRate(RATE_DAMAGE_FALL));
 
-            //float height = movementInfo.pos.m_positionZ;
-            //UpdateGroundPositionZ(movementInfo.pos.m_positionX, movementInfo.pos.m_positionY, height);
-
             if (damage > 0)
             {
                 //Prevent fall damage from being more than the player maximum health
                 if (damage > GetMaxHealth())
                     damage = GetMaxHealth();
 
-                // Gust of Wind
-                if (HasAura(43621))
+                if (HasAura(SPELL_GUST_OF_WIND))
                     damage = GetMaxHealth() / 2;
 
-                // Divine Protection
-                if (HasAura(498))
-                {
+                if (HasAura(SPELL_DIVINE_PROTECTION))
                     damage /= 2;
-                }
 
                 final_damage = EnvironmentalDamage(DAMAGE_FALL, damage);
             }