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

[Doors] Replace magic # in code with a field in doors table for when door closes. (#4288)

Browse Source 
* [Doors] Move hard coded door close timer to doors table

* Fix typo in version #

* Make field unsigned and not null
This commit is contained in:
Paul Coene 2024-04-25 17:59:01 -04:00 committed by GitHub
parent 1b8922fc14
commit 1529c0f670
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/database/database_update_manifest.cpp
View File

@ -5536,6 +5536,18 @@ ALTER TABLE `character_parcels`
ADD COLUMN `aug_slot_5` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_4`, ADD COLUMN `aug_slot_5` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_4`,
ADD COLUMN `aug_slot_6` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_5`; ADD COLUMN `aug_slot_6` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_5`;
)" )"
},
ManifestEntry{
.version = 9273,
.description = "2024_04_24_door_close_timer.sql",
.check = "SHOW COLUMNS FROM `doors` LIKE 'close_timer'",
.condition = "empty",
.match = "",
.sql = R"(
ALTER TABLE `doors`
ADD COLUMN `close_timer_ms` smallint(8) UNSIGNED NOT NULL DEFAULT 5000 AFTER `is_ldon_door`;
)",
.content_schema_update = true
} }
// -- template; copy/paste this when you need to create a new entry // -- template; copy/paste this when you need to create a new entry
// ManifestEntry{ // ManifestEntry{

52
common/repositories/base/base_doors_repository.h
View File

