Skip to content

Commit 16996b1

Browse files
urwifemykidsurwifemykids
authored
Merge branch 'TrinityCore:3.3.5' into cfpve
2 parents c5c4755 + f08cc75 commit 16996b1

29 files changed

+435
-373
lines changed

‎sql/updates/world/3.3.5/2024_09_11_00_world.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- Steelbreaker: Fix wrong itemId for Belt of the Crystal Tree
2+
UPDATE creature_loot_template SET `Item`=45455 WHERE `entry`=32867 AND `Item`=25455;

‎sql/updates/world/3.3.5/2024_09_14_00_world.sql‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
-- Shard of a Felhound
2+
UPDATE `quest_details` SET `Emote2`=1,`Emote3`=1 WHERE `ID`=4962;
3+
4+
-- The Binding
5+
DELETE FROM `quest_details` WHERE `ID`=1795;
6+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
7+
(1795,1,1,0,0,0,0,0,0,0);
8+
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1,`EmoteOncomplete`=1 WHERE `ID`=1795;
9+
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=2 WHERE `ID`=1795;
10+
11+
-- The Orb of Soran'ruk
12+
DELETE FROM `quest_details` WHERE `ID`=1740;
13+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
14+
(1740,1,1,0,0,0,0,0,0,0);
15+
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1,`EmoteOncomplete`=1 WHERE `ID`=1740;
16+
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=1740;
17+
18+
-- The Affray
19+
UPDATE `quest_details` SET `Emote3`=25 WHERE `ID`=1719;
20+
21+
-- Tome of the Cabal
22+
DELETE FROM `quest_details` WHERE `ID`=1758;
23+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
24+
(1758,1,1,0,0,0,0,0,0,0);
25+
UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=1758;
26+
27+
-- A Host of Evil
28+
DELETE FROM `quest_details` WHERE `ID`=6626;
29+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
30+
(6626,1,1,0,0,0,0,0,0,0);
31+
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=6626;
32+
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=6626;
33+
34+
-- Blueleaf Tubers
35+
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6,`EmoteOncomplete`=6 WHERE `ID`=1221;
36+
37+
-- Passage to Booty Bay
38+
DELETE FROM `quest_details` WHERE `ID`=1040;
39+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
40+
(1040,1,1,1,0,0,0,0,0,0);
41+
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=1040;
42+
43+
-- Mission: Possible But Not Probable
44+
DELETE FROM `quest_details` WHERE `ID`=2478;
45+
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
46+
(2478,1,1,1,1,0,0,0,0,0);

‎src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ bool AuctionBotSeller::Initialize()
182182
allowZero = sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_QUEST_ALLOW_ZERO); break;
183183
case ITEM_CLASS_KEY:
184184
allowZero = sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_KEY_ALLOW_ZERO); break;
185-
case ITEM_CLASS_MISC:
185+
case ITEM_CLASS_MISCELLANEOUS:
186186
allowZero = sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_MISC_ALLOW_ZERO); break;
187187
case ITEM_CLASS_GLYPH:
188188
allowZero = sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_GLYPH_ALLOW_ZERO); break;
@@ -273,7 +273,7 @@ bool AuctionBotSeller::Initialize()
273273
continue;
274274
break;
275275
}
276-
case ITEM_CLASS_MISC:
276+
case ITEM_CLASS_MISCELLANEOUS:
277277
if (prototype->SubClass == ITEM_SUBCLASS_JUNK_MOUNT)
278278
{
279279
if (uint32 value = sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_MISC_MOUNT_MIN_REQ_LEVEL))
@@ -399,7 +399,7 @@ void AuctionBotSeller::LoadItemsQuantity(SellerConfiguration& config)
399399
config.SetRandomStackRatioPerClass(ITEM_CLASS_QUIVER, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_QUIVER));
400400
config.SetRandomStackRatioPerClass(ITEM_CLASS_QUEST, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_QUEST));
401401
config.SetRandomStackRatioPerClass(ITEM_CLASS_KEY, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_KEY));
402-
config.SetRandomStackRatioPerClass(ITEM_CLASS_MISC, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_MISC));
402+
config.SetRandomStackRatioPerClass(ITEM_CLASS_MISCELLANEOUS, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_MISC));
403403
config.SetRandomStackRatioPerClass(ITEM_CLASS_GLYPH, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_RANDOMSTACKRATIO_GLYPH));
404404

