Skip to content

Commit 0fce0c3

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-pvpranks
2 parents 0d9019d + fb5c0f4 commit 0fce0c3

File tree

111 files changed

+874
-846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+874
-846
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- Add pre quest for Loyal Companions quest
2+
DELETE FROM `quest_template_addon` WHERE `ID`=12865;
3+
INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `BreadcrumbForQuestId`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
4+
(12865, 0, 0, 0, 12863, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- Add pre quest for Unwelcome Guests quest
2+
DELETE FROM `quest_template_addon` WHERE `ID`=12876;
3+
INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `BreadcrumbForQuestId`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
4+
(12876, 0, 0, 0, 12874, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
-- Update creature_template minlevel/maxlevel values.
2+
UPDATE `creature_template` SET `maxlevel`=4 WHERE `entry`=80; -- Kobold Laborer
3+
UPDATE `creature_template` SET `minlevel`=15 WHERE `entry`=121; -- Defias Pathstalker
4+
UPDATE `creature_template` SET `minlevel`=13 WHERE `entry`=123; -- Riverpaw Mongrel
5+
UPDATE `creature_template` SET `minlevel`=29 WHERE `entry`=206; -- Nightbane Vile Fang
6+
UPDATE `creature_template` SET `minlevel`=23 WHERE `entry`=579; -- Shadowhide Assassin
7+
UPDATE `creature_template` SET `maxlevel`=33 WHERE `entry`=940; -- Kurzen Medicine Man
8+
UPDATE `creature_template` SET `maxlevel`=12 WHERE `entry`=1231; -- Grif Wildheart <Hunter Trainer>
9+
UPDATE `creature_template` SET `minlevel`=16 WHERE `entry`=1725; -- Defias Watchman
10+
UPDATE `creature_template` SET `maxlevel`=50 WHERE `entry`=2505; -- Saltwater Snapjaw
11+
UPDATE `creature_template` SET `minlevel`=13 WHERE `entry`=456; -- Murloc Minor Oracle
12+
UPDATE `creature_template` SET `maxlevel`=24 WHERE `entry`=615; -- Blackrock Tracker
13+
UPDATE `creature_template` SET `maxlevel`=37 WHERE `entry`=873; -- Saltscale Oracle
14+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=11 WHERE `entry`=1240; -- Boran Ironclink <Armorer>
15+
UPDATE `creature_template` SET `minlevel`=8 WHERE `entry`=1245; -- Kogan Forgestone
16+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=12 WHERE `entry`=1255; -- Prospector Gehn <Explorers' League>
17+
UPDATE `creature_template` SET `maxlevel`=11 WHERE `entry`=1355; -- Cook Ghilm <Cooking Trainer>
18+
UPDATE `creature_template` SET `maxlevel`=10 WHERE `entry`=1358; -- Miner Grothor
19+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=10 WHERE `entry`=1360; -- Miner Grumnal
20+
UPDATE `creature_template` SET `minlevel`=16 WHERE `entry`=1725; -- Defias Watchman
21+
UPDATE `creature_template` SET `minlevel`=18, `maxlevel`=20 WHERE `entry`=2140; -- Edwin Harly <General Supplies>
22+
UPDATE `creature_template` SET `maxlevel`=20 WHERE `entry`=3556; -- Andrew Hilbert <Trade Supplies>
23+
UPDATE `creature_template` SET `maxlevel`=23 WHERE `entry`=4463; -- Blackrock Summoner
24+
UPDATE `creature_template` SET `minlevel`=32 WHERE `entry`=4638; -- Magram Scout
25+
UPDATE `creature_template` SET `maxlevel`=46 WHERE `entry`=5261; -- Enthralled Atal'ai
26+
UPDATE `creature_template` SET `maxlevel`=45 WHERE `entry`=5295; -- Enraged Feral Scar
27+
UPDATE `creature_template` SET `minlevel`=43 WHERE `entry`=5334; -- Hatecrest Myrmidon
28+
UPDATE `creature_template` SET `minlevel`=49 WHERE `entry`=5358; -- Cliff Giant
29+
UPDATE `creature_template` SET `minlevel`=47 WHERE `entry`=5361; -- Wave Strider
30+
UPDATE `creature_template` SET `maxlevel`=47 WHERE `entry`=5434; -- Coral Shark
31+
UPDATE `creature_template` SET `minlevel`=44 WHERE `entry`=5623; -- Wastewander Assassin
32+
UPDATE `creature_template` SET `maxlevel`=19 WHERE `entry`=5835; -- Foreman Grills
33+
UPDATE `creature_template` SET `minlevel`=29 WHERE `entry`=6115; -- Roaming Felguard
34+
UPDATE `creature_template` SET `minlevel`=25 WHERE `entry`=6206; -- Caverndeep Burrower
35+
UPDATE `creature_template` SET `minlevel`=25 WHERE `entry`=6207; -- Caverndeep Ambusher
36+
UPDATE `creature_template` SET `minlevel`=51 WHERE `entry`=7031; -- Obsidian Elemental
37+
UPDATE `creature_template` SET `minlevel`=19 WHERE `entry`=7170; -- Thragomm <Horde Runner>
38+
UPDATE `creature_template` SET `minlevel`=36 WHERE `entry`=7334; -- Battle Boar Horror
39+
UPDATE `creature_template` SET `minlevel`=30 WHERE `entry`=8118; -- Lillian Singh <Holiday Fireworks Vendor>
40+
UPDATE `creature_template` SET `minlevel`=40 WHERE `entry`=8276; -- Soaring Razorbeak
41+
UPDATE `creature_template` SET `maxlevel`=55 WHERE `entry`=8519; -- Blighted Surge
42+
UPDATE `creature_template` SET `minlevel`=57 WHERE `entry`=8522; -- Plague Monstrosity
43+
UPDATE `creature_template` SET `minlevel`=51 WHERE `entry`=9464; -- Overlord Ror
44+
UPDATE `creature_template` SET `minlevel`=57 WHERE `entry`=10916; -- Winterfall Runner
45+
UPDATE `creature_template` SET `maxlevel`=15 WHERE `entry`=11321; -- Molten Elemental
46+
UPDATE `creature_template` SET `maxlevel`=28 WHERE `entry`=11684; -- Warsong Shredder
47+
UPDATE `creature_template` SET `maxlevel`=59 WHERE `entry`=11745; -- Cyclone Warrior
48+
UPDATE `creature_template` SET `minlevel`=69 WHERE `entry`=12380; -- Unliving Resident
49+
UPDATE `creature_template` SET `maxlevel`=58 WHERE `entry`=14395; -- Griniblix the Spectator
50+
UPDATE `creature_template` SET `minlevel`=61 WHERE `entry`=14750; -- Gurubashi Bat Rider
51+
UPDATE `creature_template` SET `minlevel`=60 WHERE `entry`=15043; -- Zulian Crocolisk
52+
UPDATE `creature_template` SET `maxlevel`=70 WHERE `entry`=16407; -- Spectral Servant
53+
UPDATE `creature_template` SET `maxlevel`=30 WHERE `entry`=16541; -- Ghostlands Guardian
54+
UPDATE `creature_template` SET `maxlevel`=59 WHERE `entry`=17006; -- Elsaana
55+
UPDATE `creature_template` SET `minlevel`=60 WHERE `entry`=17052; -- Rumatu
56+
UPDATE `creature_template` SET `minlevel`=35 WHERE `entry`=17095; -- Balandar Brightstar
57+
UPDATE `creature_template` SET `maxlevel`=67 WHERE `entry`=17160; -- Living Cyclone
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
UPDATE `trinity_string` SET `content_default`='New ArenaTeam created [Name: "%s"][Id: %u][Type: %u][Captain: %s]' WHERE `entry`=864;
2+
UPDATE `trinity_string` SET `content_default`='Name:"%s"[%s] - PR: %u - %s' WHERE `entry`=869;
3+
UPDATE `trinity_string` SET `content_default`='SetData performed on [%s, name: %s] Field: %u, Data: %u, with %s' WHERE `entry`=555;
4+
UPDATE `trinity_string` SET `content_default`='| %80s | %20s | %15s (%10u) | %19s |' WHERE `entry`=1017;
5+
UPDATE `trinity_string` SET `content_default`='%s Name: %s Account: %s (%u) Date: %s' WHERE `entry`=1026;
6+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: account not exist!' WHERE `entry`=1023;
7+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: account character list full!' WHERE `entry`=1024;
8+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: new name already used!' WHERE `entry`=1025;
9+
UPDATE `trinity_string` SET `content_default`='Forced rename for player %s (%s) will be requested at next login.' WHERE `entry`=254;
10+
UPDATE `trinity_string` SET `content_default`='Customization for Player %s (%s) will be requested at next login.' WHERE `entry`=346;
11+
UPDATE `trinity_string` SET `content_default`='Player %s (%s) Account %s (Id: %u) deleted.' WHERE `entry`=1009;
12+
UPDATE `trinity_string` SET `content_default`='GameObject (GUID: %u) is referenced by nonexisting %s, can''t be deleted.' WHERE `entry`=274;
13+
UPDATE `trinity_string` SET `content_default`='id: %d %s effmask: %d charges: %d stack: %d slot %d duration: %d maxduration: %d %s %s caster: %s %s' WHERE `entry`=468;
14+
UPDATE `trinity_string` SET `content_default`='Mail List Info: # of mails: %u, Player: %s (%s)' WHERE `entry`=1151;
15+
UPDATE `trinity_string` SET `content_default`='Name: %s (%s), Zone: %s, Phase: %u, %s, Flags: %s, Roles: %s' WHERE `entry`=1150;
16+
UPDATE `trinity_string` SET `content_default`='Object %s' WHERE `entry`=201;
17+
UPDATE `trinity_string` SET `content_default`='│Player %s %s (%s)' WHERE `entry`=453;
18+
UPDATE `trinity_string` SET `content_default`='The value index %u is too big for %s (count: %u).' WHERE `entry`=564;
19+
UPDATE `trinity_string` SET `content_default`='You set %s field: %u to uint32 value: %u' WHERE `entry`=566;
20+
UPDATE `trinity_string` SET `content_default`='You set %s field: %u to float value: %f' WHERE `entry`=568;
21+
UPDATE `trinity_string` SET `content_default`='The uint32 value of %s in %u is: %u' WHERE `entry`=570;
22+
UPDATE `trinity_string` SET `content_default`='The float of %s value in %u is: %f' WHERE `entry`=572;
23+
UPDATE `trinity_string` SET `content_default`='| Guild Master: %s (%s)' WHERE `entry`=1178;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
UPDATE `trinity_string` SET `content_default`='NPC currently selected by player:\nName: %s\nSpawnID: %u.\nGUID: %s.\nEntry: %u.\nFaction: %u.\nNPC Flags: %u.\nDisplayID: %u (Native: %u).' WHERE `entry`=539;
2+
UPDATE `trinity_string` SET `content_default`='%s, faction is %i, flags is %i, npcflag is %i, dynflag flag is %i.' WHERE `entry`=128;
3+
UPDATE `trinity_string` SET `content_default`='You changed %s Faction to %i, flags to %i, npcflag to %i, dynflag to %i.' WHERE `entry`=130;
4+
UPDATE `trinity_string` SET `content_default`='%s (%s) movement generators stack:' WHERE `entry`=526;
5+
UPDATE `trinity_string` SET `content_default`=' Targeted to player %s (%s)' WHERE `entry`=532;
6+
UPDATE `trinity_string` SET `content_default`=' Targeted to creature %s (%s)' WHERE `entry`=533;
7+
UPDATE `trinity_string` SET `content_default`=' Follow player %s (%s)' WHERE `entry`=1139;
8+
UPDATE `trinity_string` SET `content_default`=' Follow creature %s (%s)' WHERE `entry`=1140;
9+
UPDATE `trinity_string` SET `content_default`='%s updateIndex: %i, value: %i.' WHERE `entry`=562;
10+
UPDATE `trinity_string` SET `content_default`='You change %s UpdateIndex: %i value to %i.' WHERE `entry`=563;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UPDATE `trinity_string` SET `content_default`='%s - owner: %s (%s account: %u) %s' WHERE `entry`=508;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- Fix Illidan Stormrage health and unit_class
2+
UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=22917;
3+
UPDATE `creature` SET `curhealth`=4249280 WHERE `guid`=52484;
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ALTER TABLE `gameobject_template` CHANGE `data0` `Data0` INT NOT NULL DEFAULT '0';
2+
ALTER TABLE `gameobject_template` CHANGE `data1` `Data1` INT NOT NULL DEFAULT '0';
3+
ALTER TABLE `gameobject_template` CHANGE `data2` `Data2` INT NOT NULL DEFAULT '0';
4+
ALTER TABLE `gameobject_template` CHANGE `data3` `Data3` INT NOT NULL DEFAULT '0';
5+
ALTER TABLE `gameobject_template` CHANGE `data4` `Data4` INT NOT NULL DEFAULT '0';
6+
ALTER TABLE `gameobject_template` CHANGE `data5` `Data5` INT NOT NULL DEFAULT '0';
7+
ALTER TABLE `gameobject_template` CHANGE `data6` `Data6` INT NOT NULL DEFAULT '0';
8+
ALTER TABLE `gameobject_template` CHANGE `data7` `Data7` INT NOT NULL DEFAULT '0';
9+
ALTER TABLE `gameobject_template` CHANGE `data8` `Data8` INT NOT NULL DEFAULT '0';
10+
ALTER TABLE `gameobject_template` CHANGE `data9` `Data9` INT NOT NULL DEFAULT '0';
11+
ALTER TABLE `gameobject_template` CHANGE `data10` `Data10` INT NOT NULL DEFAULT '0';
12+
ALTER TABLE `gameobject_template` CHANGE `data11` `Data11` INT NOT NULL DEFAULT '0';
13+
ALTER TABLE `gameobject_template` CHANGE `data12` `Data12` INT NOT NULL DEFAULT '0';
14+
ALTER TABLE `gameobject_template` CHANGE `data13` `Data13` INT NOT NULL DEFAULT '0';
15+
ALTER TABLE `gameobject_template` CHANGE `data14` `Data14` INT NOT NULL DEFAULT '0';
16+
ALTER TABLE `gameobject_template` CHANGE `data15` `Data15` INT NOT NULL DEFAULT '0';
17+
ALTER TABLE `gameobject_template` CHANGE `data16` `Data16` INT NOT NULL DEFAULT '0';
18+
ALTER TABLE `gameobject_template` CHANGE `data17` `Data17` INT NOT NULL DEFAULT '0';
19+
ALTER TABLE `gameobject_template` CHANGE `data18` `Data18` INT NOT NULL DEFAULT '0';
20+
ALTER TABLE `gameobject_template` CHANGE `data19` `Data19` INT NOT NULL DEFAULT '0';
21+
ALTER TABLE `gameobject_template` CHANGE `data20` `Data20` INT NOT NULL DEFAULT '0';
22+
ALTER TABLE `gameobject_template` CHANGE `data21` `Data21` INT NOT NULL DEFAULT '0';
23+
ALTER TABLE `gameobject_template` CHANGE `data22` `Data22` INT NOT NULL DEFAULT '0';
24+
ALTER TABLE `gameobject_template` CHANGE `data23` `Data23` INT NOT NULL DEFAULT '0';

0 commit comments

Comments
 (0)