@ -50,6 +50,7 @@ public:
float buffer; float buffer;
uint32_t client_version_mask; uint32_t client_version_mask;
int16_t is_ldon_door; int16_t is_ldon_door;
int16_t close_timer_ms;
int32_t dz_switch_id; int32_t dz_switch_id;
int8_t min_expansion; int8_t min_expansion;
int8_t max_expansion; int8_t max_expansion;
@ -96,6 +97,7 @@ public:
"buffer", "buffer",
"client_version_mask", "client_version_mask",
"is_ldon_door", "is_ldon_door",
"close_timer_ms",
"dz_switch_id", "dz_switch_id",
"min_expansion", "min_expansion",
"max_expansion", "max_expansion",
@ -138,6 +140,7 @@ public:
"buffer", "buffer",
"client_version_mask", "client_version_mask",
"is_ldon_door", "is_ldon_door",
"close_timer_ms",
"dz_switch_id", "dz_switch_id",
"min_expansion", "min_expansion",
"max_expansion", "max_expansion",
@ -214,6 +217,7 @@ public:
e.buffer = 0; e.buffer = 0;
e.client_version_mask = 4294967295; e.client_version_mask = 4294967295;
e.is_ldon_door = 0; e.is_ldon_door = 0;
e.close_timer_ms = 5000;
e.dz_switch_id = 0; e.dz_switch_id = 0;
e.min_expansion = -1; e.min_expansion = -1;
e.max_expansion = -1; e.max_expansion = -1;
@ -286,11 +290,12 @@ public:
e.buffer = row[28] ? strtof(row[28], nullptr) : 0; e.buffer = row[28] ? strtof(row[28], nullptr) : 0;
e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295; e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0; e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
e.dz_switch_id = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0; e.close_timer_ms = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
e.min_expansion = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1; e.dz_switch_id = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
e.max_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1; e.min_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
e.content_flags = row[34] ? row[34] : ""; e.max_expansion = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
e.content_flags_disabled = row[35] ? row[35] : ""; e.content_flags = row[35] ? row[35] : "";
e.content_flags_disabled = row[36] ? row[36] : "";
return e; return e;
} }
@ -354,11 +359,12 @@ public:
v.push_back(columns[28] + " = " + std::to_string(e.buffer)); v.push_back(columns[28] + " = " + std::to_string(e.buffer));
v.push_back(columns[29] + " = " + std::to_string(e.client_version_mask)); v.push_back(columns[29] + " = " + std::to_string(e.client_version_mask));
v.push_back(columns[30] + " = " + std::to_string(e.is_ldon_door)); v.push_back(columns[30] + " = " + std::to_string(e.is_ldon_door));
v.push_back(columns[31] + " = " + std::to_string(e.dz_switch_id)); v.push_back(columns[31] + " = " + std::to_string(e.close_timer_ms));
v.push_back(columns[32] + " = " + std::to_string(e.min_expansion)); v.push_back(columns[32] + " = " + std::to_string(e.dz_switch_id));
v.push_back(columns[33] + " = " + std::to_string(e.max_expansion)); v.push_back(columns[33] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[34] + " = '" + Strings::Escape(e.content_flags) + "'"); v.push_back(columns[34] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[35] + " = '" + Strings::Escape(e.content_flags_disabled) + "'"); v.push_back(columns[35] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[36] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -411,6 +417,7 @@ public:
v.push_back(std::to_string(e.buffer)); v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask)); v.push_back(std::to_string(e.client_version_mask));
v.push_back(std::to_string(e.is_ldon_door)); v.push_back(std::to_string(e.is_ldon_door));
v.push_back(std::to_string(e.close_timer_ms));
v.push_back(std::to_string(e.dz_switch_id)); v.push_back(std::to_string(e.dz_switch_id));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion)); v.push_back(std::to_string(e.max_expansion));
@ -476,6 +483,7 @@ public:
v.push_back(std::to_string(e.buffer)); v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask)); v.push_back(std::to_string(e.client_version_mask));
v.push_back(std::to_string(e.is_ldon_door)); v.push_back(std::to_string(e.is_ldon_door));
v.push_back(std::to_string(e.close_timer_ms));
v.push_back(std::to_string(e.dz_switch_id)); v.push_back(std::to_string(e.dz_switch_id));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion)); v.push_back(std::to_string(e.max_expansion));
@ -545,11 +553,12 @@ public:
e.buffer = row[28] ? strtof(row[28], nullptr) : 0; e.buffer = row[28] ? strtof(row[28], nullptr) : 0;
e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295; e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0; e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
e.dz_switch_id = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0; e.close_timer_ms = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
e.min_expansion = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1; e.dz_switch_id = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
e.max_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1; e.min_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
e.content_flags = row[34] ? row[34] : ""; e.max_expansion = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
e.content_flags_disabled = row[35] ? row[35] : ""; e.content_flags = row[35] ? row[35] : "";
e.content_flags_disabled = row[36] ? row[36] : "";
all_entries.push_back(e); all_entries.push_back(e);
} }
@ -605,11 +614,12 @@ public:
e.buffer = row[28] ? strtof(row[28], nullptr) : 0; e.buffer = row[28] ? strtof(row[28], nullptr) : 0;
e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295; e.client_version_mask = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0; e.is_ldon_door = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
e.dz_switch_id = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0; e.close_timer_ms = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
e.min_expansion = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1; e.dz_switch_id = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
e.max_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1; e.min_expansion = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
e.content_flags = row[34] ? row[34] : ""; e.max_expansion = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
e.content_flags_disabled = row[35] ? row[35] : ""; e.content_flags = row[35] ? row[35] : "";
e.content_flags_disabled = row[36] ? row[36] : "";
all_entries.push_back(e); all_entries.push_back(e);
} }
@ -715,6 +725,7 @@ public:
v.push_back(std::to_string(e.buffer)); v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask)); v.push_back(std::to_string(e.client_version_mask));
v.push_back(std::to_string(e.is_ldon_door)); v.push_back(std::to_string(e.is_ldon_door));
v.push_back(std::to_string(e.close_timer_ms));
v.push_back(std::to_string(e.dz_switch_id)); v.push_back(std::to_string(e.dz_switch_id));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion)); v.push_back(std::to_string(e.max_expansion));
@ -773,6 +784,7 @@ public:
v.push_back(std::to_string(e.buffer)); v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask)); v.push_back(std::to_string(e.client_version_mask));
v.push_back(std::to_string(e.is_ldon_door)); v.push_back(std::to_string(e.is_ldon_door));
v.push_back(std::to_string(e.close_timer_ms));
v.push_back(std::to_string(e.dz_switch_id)); v.push_back(std::to_string(e.dz_switch_id));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion)); v.push_back(std::to_string(e.max_expansion));

2
common/version.h
View File

@ -42,7 +42,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 9272 #define CURRENT_BINARY_DATABASE_VERSION 9273
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9043 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9043
#endif #endif

2
zone/doors.cpp
View File

@ -43,7 +43,7 @@ extern EntityList entity_list;
extern WorldServer worldserver; extern WorldServer worldserver;
Doors::Doors(const DoorsRepository::Doors &door) : Doors::Doors(const DoorsRepository::Doors &door) :
m_close_timer(5000), m_close_timer(door.close_timer_ms),
m_position(door.pos_x, door.pos_y, door.pos_z, door.heading), m_position(door.pos_x, door.pos_y, door.pos_z, door.heading),
m_destination(door.dest_x, door.dest_y, door.dest_z, door.dest_heading) m_destination(door.dest_x, door.dest_y, door.dest_z, door.dest_heading)
{ {