123 files changed, 102 insertions, 22 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2d790eac527..eb289e66100 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.29, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.29-0ubuntu0.18.04.1
+-- Server version	5.7.30-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -25,10 +25,10 @@ DROP TABLE IF EXISTS `account`;
 CREATE TABLE `account` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
   `username` varchar(32) NOT NULL DEFAULT '',
-  `salt` BINARY(32),
-  `verifier` BINARY(32),
-  `session_key_auth` BINARY(40) DEFAULT NULL,
-  `session_key_bnet` VARBINARY(64) DEFAULT NULL,
+  `salt` binary(32) DEFAULT NULL,
+  `verifier` binary(32) DEFAULT NULL,
+  `session_key_auth` binary(40) DEFAULT NULL,
+  `session_key_bnet` varbinary(64) DEFAULT NULL,
   `sha_pass_hash` varchar(40) NOT NULL DEFAULT '',
   `v` varchar(64) NOT NULL DEFAULT 'dummy value, use `verifier` instead',
   `s` varchar(64) NOT NULL DEFAULT 'dummy value, use `salt` instead',
@@ -1967,11 +1967,12 @@ INSERT INTO `updates` VALUES
 ('2020_05_15_00_auth.sql','765389B45F97A02160A58B373D63166F7F7D4427','ARCHIVED','2020-05-15 08:55:56',0),
 ('2020_06_15_00_auth.sql','3158036285CC9A4AB7D39063F9687649A21D0A94','ARCHIVED','2020-06-15 07:48:08',0),
 ('2020_06_20_00_auth.sql','85345FAF20B91DA7B157AE1E17DF5B6446C2E109','ARCHIVED','2020-06-11 10:48:00',0),
