Skip to content

Commit

Permalink
Merge pull request vmangos#2736 from vmangos/development
Browse files Browse the repository at this point in the history 
Update native branch
  • Loading branch information
@ratkosrb
ratkosrb authored Aug 28, 2024
2 parents 0680ce0 + 2f500b9 commit f371547
Show file tree
Hide file tree
Showing 32 changed files with 1,803 additions and 182 deletions.
2 changes: 1 addition & 1 deletion dep/include/g3dlite/G3D/platform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
# define __stdcall __attribute__((stdcall))
# endif

# elif defined(__x86_64__) || defined(__arm) || defined(__aarch64__)
# elif defined(__x86_64__) || defined(__arm) || defined(__arm__) || defined(__aarch64__)

# ifndef __cdecl
# define __cdecl
Expand Down
105 changes: 105 additions & 0 deletions sql/migrations/20240623045909_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
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`='20240623045909');
IF v = 0 THEN
INSERT INTO `migrations` VALUES ('20240623045909');
-- Add your query below.


-- Bonfires at Blackwood GY shouldn't be spawned pre 1.11 naxx
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=45609;
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=45611;
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=45610;
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=45608;

-- 1.12 objects in Horde camp in Silithus shouldn't be spawned pre 1.12
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49377;
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49281;
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49379;
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49375;
-- Update in gameobject_template as well
UPDATE `gameobject_template` SET `patch`=10 WHERE `entry`=181633;
UPDATE `gameobject_template` SET `patch`=10 WHERE `entry`=181634;
UPDATE `gameobject_template` SET `patch`=10 WHERE `entry`=181619;

-- Spawn missing pre 1.12 Cooking Brazier in Horde camp in Silithus
INSERT INTO `gameobject` (`guid`, `id`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecsmin`, `spawntimesecsmax`, `animprogress`, `state`, `spawn_flags`, `visibility_mod`, `patch_min`, `patch_max`) VALUES
(49998, 180689, 1, -7554.36, 742.9, -17.7829, 4.79809, 0, 0, 0.676168, -0.736748, 25, 25, 0, 1, 0, 0, 7, 9);

-- 1.12 objects in Alliance camp in Silithus shouldn't be spawned pre 1.12
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49274;
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49381;
UPDATE `gameobject` SET `patch_min`=10 WHERE `guid`=49374;
-- Update in gameobject_template as well
UPDATE `gameobject_template` SET `patch`=10 WHERE `entry`=181635;
UPDATE `gameobject_template` SET `patch`=10 WHERE `entry`=181618;

