Merge 3.3.5 to 3.3.5-solocraft

Github Actions · Github Actions · commit ac880de8906b · 2025-12-01T01:26:22.000Z
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ![logo](https://community.trinitycore.org/public/style_images/1_trinitycore.png) TrinityCore (3.3.5)
+# ![logo](https://trinitycore.org/images/logo2.png) TrinityCore (3.3.5)
 
 [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Average time to resolve an issue") [![Percentage of issues still open](https://isitmaintained.com/badge/open/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Percentage of issues still open")
 
diff --git a/sql/updates/world/3.3.5/2025_11_24_00_world.sql b/sql/updates/world/3.3.5/2025_11_24_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=66, `Emote4`=1, `RewardText`='Wintergarde is saved because of you, $N. To think that one $g man:woman; could so swiftly turn the tides of battle is hard for most to comprehend; yet here we are - victorious! You have managed to restore the faith of these people and earned the respect of your commanding officers.$B$B<Halford salutes.> $B$BLord Fordragon has returned to Angrathar to prepare our forces for the destruction of the Wrathgate and has requested that you join him! I couldn\'t recommend a better soldier for the job, $N.\n', `VerifiedBuild`=13623 WHERE `ID`=12473;
diff --git a/sql/updates/world/3.3.5/2025_11_24_01_world.sql b/sql/updates/world/3.3.5/2025_11_24_01_world.sql
@@ -0,0 +1,2 @@
+-- Old Ironbark (Area: 0 - Difficulty: 0) CreateObject1
+UPDATE `creature` SET `position_x`=-72.1718673706054687, `position_y`=-283.25238037109375, `position_z`=-57.749664306640625, `orientation`=4.084070205688476562, `VerifiedBuild`=11159 WHERE `guid`=56943 AND `id`=11491;
diff --git a/sql/updates/world/3.3.5/2025_11_24_02_world.sql b/sql/updates/world/3.3.5/2025_11_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2025_11_27_00_world.sql b/sql/updates/world/3.3.5/2025_11_27_00_world.sql
@@ -0,0 +1,4 @@
+-- Add Malister's Frost Wand spell target condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=40969;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES 
+(17, 0, 40969, 0, 0, 31, 1, 3, 23689, 0, 0, "Malister's Frost Wand only hits Proto-Drake");
diff --git a/sql/updates/world/3.3.5/2025_11_27_01_world.sql b/sql/updates/world/3.3.5/2025_11_27_01_world.sql
@@ -0,0 +1,9 @@
+-- Duggan Wildhammer faction
+UPDATE `creature_template` SET `faction`=1055 WHERE `entry`=10817;
+
+-- Duggan Wildhammer equipment
+UPDATE `creature_equip_template` SET `ItemID1`=12951, `VerifiedBuild`=0 WHERE `CreatureID`=10817 AND `ID`=1;
+
+-- Remove again event
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10817 AND `source_type`=0 AND `id` > 2;
+DELETE FROM `creature_text` WHERE `CreatureID`=10817;
diff --git a/sql/updates/world/3.3.5/2025_11_27_02_world.sql b/sql/updates/world/3.3.5/2025_11_27_02_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `gameobject` SET `position_x`=-8747.79, `position_y`=-2256.47, `position_z`=153.350, `orientation`=0.855903 WHERE `guid`=18679 AND `id`=1731;
diff --git a/sql/updates/world/3.3.5/2025_11_27_03_world.sql b/sql/updates/world/3.3.5/2025_11_27_03_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template_movement` SET `Ground` = 1, `Flight` = 0 WHERE `CreatureId` = 2830;
diff --git a/sql/updates/world/3.3.5/2025_11_29_00_world.sql b/sql/updates/world/3.3.5/2025_11_29_00_world.sql
@@ -0,0 +1,2 @@
+-- Fix Hearthglen GY
+UPDATE `graveyard_zone` SET `GhostZone`=28, `Comment`="Western Plaguelands, Hearthglen - Western Plaguelands" WHERE `ID`=1451;
diff --git a/sql/updates/world/3.3.5/2025_11_29_01_world.sql b/sql/updates/world/3.3.5/2025_11_29_01_world.sql
@@ -0,0 +1,3 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10928 AND `source_type`=0;
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=10928;
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
@@ -41,7 +41,6 @@ typedef std::map<WMOAreaTableKey, WMOAreaTableEntry const*> WMOAreaInfoByTripple
 
 DBCStorage <AreaTableEntry> sAreaTableStore(AreaTableEntryfmt);
 DBCStorage <AreaGroupEntry> sAreaGroupStore(AreaGroupEntryfmt);
-DBCStorage <AreaPOIEntry> sAreaPOIStore(AreaPOIEntryfmt);
 
 static WMOAreaInfoByTripple sWMOAreaInfoByTripple;
 
@@ -288,7 +287,6 @@ void LoadDBCStores(const std::string& dataPath)
     LOAD_DBC(sAchievementCriteriaStore,           "Achievement_Criteria.dbc");
     LOAD_DBC(sAreaTriggerStore,                   "AreaTrigger.dbc");
     LOAD_DBC(sAreaGroupStore,                     "AreaGroup.dbc");
-    LOAD_DBC(sAreaPOIStore,                       "AreaPOI.dbc");
     LOAD_DBC(sAuctionHouseStore,                  "AuctionHouse.dbc");
     LOAD_DBC(sBankBagSlotPricesStore,             "BankBagSlotPrices.dbc");
     LOAD_DBC(sBannedAddOnsStore,                  "BannedAddOns.dbc");
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
@@ -92,7 +92,6 @@ TC_GAME_API extern DBCStorage <AchievementEntry>             sAchievementStore;
 TC_GAME_API extern DBCStorage <AchievementCriteriaEntry>     sAchievementCriteriaStore;
 TC_GAME_API extern DBCStorage <AreaTableEntry>               sAreaTableStore;
 TC_GAME_API extern DBCStorage <AreaGroupEntry>               sAreaGroupStore;
-TC_GAME_API extern DBCStorage <AreaPOIEntry>                 sAreaPOIStore;
 TC_GAME_API extern DBCStorage <AreaTriggerEntry>             sAreaTriggerStore;
 TC_GAME_API extern DBCStorage <AuctionHouseEntry>            sAuctionHouseStore;
 TC_GAME_API extern DBCStorage <BankBagSlotPricesEntry>       sBankBagSlotPricesStore;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -6540,7 +6540,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
         return false;
 
     ObjectGuid victim_guid;
-    uint32 victim_rank = 0;
+    int32 victim_rank = 0;
 
     // need call before fields update to have chance move yesterday data to appropriate fields before today data change.
     UpdateHonorFields();
@@ -6571,26 +6571,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
             if (v_level <= k_grey)
                 return false;
 
-            // PLAYER_CHOSEN_TITLE VALUES DESCRIPTION
-            //  [0]      Just name
-            //  [1..14]  Alliance honor titles and player name
-            //  [15..28] Horde honor titles and player name
-            //  [29..38] Other title and player name
-            //  [39+]    Nothing
-            uint32 victim_title = victim->GetUInt32Value(PLAYER_CHOSEN_TITLE);
-                                                        // Get Killer titles, CharTitlesEntry::MaskID
-            // Ranks:
-            //  title[1..14]  -> rank[5..18]
-            //  title[15..28] -> rank[5..18]
-            //  title[other]  -> 0
-            if (victim_title == 0)
-                victim_guid.Clear();                     // Don't show HK: <rank> message, only log.
-            else if (victim_title < 15)
-                victim_rank = victim_title + 4;
-            else if (victim_title < 29)
-                victim_rank = victim_title - 14 + 4;
-            else
-                victim_guid.Clear();                     // Don't show HK: <rank> message, only log.
+            victim_rank = victim->GetByteValue(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTES_OFFSET_LIFETIME_MAX_PVP_RANK);
 
             honor_f = std::ceil(Trinity::Honor::hk_honor_at_level_f(k_level) * (v_level - k_grey) / (k_level - k_grey));
 
@@ -6635,7 +6616,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
     WorldPacket data(SMSG_PVP_CREDIT, 4+8+4);
     data << uint32(honor);
     data << victim_guid;
-    data << uint32(victim_rank);
+    data << int32(victim_rank);
 
     SendDirectMessage(&data);
 
diff --git a/src/server/shared/DataStores/DBCStructure.h b/src/server/shared/DataStores/DBCStructure.h
@@ -223,24 +223,6 @@ struct AreaGroupEntry
     uint32 NextAreaID;                                      // 7 index of next group
 };
 
-struct AreaPOIEntry
-{
-    uint32 ID;                                              // 0
-    uint32 Importance;                                      // 1
-    uint32 Icon[9];                                         // 2-10
-    uint32 FactionID;                                       // 11
-    DBCPosition3D Pos;                                      // 12-14
-    uint32 ContinentID;                                     // 15
-    //uint32 Flags;                                         // 16
-    uint32 AreaID;                                          // 17
-    //char const* Name[16];                                 // 18-33
-    //uint32 Name_lang_mask;                                // 34
-    //char const* Description[16];                          // 35-50
-    //uint32 Description_lang_mask;                         // 51
-    uint32 WorldStateID;                                    // 52
-    //uint32 WorldMapLink;                                  // 53
-};
-
 struct AreaTriggerEntry
 {
     uint32 ID;                                              // 0
diff --git a/src/server/shared/DataStores/DBCfmt.h b/src/server/shared/DataStores/DBCfmt.h
@@ -24,7 +24,6 @@ char constexpr CustomAchievementIndex[] = "ID";
 char constexpr AchievementCriteriafmt[] = "niiiiiiiixxxxxxxxxxxxxxxxxiiiix";
 char constexpr AreaTableEntryfmt[] = "niiiixxxxxissssssssssssssssxiiiiixxx";
 char constexpr AreaGroupEntryfmt[] = "niiiiiii";
-char constexpr AreaPOIEntryfmt[] = "niiiiiiiiiiifffixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxix";
 char constexpr AreaTriggerEntryfmt[] = "niffffffff";
 char constexpr AuctionHouseEntryfmt[] = "niiixxxxxxxxxxxxxxxxx";
 char constexpr BankBagSlotPricesEntryfmt[] = "ni";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ![logo](https://community.trinitycore.org/public/style_images/1_trinitycore.png) TrinityCore (3.3.5)`
	`1`	`+# ![logo](https://trinitycore.org/images/logo2.png) TrinityCore (3.3.5)`
`2`	`2`
`3`	`3`	`[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Average time to resolve an issue") [![Percentage of issues still open](https://isitmaintained.com/badge/open/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Percentage of issues still open")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=66, `Emote4`=1, `RewardText`='Wintergarde is saved because of you, $N. To think that one $g man:woman; could so swiftly turn the tides of battle is hard for most to comprehend; yet here we are - victorious! You have managed to restore the faith of these people and earned the respect of your commanding officers.$B$B<Halford salutes.> $B$BLord Fordragon has returned to Angrathar to prepare our forces for the destruction of the Wrathgate and has requested that you join him! I couldn\'t recommend a better soldier for the job, $N.\n', `VerifiedBuild`=13623 WHERE `ID`=12473;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Old Ironbark (Area: 0 - Difficulty: 0) CreateObject1`
	`2`	+UPDATE `creature` SET `position_x`=-72.1718673706054687, `position_y`=-283.25238037109375, `position_z`=-57.749664306640625, `orientation`=4.084070205688476562, `VerifiedBuild`=11159 WHERE `guid`=56943 AND `id`=11491;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	+UPDATE `gameobject` SET `position_x`=-8747.79, `position_y`=-2256.47, `position_z`=153.350, `orientation`=0.855903 WHERE `guid`=18679 AND `id`=1731;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	+UPDATE `creature_template_movement` SET `Ground` = 1, `Flight` = 0 WHERE `CreatureId` = 2830;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Fix Hearthglen GY`
	`2`	+UPDATE `graveyard_zone` SET `GhostZone`=28, `Comment`="Western Plaguelands, Hearthglen - Western Plaguelands" WHERE `ID`=1451;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+--`
	`2`	+DELETE FROM `smart_scripts` WHERE `entryorguid`=10928 AND `source_type`=0;
	`3`	+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=10928;