-('2020_07_15_00_auth.sql','56748440894EA78C3BE72C4A3F2E97E256E6EE40','RELEASED','2020-07-15 00:00:00',0),
-('2020_08_02_00_auth.sql','B0290F6558C59262D9DDD8071060A8803DD56930','RELEASED','2020-08-02 00:00:00',0),
-('2020_08_03_00_auth.sql','492CA77C0FAEEEF3E0492121B3A92689373ECFA3','RELEASED','2020-08-03 00:00:00',0),
-('2020_08_03_01_auth.sql','EC1063396CA20A2303D83238470D41EF4439EC72','RELEASED','2020-08-03 00:00:01',0),
-('2020_08_11_00_auth.sql','14C99177E43003D83A4D6F2227722F15FC15A1D0','RELEASED','2020-08-11 00:00:00',0);
+('2020_07_15_00_auth.sql','56748440894EA78C3BE72C4A3F2E97E256E6EE40','ARCHIVED','2020-07-15 00:00:00',0),
+('2020_08_02_00_auth.sql','B0290F6558C59262D9DDD8071060A8803DD56930','ARCHIVED','2020-08-02 00:00:00',0),
+('2020_08_03_00_auth.sql','492CA77C0FAEEEF3E0492121B3A92689373ECFA3','ARCHIVED','2020-08-03 00:00:00',0),
+('2020_08_03_01_auth.sql','EC1063396CA20A2303D83238470D41EF4439EC72','ARCHIVED','2020-08-03 00:00:01',0),
+('2020_08_11_00_auth.sql','14C99177E43003D83A4D6F2227722F15FC15A1D0','ARCHIVED','2020-08-11 00:00:00',0),
+('2020_08_15_00_auth.sql','A49F4A776E1583B1FF63DFE99BC0E0DD97A74674','ARCHIVED','2020-08-15 09:34:44',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2047,6 +2048,10 @@ SET character_set_client = utf8;
 SET character_set_client = @saved_cs_client;
 
 --
+-- Dumping routines for database 'auth'
+--
+
+--
 -- Final view structure for view `vw_log_history`
 --
 
@@ -2073,4 +2078,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-07-15 10:35:47
+-- Dump completed on 2020-08-15  9:34:48
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index a4c97454ac2..9afa7ba84ab 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.29, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.29-0ubuntu0.18.04.1
+-- Server version	5.7.30-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2647,7 +2647,8 @@ INSERT INTO `updates` VALUES
 ('2020_04_15_00_characters.sql','61F7DE3B81C7E479FFF9463A39DF568826926F39','ARCHIVED','2020-04-15 11:03:56',0),
 ('2020_05_15_00_characters.sql','F1C2FECAA4EB623560914E7758E0BB8364CA135A','ARCHIVED','2020-05-15 08:55:56',0),
 ('2020_06_15_00_characters.sql','99C4F85580421E928003380D8F992C4EF5E627DF','ARCHIVED','2020-06-15 07:48:08',0),
-('2020_07_15_00_characters.sql','D87627DC6E4D222F68A1F56F0B3B986EF9A590EF','ARCHIVED','2020-07-15 10:35:41',0);
+('2020_07_15_00_characters.sql','D87627DC6E4D222F68A1F56F0B3B986EF9A590EF','ARCHIVED','2020-07-15 10:35:41',0),
+('2020_08_15_00_characters.sql','70979D488ACD23DEB8E45D31C3ADC690A1B81F79','ARCHIVED','2020-08-15 09:34:44',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2804,6 +2805,10 @@ INSERT INTO `worldstates` VALUES
 (20008,0,'NextDailyQuestResetTime');
 /*!40000 ALTER TABLE `worldstates` ENABLE KEYS */;
 UNLOCK TABLES;
+
+--
+-- Dumping routines for database 'characters'
+--
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -2814,4 +2819,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-07-15 10:35:47
+-- Dump completed on 2020-08-15  9:34:48
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 81aeed2142f..8040b256142 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.29, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.29-0ubuntu0.18.04.1
+-- Server version	5.7.30-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2557,7 +2557,7 @@ CREATE TABLE `quest_greeting_locale` (
   `locale` varchar(4) NOT NULL,
   `Greeting` text,
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`ID`,`Type`)
+  PRIMARY KEY (`ID`,`Type`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3792,6 +3792,47 @@ CREATE TABLE `version` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Temporary table structure for view `vw_smart_scripts_with_labels`
+--
+
+DROP TABLE IF EXISTS `vw_smart_scripts_with_labels`;
+/*!50001 DROP VIEW IF EXISTS `vw_smart_scripts_with_labels`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `vw_smart_scripts_with_labels` AS SELECT 
+ 1 AS `entryorguid`,
+ 1 AS `source_type`,
+ 1 AS `id`,
+ 1 AS `link`,
+ 1 AS `event_type`,
+ 1 AS `event_phase_mask`,
+ 1 AS `event_chance`,
+ 1 AS `event_flags`,
+ 1 AS `event_param1`,
+ 1 AS `event_param2`,
+ 1 AS `event_param3`,
+ 1 AS `event_param4`,
+ 1 AS `event_param5`,
+ 1 AS `action_type`,
+ 1 AS `action_param1`,
+ 1 AS `action_param2`,
+ 1 AS `action_param3`,
+ 1 AS `action_param4`,
+ 1 AS `action_param5`,
+ 1 AS `action_param6`,
+ 1 AS `target_type`,
+ 1 AS `target_param1`,
+ 1 AS `target_param2`,
+ 1 AS `target_param3`,
+ 1 AS `target_param4`,
+ 1 AS `target_x`,
+ 1 AS `target_y`,
+ 1 AS `target_z`,
+ 1 AS `target_o`,
+ 1 AS `comment`*/;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `warden_checks`
 --
 
@@ -3801,12 +3842,12 @@ DROP TABLE IF EXISTS `warden_checks`;
 CREATE TABLE `warden_checks` (
   `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
   `type` tinyint(3) unsigned DEFAULT NULL,
-  `data` varchar(48) DEFAULT NULL,
   `str` varchar(20) DEFAULT NULL,
   `address` int(10) unsigned DEFAULT NULL,
   `length` tinyint(3) unsigned DEFAULT NULL,
-  `result` varchar(24) DEFAULT NULL,
   `comment` varchar(50) DEFAULT NULL,
+  `data` binary(24) DEFAULT NULL,
+  `result` varbinary(12) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=787 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3875,6 +3916,28 @@ CREATE TABLE `waypoints` (
   PRIMARY KEY (`entry`,`pointid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature waypoints';
 /*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping routines for database 'world'
+--
+
+--
+-- Final view structure for view `vw_smart_scripts_with_labels`
+--
+
+/*!50001 DROP VIEW IF EXISTS `vw_smart_scripts_with_labels`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 */
+/*!50001 VIEW `vw_smart_scripts_with_labels` AS (select `smart_scripts`.`entryorguid` AS `entryorguid`,`smart_scripts`.`source_type` AS `source_type`,`smart_scripts`.`id` AS `id`,`smart_scripts`.`link` AS `link`,(case when (`smart_scripts`.`event_type` = 0) then 'SMART_EVENT_UPDATE_IC' when (`smart_scripts`.`event_type` = 1) then 'SMART_EVENT_UPDATE_OOC' when (`smart_scripts`.`event_type` = 2) then 'SMART_EVENT_HEALTH_PCT' when (`smart_scripts`.`event_type` = 3) then 'SMART_EVENT_MANA_PCT' when (`smart_scripts`.`event_type` = 4) then 'SMART_EVENT_AGGRO' when (`smart_scripts`.`event_type` = 5) then 'SMART_EVENT_KILL' when (`smart_scripts`.`event_type` = 6) then 'SMART_EVENT_DEATH' when (`smart_scripts`.`event_type` = 7) then 'SMART_EVENT_EVADE' when (`smart_scripts`.`event_type` = 8) then 'SMART_EVENT_SPELLHIT' when (`smart_scripts`.`event_type` = 9) then 'SMART_EVENT_RANGE' when (`smart_scripts`.`event_type` = 10) then 'SMART_EVENT_OOC_LOS' when (`smart_scripts`.`event_type` = 11) then 'SMART_EVENT_RESPAWN' when (`smart_scripts`.`event_type` = 12) then 'SMART_EVENT_TARGET_HEALTH_PCT' when (`smart_scripts`.`event_type` = 13) then 'SMART_EVENT_VICTIM_CASTING' when (`smart_scripts`.`event_type` = 14) then 'SMART_EVENT_FRIENDLY_HEALTH' when (`smart_scripts`.`event_type` = 15) then 'SMART_EVENT_FRIENDLY_IS_CC' when (`smart_scripts`.`event_type` = 16) then 'SMART_EVENT_FRIENDLY_MISSING_BUFF' when (`smart_scripts`.`event_type` = 17) then 'SMART_EVENT_SUMMONED_UNIT' when (`smart_scripts`.`event_type` = 18) then 'SMART_EVENT_TARGET_MANA_PCT' when (`smart_scripts`.`event_type` = 19) then 'SMART_EVENT_ACCEPTED_QUEST' when (`smart_scripts`.`event_type` = 20) then 'SMART_EVENT_REWARD_QUEST' when (`smart_scripts`.`event_type` = 21) then 'SMART_EVENT_REACHED_HOME' when (`smart_scripts`.`event_type` = 22) then 'SMART_EVENT_RECEIVE_EMOTE' when (`smart_scripts`.`event_type` = 23) then 'SMART_EVENT_HAS_AURA' when (`smart_scripts`.`event_type` = 24) then 'SMART_EVENT_TARGET_BUFFED' when (`smart_scripts`.`event_type` = 25) then 'SMART_EVENT_RESET' when (`smart_scripts`.`event_type` = 26) then 'SMART_EVENT_IC_LOS' when (`smart_scripts`.`event_type` = 27) then 'SMART_EVENT_PASSENGER_BOARDED' when (`smart_scripts`.`event_type` = 28) then 'SMART_EVENT_PASSENGER_REMOVED' when (`smart_scripts`.`event_type` = 29) then 'SMART_EVENT_CHARMED' when (`smart_scripts`.`event_type` = 30) then 'SMART_EVENT_CHARMED_TARGET' when (`smart_scripts`.`event_type` = 31) then 'SMART_EVENT_SPELLHIT_TARGET' when (`smart_scripts`.`event_type` = 32) then 'SMART_EVENT_DAMAGED' when (`smart_scripts`.`event_type` = 33) then 'SMART_EVENT_DAMAGED_TARGET' when (`smart_scripts`.`event_type` = 34) then 'SMART_EVENT_MOVEMENTINFORM' when (`smart_scripts`.`event_type` = 35) then 'SMART_EVENT_SUMMON_DESPAWNED' when (`smart_scripts`.`event_type` = 36) then 'SMART_EVENT_CORPSE_REMOVED' when (`smart_scripts`.`event_type` = 37) then 'SMART_EVENT_AI_INIT' when (`smart_scripts`.`event_type` = 38) then 'SMART_EVENT_DATA_SET' when (`smart_scripts`.`event_type` = 39) then 'SMART_EVENT_WAYPOINT_START' when (`smart_scripts`.`event_type` = 40) then 'SMART_EVENT_WAYPOINT_REACHED' when (`smart_scripts`.`event_type` = 41) then 'SMART_EVENT_TRANSPORT_ADDPLAYER' when (`smart_scripts`.`event_type` = 42) then 'SMART_EVENT_TRANSPORT_ADDCREATURE' when (`smart_scripts`.`event_type` = 43) then 'SMART_EVENT_TRANSPORT_REMOVE_PLAYER' when (`smart_scripts`.`event_type` = 44) then 'SMART_EVENT_TRANSPORT_RELOCATE' when (`smart_scripts`.`event_type` = 45) then 'SMART_EVENT_INSTANCE_PLAYER_ENTER' when (`smart_scripts`.`event_type` = 46) then 'SMART_EVENT_AREATRIGGER_ONTRIGGER' when (`smart_scripts`.`event_type` = 47) then 'SMART_EVENT_QUEST_ACCEPTED' when (`smart_scripts`.`event_type` = 48) then 'SMART_EVENT_QUEST_OBJ_COPLETETION' when (`smart_scripts`.`event_type` = 49) then 'SMART_EVENT_QUEST_COMPLETION' when (`smart_scripts`.`event_type` = 50) then 'SMART_EVENT_QUEST_REWARDED' when (`smart_scripts`.`event_type` = 51) then 'SMART_EVENT_QUEST_FAIL' when (`smart_scripts`.`event_type` = 52) then 'SMART_EVENT_TEXT_OVER' when (`smart_scripts`.`event_type` = 53) then 'SMART_EVENT_RECEIVE_HEAL' when (`smart_scripts`.`event_type` = 54) then 'SMART_EVENT_JUST_SUMMONED' when (`smart_scripts`.`event_type` = 55) then 'SMART_EVENT_WAYPOINT_PAUSED' when (`smart_scripts`.`event_type` = 56) then 'SMART_EVENT_WAYPOINT_RESUMED' when (`smart_scripts`.`event_type` = 57) then 'SMART_EVENT_WAYPOINT_STOPPED' when (`smart_scripts`.`event_type` = 58) then 'SMART_EVENT_WAYPOINT_ENDED' when (`smart_scripts`.`event_type` = 59) then 'SMART_EVENT_TIMED_EVENT_TRIGGERED' when (`smart_scripts`.`event_type` = 60) then 'SMART_EVENT_UPDATE' when (`smart_scripts`.`event_type` = 61) then 'SMART_EVENT_LINK' when (`smart_scripts`.`event_type` = 62) then 'SMART_EVENT_GOSSIP_SELECT' when (`smart_scripts`.`event_type` = 63) then 'SMART_EVENT_JUST_CREATED' when (`smart_scripts`.`event_type` = 64) then 'SMART_EVENT_GOSSIP_HELLO' when (`smart_scripts`.`event_type` = 65) then 'SMART_EVENT_FOLLOW_COMPLETED' when (`smart_scripts`.`event_type` = 66) then 'SMART_EVENT_EVENT_PHASE_CHANGE' when (`smart_scripts`.`event_type` = 67) then 'SMART_EVENT_IS_BEHIND_TARGET' when (`smart_scripts`.`event_type` = 68) then 'SMART_EVENT_GAME_EVENT_START' when (`smart_scripts`.`event_type` = 69) then 'SMART_EVENT_GAME_EVENT_END' when (`smart_scripts`.`event_type` = 70) then 'SMART_EVENT_GO_LOOT_STATE_CHANGED' when (`smart_scripts`.`event_type` = 71) then 'SMART_EVENT_GO_EVENT_INFORM' when (`smart_scripts`.`event_type` = 72) then 'SMART_EVENT_ACTION_DONE' when (`smart_scripts`.`event_type` = 73) then 'SMART_EVENT_ON_SPELLCLICK' when (`smart_scripts`.`event_type` = 74) then 'SMART_EVENT_FRIENDLY_HEALTH_PCT' when (`smart_scripts`.`event_type` = 75) then 'SMART_EVENT_DISTANCE_CREATURE' when (`smart_scripts`.`event_type` = 76) then 'SMART_EVENT_DISTANCE_GAMEOBJECT' when (`smart_scripts`.`event_type` = 77) then 'SMART_EVENT_COUNTER_SET' when (`smart_scripts`.`event_type` = 78) then 'SMART_EVENT_SCENE_START' when (`smart_scripts`.`event_type` = 79) then 'SMART_EVENT_SCENE_TRIGGER' when (`smart_scripts`.`event_type` = 80) then 'SMART_EVENT_SCENE_CANCEL' when (`smart_scripts`.`event_type` = 81) then 'SMART_EVENT_SCENE_COMPLETE' when (`smart_scripts`.`event_type` = 82) then 'SMART_EVENT_SUMMONED_UNIT_DIES' else `smart_scripts`.`event_type` end) AS `event_type`,`smart_scripts`.`event_phase_mask` AS `event_phase_mask`,`smart_scripts`.`event_chance` AS `event_chance`,`smart_scripts`.`event_flags` AS `event_flags`,`smart_scripts`.`event_param1` AS `event_param1`,`smart_scripts`.`event_param2` AS `event_param2`,`smart_scripts`.`event_param3` AS `event_param3`,`smart_scripts`.`event_param4` AS `event_param4`,`smart_scripts`.`event_param5` AS `event_param5`,(case when (`smart_scripts`.`action_type` = 0) then 'SMART_ACTION_NONE' when (`smart_scripts`.`action_type` = 1) then 'SMART_ACTION_TALK' when (`smart_scripts`.`action_type` = 2) then 'SMART_ACTION_SET_FACTION' when (`smart_scripts`.`action_type` = 3) then 'SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL' when (`smart_scripts`.`action_type` = 4) then 'SMART_ACTION_SOUND' when (`smart_scripts`.`action_type` = 5) then 'SMART_ACTION_PLAY_EMOTE' when (`smart_scripts`.`action_type` = 6) then 'SMART_ACTION_FAIL_QUEST' when (`smart_scripts`.`action_type` = 7) then 'SMART_ACTION_OFFER_QUEST' when (`smart_scripts`.`action_type` = 8) then 'SMART_ACTION_SET_REACT_STATE' when (`smart_scripts`.`action_type` = 9) then 'SMART_ACTION_ACTIVATE_GOBJECT' when (`smart_scripts`.`action_type` = 10) then 'SMART_ACTION_RANDOM_EMOTE' when (`smart_scripts`.`action_type` = 11) then 'SMART_ACTION_CAST' when (`smart_scripts`.`action_type` = 12) then 'SMART_ACTION_SUMMON_CREATURE' when (`smart_scripts`.`action_type` = 13) then 'SMART_ACTION_THREAT_SINGLE_PCT' when (`smart_scripts`.`action_type` = 14) then 'SMART_ACTION_THREAT_ALL_PCT' when (`smart_scripts`.`action_type` = 15) then 'SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS' when (`smart_scripts`.`action_type` = 16) then 'SMART_ACTION_RESERVED_16' when (`smart_scripts`.`action_type` = 17) then 'SMART_ACTION_SET_EMOTE_STATE' when (`smart_scripts`.`action_type` = 18) then 'SMART_ACTION_SET_UNIT_FLAG' when (`smart_scripts`.`action_type` = 19) then 'SMART_ACTION_REMOVE_UNIT_FLAG' when (`smart_scripts`.`action_type` = 20) then 'SMART_ACTION_AUTO_ATTACK' when (`smart_scripts`.`action_type` = 21) then 'SMART_ACTION_ALLOW_COMBAT_MOVEMENT' when (`smart_scripts`.`action_type` = 22) then 'SMART_ACTION_SET_EVENT_PHASE' when (`smart_scripts`.`action_type` = 23) then 'SMART_ACTION_INC_EVENT_PHASE' when (`smart_scripts`.`action_type` = 24) then 'SMART_ACTION_EVADE' when (`smart_scripts`.`action_type` = 25) then 'SMART_ACTION_FLEE_FOR_ASSIST' when (`smart_scripts`.`action_type` = 26) then 'SMART_ACTION_CALL_GROUPEVENTHAPPENS' when (`smart_scripts`.`action_type` = 27) then 'SMART_ACTION_COMBAT_STOP' when (`smart_scripts`.`action_type` = 28) then 'SMART_ACTION_REMOVEAURASFROMSPELL' when (`smart_scripts`.`action_type` = 29) then 'SMART_ACTION_FOLLOW' when (`smart_scripts`.`action_type` = 30) then 'SMART_ACTION_RANDOM_PHASE' when (`smart_scripts`.`action_type` = 31) then 'SMART_ACTION_RANDOM_PHASE_RANGE' when (`smart_scripts`.`action_type` = 32) then 'SMART_ACTION_RESET_GOBJECT' when (`smart_scripts`.`action_type` = 33) then 'SMART_ACTION_CALL_KILLEDMONSTER' when (`smart_scripts`.`action_type` = 34) then 'SMART_ACTION_SET_INST_DATA' when (`smart_scripts`.`action_type` = 35) then 'SMART_ACTION_SET_INST_DATA64' when (`smart_scripts`.`action_type` = 36) then 'SMART_ACTION_UPDATE_TEMPLATE' when (`smart_scripts`.`action_type` = 37) then 'SMART_ACTION_DIE' when (`smart_scripts`.`action_type` = 38) then 'SMART_ACTION_SET_IN_COMBAT_WITH_ZONE' when (`smart_scripts`.`action_type` = 39) then 'SMART_ACTION_CALL_FOR_HELP' when (`smart_scripts`.`action_type` = 40) then 'SMART_ACTION_SET_SHEATH' when (`smart_scripts`.`action_type` = 41) then 'SMART_ACTION_FORCE_DESPAWN' when (`smart_scripts`.`action_type` = 42) then 'SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL' when (`smart_scripts`.`action_type` = 43) then 'SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL' when (`smart_scripts`.`action_type` = 44) then 'SMART_ACTION_SET_INGAME_PHASE_MASK' when (`smart_scripts`.`action_type` = 45) then 'SMART_ACTION_SET_DATA' when (`smart_scripts`.`action_type` = 46) then 'SMART_ACTION_ATTACK_STOP' when (`smart_scripts`.`action_type` = 47) then 'SMART_ACTION_SET_VISIBILITY' when (`smart_scripts`.`action_type` = 48) then 'SMART_ACTION_SET_ACTIVE' when (`smart_scripts`.`action_type` = 49) then 'SMART_ACTION_ATTACK_START' when (`smart_scripts`.`action_type` = 50) then 'SMART_ACTION_SUMMON_GO' when (`smart_scripts`.`action_type` = 51) then 'SMART_ACTION_KILL_UNIT' when (`smart_scripts`.`action_type` = 52) then 'SMART_ACTION_ACTIVATE_TAXI' when (`smart_scripts`.`action_type` = 53) then 'SMART_ACTION_WP_START' when (`smart_scripts`.`action_type` = 54) then 'SMART_ACTION_WP_PAUSE' when (`smart_scripts`.`action_type` = 55) then 'SMART_ACTION_WP_STOP' when (`smart_scripts`.`action_type` = 56) then 'SMART_ACTION_ADD_ITEM' when (`smart_scripts`.`action_type` = 57) then 'SMART_ACTION_REMOVE_ITEM' when (`smart_scripts`.`action_type` = 58) then 'SMART_ACTION_INSTALL_AI_TEMPLATE' when (`smart_scripts`.`action_type` = 59) then 'SMART_ACTION_SET_RUN' when (`smart_scripts`.`action_type` = 60) then 'SMART_ACTION_SET_DISABLE_GRAVITY' when (`smart_scripts`.`action_type` = 61) then 'SMART_ACTION_SET_SWIM' when (`smart_scripts`.`action_type` = 62) then 'SMART_ACTION_TELEPORT' when (`smart_scripts`.`action_type` = 63) then 'SMART_ACTION_SET_COUNTER' when (`smart_scripts`.`action_type` = 64) then 'SMART_ACTION_STORE_TARGET_LIST' when (`smart_scripts`.`action_type` = 65) then 'SMART_ACTION_WP_RESUME' when (`smart_scripts`.`action_type` = 66) then 'SMART_ACTION_SET_ORIENTATION' when (`smart_scripts`.`action_type` = 67) then 'SMART_ACTION_CREATE_TIMED_EVENT' when (`smart_scripts`.`action_type` = 68) then 'SMART_ACTION_PLAYMOVIE' when (`smart_scripts`.`action_type` = 69) then 'SMART_ACTION_MOVE_TO_POS' when (`smart_scripts`.`action_type` = 70) then 'SMART_ACTION_ENABLE_TEMP_GOBJ' when (`smart_scripts`.`action_type` = 71) then 'SMART_ACTION_EQUIP' when (`smart_scripts`.`action_type` = 72) then 'SMART_ACTION_CLOSE_GOSSIP' when (`smart_scripts`.`action_type` = 73) then 'SMART_ACTION_TRIGGER_TIMED_EVENT' when (`smart_scripts`.`action_type` = 74) then 'SMART_ACTION_REMOVE_TIMED_EVENT' when (`smart_scripts`.`action_type` = 75) then 'SMART_ACTION_ADD_AURA' when (`smart_scripts`.`action_type` = 76) then 'SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT' when (`smart_scripts`.`action_type` = 77) then 'SMART_ACTION_RESET_SCRIPT_BASE_OBJECT' when (`smart_scripts`.`action_type` = 78) then 'SMART_ACTION_CALL_SCRIPT_RESET' when (`smart_scripts`.`action_type` = 79) then 'SMART_ACTION_SET_RANGED_MOVEMENT' when (`smart_scripts`.`action_type` = 80) then 'SMART_ACTION_CALL_TIMED_ACTIONLIST' when (`smart_scripts`.`action_type` = 81) then 'SMART_ACTION_SET_NPC_FLAG' when (`smart_scripts`.`action_type` = 82) then 'SMART_ACTION_ADD_NPC_FLAG' when (`smart_scripts`.`action_type` = 83) then 'SMART_ACTION_REMOVE_NPC_FLAG' when (`smart_scripts`.`action_type` = 84) then 'SMART_ACTION_SIMPLE_TALK' when (`smart_scripts`.`action_type` = 85) then 'SMART_ACTION_SELF_CAST' when (`smart_scripts`.`action_type` = 86) then 'SMART_ACTION_CROSS_CAST' when (`smart_scripts`.`action_type` = 87) then 'SMART_ACTION_CALL_RANDOM_TIMED_ACTIONLIST' when (`smart_scripts`.`action_type` = 88) then 'SMART_ACTION_CALL_RANDOM_RANGE_TIMED_ACTIONLIST' when (`smart_scripts`.`action_type` = 89) then 'SMART_ACTION_RANDOM_MOVE' when (`smart_scripts`.`action_type` = 90) then 'SMART_ACTION_SET_UNIT_FIELD_BYTES_1' when (`smart_scripts`.`action_type` = 91) then 'SMART_ACTION_REMOVE_UNIT_FIELD_BYTES_1' when (`smart_scripts`.`action_type` = 92) then 'SMART_ACTION_INTERRUPT_SPELL' when (`smart_scripts`.`action_type` = 93) then 'SMART_ACTION_SEND_GO_CUSTOM_ANIM' when (`smart_scripts`.`action_type` = 94) then 'SMART_ACTION_SET_DYNAMIC_FLAG' when (`smart_scripts`.`action_type` = 95) then 'SMART_ACTION_ADD_DYNAMIC_FLAG' when (`smart_scripts`.`action_type` = 96) then 'SMART_ACTION_REMOVE_DYNAMIC_FLAG' when (`smart_scripts`.`action_type` = 97) then 'SMART_ACTION_JUMP_TO_POS' when (`smart_scripts`.`action_type` = 98) then 'SMART_ACTION_SEND_GOSSIP_MENU' when (`smart_scripts`.`action_type` = 99) then 'SMART_ACTION_GO_SET_LOOT_STATE' when (`smart_scripts`.`action_type` = 100) then 'SMART_ACTION_SEND_TARGET_TO_TARGET' when (`smart_scripts`.`action_type` = 101) then 'SMART_ACTION_SET_HOME_POS' when (`smart_scripts`.`action_type` = 102) then 'SMART_ACTION_SET_HEALTH_REGEN' when (`smart_scripts`.`action_type` = 103) then 'SMART_ACTION_SET_ROOT' when (`smart_scripts`.`action_type` = 104) then 'SMART_ACTION_SET_GO_FLAG' when (`smart_scripts`.`action_type` = 105) then 'SMART_ACTION_ADD_GO_FLAG' when (`smart_scripts`.`action_type` = 106) then 'SMART_ACTION_REMOVE_GO_FLAG' when (`smart_scripts`.`action_type` = 107) then 'SMART_ACTION_SUMMON_CREATURE_GROUP' when (`smart_scripts`.`action_type` = 108) then 'SMART_ACTION_SET_POWER' when (`smart_scripts`.`action_type` = 109) then 'SMART_ACTION_ADD_POWER' when (`smart_scripts`.`action_type` = 110) then 'SMART_ACTION_REMOVE_POWER' when (`smart_scripts`.`action_type` = 111) then 'SMART_ACTION_GAME_EVENT_STOP' when (`smart_scripts`.`action_type` = 112) then 'SMART_ACTION_GAME_EVENT_START' when (`smart_scripts`.`action_type` = 113) then 'SMART_ACTION_START_CLOSEST_WAYPOINT' when (`smart_scripts`.`action_type` = 114) then 'SMART_ACTION_MOVE_OFFSET' when (`smart_scripts`.`action_type` = 115) then 'SMART_ACTION_RANDOM_SOUND' when (`smart_scripts`.`action_type` = 116) then 'SMART_ACTION_SET_CORPSE_DELAY' when (`smart_scripts`.`action_type` = 117) then 'SMART_ACTION_DISABLE_EVADE' when (`smart_scripts`.`action_type` = 118) then 'SMART_ACTION_GO_SET_GO_STATE' when (`smart_scripts`.`action_type` = 119) then 'SMART_ACTION_SET_CAN_FLY' when (`smart_scripts`.`action_type` = 120) then 'SMART_ACTION_REMOVE_AURAS_BY_TYPE' when (`smart_scripts`.`action_type` = 121) then 'SMART_ACTION_SET_SIGHT_DIST' when (`smart_scripts`.`action_type` = 122) then 'SMART_ACTION_FLEE' when (`smart_scripts`.`action_type` = 123) then 'SMART_ACTION_ADD_THREAT' when (`smart_scripts`.`action_type` = 124) then 'SMART_ACTION_LOAD_EQUIPMENT' when (`smart_scripts`.`action_type` = 125) then 'SMART_ACTION_TRIGGER_RANDOM_TIMED_EVENT' when (`smart_scripts`.`action_type` = 126) then 'SMART_ACTION_REMOVE_ALL_GAMEOBJECTS' when (`smart_scripts`.`action_type` = 127) then 'SMART_ACTION_PAUSE_MOVEMENT' when (`smart_scripts`.`action_type` = 128) then 'SMART_ACTION_PLAY_ANIMKIT' when (`smart_scripts`.`action_type` = 129) then 'SMART_ACTION_SCENE_PLAY' when (`smart_scripts`.`action_type` = 130) then 'SMART_ACTION_SCENE_CANCEL' when (`smart_scripts`.`action_type` = 131) then 'SMART_ACTION_SPAWN_SPAWNGROUP' when (`smart_scripts`.`action_type` = 132) then 'SMART_ACTION_DESPAWN_SPAWNGROUP' when (`smart_scripts`.`action_type` = 133) then 'SMART_ACTION_RESPAWN_BY_SPAWNID' when (`smart_scripts`.`action_type` = 134) then 'SMART_ACTION_INVOKER_CAST' when (`smart_scripts`.`action_type` = 135) then 'SMART_ACTION_PLAY_CINEMATIC' when (`smart_scripts`.`action_type` = 136) then 'SMART_ACTION_SET_MOVEMENT_SPEED' when (`smart_scripts`.`action_type` = 137) then 'SMART_ACTION_PLAY_SPELL_VISUAL_KIT' when (`smart_scripts`.`action_type` = 138) then 'SMART_ACTION_OVERRIDE_LIGHT' when (`smart_scripts`.`action_type` = 139) then 'SMART_ACTION_OVERRIDE_WEATHER' else `smart_scripts`.`action_type` end) AS `action_type`,`smart_scripts`.`action_param1` AS `action_param1`,`smart_scripts`.`action_param2` AS `action_param2`,`smart_scripts`.`action_param3` AS `action_param3`,`smart_scripts`.`action_param4` AS `action_param4`,`smart_scripts`.`action_param5` AS `action_param5`,`smart_scripts`.`action_param6` AS `action_param6`,(case when (`smart_scripts`.`target_type` = 0) then 'SMART_TARGET_NONE' when (`smart_scripts`.`target_type` = 1) then 'SMART_TARGET_SELF' when (`smart_scripts`.`target_type` = 2) then 'SMART_TARGET_VICTIM' when (`smart_scripts`.`target_type` = 3) then 'SMART_TARGET_HOSTILE_SECOND_AGGRO' when (`smart_scripts`.`target_type` = 4) then 'SMART_TARGET_HOSTILE_LAST_AGGRO' when (`smart_scripts`.`target_type` = 5) then 'SMART_TARGET_HOSTILE_RANDOM' when (`smart_scripts`.`target_type` = 6) then 'SMART_TARGET_HOSTILE_RANDOM_NOT_TOP' when (`smart_scripts`.`target_type` = 7) then 'SMART_TARGET_ACTION_INVOKER' when (`smart_scripts`.`target_type` = 8) then 'SMART_TARGET_POSITION' when (`smart_scripts`.`target_type` = 9) then 'SMART_TARGET_CREATURE_RANGE' when (`smart_scripts`.`target_type` = 10) then 'SMART_TARGET_CREATURE_GUID' when (`smart_scripts`.`target_type` = 11) then 'SMART_TARGET_CREATURE_DISTANCE' when (`smart_scripts`.`target_type` = 12) then 'SMART_TARGET_STORED' when (`smart_scripts`.`target_type` = 13) then 'SMART_TARGET_GAMEOBJECT_RANGE' when (`smart_scripts`.`target_type` = 14) then 'SMART_TARGET_GAMEOBJECT_GUID' when (`smart_scripts`.`target_type` = 15) then 'SMART_TARGET_GAMEOBJECT_DISTANCE' when (`smart_scripts`.`target_type` = 16) then 'SMART_TARGET_INVOKER_PARTY' when (`smart_scripts`.`target_type` = 17) then 'SMART_TARGET_PLAYER_RANGE' when (`smart_scripts`.`target_type` = 18) then 'SMART_TARGET_PLAYER_DISTANCE' when (`smart_scripts`.`target_type` = 19) then 'SMART_TARGET_CLOSEST_CREATURE' when (`smart_scripts`.`target_type` = 20) then 'SMART_TARGET_CLOSEST_GAMEOBJECT' when (`smart_scripts`.`target_type` = 21) then 'SMART_TARGET_CLOSEST_PLAYER' when (`smart_scripts`.`target_type` = 22) then 'SMART_TARGET_ACTION_INVOKER_VEHICLE' when (`smart_scripts`.`target_type` = 23) then 'SMART_TARGET_OWNER_OR_SUMMONER' when (`smart_scripts`.`target_type` = 24) then 'SMART_TARGET_THREAT_LIST' when (`smart_scripts`.`target_type` = 25) then 'SMART_TARGET_CLOSEST_ENEMY' when (`smart_scripts`.`target_type` = 26) then 'SMART_TARGET_CLOSEST_FRIENDLY' when (`smart_scripts`.`target_type` = 27) then 'SMART_TARGET_LOOT_RECIPIENTS' when (`smart_scripts`.`target_type` = 28) then 'SMART_TARGET_FARTHEST' when (`smart_scripts`.`target_type` = 29) then 'SMART_TARGET_VEHICLE_PASSENGER' when (`smart_scripts`.`target_type` = 30) then 'SMART_TARGET_CLOSEST_UNSPAWNED_GAMEOBJECT' else `smart_scripts`.`target_type` end) AS `target_type`,`smart_scripts`.`target_param1` AS `target_param1`,`smart_scripts`.`target_param2` AS `target_param2`,`smart_scripts`.`target_param3` AS `target_param3`,`smart_scripts`.`target_param4` AS `target_param4`,`smart_scripts`.`target_x` AS `target_x`,`smart_scripts`.`target_y` AS `target_y`,`smart_scripts`.`target_z` AS `target_z`,`smart_scripts`.`target_o` AS `target_o`,`smart_scripts`.`comment` AS `comment` from `smart_scripts`) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -3885,4 +3948,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-07-15 10:35:48
+-- Dump completed on 2020-08-15  9:34:48
diff --git a/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_07_15_00_auth.sql
index d0cbe2be812..d0cbe2be812 100644
--- a/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_07_15_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_08_02_00_auth.sql b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_02_00_auth.sql
index 035ca4c4367..035ca4c4367 100644
--- a/sql/updates/auth/3.3.5/2020_08_02_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_02_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_08_03_00_auth.sql b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_03_00_auth.sql
index 47fd5fdf4db..47fd5fdf4db 100644
--- a/sql/updates/auth/3.3.5/2020_08_03_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_03_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_08_03_01_auth.sql b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_03_01_auth.sql
index f46d259aa4b..f46d259aa4b 100644
--- a/sql/updates/auth/3.3.5/2020_08_03_01_auth.sql
+++ b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_03_01_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_08_11_00_auth.sql b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_11_00_auth.sql
index 16296ac7c90..16296ac7c90 100644
--- a/sql/updates/auth/3.3.5/2020_08_11_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20071_2020_08_15/2020_08_11_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql b/sql/old/3.3.5a/characters/20071_2020_08_15/2020_07_15_00_characters.sql
index a7c2ce238da..a7c2ce238da 100644
--- a/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql
+++ b/sql/old/3.3.5a/characters/20071_2020_08_15/2020_07_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2020_07_15_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_15_00_world.sql
index 4126ef8b506..4126ef8b506 100644
--- a/sql/updates/world/3.3.5/2020_07_15_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_22_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_22_00_world.sql
index 4f59b08a38a..4f59b08a38a 100644
--- a/sql/updates/world/3.3.5/2020_07_22_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_24_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_24_00_world.sql
index 7a6b7b4a7ab..7a6b7b4a7ab 100644
--- a/sql/updates/world/3.3.5/2020_07_24_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_24_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_24_01_world.sql
index d1cbf024577..d1cbf024577 100644
--- a/sql/updates/world/3.3.5/2020_07_24_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_29_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_00_world.sql
index 4e3b7bb4769..4e3b7bb4769 100644
--- a/sql/updates/world/3.3.5/2020_07_29_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_29_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_01_world.sql
index ba50d9ad726..ba50d9ad726 100644
--- a/sql/updates/world/3.3.5/2020_07_29_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_29_02_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_02_world.sql
index 15fc68e49c4..15fc68e49c4 100644
--- a/sql/updates/world/3.3.5/2020_07_29_02_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_30_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_30_00_world.sql
index 6a1fba7f401..6a1fba7f401 100644
--- a/sql/updates/world/3.3.5/2020_07_30_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_00_world.sql
index 7082637e9ae..7082637e9ae 100644
--- a/sql/updates/world/3.3.5/2020_07_31_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_01_world.sql
index bea5e506307..bea5e506307 100644
--- a/sql/updates/world/3.3.5/2020_07_31_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_02_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_02_world.sql
index 89c03c922a3..89c03c922a3 100644
--- a/sql/updates/world/3.3.5/2020_07_31_02_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_03_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_03_world.sql
index 3586eadbcdb..3586eadbcdb 100644
--- a/sql/updates/world/3.3.5/2020_07_31_03_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_04_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_04_world.sql
index 6c8bf689b97..6c8bf689b97 100644
--- a/sql/updates/world/3.3.5/2020_07_31_04_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_05_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_05_world.sql
index 64ffb931687..64ffb931687 100644
--- a/sql/updates/world/3.3.5/2020_07_31_05_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_06_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_06_world.sql
index 3aac5d5ea07..3aac5d5ea07 100644
--- a/sql/updates/world/3.3.5/2020_07_31_06_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_07_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_07_world.sql
index 1bda17dc11c..1bda17dc11c 100644
--- a/sql/updates/world/3.3.5/2020_07_31_07_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_08_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_08_world.sql
index 3424e818333..3424e818333 100644
--- a/sql/updates/world/3.3.5/2020_07_31_08_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_09_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_09_world.sql
index 9ceb3e3b7f1..9ceb3e3b7f1 100644
--- a/sql/updates/world/3.3.5/2020_07_31_09_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_10_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_10_world.sql
index 9806ef1daaf..9806ef1daaf 100644
--- a/sql/updates/world/3.3.5/2020_07_31_10_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_11_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_11_world.sql
index 0fee16f785d..0fee16f785d 100644
--- a/sql/updates/world/3.3.5/2020_07_31_11_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_12_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_12_world.sql
index 10fee5562f6..10fee5562f6 100644
--- a/sql/updates/world/3.3.5/2020_07_31_12_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_13_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_13_world.sql
index d0281c3893a..d0281c3893a 100644
--- a/sql/updates/world/3.3.5/2020_07_31_13_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_13_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_14_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_14_world.sql
index 3007e301ebc..3007e301ebc 100644
--- a/sql/updates/world/3.3.5/2020_07_31_14_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_14_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_15_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_15_world.sql
index 401ace11783..401ace11783 100644
--- a/sql/updates/world/3.3.5/2020_07_31_15_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_15_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_16_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_16_world.sql
index 620f5202804..620f5202804 100644
--- a/sql/updates/world/3.3.5/2020_07_31_16_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_16_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_17_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_17_world.sql
index 0aeaea1d910..0aeaea1d910 100644
--- a/sql/updates/world/3.3.5/2020_07_31_17_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_17_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_18_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_18_world.sql
index f685a5cb4f2..f685a5cb4f2 100644
--- a/sql/updates/world/3.3.5/2020_07_31_18_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_18_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_19_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_19_world.sql
index 53dfdbeed9e..53dfdbeed9e 100644
--- a/sql/updates/world/3.3.5/2020_07_31_19_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_19_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_20_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_20_world.sql
index c721df15594..c721df15594 100644
--- a/sql/updates/world/3.3.5/2020_07_31_20_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_20_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_21_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_21_world.sql
index b85e190a3a7..b85e190a3a7 100644
--- a/sql/updates/world/3.3.5/2020_07_31_21_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_21_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_22_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_22_world.sql
index 9456d23bd62..9456d23bd62 100644
--- a/sql/updates/world/3.3.5/2020_07_31_22_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_22_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_23_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_23_world.sql
index 695c61be076..695c61be076 100644
--- a/sql/updates/world/3.3.5/2020_07_31_23_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_23_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_24_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_24_world.sql
index 3b7fcbc1c1a..3b7fcbc1c1a 100644
--- a/sql/updates/world/3.3.5/2020_07_31_24_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_24_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_31_25_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_25_world.sql
index 22bd6e518d9..22bd6e518d9 100644
--- a/sql/updates/world/3.3.5/2020_07_31_25_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_07_31_25_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_00_world.sql
index ff7fda3bd57..ff7fda3bd57 100644
--- a/sql/updates/world/3.3.5/2020_08_02_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_01_world.sql
index dcfb592657b..dcfb592657b 100644
--- a/sql/updates/world/3.3.5/2020_08_02_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_02_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_02_world_335.sql
index ae99c399ce0..ae99c399ce0 100644
--- a/sql/updates/world/3.3.5/2020_08_02_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_03_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_03_world_335.sql
index 3ae9c56e68d..3ae9c56e68d 100644
--- a/sql/updates/world/3.3.5/2020_08_02_03_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_04_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_04_world_335.sql
index ba40db61dc1..ba40db61dc1 100644
--- a/sql/updates/world/3.3.5/2020_08_02_04_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_05_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_05_world_335.sql
index ed10e5ce12b..ed10e5ce12b 100644
--- a/sql/updates/world/3.3.5/2020_08_02_05_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_06_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_06_world_335.sql
index ca5e4f5be83..ca5e4f5be83 100644
--- a/sql/updates/world/3.3.5/2020_08_02_06_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_07_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_07_world_335.sql
index edecba77cfd..edecba77cfd 100644
--- a/sql/updates/world/3.3.5/2020_08_02_07_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_08_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_08_world.sql
index 3759b155bed..3759b155bed 100644
--- a/sql/updates/world/3.3.5/2020_08_02_08_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_09_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_09_world_335.sql
index 78ff5ffa4a6..78ff5ffa4a6 100644
--- a/sql/updates/world/3.3.5/2020_08_02_09_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_09_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_10_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_10_world_335.sql
index 2f13430d9c1..2f13430d9c1 100644
--- a/sql/updates/world/3.3.5/2020_08_02_10_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_11_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_11_world.sql
index 080a7c01e8a..080a7c01e8a 100644
--- a/sql/updates/world/3.3.5/2020_08_02_11_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_12_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_12_world.sql
index de3a9f38d9e..de3a9f38d9e 100644
--- a/sql/updates/world/3.3.5/2020_08_02_12_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_13_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_13_world_335.sql
index 9b02a38a660..9b02a38a660 100644
--- a/sql/updates/world/3.3.5/2020_08_02_13_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_13_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_14_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_14_world.sql
index 76f17715acd..76f17715acd 100644
--- a/sql/updates/world/3.3.5/2020_08_02_14_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_14_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_15_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_15_world_335.sql
index b1309ac4edb..b1309ac4edb 100644
--- a/sql/updates/world/3.3.5/2020_08_02_15_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_15_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_16_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_16_world_335.sql
index 03d7b878707..03d7b878707 100644
--- a/sql/updates/world/3.3.5/2020_08_02_16_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_16_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_17_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_17_world_335.sql
index f21dbf78d19..f21dbf78d19 100644
--- a/sql/updates/world/3.3.5/2020_08_02_17_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_17_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_18_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_18_world_335.sql
index eff0c8a057e..eff0c8a057e 100644
--- a/sql/updates/world/3.3.5/2020_08_02_18_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_18_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_19_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_19_world.sql
index ab175c6dc85..ab175c6dc85 100644
--- a/sql/updates/world/3.3.5/2020_08_02_19_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_19_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_20_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_20_world_335.sql
index ce1e167de08..ce1e167de08 100644
--- a/sql/updates/world/3.3.5/2020_08_02_20_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_20_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_21_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_21_world_335.sql
index 90bb1b9c672..90bb1b9c672 100644
--- a/sql/updates/world/3.3.5/2020_08_02_21_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_21_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_22_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_22_world_335.sql
index af12f1f9a12..af12f1f9a12 100644
--- a/sql/updates/world/3.3.5/2020_08_02_22_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_22_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_23_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_23_world_335.sql
index 7e42cace10b..7e42cace10b 100644
--- a/sql/updates/world/3.3.5/2020_08_02_23_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_23_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_24_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_24_world_335.sql
index 845cd5e0c1a..845cd5e0c1a 100644
--- a/sql/updates/world/3.3.5/2020_08_02_24_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_24_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_25_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_25_world.sql
index c9f56fd254d..c9f56fd254d 100644
--- a/sql/updates/world/3.3.5/2020_08_02_25_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_25_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_26_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_26_world_335.sql
index d51b24fde6f..d51b24fde6f 100644
--- a/sql/updates/world/3.3.5/2020_08_02_26_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_26_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_27_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_27_world.sql
index 8061c59307c..8061c59307c 100644
--- a/sql/updates/world/3.3.5/2020_08_02_27_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_27_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_28_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_28_world_335.sql
index fa71b667ef1..fa71b667ef1 100644
--- a/sql/updates/world/3.3.5/2020_08_02_28_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_28_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_29_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_29_world_335.sql
index 3e50c0d0f7e..3e50c0d0f7e 100644
--- a/sql/updates/world/3.3.5/2020_08_02_29_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_29_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_30_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_30_world_335.sql
index 812c395f350..812c395f350 100644
--- a/sql/updates/world/3.3.5/2020_08_02_30_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_30_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_31_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_31_world.sql
index 682d942e2e5..682d942e2e5 100644
--- a/sql/updates/world/3.3.5/2020_08_02_31_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_31_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_02_32_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_32_world.sql
index 1b240f74ca8..1b240f74ca8 100644
--- a/sql/updates/world/3.3.5/2020_08_02_32_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_02_32_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_03_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_00_world.sql
index 0956b502d08..0956b502d08 100644
--- a/sql/updates/world/3.3.5/2020_08_03_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_03_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_01_world.sql
index 132881b3c83..132881b3c83 100644
--- a/sql/updates/world/3.3.5/2020_08_03_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_03_02_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_02_world.sql
index 49026de3e54..49026de3e54 100644
--- a/sql/updates/world/3.3.5/2020_08_03_02_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_03_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_04_00_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_04_00_world_335.sql
index 24b272d9cf6..24b272d9cf6 100644
--- a/sql/updates/world/3.3.5/2020_08_04_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_04_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_04_01_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_04_01_world_335.sql
index f118da6b3f5..f118da6b3f5 100644
--- a/sql/updates/world/3.3.5/2020_08_04_01_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_04_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_00_world.sql
index 52dfe308e27..52dfe308e27 100644
--- a/sql/updates/world/3.3.5/2020_08_05_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_01_world.sql
index bfa0e4542bb..bfa0e4542bb 100644
--- a/sql/updates/world/3.3.5/2020_08_05_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_02_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_02_world_335.sql
index e669007d039..e669007d039 100644
--- a/sql/updates/world/3.3.5/2020_08_05_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_03_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_03_world_335.sql
index 6b169ed6bb2..6b169ed6bb2 100644
--- a/sql/updates/world/3.3.5/2020_08_05_03_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_04_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_04_world_335.sql
index 229eb0a7a0a..229eb0a7a0a 100644
--- a/sql/updates/world/3.3.5/2020_08_05_04_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_05_05_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_05_world.sql
index e6cdab73843..e6cdab73843 100644
--- a/sql/updates/world/3.3.5/2020_08_05_05_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_05_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_07_00_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_00_world_335.sql
index c917a3ed8f8..c917a3ed8f8 100644
--- a/sql/updates/world/3.3.5/2020_08_07_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_07_01_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_01_world_335.sql
index 53dcb2dce55..53dcb2dce55 100644
--- a/sql/updates/world/3.3.5/2020_08_07_01_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_07_02_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_02_world.sql
index edeb7cdbdc2..edeb7cdbdc2 100644
--- a/sql/updates/world/3.3.5/2020_08_07_02_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_07_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_00_world.sql
index ab58f6f93bd..ab58f6f93bd 100644
--- a/sql/updates/world/3.3.5/2020_08_08_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_01_world.sql
index 1bc24a0eec8..1bc24a0eec8 100644
--- a/sql/updates/world/3.3.5/2020_08_08_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_02_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_02_world.sql
index ccdef830dab..ccdef830dab 100644
--- a/sql/updates/world/3.3.5/2020_08_08_02_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_03_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_03_world.sql
index 4e319eb3247..4e319eb3247 100644
--- a/sql/updates/world/3.3.5/2020_08_08_03_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_04_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_04_world_335.sql
index 563c930ebe3..563c930ebe3 100644
--- a/sql/updates/world/3.3.5/2020_08_08_04_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_05_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_05_world_335.sql
index 8ffb1fc1696..8ffb1fc1696 100644
--- a/sql/updates/world/3.3.5/2020_08_08_05_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_08_06_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_06_world_335.sql
index 61ddc236e75..61ddc236e75 100644
--- a/sql/updates/world/3.3.5/2020_08_08_06_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_08_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_09_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_09_00_world.sql
index 9442faba6f2..9442faba6f2 100644
--- a/sql/updates/world/3.3.5/2020_08_09_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_09_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_09_01_world.sql
index 0b4f2ac1621..0b4f2ac1621 100644
--- a/sql/updates/world/3.3.5/2020_08_09_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_00_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_00_world_335.sql
index f6b3e82656c..f6b3e82656c 100644
--- a/sql/updates/world/3.3.5/2020_08_10_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_01_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_01_world_335.sql
index a8923331a86..a8923331a86 100644
--- a/sql/updates/world/3.3.5/2020_08_10_01_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_02_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_02_world_335.sql
index 98b74a75824..98b74a75824 100644
--- a/sql/updates/world/3.3.5/2020_08_10_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_03_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_03_world.sql
index d5702a904ce..d5702a904ce 100644
--- a/sql/updates/world/3.3.5/2020_08_10_03_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_04_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_04_world_335.sql
index 5ddb8d0659c..5ddb8d0659c 100644
--- a/sql/updates/world/3.3.5/2020_08_10_04_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_10_05_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_05_world_335.sql
index 027d8c3d1b1..027d8c3d1b1 100644
--- a/sql/updates/world/3.3.5/2020_08_10_05_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_10_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_11_00_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_11_00_world_335.sql
index 6e66caa8855..6e66caa8855 100644
--- a/sql/updates/world/3.3.5/2020_08_11_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_11_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_00_world.sql
index da054064bd8..da054064bd8 100644
--- a/sql/updates/world/3.3.5/2020_08_12_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_01_world.sql
index 0f5ddaee20a..0f5ddaee20a 100644
--- a/sql/updates/world/3.3.5/2020_08_12_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_02_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_02_world_335.sql
index 7b00a910141..7b00a910141 100644
--- a/sql/updates/world/3.3.5/2020_08_12_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_03_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_03_world_335.sql
index 3f0180ab740..3f0180ab740 100644
--- a/sql/updates/world/3.3.5/2020_08_12_03_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_04_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_04_world_335.sql
index 99177470bdf..99177470bdf 100644
--- a/sql/updates/world/3.3.5/2020_08_12_04_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_12_05_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_05_world_335.sql
index 052bec33acc..052bec33acc 100644
--- a/sql/updates/world/3.3.5/2020_08_12_05_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_12_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_13_00_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_13_00_world.sql
index 3cd31e5a765..3cd31e5a765 100644
--- a/sql/updates/world/3.3.5/2020_08_13_00_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_13_01_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_13_01_world.sql
index 4b9e14632d3..4b9e14632d3 100644
--- a/sql/updates/world/3.3.5/2020_08_13_01_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_00_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_00_world_335.sql
index c2866ca4b8d..c2866ca4b8d 100644
--- a/sql/updates/world/3.3.5/2020_08_15_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_01_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_01_world_335.sql
index 157f81aa087..157f81aa087 100644
--- a/sql/updates/world/3.3.5/2020_08_15_01_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_02_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_02_world_335.sql
index b68e0f1421a..b68e0f1421a 100644
--- a/sql/updates/world/3.3.5/2020_08_15_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_03_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_03_world.sql
index 90200c02288..90200c02288 100644
--- a/sql/updates/world/3.3.5/2020_08_15_03_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_04_world.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_04_world.sql
index 2c865a0c234..2c865a0c234 100644
--- a/sql/updates/world/3.3.5/2020_08_15_04_world.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_08_15_05_world_335.sql b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_05_world_335.sql
index 4ba99047e49..4ba99047e49 100644
--- a/sql/updates/world/3.3.5/2020_08_15_05_world_335.sql
+++ b/sql/old/3.3.5a/world/20071_2020_08_15/2020_08_15_05_world_335.sql
diff --git a/sql/updates/auth/3.3.5/2020_08_15_00_auth.sql b/sql/updates/auth/3.3.5/2020_08_15_00_auth.sql
new file mode 100644
index 00000000000..9a33bcc953f
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2020_08_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20081 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2020_08_15_00_characters.sql b/sql/updates/characters/3.3.5/2020_08_15_00_characters.sql
new file mode 100644
index 00000000000..156854247e1
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2020_08_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20081 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2020_08_15_06_world.sql b/sql/updates/world/3.3.5/2020_08_15_06_world.sql
new file mode 100644
index 00000000000..139364a07b5
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_08_15_06_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.20081 world
+UPDATE `version` SET `db_version`='TDB 335.20081', `cache_id`=20081 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';