-- Spawn missing pre 1.12 Cooking Brazier in Alliance camp in Silithus
INSERT INTO `gameobject` (`guid`, `id`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecsmin`, `spawntimesecsmax`, `animprogress`, `state`, `spawn_flags`, `visibility_mod`, `patch_min`, `patch_max`) VALUES
(49999, 180688, 1, -7165.76, 1389.52, 2.41821, 3.06785, 0, 0, 0.99932, 0.0368614, 25, 25, 0, 1, 0, 0, 7, 9);

-- Stonelash Flayer shouldn't be spawned pre 1.8
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=44397;
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=44396;

-- Set patch of pooled food/barrel to not spawn pre 1.11
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=902;
UPDATE `gameobject` SET `patch_min`=9 WHERE `guid`=904;

-- Moonwell (for mooncloth crafting) at Cenarion Hold shouldn't be spawned pre 1.8
UPDATE `gameobject` SET `patch_min`=6 WHERE `guid`=49378;

-- Twilight Masters in northeast Silithus shouldn't be spawned pre 1.8
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=43069;
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=43070;
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=43071;
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=43076;
UPDATE `creature` SET `patch_min`=6 WHERE `guid`=43077;

-- Bonfire Damage in northeast Silithus shouldn't be spawned in pre 1.8
UPDATE `gameobject` SET `patch_min`=6 WHERE `guid`=49282;

-- Terrain was changed a bit in Cenarion Hold in 1.9, remove objects that didn't exist prior to 1.9.0:
-- Forge
UPDATE `gameobject` SET `patch_min`=7 WHERE `guid`=49393;
-- Anvil
UPDATE `gameobject` SET `patch_min`=7 WHERE `guid`=49394;
-- Cooking Brazier
UPDATE `gameobject` SET `patch_min`=7 WHERE `guid`=49395;

-- Cenarion Hold Infantry with waypoints should be mounted pre 1.9.
INSERT INTO `creature_addon` (`guid`, `patch`, `display_id`, `mount_display_id`, `equipment_id`, `stand_state`, `sheath_state`, `emote_state`, `auras`) VALUES
(42895, 6, 0, 14330, -1, 0, 1, 0, NULL),
(42898, 6, 0, 14330, -1, 0, 1, 0, NULL),
(42895, 7, 0, 0, -1, 0, 1, 0, NULL),
(42898, 7, 0, 0, -1, 0, 1, 0, NULL),
(42897, 6, 0, 14330, -1, 0, 1, 0, NULL),
(60006, 6, 0, 14330, -1, 0, 1, 0, NULL),
(42897, 7, 0, 0, -1, 0, 1, 0, NULL),
(60006, 7, 0, 0, -1, 0, 1, 0, NULL);

-- Several Cenarion Hold Infantry NPCs shouldn't be spawned pre 1.9.
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42772;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42784;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42868;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42769;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42773;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42776;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42777;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42768;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42884;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42782;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42783;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42766;
UPDATE `creature` SET `patch_min`=7 WHERE `guid`=42767;


-- End of migration.
END IF;
END??
DELIMITER ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
22 changes: 22 additions & 0 deletions sql/migrations/20240705213916_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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`='20240705213916');
IF v = 0 THEN
INSERT INTO `migrations` VALUES ('20240705213916');
-- Add your query below.


-- Fix Stormwind and Orgrimmar world buffs not applying to pets.
UPDATE `generic_scripts` SET `datalong3`=1 WHERE `command`=92 && `id` IN (4974, 7782, 7496);
UPDATE `creature_movement_scripts` SET `datalong3`=1 WHERE `command`=92 && `id` IN (1439202, 1472002);


