Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
This commit is contained in:
DDuarte
2014-01-11 17:26:22 +00:00
parent 33c2bd5ce1 41b613186e
commit 08003577de
1318 changed files with 2645 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/updates/world/2014_01_04_00_world_creature_classlevelstats.sql Normal file
View File

@@ -0,0 +1,10 @@
ALTER TABLE `creature_classlevelstats`
CHANGE `level` `level` TINYINT(3) UNSIGNED NOT NULL,
CHANGE `class` `class` TINYINT(3) UNSIGNED NOT NULL,
CHANGE `basehp0` `basehp0` SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL,
CHANGE `basehp1` `basehp1` SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL,
CHANGE `basehp2` `basehp2` SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL,
CHANGE `basemana` `basemana` SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
CHANGE `basearmor` `basearmor` SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL,
CHANGE `attackpower` `attackpower` SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
CHANGE `rangedattackpower` `rangedattackpower` SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL;

27
sql/updates/world/2014_01_04_01_world_spelldifficulty_dbc.sql Normal file
View File

@@ -0,0 +1,27 @@
DELETE FROM `spelldifficulty_dbc` WHERE `spellid0` IN (36924,37162,48133,48849,49381,49518,49527,49528,49537,49544,49548,49555,50761,50830,50831,50834,51849,52469,52592,53472,54479,55959,56130,65868,67875,67883,68783,67881);
INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`, `spellid2`, `spellid3`) VALUES
(36924,36924,39017,0,0),
(37162,37162,39019,0,0),
(48133,48133,59271,0,0),
(48849,48849,59422,0,0),
(49381,49381,59805,0,0),
(49518,49518,59971,0,0),
(49527,49527,59972,0,0),
(49528,49528,59973,0,0),
(49537,49537,59963,0,0),
(49544,49544,59965,0,0),
(49548,49548,59969,0,0),
(49555,49555,59807,0,0),
(50761,50761,59727,0,0),
(50830,50830,59844,0,0),
(50831,50831,59845,0,0),
(50834,50834,59846,0,0),
(51849,51849,59861,0,0),
(52469,52469,59364,0,0),
(52592,52592,59368,0,0),
(53472,53472,59433,0,0),
(54479,54479,59471,0,0),
(55959,55959,59513,0,0),
(56130,56130,59467,0,0);
UPDATE `spelldifficulty_dbc` SET `id` = `spellid0`;

6
sql/updates/world/2014_01_04_02_world_spelldifficulty_dbc.sql Normal file
View File

@@ -0,0 +1,6 @@
DELETE FROM `spelldifficulty_dbc` WHERE `spellid0` IN (31956,36127,49380,59803,49381);
INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`, `spellid2`, `spellid3`) VALUES
(31956,31956,38801,0,0),
(36127,36127,39005,0,0),
(49380,49380,59803,0,0),
(49381,49381,59805,0,0);

19
sql/updates/world/2014_01_07_00_world_creature_template.sql Normal file
View File

@@ -0,0 +1,19 @@
UPDATE `creature_template` SET `dmg_multiplier`=7.5 WHERE `entry` IN (32386,32358,32377,32398,32409,32400,32417,32429,32438,32422,32357,32471,32481,32475,32447,32495,32501);
UPDATE `creature_template` SET `dmg_multiplier`=13 WHERE `entry` IN (31673,31674);
UPDATE `creature_template` SET `exp`=2 WHERE `entry` IN (35543,35521,35539,35306,35541,35530,40420,31539,34918,35407,40424,40418,35529,35524,35537,35520,31540,35533,35401,35310,35308,35522,35538,35527,35534,35528,35542,35536,35535,35525,35519,35531,40422);
UPDATE `creature_template` SET `faction_A`=1921, `faction_H`=1921 WHERE `entry`=25335;
UPDATE `creature_template` SET `faction_A`=1978, `faction_H`=1978 WHERE `entry`=25338;
UPDATE `creature_template` SET `faction_A`=1982, `faction_H`=1982 WHERE `entry`=25451;
UPDATE `creature_template` SET `faction_A`=634, `faction_H`=634 WHERE `entry`=26093;
UPDATE `creature_template` SET `faction_A`=29, `faction_H`=29 WHERE `entry` IN (26537,26539);
UPDATE `creature_template` SET `faction_A`=35, `faction_H`=35 WHERE `entry`=27135;
UPDATE `creature_template` SET `faction_A`=974, `faction_H`=974 WHERE `entry`=27860;
UPDATE `creature_template` SET `faction_A`=11, `faction_H`=11 WHERE `entry` IN (29292,29293,29294,29295);
UPDATE `creature_template` SET `faction_A`=21, `faction_H`=21 WHERE `entry`=32263;
UPDATE `creature_template` SET `faction_A`=16, `faction_H`=16 WHERE `entry`=32487;
UPDATE `creature_template` SET `faction_A`=14, `faction_H`=14 WHERE `entry`=33785;
UPDATE `creature_template` SET `faction_A`=68, `faction_H`=68 WHERE `entry`=33996;
UPDATE `creature_template` SET `faction_A`=1771, `faction_H`=1771 WHERE `entry` IN (37069,37549,36940,37550,36941,37551);

