pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Zone] Deprecate Zone expansion Field (#2297)

Browse Source
This commit is contained in:
Chris Miles 2022-07-14 02:49:35 -05:00 committed by GitHub
parent c8b3ca53fe
commit ddb5794462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 134 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
common/repositories/base/base_zone_repository.h
View File

@ -80,7 +80,6 @@ public:
int insttype; int insttype;
int64 shutdowndelay; int64 shutdowndelay;
int peqzone; int peqzone;
int expansion;
int suspendbuffs; int suspendbuffs;
int rain_chance1; int rain_chance1;
int rain_chance2; int rain_chance2;
@ -184,7 +183,6 @@ public:
"insttype", "insttype",
"shutdowndelay", "shutdowndelay",
"peqzone", "peqzone",
"expansion",
"suspendbuffs", "suspendbuffs",
"rain_chance1", "rain_chance1",
"rain_chance2", "rain_chance2",
@ -284,7 +282,6 @@ public:
"insttype", "insttype",
"shutdowndelay", "shutdowndelay",
"peqzone", "peqzone",
"expansion",
"suspendbuffs", "suspendbuffs",
"rain_chance1", "rain_chance1",
"rain_chance2", "rain_chance2",
@ -418,7 +415,6 @@ public:
entry.insttype = 0; entry.insttype = 0;
entry.shutdowndelay = 5000; entry.shutdowndelay = 5000;
entry.peqzone = 1; entry.peqzone = 1;
entry.expansion = 0;
entry.suspendbuffs = 0; entry.suspendbuffs = 0;
entry.rain_chance1 = 0; entry.rain_chance1 = 0;
entry.rain_chance2 = 0; entry.rain_chance2 = 0;
@ -547,39 +543,38 @@ public:
entry.insttype = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.shutdowndelay = strtoll(row[59], nullptr, 10); entry.shutdowndelay = strtoll(row[59], nullptr, 10);
entry.peqzone = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.expansion = atoi(row[61]); entry.suspendbuffs = atoi(row[61]);
entry.suspendbuffs = atoi(row[62]); entry.rain_chance1 = atoi(row[62]);
entry.rain_chance1 = atoi(row[63]); entry.rain_chance2 = atoi(row[63]);
entry.rain_chance2 = atoi(row[64]); entry.rain_chance3 = atoi(row[64]);
entry.rain_chance3 = atoi(row[65]); entry.rain_chance4 = atoi(row[65]);
entry.rain_chance4 = atoi(row[66]); entry.rain_duration1 = atoi(row[66]);
entry.rain_duration1 = atoi(row[67]); entry.rain_duration2 = atoi(row[67]);
entry.rain_duration2 = atoi(row[68]); entry.rain_duration3 = atoi(row[68]);
entry.rain_duration3 = atoi(row[69]); entry.rain_duration4 = atoi(row[69]);
entry.rain_duration4 = atoi(row[70]); entry.snow_chance1 = atoi(row[70]);
entry.snow_chance1 = atoi(row[71]); entry.snow_chance2 = atoi(row[71]);
entry.snow_chance2 = atoi(row[72]); entry.snow_chance3 = atoi(row[72]);
entry.snow_chance3 = atoi(row[73]); entry.snow_chance4 = atoi(row[73]);
entry.snow_chance4 = atoi(row[74]); entry.snow_duration1 = atoi(row[74]);
entry.snow_duration1 = atoi(row[75]); entry.snow_duration2 = atoi(row[75]);
entry.snow_duration2 = atoi(row[76]); entry.snow_duration3 = atoi(row[76]);
entry.snow_duration3 = atoi(row[77]); entry.snow_duration4 = atoi(row[77]);
entry.snow_duration4 = atoi(row[78]); entry.gravity = static_cast<float>(atof(row[78]));
entry.gravity = static_cast<float>(atof(row[79])); entry.type = atoi(row[79]);
entry.type = atoi(row[80]); entry.skylock = atoi(row[80]);
entry.skylock = atoi(row[81]); entry.fast_regen_hp = atoi(row[81]);
entry.fast_regen_hp = atoi(row[82]); entry.fast_regen_mana = atoi(row[82]);
entry.fast_regen_mana = atoi(row[83]); entry.fast_regen_endurance = atoi(row[83]);
entry.fast_regen_endurance = atoi(row[84]); entry.npc_max_aggro_dist = atoi(row[84]);
entry.npc_max_aggro_dist = atoi(row[85]); entry.max_movement_update_range = atoi(row[85]);
entry.max_movement_update_range = atoi(row[86]); entry.min_expansion = atoi(row[86]);
entry.min_expansion = atoi(row[87]); entry.max_expansion = atoi(row[87]);
entry.max_expansion = atoi(row[88]); entry.content_flags = row[88] ? row[88] : "";
entry.content_flags = row[89] ? row[89] : ""; entry.content_flags_disabled = row[89] ? row[89] : "";
entry.content_flags_disabled = row[90] ? row[90] : ""; entry.underworld_teleport_index = atoi(row[90]);
entry.underworld_teleport_index = atoi(row[91]); entry.lava_damage = atoi(row[91]);
entry.lava_damage = atoi(row[92]); entry.min_lava_damage = atoi(row[92]);
entry.min_lava_damage = atoi(row[93]);
return entry; return entry;
} }
@ -673,39 +668,38 @@ public:
update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.insttype)); update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.insttype));
update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.shutdowndelay)); update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.shutdowndelay));
update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.peqzone)); update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.peqzone));
update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.expansion)); update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.suspendbuffs));
update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.suspendbuffs)); update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.rain_chance1));
update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance1)); update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance2));
update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance2)); update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance3));
update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance3)); update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance4));
update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_chance4)); update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_duration1));
update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration1)); update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration2));
update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration2)); update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration3));
update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration3)); update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration4));
update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.rain_duration4)); update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.snow_chance1));
update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance1)); update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance2));
update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance2)); update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance3));
update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance3)); update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance4));
update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_chance4)); update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_duration1));
update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration1)); update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration2));
update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration2)); update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration3));
update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration3)); update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration4));
update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.snow_duration4)); update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.gravity));
update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.gravity)); update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.type));
update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.type)); update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.skylock));
update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.skylock)); update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.fast_regen_hp));
update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_hp)); update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_mana));
update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_mana)); update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_endurance));
update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.fast_regen_endurance)); update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.npc_max_aggro_dist));
update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.npc_max_aggro_dist)); update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.max_movement_update_range));
update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.max_movement_update_range)); update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.min_expansion));
update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.min_expansion)); update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.max_expansion));
update_values.push_back(columns[88] + " = " + std::to_string(zone_entry.max_expansion)); update_values.push_back(columns[88] + " = '" + Strings::Escape(zone_entry.content_flags) + "'");
update_values.push_back(columns[89] + " = '" + Strings::Escape(zone_entry.content_flags) + "'"); update_values.push_back(columns[89] + " = '" + Strings::Escape(zone_entry.content_flags_disabled) + "'");
update_values.push_back(columns[90] + " = '" + Strings::Escape(zone_entry.content_flags_disabled) + "'"); update_values.push_back(columns[90] + " = " + std::to_string(zone_entry.underworld_teleport_index));
update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.underworld_teleport_index)); update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.lava_damage));
update_values.push_back(columns[92] + " = " + std::to_string(zone_entry.lava_damage)); update_values.push_back(columns[92] + " = " + std::to_string(zone_entry.min_lava_damage));
update_values.push_back(columns[93] + " = " + std::to_string(zone_entry.min_lava_damage));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -788,7 +782,6 @@ public:
insert_values.push_back(std::to_string(zone_entry.insttype)); insert_values.push_back(std::to_string(zone_entry.insttype));
insert_values.push_back(std::to_string(zone_entry.shutdowndelay)); insert_values.push_back(std::to_string(zone_entry.shutdowndelay));
insert_values.push_back(std::to_string(zone_entry.peqzone)); insert_values.push_back(std::to_string(zone_entry.peqzone));
insert_values.push_back(std::to_string(zone_entry.expansion));
insert_values.push_back(std::to_string(zone_entry.suspendbuffs)); insert_values.push_back(std::to_string(zone_entry.suspendbuffs));
insert_values.push_back(std::to_string(zone_entry.rain_chance1)); insert_values.push_back(std::to_string(zone_entry.rain_chance1));
insert_values.push_back(std::to_string(zone_entry.rain_chance2)); insert_values.push_back(std::to_string(zone_entry.rain_chance2));
@ -911,7 +904,6 @@ public:
insert_values.push_back(std::to_string(zone_entry.insttype)); insert_values.push_back(std::to_string(zone_entry.insttype));
insert_values.push_back(std::to_string(zone_entry.shutdowndelay)); insert_values.push_back(std::to_string(zone_entry.shutdowndelay));
insert_values.push_back(std::to_string(zone_entry.peqzone)); insert_values.push_back(std::to_string(zone_entry.peqzone));
insert_values.push_back(std::to_string(zone_entry.expansion));
insert_values.push_back(std::to_string(zone_entry.suspendbuffs)); insert_values.push_back(std::to_string(zone_entry.suspendbuffs));
insert_values.push_back(std::to_string(zone_entry.rain_chance1)); insert_values.push_back(std::to_string(zone_entry.rain_chance1));
insert_values.push_back(std::to_string(zone_entry.rain_chance2)); insert_values.push_back(std::to_string(zone_entry.rain_chance2));
@ -1038,39 +1030,38 @@ public:
entry.insttype = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.shutdowndelay = strtoll(row[59], nullptr, 10); entry.shutdowndelay = strtoll(row[59], nullptr, 10);
entry.peqzone = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.expansion = atoi(row[61]); entry.suspendbuffs = atoi(row[61]);
entry.suspendbuffs = atoi(row[62]); entry.rain_chance1 = atoi(row[62]);
entry.rain_chance1 = atoi(row[63]); entry.rain_chance2 = atoi(row[63]);
entry.rain_chance2 = atoi(row[64]); entry.rain_chance3 = atoi(row[64]);
entry.rain_chance3 = atoi(row[65]); entry.rain_chance4 = atoi(row[65]);
entry.rain_chance4 = atoi(row[66]); entry.rain_duration1 = atoi(row[66]);
entry.rain_duration1 = atoi(row[67]); entry.rain_duration2 = atoi(row[67]);
entry.rain_duration2 = atoi(row[68]); entry.rain_duration3 = atoi(row[68]);
entry.rain_duration3 = atoi(row[69]); entry.rain_duration4 = atoi(row[69]);
entry.rain_duration4 = atoi(row[70]); entry.snow_chance1 = atoi(row[70]);
entry.snow_chance1 = atoi(row[71]); entry.snow_chance2 = atoi(row[71]);
entry.snow_chance2 = atoi(row[72]); entry.snow_chance3 = atoi(row[72]);
entry.snow_chance3 = atoi(row[73]); entry.snow_chance4 = atoi(row[73]);
entry.snow_chance4 = atoi(row[74]); entry.snow_duration1 = atoi(row[74]);
entry.snow_duration1 = atoi(row[75]); entry.snow_duration2 = atoi(row[75]);
entry.snow_duration2 = atoi(row[76]); entry.snow_duration3 = atoi(row[76]);
entry.snow_duration3 = atoi(row[77]); entry.snow_duration4 = atoi(row[77]);
entry.snow_duration4 = atoi(row[78]); entry.gravity = static_cast<float>(atof(row[78]));
entry.gravity = static_cast<float>(atof(row[79])); entry.type = atoi(row[79]);
entry.type = atoi(row[80]); entry.skylock = atoi(row[80]);
entry.skylock = atoi(row[81]); entry.fast_regen_hp = atoi(row[81]);
entry.fast_regen_hp = atoi(row[82]); entry.fast_regen_mana = atoi(row[82]);
entry.fast_regen_mana = atoi(row[83]); entry.fast_regen_endurance = atoi(row[83]);
entry.fast_regen_endurance = atoi(row[84]); entry.npc_max_aggro_dist = atoi(row[84]);
entry.npc_max_aggro_dist = atoi(row[85]); entry.max_movement_update_range = atoi(row[85]);
entry.max_movement_update_range = atoi(row[86]); entry.min_expansion = atoi(row[86]);
entry.min_expansion = atoi(row[87]); entry.max_expansion = atoi(row[87]);
entry.max_expansion = atoi(row[88]); entry.content_flags = row[88] ? row[88] : "";
entry.content_flags = row[89] ? row[89] : ""; entry.content_flags_disabled = row[89] ? row[89] : "";
entry.content_flags_disabled = row[90] ? row[90] : ""; entry.underworld_teleport_index = atoi(row[90]);
entry.underworld_teleport_index = atoi(row[91]); entry.lava_damage = atoi(row[91]);
entry.lava_damage = atoi(row[92]); entry.min_lava_damage = atoi(row[92]);
entry.min_lava_damage = atoi(row[93]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -1156,39 +1147,38 @@ public:
entry.insttype = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.shutdowndelay = strtoll(row[59], nullptr, 10); entry.shutdowndelay = strtoll(row[59], nullptr, 10);
entry.peqzone = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.expansion = atoi(row[61]); entry.suspendbuffs = atoi(row[61]);
entry.suspendbuffs = atoi(row[62]); entry.rain_chance1 = atoi(row[62]);
entry.rain_chance1 = atoi(row[63]); entry.rain_chance2 = atoi(row[63]);
entry.rain_chance2 = atoi(row[64]); entry.rain_chance3 = atoi(row[64]);
entry.rain_chance3 = atoi(row[65]); entry.rain_chance4 = atoi(row[65]);
entry.rain_chance4 = atoi(row[66]); entry.rain_duration1 = atoi(row[66]);
entry.rain_duration1 = atoi(row[67]); entry.rain_duration2 = atoi(row[67]);
entry.rain_duration2 = atoi(row[68]); entry.rain_duration3 = atoi(row[68]);
entry.rain_duration3 = atoi(row[69]); entry.rain_duration4 = atoi(row[69]);
entry.rain_duration4 = atoi(row[70]); entry.snow_chance1 = atoi(row[70]);
entry.snow_chance1 = atoi(row[71]); entry.snow_chance2 = atoi(row[71]);
entry.snow_chance2 = atoi(row[72]); entry.snow_chance3 = atoi(row[72]);
entry.snow_chance3 = atoi(row[73]); entry.snow_chance4 = atoi(row[73]);
entry.snow_chance4 = atoi(row[74]); entry.snow_duration1 = atoi(row[74]);
entry.snow_duration1 = atoi(row[75]); entry.snow_duration2 = atoi(row[75]);
entry.snow_duration2 = atoi(row[76]); entry.snow_duration3 = atoi(row[76]);
entry.snow_duration3 = atoi(row[77]); entry.snow_duration4 = atoi(row[77]);
entry.snow_duration4 = atoi(row[78]); entry.gravity = static_cast<float>(atof(row[78]));
entry.gravity = static_cast<float>(atof(row[79])); entry.type = atoi(row[79]);
entry.type = atoi(row[80]); entry.skylock = atoi(row[80]);
entry.skylock = atoi(row[81]); entry.fast_regen_hp = atoi(row[81]);
entry.fast_regen_hp = atoi(row[82]); entry.fast_regen_mana = atoi(row[82]);
entry.fast_regen_mana = atoi(row[83]); entry.fast_regen_endurance = atoi(row[83]);
entry.fast_regen_endurance = atoi(row[84]); entry.npc_max_aggro_dist = atoi(row[84]);
entry.npc_max_aggro_dist = atoi(row[85]); entry.max_movement_update_range = atoi(row[85]);
entry.max_movement_update_range = atoi(row[86]); entry.min_expansion = atoi(row[86]);
entry.min_expansion = atoi(row[87]); entry.max_expansion = atoi(row[87]);
entry.max_expansion = atoi(row[88]); entry.content_flags = row[88] ? row[88] : "";
entry.content_flags = row[89] ? row[89] : ""; entry.content_flags_disabled = row[89] ? row[89] : "";
entry.content_flags_disabled = row[90] ? row[90] : ""; entry.underworld_teleport_index = atoi(row[90]);
entry.underworld_teleport_index = atoi(row[91]); entry.lava_damage = atoi(row[91]);
entry.lava_damage = atoi(row[92]); entry.min_lava_damage = atoi(row[92]);
entry.min_lava_damage = atoi(row[93]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }

2
common/version.h
View File

@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9185 #define CURRENT_BINARY_DATABASE_VERSION 9186
#ifdef BOTS #ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029

1
utils/sql/db_update_manifest.txt
View File

@ -439,6 +439,7 @@
9183|2022_05_07_merchant_data_buckets.sql|SHOW COLUMNS FROM `merchantlist` LIKE 'bucket_comparison'|empty 9183|2022_05_07_merchant_data_buckets.sql|SHOW COLUMNS FROM `merchantlist` LIKE 'bucket_comparison'|empty
9184|2022_05_21_schema_consistency.sql|SELECT * FROM db_version WHERE version >= 9184|empty| 9184|2022_05_21_schema_consistency.sql|SELECT * FROM db_version WHERE version >= 9184|empty|
9185|2022_05_07_discord_webhooks.sql|SHOW TABLES LIKE 'discord_webhooks'|empty| 9185|2022_05_07_discord_webhooks.sql|SHOW TABLES LIKE 'discord_webhooks'|empty|
9186|2022_07_09_zone_expansion_deprecate.sql|SHOW COLUMNS FROM 'zone' LIKE 'expansion'|notempty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

2
utils/sql/git/required/2022_07_09_zone_expansion_deprecate.sql Normal file
View File

@ -0,0 +1,2 @@
UPDATE `zone` set min_expansion = expansion;
ALTER TABLE `zone` DROP `expansion`;

4
zone/zoning.cpp
View File

@ -347,7 +347,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
for (auto &z: zone_store.zones) { for (auto &z: zone_store.zones) {
if (z.short_name == target_zone_name && z.version == 0) { if (z.short_name == target_zone_name && z.version == 0) {
found_zone = true; found_zone = true;
if (z.expansion <= (content_service.GetCurrentExpansion() + 1)) { if (z.min_expansion <= (content_service.GetCurrentExpansion() + 1)) {
meets_zone_expansion_check = true; meets_zone_expansion_check = true;
break; break;
} }
@ -361,7 +361,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
if (!found_zone) { if (!found_zone) {
auto zones = ZoneRepository::GetWhere(content_db, auto zones = ZoneRepository::GetWhere(content_db,
fmt::format( fmt::format(
"expansion <= {} AND short_name = '{}' and version = 0", "min_expansion <= {} AND short_name = '{}' and version = 0",
(content_service.GetCurrentExpansion() + 1), (content_service.GetCurrentExpansion() + 1),
target_zone_name target_zone_name
) )