-- End of migration.
END IF;
END??
DELIMITER ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
34 changes: 34 additions & 0 deletions sql/migrations/20240723231603_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
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`='20240723231603');
IF v = 0 THEN
INSERT INTO `migrations` VALUES ('20240723231603');
-- Add your query below.


/*
World of Warcraft Client Patch 1.6.1 (2005-08-02)
- The Oil of Immolation effect is no longer affected by bonuses to
spell damage from items.
*/
UPDATE `spell_template` SET `effectBonusCoefficient1`=1 WHERE `entry`=11351 && `build` < 4544;

/*
World of Warcraft Client Patch 1.6.1 (2005-08-02)
- Lowered experience values for Creeping Sludge.
*/
DELETE FROM `creature_template` WHERE `entry`=12222;
INSERT INTO `creature_template` (`entry`, `patch`, `name`, `subname`, `level_min`, `level_max`, `faction`, `npc_flags`, `gossip_menu_id`, `display_id1`, `display_id2`, `display_id3`, `display_id4`, `display_scale1`, `display_scale2`, `display_scale3`, `display_scale4`, `display_probability1`, `display_probability2`, `display_probability3`, `display_probability4`, `display_total_probability`, `mount_display_id`, `speed_walk`, `speed_run`, `detection_range`, `call_for_help_range`, `leash_range`, `type`, `pet_family`, `rank`, `unit_class`, `xp_multiplier`, `health_multiplier`, `mana_multiplier`, `armor_multiplier`, `damage_multiplier`, `damage_variance`, `damage_school`, `base_attack_time`, `ranged_attack_time`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `loot_id`, `pickpocket_loot_id`, `skinning_loot_id`, `gold_min`, `gold_max`, `spell_id1`, `spell_id2`, `spell_id3`, `spell_id4`, `spell_list_id`, `pet_spell_list_id`, `spawn_spell_id`, `auras`, `ai_name`, `movement_type`, `inhabit_type`, `civilian`, `racial_leader`, `equipment_id`, `trainer_id`, `vendor_id`, `mechanic_immune_mask`, `school_immune_mask`, `immunity_flags`, `static_flags1`, `static_flags2`, `flags_extra`, `script_name`) VALUES (12222, 0, 'Creeping Sludge', '', 45, 46, 16, 0, 0, 12349, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.8, 0.285714, 20, 5, 0, 10, 0, 1, 1, 1, 3, 1.5, 0.95, 3.9, 0.14, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12222, 12222, 0, 221, 498, 0, 0, 0, 0, 0, 0, 0, '22638', 'EventAI', 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');
INSERT INTO `creature_template` (`entry`, `patch`, `name`, `subname`, `level_min`, `level_max`, `faction`, `npc_flags`, `gossip_menu_id`, `display_id1`, `display_id2`, `display_id3`, `display_id4`, `display_scale1`, `display_scale2`, `display_scale3`, `display_scale4`, `display_probability1`, `display_probability2`, `display_probability3`, `display_probability4`, `display_total_probability`, `mount_display_id`, `speed_walk`, `speed_run`, `detection_range`, `call_for_help_range`, `leash_range`, `type`, `pet_family`, `rank`, `unit_class`, `xp_multiplier`, `health_multiplier`, `mana_multiplier`, `armor_multiplier`, `damage_multiplier`, `damage_variance`, `damage_school`, `base_attack_time`, `ranged_attack_time`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `loot_id`, `pickpocket_loot_id`, `skinning_loot_id`, `gold_min`, `gold_max`, `spell_id1`, `spell_id2`, `spell_id3`, `spell_id4`, `spell_list_id`, `pet_spell_list_id`, `spawn_spell_id`, `auras`, `ai_name`, `movement_type`, `inhabit_type`, `civilian`, `racial_leader`, `equipment_id`, `trainer_id`, `vendor_id`, `mechanic_immune_mask`, `school_immune_mask`, `immunity_flags`, `static_flags1`, `static_flags2`, `flags_extra`, `script_name`) VALUES (12222, 1, 'Creeping Sludge', '', 45, 46, 16, 0, 0, 14350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.8, 0.285714, 20, 5, 0, 10, 0, 1, 1, 1, 3, 1.5, 0.95, 3.9, 0.14, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12222, 12222, 0, 221, 498, 0, 0, 0, 0, 0, 0, 0, '22638', 'EventAI', 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');
INSERT INTO `creature_template` (`entry`, `patch`, `name`, `subname`, `level_min`, `level_max`, `faction`, `npc_flags`, `gossip_menu_id`, `display_id1`, `display_id2`, `display_id3`, `display_id4`, `display_scale1`, `display_scale2`, `display_scale3`, `display_scale4`, `display_probability1`, `display_probability2`, `display_probability3`, `display_probability4`, `display_total_probability`, `mount_display_id`, `speed_walk`, `speed_run`, `detection_range`, `call_for_help_range`, `leash_range`, `type`, `pet_family`, `rank`, `unit_class`, `xp_multiplier`, `health_multiplier`, `mana_multiplier`, `armor_multiplier`, `damage_multiplier`, `damage_variance`, `damage_school`, `base_attack_time`, `ranged_attack_time`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `loot_id`, `pickpocket_loot_id`, `skinning_loot_id`, `gold_min`, `gold_max`, `spell_id1`, `spell_id2`, `spell_id3`, `spell_id4`, `spell_list_id`, `pet_spell_list_id`, `spawn_spell_id`, `auras`, `ai_name`, `movement_type`, `inhabit_type`, `civilian`, `racial_leader`, `equipment_id`, `trainer_id`, `vendor_id`, `mechanic_immune_mask`, `school_immune_mask`, `immunity_flags`, `static_flags1`, `static_flags2`, `flags_extra`, `script_name`) VALUES (12222, 4, 'Creeping Sludge', '', 45, 46, 16, 0, 0, 14350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.8, 0.285714, 20, 5, 0, 10, 0, 1, 1, 0.1, 3, 1.5, 0.95, 3.9, 0.14, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12222, 12222, 0, 221, 498, 0, 0, 0, 0, 0, 0, 0, '22638', 'EventAI', 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');


-- End of migration.
END IF;
END??
DELIMITER ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
Loading

0 comments on commit f371547

Please sign in to comment.