10
sql/updates/world/2014_01_08_00_world_creature_template.sql Normal file
View File

@@ -0,0 +1,10 @@
UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82, exp=2, `faction_A`=16, `faction_H`=16, `dmg_multiplier`=7.5, `baseattacktime`=2000, `rangeattacktime`=2000, `dynamicflags`=0, `mechanic_immune_mask`=8388624, `ScriptName`='npc_memory' WHERE `entry` IN (
35052,35041,35033,35046,35043,35047,35044,35039,35034,35049,35030,34942,35050,35042,35045,35037,35031,35038,35029,35048,35032,35028,35040,35036,35051);
UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82, exp=2, `faction_A`=16, `faction_H`=16, `dmg_multiplier`=13, `baseattacktime`=2000, `rangeattacktime`=2000, `dynamicflags`=0, `mechanic_immune_mask`=8388624 WHERE `entry` IN (
35519,35520,35521,35522,35523,35524,35525,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539,35540,35541,35542,35543,35544);
UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `faction_A`=16, `faction_H`=16, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_flags`=32832, `dynamicflags`=0 WHERE `entry` IN (35305,35306,35307,35308,35309,35310);
UPDATE `creature_template` SET `dmg_multiplier`=13 WHERE `entry` IN (35306,35308,35310);
UPDATE `creature_template` SET `exp`=2 WHERE `entry` IN (37531,38139,37532,38151);

22
sql/updates/world/2014_01_09_00_world_misc.sql Normal file
View File

@@ -0,0 +1,22 @@
UPDATE `creature_template` SET `unit_flags`=33685504, `rangeattacktime`=2000, `spell1`=0 WHERE `entry` IN (16363,29379);
UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `faction_A`=14, `faction_H`=14, `unit_flags`=33947648, `baseattacktime`=2000, `rangeattacktime`=2000, `spell1`=0, `InhabitType`=4, `flags_extra`=128 WHERE `entry` IN (17662,18602);
UPDATE `creature_template` SET `ScriptName`='npc_broggok_poison_cloud' WHERE `entry`=17662;
DELETE FROM `spelldifficulty_dbc` WHERE `spellid0` IN (28157,28158,30913,30917,30914);
INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`, `spellid2`, `spellid3`) VALUES
(28157,28157,54364,0,0),
(28158,28158,54362,0,0),
(30913,30913,38458,0,0),
(30917,30917,38459,0,0),
(30914,30914,38462,0,0);
DELETE FROM `spell_script_names` WHERE `spell_id` IN (28169,28158,54362,30914,38462);
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(28169,'spell_grobbulus_mutating_injection'),
(28158,'spell_grobbulus_poison_cloud'),
(54362,'spell_grobbulus_poison_cloud'),
(30914,'spell_broggok_poison_cloud'),
(38462,'spell_broggok_poison_cloud');
DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-28169;

2
sql/updates/world/2014_01_09_01_world_creature.sql Normal file
View File

@@ -0,0 +1,2 @@
-- Delete dubble spawns
DELETE FROM `creature` WHERE `guid` IN (142975, 142976, 142977, 142978, 142979, 142980, 142981, 142982, 142983, 142984, 142985, 142986);