From 393adc20671d7f6e64e73dcead93abe3bceabbd9 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sat, 7 Jan 2017 07:46:44 +0100
Subject: [PATCH] rename files

---
 .../2017_01_07_00_from_335_was_2017_01_06_00_auth.sql}          | 0
 sql/updates/world/3.3.5/2017_01_04_03_world_335.sql             | 2 --
 .../2017_01_07_00_world_from_335_was_2017_01_02_00_world.sql}   | 0
 .../2017_01_07_01_world_from_335_was_2017_01_02_01_world.sql}   | 0
 .../2017_01_07_02_world_from_335_was_2017_01_02_02_world.sql}   | 0
 .../2017_01_07_03_world_from_335_was_2017_01_02_03_world.sql}   | 0
 .../2017_01_07_04_world_from_335_was_2017_01_02_04_world.sql}   | 0
 ...017_01_07_05_world_from_335_was_2017_01_02_05_world_335.sql} | 2 ++
 .../2017_01_07_06_world_from_335_was_2017_01_02_06_world.sql}   | 0
 .../2017_01_07_07_world_from_335_was_2017_01_02_07_world.sql}   | 0
 .../2017_01_07_08_world_from_335_was_2017_01_02_08_world.sql}   | 0
 .../2017_01_07_09_world_from_335_was_2017_01_02_09_world.sql}   | 0
 ...017_01_07_10_world_from_335_was_2017_01_03_00_world_335.sql} | 2 ++
 .../2017_01_07_11_world_from_335_was_2017_01_03_01_world.sql}   | 0
 ...017_01_07_12_world_from_335_was_2017_01_04_00_world_335.sql} | 2 ++
 .../2017_01_07_13_world_from_335_was_2017_01_04_01_world.sql}   | 0
 ...017_01_07_14_world_from_335_was_2017_01_04_02_world_335.sql} | 2 ++
 ...2017_01_07_15_world_from_335_was_2017_01_04_03_world_335.sql | 2 ++
 .../2017_01_07_16_world_from_335_was_2017_01_05_00_world.sql}   | 0
 .../2017_01_07_17_world_from_335_was_2017_01_05_01_world.sql}   | 0
 .../2017_01_07_18_world_from_335_was_2017_01_05_02_world.sql}   | 0
 .../2017_01_07_19_world_from_335_was_2017_01_05_03_world.sql}   | 0
 .../2017_01_07_20_world_from_335_was_2017_01_06_00_world.sql}   | 2 ++
 .../2017_01_07_21_world_from_335_was_2017_01_06_01_world.sql}   | 0
 24 files changed, 12 insertions(+), 2 deletions(-)
 rename sql/updates/auth/{3.3.5/2017_01_06_00_auth.sql => 4.3.4/2017_01_07_00_from_335_was_2017_01_06_00_auth.sql} (100%)
 delete mode 100644 sql/updates/world/3.3.5/2017_01_04_03_world_335.sql
 rename sql/updates/world/{3.3.5/2017_01_02_00_world.sql => 4.3.4/2017_01_07_00_world_from_335_was_2017_01_02_00_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_01_world.sql => 4.3.4/2017_01_07_01_world_from_335_was_2017_01_02_01_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_02_world.sql => 4.3.4/2017_01_07_02_world_from_335_was_2017_01_02_02_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_03_world.sql => 4.3.4/2017_01_07_03_world_from_335_was_2017_01_02_03_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_04_world.sql => 4.3.4/2017_01_07_04_world_from_335_was_2017_01_02_04_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_05_world_335.sql => 4.3.4/2017_01_07_05_world_from_335_was_2017_01_02_05_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2017_01_02_06_world.sql => 4.3.4/2017_01_07_06_world_from_335_was_2017_01_02_06_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_07_world.sql => 4.3.4/2017_01_07_07_world_from_335_was_2017_01_02_07_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_08_world.sql => 4.3.4/2017_01_07_08_world_from_335_was_2017_01_02_08_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_02_09_world.sql => 4.3.4/2017_01_07_09_world_from_335_was_2017_01_02_09_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_03_00_world_335.sql => 4.3.4/2017_01_07_10_world_from_335_was_2017_01_03_00_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2017_01_03_01_world.sql => 4.3.4/2017_01_07_11_world_from_335_was_2017_01_03_01_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_04_00_world_335.sql => 4.3.4/2017_01_07_12_world_from_335_was_2017_01_04_00_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2017_01_04_01_world.sql => 4.3.4/2017_01_07_13_world_from_335_was_2017_01_04_01_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_04_02_world_335.sql => 4.3.4/2017_01_07_14_world_from_335_was_2017_01_04_02_world_335.sql} (99%)
 create mode 100644 sql/updates/world/4.3.4/2017_01_07_15_world_from_335_was_2017_01_04_03_world_335.sql
 rename sql/updates/world/{3.3.5/2017_01_05_00_world.sql => 4.3.4/2017_01_07_16_world_from_335_was_2017_01_05_00_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_05_01_world.sql => 4.3.4/2017_01_07_17_world_from_335_was_2017_01_05_01_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_05_02_world.sql => 4.3.4/2017_01_07_18_world_from_335_was_2017_01_05_02_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_05_03_world.sql => 4.3.4/2017_01_07_19_world_from_335_was_2017_01_05_03_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2017_01_06_00_world.sql => 4.3.4/2017_01_07_20_world_from_335_was_2017_01_06_00_world.sql} (70%)
 rename sql/updates/world/{3.3.5/2017_01_06_01_world.sql => 4.3.4/2017_01_07_21_world_from_335_was_2017_01_06_01_world.sql} (100%)

