Merge branch 'master' of https://github.com/EQEmu/Server into inv_possessions_rework

utils/sql/db_update_manifest.txt

@@ -379,8 +379,10 @@
 9123|2018_07_07_data_buckets.sql|SHOW TABLES LIKE 'data_buckets'|empty|
 9124|2018_07_09_tasks.sql|SHOW COLUMNS FROM `tasks` LIKE 'type'|empty|
 9125|2018_07_20_task_emote.sql|SHOW COLUMNS FROM `tasks` LIKE 'completion_emote'|empty|
-9126|2018_08_13_inventory_version_update.sql|SHOW TABLES LIKE 'inventory_versions'|empty|
-9127|2018_08_13_inventory_update.sql|SELECT * FROM `inventory_versions` WHERE `version` = 2 and `step` = 0|not_empty|
+9126|2018_09_07_FastRegen.sql|SHOW COLUMNS FROM `zone` LIKE 'fast_regen_hp'|empty|
+9127|2018_09_07_NPCMaxAggroDist.sql|SHOW COLUMNS FROM `zone` LIKE 'npc_max_aggro_dist'|empty|
+9128|2018_08_13_inventory_version_update.sql|SHOW TABLES LIKE 'inventory_versions'|empty|
+9129|2018_08_13_inventory_update.sql|SELECT * FROM `inventory_versions` WHERE `version` = 2 and `step` = 0|not_empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/required/2018_09_07_FastRegen.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `zone` ADD `fast_regen_hp` INT NOT NULL DEFAULT '180';
+ALTER TABLE `zone` ADD `fast_regen_mana` INT NOT NULL DEFAULT '180';
+ALTER TABLE `zone` ADD `fast_regen_endurance` INT NOT NULL DEFAULT '180';

utils/sql/git/required/2018_09_07_NPCMaxAggroDist.sql

@@ -0,0 +1 @@
+ALTER TABLE `zone` ADD `npc_max_aggro_dist` INT NOT NULL DEFAULT '600';

utils/sql/system_tables.txt

@@ -1,11 +1,10 @@
 aa_ability
 aa_actions
 aa_effects
-aa_required_level_cost
-aa_ranks
 aa_rank_effects
 aa_rank_prereqs
-task_activities
+aa_ranks
+aa_required_level_cost
 adventure_template
 adventure_template_entry
 adventure_template_entry_flavor
@@ -18,6 +17,7 @@ char_create_combinations
 char_create_point_allocations
 class_skill
 damageshieldtypes
+data_buckets
 doors
 faction_list
 faction_list_mod
@@ -33,38 +33,39 @@ ground_spawns
 horses
 instance_list
 items
-ldon_trap_templates
 ldon_trap_entries
+ldon_trap_templates
 level_exp_mods
+logsys_categories
 lootdrop
 lootdrop_entries
 loottable
 loottable_entries
 merc_armorinfo
-merc_weaponinfo
-merc_stats
+merc_buffs
+merc_inventory
 merc_merchant_entries
 merc_merchant_template_entries
 merc_merchant_templates
-merc_stance_entries
-merc_templates
-merc_npc_types
 merc_name_types
-merc_subtypes 
-merc_types
+merc_npc_types
 merc_spell_list_entries
 merc_spell_lists
-merc_buffs
-mercs
-merc_inventory 
+merc_stance_entries
+merc_stats
+merc_subtypes
+merc_templates
+merc_types
+merc_weaponinfo
 merchantlist
+mercs
 npc_emotes
 npc_faction
 npc_faction_entries
 npc_spells
-npc_spells_entries
 npc_spells_effects
 npc_spells_effects_entries
+npc_spells_entries
 npc_types
 npc_types_metadata
 npc_types_tint
@@ -77,14 +78,15 @@ races
 saylink
 skill_caps
 spawn2
-spawn_conditions
 spawn_condition_values
+spawn_conditions
 spawn_events
 spawnentry
 spawngroup
 spells_new
 start_zones
 starting_items
+task_activities
 tasks
 tasksets
 titles