Update native branch

contrib/mmap/src/TerrainBuilder.cpp

@@ -750,8 +750,7 @@ namespace MMAP
 
             /// Check every map vertice
             // x, y * -1
-            Vector3 up(0, 0, 1);
-
+
             for (vector<GroupModel>::iterator it = groupModels.begin(); it != groupModels.end(); ++it)
                 for (int t = 0; t < mapVertsCount / 3; ++t)
                 {
@@ -764,7 +763,7 @@ namespace MMAP
 
                     float outDist = -1.0f;
                     float inDist  = -1.0f;
-                    if (it->IsUnderObject(v, up, isM2, &outDist, &inDist)) // inDist < outDist
+                    if (it->IsUnderObject(v, Vector3::up(), isM2, &outDist, &inDist)) // inDist < outDist
                     {
                         //if there are less than 5.0y between terrain and model then mark the terrain as unwalkable
                         if (inDist < 5.0f)

dep/include/g3dlite/G3D/Ray.h

@@ -33,22 +33,6 @@ class Ray {
     /** 1.0 / direction */
     Vector3 m_invDirection;
 
-
-    /** The following are for the "ray slope" optimization from
-      "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
-      Computer Graphics Lab, TU Braunschweig, Germany and
-      University of Koblenz-Landau, Germany */
-    enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};    
-
-    Classification classification;
-
-    /** ray slope */
-    float ibyj, jbyi, kbyj, jbyk, ibyk, kbyi;
-
-    /** Precomputed components */
-    float c_xy, c_xz, c_yx, c_yz, c_zx, c_zy;
-
 public:
     /** \param direction Assumed to have unit length */
     void set(const Point3& origin, const Vector3& direction);

dep/include/g3dlite/G3D/Vector3.h

@@ -236,13 +236,13 @@ class Vector3 {
      */
     inline Vector3 directionOrZero() const {
         float mag = magnitude();
-        if (mag < 0.0000001f) {
+        if (mag < 0.0000001f) 
             return Vector3::zero();
-        } else if (mag < 1.00001f && mag > 0.99999f) {
+        if (mag < 1.00001f && mag > 0.99999f) 
             return *this;
-        } else {
-            return *this * (1.0f / mag);
-        }
+
+        return *this * (1.0f / mag);
+
     }
 
     /**
@@ -424,6 +424,8 @@ class Vector3 {
     static const Vector3& unitZ();
     static const Vector3& inf();
     static const Vector3& nan();
+    static const Vector3& up();
+    static const Vector3& down();
 
     /** Smallest (most negative) representable vector */
     static const Vector3& minFinite();
@@ -597,7 +599,7 @@ std::ostream& operator<<(std::ostream& os, const Vector3&);
 
 
 void serialize(const Vector3::Axis& a, class BinaryOutput& bo);
-void deserialize(Vector3::Axis& a, class BinaryInput& bo);
+void deserialize(Vector3::Axis& a, class BinaryInput& bi);
 
 
 //----------------------------------------------------------------------------

dep/src/g3dlite/Ray.cpp

@@ -21,105 +21,6 @@ void Ray::set(const Vector3& origin, const Vector3& direction) {
     debugAssert(direction.isUnit());
 
     m_invDirection = Vector3::one() / direction;
-
-    // ray slope
-    ibyj = m_direction.x * m_invDirection.y;
-    jbyi = m_direction.y * m_invDirection.x;
-    jbyk = m_direction.y * m_invDirection.z;
-    kbyj = m_direction.z * m_invDirection.y;
-    ibyk = m_direction.x * m_invDirection.z;
-    kbyi = m_direction.z * m_invDirection.x;
-
-    // precomputed terms
-    c_xy = m_origin.y - jbyi * m_origin.x;
-    c_xz = m_origin.z - kbyi * m_origin.x;
-    c_yx = m_origin.x - ibyj * m_origin.y;
-    c_yz = m_origin.z - kbyj * m_origin.y;
-    c_zx = m_origin.x - ibyk * m_origin.z;
-    c_zy = m_origin.y - jbyk * m_origin.z;    
-
-    //ray slope classification
-    if (m_direction.x < 0) {
-        if (m_direction.y < 0) {
-            if (m_direction.z < 0) {
-                classification = MMM;
-            } else if (m_direction.z > 0) {
-                classification = MMP;
-            } else { //(m_direction.z >= 0)
-                classification = MMO;
-            }
-        } else { //(m_direction.y >= 0)
-            if (m_direction.z < 0) {
-                if (m_direction.y == 0) {
-                    classification = MOM;
-                } else {
-                    classification = MPM;
-                }
-            } else { //(m_direction.z >= 0)
-                if ((m_direction.y == 0) && (m_direction.z == 0)) {
-                    classification = MOO;
-                } else if (m_direction.z == 0) {
-                    classification = MPO;
-                } else if (m_direction.y == 0) {
-                    classification = MOP;
-                } else {
-                    classification = MPP;
-                }
-            }
-        }
-    } else { //(m_direction.x >= 0)
-        if (m_direction.y < 0) {
-            if (m_direction.z < 0) {
-                if (m_direction.x == 0) {
-                    classification = OMM;
-                } else {
-                    classification = PMM;
-                }
-            } else { //(m_direction.z >= 0)
-                if ((m_direction.x == 0) && (m_direction.z == 0)) {
-                    classification = OMO;
-                } else if (m_direction.z == 0) {
-                    classification = PMO;
-                } else if (m_direction.x == 0) {
-                    classification = OMP;
-                } else {
-                    classification = PMP;
-                }
-            }
-        } else { //(m_direction.y >= 0)
-            if (m_direction.z < 0) {
-                if ((m_direction.x == 0) && (m_direction.y == 0)) {
-                    classification = OOM;
-                } else if (m_direction.x == 0) {
-                    classification = OPM;
-                } else if (m_direction.y == 0) {
-                    classification = POM;
-                } else {
-                    classification = PPM;
-                }
-            } else { //(m_direction.z > 0)
-                if (m_direction.x == 0) {
-                    if (m_direction.y == 0) {
-                        classification = OOP;
-                    } else if (m_direction.z == 0) {
-                        classification = OPO;
-                    } else {
-                        classification = OPP;
-                    }
-                } else {
-                    if ((m_direction.y == 0) && (m_direction.z == 0)) {
-                        classification = POO;
-                    } else if (m_direction.y == 0) {
-                        classification = POP;
-                    } else if (m_direction.z == 0) {
-                        classification = PPO;
-                    } else {
-                        classification = PPP;
-                    }
-                }
-            }            
-        }
-    }
 }
 
 

dep/src/g3dlite/Vector3.cpp

@@ -102,7 +102,7 @@ Any Vector3::toAny(const std::string& name) const {
     return any;
 }
 
-Vector3::Vector3(const class Color3& v) : x(v.r), y(v.g), z(v.b) {}
+Vector3::Vector3(const class Color3& c) : x(c.r), y(c.g), z(c.b) {}
 
 Vector3::Vector3(const class Vector3int32& v) : x((float)v.x), y((float)v.y), z((float)v.z) {}
 
@@ -116,11 +116,13 @@ Vector3& Vector3::ignore() {
     return v;
 }
 
-const Vector3& Vector3::zero() { static const Vector3 v(0, 0, 0); return v; }
+const Vector3& Vector3::zero()     { static const Vector3 v(0, 0, 0); return v; }
 const Vector3& Vector3::one()      { static const Vector3 v(1, 1, 1); return v; }
 const Vector3& Vector3::unitX()    { static const Vector3 v(1, 0, 0); return v; }
 const Vector3& Vector3::unitY()    { static const Vector3 v(0, 1, 0); return v; }
 const Vector3& Vector3::unitZ()    { static const Vector3 v(0, 0, 1); return v; }
+const Vector3& Vector3::up()       { return unitZ(); }
+const Vector3& Vector3::down()     { static const Vector3 v(0, 0, -1); return v; }
 const Vector3& Vector3::inf()      { static const Vector3 v((float)G3D::finf(), (float)G3D::finf(), (float)G3D::finf()); return v; }
 const Vector3& Vector3::nan()      { static const Vector3 v((float)G3D::fnan(), (float)G3D::fnan(), (float)G3D::fnan()); return v; }
 const Vector3& Vector3::minFinite(){ static const Vector3 v(-FLT_MAX, -FLT_MAX, -FLT_MAX); return v; }
@@ -303,11 +305,11 @@ Vector3 Vector3::cosPowHemiRandom(const Vector3& normal, const float k, Random&
 Vector3 Vector3::hemiRandom(const Vector3& normal, Random& r) {
     const Vector3& V = Vector3::random(r);
 
-    if (V.dot(normal) < 0) {
+    if (V.dot(normal) < 0) 
         return -V;
-    } else {
-        return V;
-    }
+
+    return V;
+
 }
 
 //----------------------------------------------------------------------------
@@ -345,12 +347,14 @@ Vector3 Vector3::refractionDirection(
 
     float det = 1.0f - (float)square(hRatio) * (1.0f - (float)square(WdotN));
 
-    if (det < 0) {
+    if (det < 0)
+    {
         // Total internal reflection
         return Vector3::zero();
-    } else {
-        return -hRatio * (W - WdotN * N) - N * sqrt(det);
     }
+
+    return -hRatio * (W - WdotN * N) - N * sqrt(det);
+
 }
 
 //----------------------------------------------------------------------------

sql/migrations/20250307204042_world.sql

@@ -0,0 +1,31 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250307204042');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250307204042');
+-- Add your query below.
+
+-- Prospector Khazgorm (credit cmangos)
+UPDATE `creature` SET `position_x` = -4181.31005859375, `position_y` = -2184.330078125, `position_z` = 50.26649856567383, `orientation` = 0.2923249900341034 WHERE `guid` = 13984 AND `id` = 3392;
+UPDATE `creature` SET `position_x` = -4134.08984375, `position_y` = -2190.56005859375, `position_z` = 50.93259811401367, `orientation` = 5.971350193023682 WHERE `guid` = 14326 AND `id` = 3392;
+UPDATE `creature` SET `position_x` = -4208.52001953125, `position_y` = -2274.22998046875, `position_z` = 50.26689910888672, `orientation` = 3.9258201122283936 WHERE `guid` = 14325 AND `id` = 3392;
+UPDATE `creature` SET `position_x` = -4176.35009765625, `position_y` = -2235.199951171875, `position_z` = 51.03120040893555, `orientation` = 5.194900035858154 WHERE `guid` = 14324 AND `id` = 3392;
+
+INSERT INTO `conditions` (`condition_entry`, `type`, `value1`, `value2`, `value3`, `value4`, `flags`) VALUES 
+(4130,-1,4105,4018,0,0,0); -- Player is Tauren and Patch is 1.10 or later
+
+UPDATE `gossip_menu` SET `condition_id` = 4130, `text_id` = 8370 WHERE `entry` = 4015 AND `text_id` = 8368; -- Velma Warnam
+UPDATE `gossip_menu` SET `condition_id` = 4130 WHERE `entry` = 4022 AND `text_id` = 8407; -- Xar'Ti
+
+-- Correct lockId for Jinxed Hoodoo Pile according to both 1.8 and Classic sniffs
+UPDATE `gameobject_template` SET `data0` = 43 WHERE `entry` IN (180228, 180229);
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

sql/migrations/20250407022846_world.sql

@@ -0,0 +1,28 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250407022846');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250407022846');
+-- Add your query below.
+
+
+-- Add scripts for more spells.
+UPDATE `spell_template` SET `script_name`='spell_gnomeregan_collecting_fallout' WHERE `entry`=12709;
+DELETE FROM `spell_effect_mod` WHERE `Id`=12709;
+UPDATE `spell_template` SET `script_name`='spell_linkens_boomerang' WHERE `entry`=15712;
+UPDATE `spell_template` SET `script_name`='spell_scorpid_surprise' WHERE `entry`=6410;
+UPDATE `spell_template` SET `script_name`='spell_rogue_vanish' WHERE `entry` IN (1856, 1857, 27617);
+UPDATE `spell_template` SET `script_name`='spell_brittle_armor_dummy' WHERE `entry`=29284;
+UPDATE `spell_template` SET `script_name`='spell_mercurial_shield_dummy' WHERE `entry`=29286;
+UPDATE `spell_template` SET `script_name`='spell_everlook_transporter' WHERE `entry`=23442;
+
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

sql/migrations/20250407071532_world.sql

@@ -0,0 +1,23 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250407071532');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250407071532');
+-- Add your query below.
+
+
+UPDATE `spell_template` SET `script_name`='spell_gdr_channel' WHERE `entry`=13278;
+UPDATE `spell_template` SET `script_name`='spell_gdr_periodic' WHERE `entry`=13493;
+DELETE FROM `spell_effect_mod` WHERE `Id` IN (13278, 13493);
+UPDATE `spell_template` SET `script_name`='spell_paladin_judgement_of_light_proc_aura' WHERE `entry` IN (20185, 20344, 20345, 20346, 25751);
+
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

sql/migrations/20250408054135_world.sql

@@ -0,0 +1,30 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250408054135');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250408054135');
+-- Add your query below.
+
+
+UPDATE `spell_template` SET `script_name`='spell_druid_swiftmend' WHERE `entry`=18562 AND `build`>=5464;
+UPDATE `spell_template` SET `script_name`='spell_paladin_judgement_of_light_heal' WHERE `entry` IN (20267, 20341, 20342, 20343);
+UPDATE `spell_template` SET `script_name`='spell_warrior_bloodrage' WHERE `entry`=2687;
+UPDATE `spell_template` SET `script_name`='spell_ubrs_freeze_rookery_egg' WHERE `entry` IN (15748, 16028);
+UPDATE `spell_template` SET `script_name`='spell_warlock_devour_magic' WHERE `entry` IN (19505, 19731, 19734, 19736);
+UPDATE `spell_template` SET `script_name`='spell_av_create_shredder' WHERE `entry` IN (21544, 21565);
+UPDATE `spell_template` SET `script_name`='spell_target_dummy' WHERE `entry` IN (4071, 4072, 19805);
+UPDATE `spell_template` SET `script_name`='spell_eye_of_naxxramas_summon_rockwing_gargoyles' WHERE `entry`=16381;
+UPDATE `spell_template` SET `script_name`='spell_chained_essence_of_eranikus' WHERE `entry`=12766;
+UPDATE `spell_template` SET `script_name`='spell_release_umis_yeti' WHERE `entry`=17166;
+UPDATE `spell_template` SET `script_name`='spell_vanquished_tentacle_of_cthun' WHERE `entry`=26391;
+
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

sql/migrations/20250408123201_world.sql

@@ -0,0 +1,25 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250408123201');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250408123201');
+-- Add your query below.
+
+
+UPDATE `spell_template` SET `script_name`='spell_warlock_inferno' WHERE `entry` IN (1122, 24670);
+UPDATE `spell_template` SET `script_name`='spell_thaddius_magnetic_pull' WHERE `entry`=28337;
+UPDATE `spell_template` SET `script_name`='spell_maexxna_spider_web' WHERE `entry`=28434;
+UPDATE `spell_template` SET `script_name`='spell_paladin_reckoning' WHERE `entry`=20178;
+UPDATE `spell_template` SET `script_name`='spell_goblin_jumper_cables' WHERE `entry`=8342;
+UPDATE `spell_template` SET `script_name`='spell_goblin_jumper_cables_xl' WHERE `entry`=22999;
+
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;