diff --git a/sql/updates/auth/3.3.5/2017_01_06_00_auth.sql b/sql/updates/auth/4.3.4/2017_01_07_00_from_335_was_2017_01_06_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2017_01_06_00_auth.sql
rename to sql/updates/auth/4.3.4/2017_01_07_00_from_335_was_2017_01_06_00_auth.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_03_world_335.sql b/sql/updates/world/3.3.5/2017_01_04_03_world_335.sql
deleted file mode 100644
index ddf4dfa0b1c..00000000000
--- a/sql/updates/world/3.3.5/2017_01_04_03_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- 
-UPDATE `creature` SET `MovementType`=2 WHERE  `guid`=33909;
diff --git a/sql/updates/world/3.3.5/2017_01_02_00_world.sql b/sql/updates/world/4.3.4/2017_01_07_00_world_from_335_was_2017_01_02_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_00_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_00_world_from_335_was_2017_01_02_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_01_world.sql b/sql/updates/world/4.3.4/2017_01_07_01_world_from_335_was_2017_01_02_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_01_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_01_world_from_335_was_2017_01_02_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_02_world.sql b/sql/updates/world/4.3.4/2017_01_07_02_world_from_335_was_2017_01_02_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_02_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_02_world_from_335_was_2017_01_02_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_03_world.sql b/sql/updates/world/4.3.4/2017_01_07_03_world_from_335_was_2017_01_02_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_03_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_03_world_from_335_was_2017_01_02_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_04_world.sql b/sql/updates/world/4.3.4/2017_01_07_04_world_from_335_was_2017_01_02_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_04_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_04_world_from_335_was_2017_01_02_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_05_world_335.sql b/sql/updates/world/4.3.4/2017_01_07_05_world_from_335_was_2017_01_02_05_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2017_01_02_05_world_335.sql
rename to sql/updates/world/4.3.4/2017_01_07_05_world_from_335_was_2017_01_02_05_world_335.sql
index 18d952eebbc..bea4ac26178 100644
--- a/sql/updates/world/3.3.5/2017_01_02_05_world_335.sql
+++ b/sql/updates/world/4.3.4/2017_01_07_05_world_from_335_was_2017_01_02_05_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Rot Hide Gnoll SAI
 SET @ENTRY := 1674;
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
@@ -5,3 +6,4 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
 INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
 (@ENTRY,0,0,0,0,0,100,0,7000,21000,120000,125000,11,3237,0,0,0,0,0,2,0,0,0,0,0,0,0,"Rot Hide Gnoll - In Combat - Cast 'Curse of Thule'"),
 (@ENTRY,0,1,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Rot Hide Gnoll - Between 0-15% Health - Flee For Assist (No Repeat)");
+*/
diff --git a/sql/updates/world/3.3.5/2017_01_02_06_world.sql b/sql/updates/world/4.3.4/2017_01_07_06_world_from_335_was_2017_01_02_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_06_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_06_world_from_335_was_2017_01_02_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_07_world.sql b/sql/updates/world/4.3.4/2017_01_07_07_world_from_335_was_2017_01_02_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_07_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_07_world_from_335_was_2017_01_02_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_08_world.sql b/sql/updates/world/4.3.4/2017_01_07_08_world_from_335_was_2017_01_02_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_08_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_08_world_from_335_was_2017_01_02_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_09_world.sql b/sql/updates/world/4.3.4/2017_01_07_09_world_from_335_was_2017_01_02_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_02_09_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_09_world_from_335_was_2017_01_02_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_03_00_world_335.sql b/sql/updates/world/4.3.4/2017_01_07_10_world_from_335_was_2017_01_03_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2017_01_03_00_world_335.sql
rename to sql/updates/world/4.3.4/2017_01_07_10_world_from_335_was_2017_01_03_00_world_335.sql
index e9b89443c63..296546751f2 100644
--- a/sql/updates/world/3.3.5/2017_01_03_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2017_01_07_10_world_from_335_was_2017_01_03_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- 
 -- Remove Loot From NPC Who SHould Not Have Any
 DELETE FROM `creature_loot_template` WHERE `entry` IN 
@@ -1095,3 +1096,4 @@ UPDATE `areatrigger_teleport` SET `target_position_x` = -327.5286, `target_posit
 
 -- NOTE! be carefull with this unitflags 32768. Implement NPC Swimming Proper Animations
 UPDATE `creature_template` SET `Unit_Flags`=`Unit_Flags`|32768 WHERE `InhabitType` IN (2);
+*/
diff --git a/sql/updates/world/3.3.5/2017_01_03_01_world.sql b/sql/updates/world/4.3.4/2017_01_07_11_world_from_335_was_2017_01_03_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_03_01_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_11_world_from_335_was_2017_01_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_00_world_335.sql b/sql/updates/world/4.3.4/2017_01_07_12_world_from_335_was_2017_01_04_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2017_01_04_00_world_335.sql
rename to sql/updates/world/4.3.4/2017_01_07_12_world_from_335_was_2017_01_04_00_world_335.sql
index 312d6e377df..01853be07a6 100644
--- a/sql/updates/world/3.3.5/2017_01_04_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2017_01_07_12_world_from_335_was_2017_01_04_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Right and Left Camp Attack
 -- ======================================
 -- All Bosses Are Immune To Crowd Control -- Daze, Horror, Shackle, Banish, Polymorph, Knockout, Freeze, Stun, Snare, Sleep, Silence, Pacify, Root, Fear, Distract, Disarm, Confused, Charm
@@ -135,3 +136,4 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`,
 
 -- VanCleef Adds (Should Not Random Move)
 UPDATE `creature` SET `SpawnDist` = 0, `MovementType` = 0 WHERE `guid` IN (79369,79370);
+*/
diff --git a/sql/updates/world/3.3.5/2017_01_04_01_world.sql b/sql/updates/world/4.3.4/2017_01_07_13_world_from_335_was_2017_01_04_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_04_01_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_13_world_from_335_was_2017_01_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_02_world_335.sql b/sql/updates/world/4.3.4/2017_01_07_14_world_from_335_was_2017_01_04_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2017_01_04_02_world_335.sql
rename to sql/updates/world/4.3.4/2017_01_07_14_world_from_335_was_2017_01_04_02_world_335.sql
index e0c9484fa0b..57101adda67 100644
--- a/sql/updates/world/3.3.5/2017_01_04_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2017_01_07_14_world_from_335_was_2017_01_04_02_world_335.sql
@@ -1,4 +1,5 @@
 -- 
+/*
 SET @NPC := 26908;
 SET @PATH := @NPC * 10;
 UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
@@ -70,3 +71,4 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`
 (@PATH, 62, -1709.83, -507.869, -12.8309, 0),
 (@PATH, 63, -1729.44, -528.724, -13.8673, 0),
 (@PATH, 64, -1731.65, -542.165, -13.1692, 0);
+*/
diff --git a/sql/updates/world/4.3.4/2017_01_07_15_world_from_335_was_2017_01_04_03_world_335.sql b/sql/updates/world/4.3.4/2017_01_07_15_world_from_335_was_2017_01_04_03_world_335.sql
new file mode 100644
index 00000000000..e43ad9a403b
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_01_07_15_world_from_335_was_2017_01_04_03_world_335.sql
@@ -0,0 +1,2 @@
+-- 
+-- UPDATE `creature` SET `MovementType`=2 WHERE  `guid`=33909;
diff --git a/sql/updates/world/3.3.5/2017_01_05_00_world.sql b/sql/updates/world/4.3.4/2017_01_07_16_world_from_335_was_2017_01_05_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_05_00_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_16_world_from_335_was_2017_01_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_01_world.sql b/sql/updates/world/4.3.4/2017_01_07_17_world_from_335_was_2017_01_05_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_05_01_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_17_world_from_335_was_2017_01_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_02_world.sql b/sql/updates/world/4.3.4/2017_01_07_18_world_from_335_was_2017_01_05_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_05_02_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_18_world_from_335_was_2017_01_05_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_03_world.sql b/sql/updates/world/4.3.4/2017_01_07_19_world_from_335_was_2017_01_05_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_05_03_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_19_world_from_335_was_2017_01_05_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_06_00_world.sql b/sql/updates/world/4.3.4/2017_01_07_20_world_from_335_was_2017_01_06_00_world.sql
similarity index 70%
rename from sql/updates/world/3.3.5/2017_01_06_00_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_20_world_from_335_was_2017_01_06_00_world.sql
index 61a7c137261..fd1b650004b 100644
--- a/sql/updates/world/3.3.5/2017_01_06_00_world.sql
+++ b/sql/updates/world/4.3.4/2017_01_07_20_world_from_335_was_2017_01_06_00_world.sql
@@ -2,6 +2,8 @@ DELETE FROM `command` WHERE `permission`=698;
 INSERT INTO `command` (`name`, `permission`, `help`) VALUES
 ('character changeaccount', 698, 'Syntax: .character changeaccount [$player] $account\n\nTransfers ownership of named (or selected) character to another account');
 
+UPDATE `trinity_string` SET `entry`=1999 WHERE `entry`=1184; -- 1184 was already used on 4.3.4 but no on master, on master 1999 is used but it will never be used on 3.3.5a/4.3.4 so i reuse this
+
 DELETE FROM `trinity_string` WHERE `entry`=1184;
 INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
 (1184, 'Successfully transferred ownership of character %s to account %s');
diff --git a/sql/updates/world/3.3.5/2017_01_06_01_world.sql b/sql/updates/world/4.3.4/2017_01_07_21_world_from_335_was_2017_01_06_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_01_06_01_world.sql
rename to sql/updates/world/4.3.4/2017_01_07_21_world_from_335_was_2017_01_06_01_world.sql