From ec3ef411a1ed5efb34db0a73f0877b7b31233629 Mon Sep 17 00:00:00 2001 From: Aeadoin <109764533+Aeadoin@users.noreply.github.com> Date: Sat, 25 Mar 2023 20:08:40 -0400 Subject: [PATCH] [Fix] Fix for SQL Query in npc_scale_global_base (#3144) --- common/version.h | 2 +- utils/sql/db_update_manifest.txt | 1 + ...scale_global_base_heroic_strikethrough.sql | 2 +- ...023_03_24_npc_scale_global_base_verify.sql | 57 +++++++++++++++++++ 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 utils/sql/git/required/2023_03_24_npc_scale_global_base_verify.sql diff --git a/common/version.h b/common/version.h index bb067bfb4..fc36df4c5 100644 --- a/common/version.h +++ b/common/version.h @@ -42,7 +42,7 @@ * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt */ -#define CURRENT_BINARY_DATABASE_VERSION 9226 +#define CURRENT_BINARY_DATABASE_VERSION 9227 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9038 diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index c7aaab906..40cd1527a 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -480,6 +480,7 @@ 9224|2023_03_08_npc_scale_global_base_avoidance.sql|SHOW COLUMNS FROM `npc_scale_global_base` LIKE 'hp_regen_per_second'|empty| 9225|2023_01_21_bots_raid_members.sql|SHOW COLUMNS FROM `raid_members` LIKE 'bot_id'|empty| 9226|2023_03_17_corpse_fields.sql|SHOW COLUMNS FROM `character_corpse_items` LIKE 'custom_data'|empty| +9227|2023_03_24_npc_scale_global_base_verify.sql|SHOW COLUMNS FROM `npc_scale_global_base` LIKE 'heroic_strikethrough'|not_empty| # Upgrade conditions: # This won't be needed after this system is implemented, but it is used database that are not diff --git a/utils/sql/git/required/2023_03_04_npc_scale_global_base_heroic_strikethrough.sql b/utils/sql/git/required/2023_03_04_npc_scale_global_base_heroic_strikethrough.sql index 6559cb0a0..b2fd1cade 100644 --- a/utils/sql/git/required/2023_03_04_npc_scale_global_base_heroic_strikethrough.sql +++ b/utils/sql/git/required/2023_03_04_npc_scale_global_base_heroic_strikethrough.sql @@ -51,5 +51,5 @@ ALTER TABLE `npc_scale_global_base` MODIFY COLUMN `attack_delay` int(11) NOT NULL DEFAULT 0 AFTER `hp_regen_rate`, MODIFY COLUMN `spell_scale` int(11) NOT NULL DEFAULT 100 AFTER `attack_delay`, MODIFY COLUMN `heal_scale` int(11) NOT NULL DEFAULT 100 AFTER `spell_scale`, - MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT '' AFTER `heal_scale`, + MODIFY COLUMN special_abilities text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL AFTER heal_scale, ADD COLUMN `heroic_strikethrough` int(11) NOT NULL DEFAULT 0 AFTER `heal_scale`; diff --git a/utils/sql/git/required/2023_03_24_npc_scale_global_base_verify.sql b/utils/sql/git/required/2023_03_24_npc_scale_global_base_verify.sql new file mode 100644 index 000000000..2036f918d --- /dev/null +++ b/utils/sql/git/required/2023_03_24_npc_scale_global_base_verify.sql @@ -0,0 +1,57 @@ +UPDATE `npc_scale_global_base` SET ac = 0 WHERE ac IS NULL; +UPDATE `npc_scale_global_base` SET hp = 0 WHERE hp IS NULL; +UPDATE `npc_scale_global_base` SET accuracy = 0 WHERE accuracy IS NULL; +UPDATE `npc_scale_global_base` SET slow_mitigation = 0 WHERE slow_mitigation IS NULL; +UPDATE `npc_scale_global_base` SET attack = 0 WHERE attack IS NULL; +UPDATE `npc_scale_global_base` SET strength = 0 WHERE strength IS NULL; +UPDATE `npc_scale_global_base` SET stamina = 0 WHERE stamina IS NULL; +UPDATE `npc_scale_global_base` SET dexterity = 0 WHERE dexterity IS NULL; +UPDATE `npc_scale_global_base` SET agility = 0 WHERE agility IS NULL; +UPDATE `npc_scale_global_base` SET intelligence = 0 WHERE intelligence IS NULL; +UPDATE `npc_scale_global_base` SET wisdom = 0 WHERE wisdom IS NULL; +UPDATE `npc_scale_global_base` SET charisma = 0 WHERE charisma IS NULL; +UPDATE `npc_scale_global_base` SET magic_resist = 0 WHERE magic_resist IS NULL; +UPDATE `npc_scale_global_base` SET cold_resist = 0 WHERE cold_resist IS NULL; +UPDATE `npc_scale_global_base` SET fire_resist = 0 WHERE fire_resist IS NULL; +UPDATE `npc_scale_global_base` SET poison_resist = 0 WHERE poison_resist IS NULL; +UPDATE `npc_scale_global_base` SET disease_resist = 0 WHERE disease_resist IS NULL; +UPDATE `npc_scale_global_base` SET corruption_resist = 0 WHERE corruption_resist IS NULL; +UPDATE `npc_scale_global_base` SET physical_resist = 0 WHERE physical_resist IS NULL; +UPDATE `npc_scale_global_base` SET min_dmg = 0 WHERE min_dmg IS NULL; +UPDATE `npc_scale_global_base` SET max_dmg = 0 WHERE max_dmg IS NULL; +UPDATE `npc_scale_global_base` SET hp_regen_rate = 0 WHERE hp_regen_rate IS NULL; +UPDATE `npc_scale_global_base` SET attack_delay = 0 WHERE attack_delay IS NULL; +UPDATE `npc_scale_global_base` SET physical_resist = 0 WHERE physical_resist IS NULL; +UPDATE `npc_scale_global_base` SET spell_scale = 100 WHERE spell_scale IS NULL; +UPDATE `npc_scale_global_base` SET heal_scale = 100 WHERE heal_scale IS NULL; +UPDATE `npc_scale_global_base` SET special_abilities = '' WHERE special_abilities IS NULL; +ALTER TABLE `npc_scale_global_base` + MODIFY COLUMN `ac` int(11) NOT NULL DEFAULT 0 AFTER `instance_version_list`, + MODIFY COLUMN `hp` bigint(20) NOT NULL DEFAULT 0 AFTER `ac`, + MODIFY COLUMN `accuracy` int(11) NOT NULL DEFAULT 0 AFTER `hp`, + MODIFY COLUMN `slow_mitigation` int(11) NOT NULL DEFAULT 0 AFTER `accuracy`, + MODIFY COLUMN `attack` int(11) NOT NULL DEFAULT 0 AFTER `slow_mitigation`, + MODIFY COLUMN `strength` int(11) NOT NULL DEFAULT 0 AFTER `attack`, + MODIFY COLUMN `stamina` int(11) NOT NULL DEFAULT 0 AFTER `strength`, + MODIFY COLUMN `dexterity` int(11) NOT NULL DEFAULT 0 AFTER `stamina`, + MODIFY COLUMN `agility` int(11) NOT NULL DEFAULT 0 AFTER `dexterity`, + MODIFY COLUMN `intelligence` int(11) NOT NULL DEFAULT 0 AFTER `agility`, + MODIFY COLUMN `wisdom` int(11) NOT NULL DEFAULT 0 AFTER `intelligence`, + MODIFY COLUMN `charisma` int(11) NOT NULL DEFAULT 0 AFTER `wisdom`, + MODIFY COLUMN `magic_resist` int(11) NOT NULL DEFAULT 0 AFTER `charisma`, + MODIFY COLUMN `cold_resist` int(11) NOT NULL DEFAULT 0 AFTER `magic_resist`, + MODIFY COLUMN `fire_resist` int(11) NOT NULL DEFAULT 0 AFTER `cold_resist`, + MODIFY COLUMN `poison_resist` int(11) NOT NULL DEFAULT 0 AFTER `fire_resist`, + MODIFY COLUMN `disease_resist` int(11) NOT NULL DEFAULT 0 AFTER `poison_resist`, + MODIFY COLUMN `corruption_resist` int(11) NOT NULL DEFAULT 0 AFTER `disease_resist`, + MODIFY COLUMN `physical_resist` int(11) NOT NULL DEFAULT 0 AFTER `corruption_resist`, + MODIFY COLUMN `min_dmg` int(11) NOT NULL DEFAULT 0 AFTER `physical_resist`, + MODIFY COLUMN `max_dmg` int(11) NOT NULL DEFAULT 0 AFTER `min_dmg`, + MODIFY COLUMN `hp_regen_rate` bigint(20) NOT NULL DEFAULT 0 AFTER `max_dmg`, + MODIFY COLUMN `attack_delay` int(11) NOT NULL DEFAULT 0 AFTER `hp_regen_rate`, + MODIFY COLUMN `hp_regen_per_second` bigint(20) NOT NULL DEFAULT 0 AFTER `hp_regen_rate`, + MODIFY COLUMN `spell_scale` int(11) NOT NULL DEFAULT 100 AFTER `attack_delay`, + MODIFY COLUMN `heal_scale` int(11) NOT NULL DEFAULT 100 AFTER `spell_scale`, + MODIFY COLUMN `heroic_strikethrough` int(11) NOT NULL DEFAULT 0 AFTER `avoidance`, + MODIFY COLUMN `avoidance` int(11) unsigned NOT NULL DEFAULT 0 AFTER `heal_scale`, + MODIFY COLUMN special_abilities text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL AFTER heroic_strikethrough; \ No newline at end of file