405405
// Set the best value to get nearest amount of items wanted
@@ -434,7 +434,7 @@ void AuctionBotSeller::LoadItemsQuantity(SellerConfiguration& config)
434434
index = CONFIG_AHBOT_CLASS_QUEST_PRIORITY; break;
435435
case ITEM_CLASS_KEY:
436436
index = CONFIG_AHBOT_CLASS_KEY_PRIORITY; break;
437-
case ITEM_CLASS_MISC:
437+
case ITEM_CLASS_MISCELLANEOUS:
438438
index = CONFIG_AHBOT_CLASS_MISC_PRIORITY; break;
439439
case ITEM_CLASS_GLYPH:
440440
index = CONFIG_AHBOT_CLASS_GLYPH_PRIORITY; break;
@@ -512,7 +512,7 @@ void AuctionBotSeller::LoadSellerValues(SellerConfiguration& config)
512512
config.SetPriceRatioPerClass(ITEM_CLASS_QUEST, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_QUEST_PRICE_RATIO));
513513
config.SetPriceRatioPerClass(ITEM_CLASS_KEY, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_KEY_PRICE_RATIO));
514514
config.SetPriceRatioPerClass(ITEM_CLASS_PERMANENT, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_PERMANENT_PRICE_RATIO));
515-
config.SetPriceRatioPerClass(ITEM_CLASS_MISC, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_MISC_PRICE_RATIO));
515+
config.SetPriceRatioPerClass(ITEM_CLASS_MISCELLANEOUS, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_MISC_PRICE_RATIO));
516516
config.SetPriceRatioPerClass(ITEM_CLASS_GLYPH, sAuctionBotConfig->GetConfig(CONFIG_AHBOT_CLASS_GLYPH_PRICE_RATIO));
517517

