Skip to content

Commit c4913cd

Browse files
Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]
2 parents 13a8fee + 0306c47 commit c4913cd

6 files changed

Lines changed: 26 additions & 2 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_01_17_01 -> 2026_01_18_00
2+
-- Sets "Spiritsbreath" to be 100 from 58 % drop rate for "Grumbald One-Eye"
3+
UPDATE `creature_loot_template` SET `Chance` = 100 WHERE `Entry` = 26681 AND `Item` = 36740;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- DB update 2026_01_18_00 -> 2026_01_18_01
2+
-- Add skinning loot table for creature 1933 (Sheep) to enable Ruined Leather Scraps, Wool Cloth, and Light Leather drops.
3+
UPDATE `creature_template` SET `skinloot` = 1933 WHERE (`entry` = 1933);
4+
5+
DELETE FROM `skinning_loot_template` WHERE (`Entry` = 1933);
6+
INSERT INTO `skinning_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
7+
(1933, 2934, 0, 55, 0, 1, 1, 1, 1, 'Ruined Leather Scraps'),
8+
(1933, 2592, 0, 35, 0, 1, 1, 1, 1, 'Wool Cloth'),
9+
(1933, 2318, 0, 10, 0, 1, 1, 1, 1, 'Light Leather');
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- DB update 2026_01_18_01 -> 2026_01_18_02
2+
--
3+
UPDATE `trainer_spell` SET `ReqSkillRank`=275 WHERE `SpellId`=29356;
4+
UPDATE `trainer_spell` SET `ReqSkillRank`=230 WHERE `SpellId`=16153;
5+
UPDATE `trainer_spell` SET `ReqSkillRank`=375 WHERE `SpellId`=29361;

src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ BattlegroundSA::BattlegroundSA()
5252
EndRoundTimer = 0s;
5353
ShipsStarted = false;
5454
Status = BG_SA_NOTSTARTED;
55+
_nextShipIsEast = true;
5556

5657
for (uint8 i = 0; i < 6; i++)
5758
GateStatus[i] = BG_SA_GATE_OK;
@@ -85,6 +86,7 @@ void BattlegroundSA::Init()
8586
_notEvenAScratch[TEAM_HORDE] = true;
8687
Status = BG_SA_WARMUP;
8788
_relicClicked = false;
89+
_nextShipIsEast = true;
8890
}
8991

9092
bool BattlegroundSA::SetupBattleground()
@@ -181,6 +183,7 @@ bool BattlegroundSA::ResetObjs()
181183

182184
TotalTime = 0s;
183185
ShipsStarted = false;
186+
_nextShipIsEast = true;
184187

185188
//Graveyards!
186189
for (uint8 i = 0; i < BG_SA_MAX_GY; i++)
@@ -574,10 +577,12 @@ void BattlegroundSA::TeleportToEntrancePosition(Player* player)
574577
if (!ShipsStarted)
575578
{
576579
player->CastSpell(player, 12438, true);//Without this player falls before boat loads...
577-
if (urand(0, 1))
580+
if (_nextShipIsEast)
578581
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2682.936f, -830.368f, 15.0f, 2.895f, 0);
579582
else
580583
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2577.003f, 980.261f, 15.0f, 0.807f, 0);
584+
585+
_nextShipIsEast = !_nextShipIsEast;
581586
}
582587
else
583588
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 1600.381f, -106.263f, 8.8745f, 3.78f, 0);

src/server/game/Battlegrounds/Zones/BattlegroundSA.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,5 +620,7 @@ class AC_GAME_API BattlegroundSA : public Battleground
620620

621621
// Achievement: Not Even a Scratch
622622
bool _notEvenAScratch[PVP_TEAMS_COUNT];
623+
/// Toggle for alternating player spawns between East and West ships (true = first/East ship, false = second/West ship)
624+
bool _nextShipIsEast;
623625
};
624626
#endif

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ struct boss_hadronox : public BossAI
172172
SummonCrusherPack(SUMMON_GROUP_CRUSHER_3);
173173
events.ScheduleEvent(EVENT_HADRONOX_MOVE1, 0s);
174174
events.ScheduleEvent(EVENT_HADRONOX_MOVE2, 45s);
175-
events.ScheduleEvent(EVENT_HADRONOX_MOVE3, 90s);
175+
events.ScheduleEvent(EVENT_HADRONOX_MOVE3, 70s);
176176
}
177177
}
178178

0 commit comments

Comments
 (0)