pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 23:58:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Spawn] Split spawn2 enabled into its own state table

Browse Source
This commit is contained in:
Akkadius
2023-10-29 21:55:33 -05:00
parent 0a3972deb9
commit 9ca28bcd19
7 changed files with 479 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database/database_update_manifest.cpp
+19
View File
@@ -4995,6 +4995,25 @@ ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,
DROP PRIMARY KEY,
ADD PRIMARY KEY (`id`) USING BTREE,
ADD UNIQUE INDEX(`varname`);
)"
},
ManifestEntry{
.version = 9241,
.description = "2023_10_29_split_spawn2_enabled.sql",
.check = "SHOW TABLES LIKE 'spawn2_disabled'",
.condition = "empty",
.match = "",
.sql = R"(
CREATE TABLE `spawn2_backup_2023_10_29` LIKE `spawn2`;
CREATE TABLE `spawn2_disabled` (
`id` bigint(11) NOT NULL AUTO_INCREMENT,
`spawn2_id` int(11) DEFAULT NULL,
`disabled` smallint(11) DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `spawn2_id` (`spawn2_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
INSERT INTO spawn2_disabled (spawn2_id, disabled) SELECT id, 1 FROM spawn2 WHERE enabled = 0;
ALTER TABLE `spawn2` DROP COLUMN `enabled`;
)"
},
common/database_schema.h
+1
View File
@@ -345,6 +345,7 @@ namespace DatabaseSchema {
"respawn_times",
"saylink",
"server_scheduled_events",
"spawn2_disabled",
"player_event_log_settings",
"player_event_logs",
"shared_task_activity_state",
common/repositories/base/base_spawn2_disabled_repository.h
+344
View File
@@ -0,0 +1,344 @@
/**
* DO NOT MODIFY THIS FILE
*
* This repository was automatically generated and is NOT to be modified directly.
* Any repository modifications are meant to be made to the repository extending the base.
* Any modifications to base repositories are to be made by the generator only
*
* @generator ./utils/scripts/generators/repository-generator.pl
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
*/
#ifndef EQEMU_BASE_SPAWN2_DISABLED_REPOSITORY_H
#define EQEMU_BASE_SPAWN2_DISABLED_REPOSITORY_H
#include "../../database.h"
#include "../../strings.h"
#include <ctime>
class BaseSpawn2DisabledRepository {
public:
struct Spawn2Disabled {
int64_t id;
int32_t spawn2_id;
int16_t disabled;
};
static std::string PrimaryKey()
{
return std::string("id");
}
static std::vector<std::string> Columns()
{
return {
"id",
"spawn2_id",
"disabled",
};
}
static std::vector<std::string> SelectColumns()
{
return {
"id",
"spawn2_id",
"disabled",
};
}
static std::string ColumnsRaw()
{
return std::string(Strings::Implode(", ", Columns()));
}
static std::string SelectColumnsRaw()
{
return std::string(Strings::Implode(", ", SelectColumns()));
}
static std::string TableName()
{
return std::string("spawn2_disabled");
}
static std::string BaseSelect()
{
return fmt::format(
"SELECT {} FROM {}",
SelectColumnsRaw(),
TableName()
);
}
static std::string BaseInsert()
{
return fmt::format(
"INSERT INTO {} ({}) ",
TableName(),
ColumnsRaw()
);
}
static Spawn2Disabled NewEntity()
{
Spawn2Disabled e{};
e.id = 0;
e.spawn2_id = 0;
e.disabled = 0;
return e;
}
static Spawn2Disabled GetSpawn2Disabled(
const std::vector<Spawn2Disabled> &spawn2_disableds,
int spawn2_disabled_id
)
{
for (auto &spawn2_disabled : spawn2_disableds) {
if (spawn2_disabled.id == spawn2_disabled_id) {
return spawn2_disabled;
}
}
return NewEntity();
}
static Spawn2Disabled FindOne(
Database& db,
int spawn2_disabled_id
)
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE {} = {} LIMIT 1",
BaseSelect(),
PrimaryKey(),
spawn2_disabled_id
)
);
auto row = results.begin();
if (results.RowCount() == 1) {
Spawn2Disabled e{};
e.id = strtoll(row[0], nullptr, 10);
e.spawn2_id = static_cast<int32_t>(atoi(row[1]));
e.disabled = static_cast<int16_t>(atoi(row[2]));
return e;
}
return NewEntity();
}
static int DeleteOne(
Database& db,
int spawn2_disabled_id
)
{
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {} = {}",
TableName(),
PrimaryKey(),
spawn2_disabled_id
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static int UpdateOne(
Database& db,
const Spawn2Disabled &e
)
{
std::vector<std::string> v;
auto columns = Columns();
v.push_back(columns[1] + " = " + std::to_string(e.spawn2_id));
v.push_back(columns[2] + " = " + std::to_string(e.disabled));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", v),
PrimaryKey(),
e.id
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static Spawn2Disabled InsertOne(
Database& db,
Spawn2Disabled e
)
{
std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.spawn2_id));
v.push_back(std::to_string(e.disabled));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
Strings::Implode(",", v)
)
);
if (results.Success()) {
e.id = results.LastInsertedID();
return e;
}
e = NewEntity();
return e;
}
static int InsertMany(
Database& db,
const std::vector<Spawn2Disabled> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &e: entries) {
std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.spawn2_id));
v.push_back(std::to_string(e.disabled));
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
}
std::vector<std::string> v;
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES {}",
BaseInsert(),
Strings::Implode(",", insert_chunks)
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static std::vector<Spawn2Disabled> All(Database& db)
{
std::vector<Spawn2Disabled> all_entries;
auto results = db.QueryDatabase(
fmt::format(
"{}",
BaseSelect()
)
);
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Spawn2Disabled e{};
e.id = strtoll(row[0], nullptr, 10);
e.spawn2_id = static_cast<int32_t>(atoi(row[1]));
e.disabled = static_cast<int16_t>(atoi(row[2]));
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<Spawn2Disabled> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<Spawn2Disabled> all_entries;
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE {}",
BaseSelect(),
where_filter
)
);
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Spawn2Disabled e{};
e.id = strtoll(row[0], nullptr, 10);
e.spawn2_id = static_cast<int32_t>(atoi(row[1]));
e.disabled = static_cast<int16_t>(atoi(row[2]));
all_entries.push_back(e);
}
return all_entries;
}
static int DeleteWhere(Database& db, const std::string &where_filter)
{
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {}",
TableName(),
where_filter
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static int Truncate(Database& db)
{
auto results = db.QueryDatabase(
fmt::format(
"TRUNCATE TABLE {}",
TableName()
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static int64 GetMaxId(Database& db)
{
auto results = db.QueryDatabase(
fmt::format(
"SELECT COALESCE(MAX({}), 0) FROM {}",
PrimaryKey(),
TableName()
)
);
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
}
static int64 Count(Database& db, const std::string &where_filter = "")
{
auto results = db.QueryDatabase(
fmt::format(
"SELECT COUNT(*) FROM {} {}",
TableName(),
(where_filter.empty() ? "" : "WHERE " + where_filter)
)
);
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
}
};
#endif //EQEMU_BASE_SPAWN2_DISABLED_REPOSITORY_H
common/repositories/spawn2_disabled_repository.h
+50
View File
@@ -0,0 +1,50 @@
#ifndef EQEMU_SPAWN2_DISABLED_REPOSITORY_H
#define EQEMU_SPAWN2_DISABLED_REPOSITORY_H
#include "../database.h"
#include "../strings.h"
#include "base/base_spawn2_disabled_repository.h"
class Spawn2DisabledRepository: public BaseSpawn2DisabledRepository {
public:
/**
* This file was auto generated and can be modified and extended upon
*
* Base repository methods are automatically
* generated in the "base" version of this repository. The base repository
* is immutable and to be left untouched, while methods in this class
* are used as extension methods for more specific persistence-layer
* accessors or mutators.
*
* Base Methods (Subject to be expanded upon in time)
*
* Note: Not all tables are designed appropriately to fit functionality with all base methods
*
* InsertOne
* UpdateOne
* DeleteOne
* FindOne
* GetWhere(std::string where_filter)
* DeleteWhere(std::string where_filter)
* InsertMany
* All
*
* Example custom methods in a repository
*
* Spawn2DisabledRepository::GetByZoneAndVersion(int zone_id, int zone_version)
* Spawn2DisabledRepository::GetWhereNeverExpires()
* Spawn2DisabledRepository::GetWhereXAndY()
* Spawn2DisabledRepository::DeleteWhereXAndY()
*
* Most of the above could be covered by base methods, but if you as a developer
* find yourself re-using logic for other parts of the code, its best to just make a
* method that can be re-used easily elsewhere especially if it can use a base repository
* method and encapsulate filters there
*/
// Custom extended repository methods here
};
#endif //EQEMU_SPAWN2_DISABLED_REPOSITORY_H
common/version.h
+1 -1
View File
@@ -42,7 +42,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/
#define CURRENT_BINARY_DATABASE_VERSION 9240
#define CURRENT_BINARY_DATABASE_VERSION 9241
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9040
zone/spawn2.cpp
+50 -47
View File
@@ -27,6 +27,8 @@
#include "zone.h"
#include "zonedb.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/repositories/spawn2_repository.h"
#include "../common/repositories/spawn2_disabled_repository.h"
extern EntityList entity_list;
extern Zone* zone;
@@ -468,60 +470,61 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
LogInfo("Loaded [{}] respawn timer(s)", Strings::Commify(results.RowCount()));
const char *zone_name = ZoneName(zoneid);
std::string query = fmt::format(
"SELECT "
"id, "
"spawngroupID, "
"x, "
"y, "
"z, "
"heading, "
"respawntime, "
"variance, "
"pathgrid, "
"path_when_zone_idle, "
"_condition, "
"cond_value, "
"enabled, "
"animation "
"FROM "
"spawn2 "
"WHERE TRUE {} AND zone = '{}' AND (version = {} OR version = -1) ",
ContentFilterCriteria::apply(),
zone_name,
version
);
results = QueryDatabase(query);
if (!results.Success()) {
return false;
auto spawns = Spawn2Repository::GetWhere(
content_db, fmt::format(
"WHERE TRUE {} AND zone = '{}' AND (version = {} OR version = -1) ",
ContentFilterCriteria::apply(),
zone_name,
version
)
);
std::vector<uint32> spawn2_ids;
for (auto &s: spawns) {
spawn2_ids.push_back(s.id);
}
for (auto row = results.begin(); row != results.end(); ++row) {
auto disabled_spawns = Spawn2DisabledRepository::GetWhere(
database,
fmt::format(
"WHERE spawn2_id IN ({})",
Strings::Join(spawn2_ids, ",")
)
);
for (auto &s: spawns) {
uint32 spawn_time_left = 0;
Spawn2* new_spawn = 0;
bool perl_enabled = Strings::ToInt(row[12]) == 1 ? true : false;
if (spawn_times.count(s.id) != 0) {
spawn_time_left = spawn_times[s.id];
}
if (spawn_times.count(Strings::ToInt(row[0])) != 0)
spawn_time_left = spawn_times[Strings::ToInt(row[0])];
// load from spawn2_disabled
bool spawn_enabled = true;
// check if spawn is disabled
for (auto &ds: disabled_spawns) {
if (ds.spawn2_id == s.id) {
spawn_enabled = false;
break;
}
}
new_spawn = new Spawn2(
Strings::ToInt(row[0]), // uint32 in_spawn2_id
Strings::ToInt(row[1]), // uint32 spawngroup_id
Strings::ToFloat(row[2]), // float in_x
Strings::ToFloat(row[3]), // float in_y
Strings::ToFloat(row[4]), // float in_z
Strings::ToFloat(row[5]), // float in_heading
Strings::ToInt(row[6]), // uint32 respawn
Strings::ToInt(row[7]), // uint32 variance
spawn_time_left, // uint32 timeleft
Strings::ToInt(row[8]), // uint32 grid
(bool)Strings::ToInt(row[9]), // bool path_when_zone_idle
Strings::ToInt(row[10]), // uint16 in_cond_id
Strings::ToInt(row[11]), // int16 in_min_value
perl_enabled, // bool in_enabled
(EmuAppearance)Strings::ToInt(row[13]) // EmuAppearance anim
auto new_spawn = new Spawn2(
s.id,
s.spawngroupID,
s.x,
s.y,
s.z,
s.heading,
s.respawntime,
s.variance,
spawn_time_left,
s.pathgrid,
(bool) s.path_when_zone_idle,
s._condition,
(int16) s.cond_value,
spawn_enabled,
(EmuAppearance) s.animation
);
spawn2_list.Insert(new_spawn);
zone/zonedb.cpp
+14 -2
View File
@@ -21,6 +21,7 @@
#include "../common/repositories/character_pet_info_repository.h"
#include "../common/repositories/character_buffs_repository.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/repositories/spawn2_disabled_repository.h"
#include <ctime>
#include <iostream>
@@ -173,8 +174,19 @@ uint32 ZoneDatabase::GetSpawnTimeLeft(uint32 id, uint16 instance_id)
void ZoneDatabase::UpdateSpawn2Status(uint32 id, uint8 new_status)
{
std::string query = StringFormat("UPDATE spawn2 SET enabled = %i WHERE id = %lu", new_status, (unsigned long)id);
QueryDatabase(query);
auto spawns = Spawn2DisabledRepository::GetWhere(*this, fmt::format("spawn2_id = {}", id));
if (!spawns.empty()) {
auto spawn = spawns[0];
// 1 = enabled 0 = disabled
spawn.disabled = new_status ? 0 : 1;
Spawn2DisabledRepository::UpdateOne(*this, spawn);
return;
}
auto spawn = Spawn2DisabledRepository::NewEntity();
spawn.spawn2_id = id;
spawn.disabled = new_status ? 0 : 1;
Spawn2DisabledRepository::InsertOne(*this, spawn);
}
bool ZoneDatabase::SetSpecialAttkFlag(uint8 id, const char* flag) {