518518
//load min and max auction times
@@ -691,7 +691,7 @@ uint32 AuctionBotSeller::GetBuyModifier(ItemTemplate const* prototype)
691691
case ITEM_SUBCLASS_WEAPON_AXE:
692692
case ITEM_SUBCLASS_WEAPON_MACE:
693693
case ITEM_SUBCLASS_WEAPON_SWORD:
694-
case ITEM_SUBCLASS_WEAPON_FIST:
694+
case ITEM_SUBCLASS_WEAPON_FIST_WEAPON:
695695
case ITEM_SUBCLASS_WEAPON_DAGGER:
696696
return 1200;
697697
case ITEM_SUBCLASS_WEAPON_AXE2:
@@ -710,7 +710,7 @@ uint32 AuctionBotSeller::GetBuyModifier(ItemTemplate const* prototype)
710710
{
711711
switch (prototype->SubClass)
712712
{
713-
case ITEM_SUBCLASS_ARMOR_MISC:
713+
case ITEM_SUBCLASS_ARMOR_MISCELLANEOUS:
714714
case ITEM_SUBCLASS_ARMOR_CLOTH:
715715
return 500;
716716
case ITEM_SUBCLASS_ARMOR_LEATHER:

‎src/server/game/Entities/Item/ItemTemplate.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ enum ItemClass : uint8
308308
ITEM_CLASS_QUEST = 12,
309309
ITEM_CLASS_KEY = 13,
310310
ITEM_CLASS_PERMANENT = 14,
311-
ITEM_CLASS_MISC = 15,
311+
ITEM_CLASS_MISCELLANEOUS = 15,
312312
ITEM_CLASS_GLYPH = 16
313313
};
314314

@@ -321,7 +321,7 @@ enum ItemSubclassConsumable
321321
ITEM_SUBCLASS_ELIXIR = 2,
322322
ITEM_SUBCLASS_FLASK = 3,
323323
ITEM_SUBCLASS_SCROLL = 4,
324-
ITEM_SUBCLASS_FOOD = 5,
324+
ITEM_SUBCLASS_FOOD_DRINK = 5,
325325
ITEM_SUBCLASS_ITEM_ENHANCEMENT = 6,
326326
ITEM_SUBCLASS_BANDAGE = 7,
327327
ITEM_SUBCLASS_CONSUMABLE_OTHER = 8
@@ -359,8 +359,8 @@ enum ItemSubclassWeapon
359359
ITEM_SUBCLASS_WEAPON_STAFF = 10,
360360
ITEM_SUBCLASS_WEAPON_EXOTIC = 11,
361361
ITEM_SUBCLASS_WEAPON_EXOTIC2 = 12,
362-
ITEM_SUBCLASS_WEAPON_FIST = 13,
363-
ITEM_SUBCLASS_WEAPON_MISC = 14,
362+
ITEM_SUBCLASS_WEAPON_FIST_WEAPON = 13,
363+
ITEM_SUBCLASS_WEAPON_MISCELLANEOUS = 14,
364364
ITEM_SUBCLASS_WEAPON_DAGGER = 15,
365365
ITEM_SUBCLASS_WEAPON_THROWN = 16,
366366
ITEM_SUBCLASS_WEAPON_SPEAR = 17,
@@ -392,7 +392,7 @@ enum ItemSubclassGem
392392

393393
enum ItemSubclassArmor
394394
{
395-
ITEM_SUBCLASS_ARMOR_MISC = 0,
395+
ITEM_SUBCLASS_ARMOR_MISCELLANEOUS = 0,
396396
ITEM_SUBCLASS_ARMOR_CLOTH = 1,
397397
ITEM_SUBCLASS_ARMOR_LEATHER = 2,
398398
ITEM_SUBCLASS_ARMOR_MAIL = 3,
@@ -466,10 +466,11 @@ enum ItemSubclassRecipe
466466
ITEM_SUBCLASS_FIRST_AID_MANUAL = 7,
467467
ITEM_SUBCLASS_ENCHANTING_FORMULA = 8,
468468
ITEM_SUBCLASS_FISHING_MANUAL = 9,
469-
ITEM_SUBCLASS_JEWELCRAFTING_RECIPE = 10
469+
ITEM_SUBCLASS_JEWELCRAFTING_RECIPE = 10,
470+
ITEM_SUBCLASS_INSCRIPTION_TECHNIQUE = 11
470471
};
471472

472-
#define MAX_ITEM_SUBCLASS_RECIPE 11
473+
#define MAX_ITEM_SUBCLASS_RECIPE 12
473474

474475
enum ItemSubclassMoney
475476
{

‎src/server/game/Entities/Object/Object.cpp‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
315315
ASSERT(unit);
316316
unit->BuildMovementPacket(data);
317317

318-
*data << unit->GetSpeed(MOVE_WALK)
319-
<< unit->GetSpeed(MOVE_RUN)
320-
<< unit->GetSpeed(MOVE_RUN_BACK)
321-
<< unit->GetSpeed(MOVE_SWIM)
322-
<< unit->GetSpeed(MOVE_SWIM_BACK)
323-
<< unit->GetSpeed(MOVE_FLIGHT)
324-
<< unit->GetSpeed(MOVE_FLIGHT_BACK)
325-
<< unit->GetSpeed(MOVE_TURN_RATE)
326-
<< unit->GetSpeed(MOVE_PITCH_RATE);
318+
*data << float(unit->GetSpeed(MOVE_WALK));
319+
*data << float(unit->GetSpeed(MOVE_RUN));
320+
*data << float(unit->GetSpeed(MOVE_RUN_BACK));
321+
*data << float(unit->GetSpeed(MOVE_SWIM));
322+
*data << float(unit->GetSpeed(MOVE_SWIM_BACK));
323+
*data << float(unit->GetSpeed(MOVE_FLIGHT));
324+
*data << float(unit->GetSpeed(MOVE_FLIGHT_BACK));
325+
*data << float(unit->GetSpeed(MOVE_TURN_RATE));
326+
*data << float(unit->GetSpeed(MOVE_PITCH_RATE));
327327

328328
// 0x08000000
329329
if (unit->m_movementInfo.GetMovementFlags() & MOVEMENTFLAG_SPLINE_ENABLED)
@@ -341,21 +341,21 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
341341
else
342342
*data << uint8(0);
343343

344-
*data << object->GetPositionX();
345-
*data << object->GetPositionY();
346-
*data << object->GetPositionZ();
344+
*data << float(object->GetPositionX());
345+
*data << float(object->GetPositionY());
346+
*data << float(object->GetPositionZ());
347347

348348
if (transport)
349349
{
350-
*data << object->GetTransOffsetX();
351-
*data << object->GetTransOffsetY();
352-
*data << object->GetTransOffsetZ();
350+
*data << float(object->GetTransOffsetX());
351+
*data << float(object->GetTransOffsetY());
352+
*data << float(object->GetTransOffsetZ());
353353
}
354354
else
355355
{
356-
*data << object->GetPositionX();
357-
*data << object->GetPositionY();
358-
*data << object->GetPositionZ();
356+
*data << float(object->GetPositionX());
357+
*data << float(object->GetPositionY());
358+
*data << float(object->GetPositionZ());
359359
}
360360

361361
*data << object->GetOrientation();
@@ -371,10 +371,10 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
371371
if (flags & UPDATEFLAG_STATIONARY_POSITION)
372372
{
373373
ASSERT(object);
374-
*data << object->GetStationaryX();
375-
*data << object->GetStationaryY();
376-
*data << object->GetStationaryZ();
377-
*data << object->GetStationaryO();
374+
*data << float(object->GetStationaryX());
375+
*data << float(object->GetStationaryY());
376+
*data << float(object->GetStationaryZ());
377+
*data << float(object->GetStationaryO());
378378
}
379379
}
380380
}
@@ -443,7 +443,6 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
443443
// 0x80
444444
if (flags & UPDATEFLAG_VEHICLE)
445445
{
446-
/// @todo Allow players to aquire this updateflag.
447446
ASSERT(unit);
448447
ASSERT(unit->GetVehicleKit());
449448
ASSERT(unit->GetVehicleKit()->GetVehicleInfo());

0 commit comments

Comments
 (0)