From 3e50427bb7fbd37c41bf4bdb8f1282fa4ea7cafa Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 14 Jan 2024 19:58:03 -0600 Subject: [PATCH] [Repositories] Add `rank` to reserved words (#3982) * [Repositories] Add `rank` to reserved words * Update zonedb.cpp * Guild Ranks --------- Co-authored-by: Kinglykrab --- ...haracter_leadership_abilities_repository.h | 40 +++++++++---------- .../base/base_guild_members_repository.h | 24 +++++------ .../base/base_guild_ranks_repository.h | 24 +++++------ .../base/base_spells_new_repository.h | 24 +++++------ .../generators/repository-generator.pl | 1 + zone/zonedb.cpp | 8 ++-- 6 files changed, 61 insertions(+), 60 deletions(-) diff --git a/common/repositories/base/base_character_leadership_abilities_repository.h b/common/repositories/base/base_character_leadership_abilities_repository.h index 05baf85e8..8aad02e90 100644 --- a/common/repositories/base/base_character_leadership_abilities_repository.h +++ b/common/repositories/base/base_character_leadership_abilities_repository.h @@ -21,7 +21,7 @@ public: struct CharacterLeadershipAbilities { uint32_t id; uint16_t slot; - uint16_t rank; + uint16_t rank_; }; static std::string PrimaryKey() @@ -34,7 +34,7 @@ public: return { "id", "slot", - "rank", + "`rank`", }; } @@ -43,7 +43,7 @@ public: return { "id", "slot", - "rank", + "`rank`", }; } @@ -84,9 +84,9 @@ public: { CharacterLeadershipAbilities e{}; - e.id = 0; - e.slot = 0; - e.rank = 0; + e.id = 0; + e.slot = 0; + e.rank_ = 0; return e; } @@ -123,9 +123,9 @@ public: if (results.RowCount() == 1) { CharacterLeadershipAbilities e{}; - e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; + e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; return e; } @@ -161,7 +161,7 @@ public: v.push_back(columns[0] + " = " + std::to_string(e.id)); v.push_back(columns[1] + " = " + std::to_string(e.slot)); - v.push_back(columns[2] + " = " + std::to_string(e.rank)); + v.push_back(columns[2] + " = " + std::to_string(e.rank_)); auto results = db.QueryDatabase( fmt::format( @@ -185,7 +185,7 @@ public: v.push_back(std::to_string(e.id)); v.push_back(std::to_string(e.slot)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); auto results = db.QueryDatabase( fmt::format( @@ -217,7 +217,7 @@ public: v.push_back(std::to_string(e.id)); v.push_back(std::to_string(e.slot)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); } @@ -251,9 +251,9 @@ public: for (auto row = results.begin(); row != results.end(); ++row) { CharacterLeadershipAbilities e{}; - e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; + e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; all_entries.push_back(e); } @@ -278,9 +278,9 @@ public: for (auto row = results.begin(); row != results.end(); ++row) { CharacterLeadershipAbilities e{}; - e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; + e.slot = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; all_entries.push_back(e); } @@ -357,7 +357,7 @@ public: v.push_back(std::to_string(e.id)); v.push_back(std::to_string(e.slot)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); auto results = db.QueryDatabase( fmt::format( @@ -382,7 +382,7 @@ public: v.push_back(std::to_string(e.id)); v.push_back(std::to_string(e.slot)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); } diff --git a/common/repositories/base/base_guild_members_repository.h b/common/repositories/base/base_guild_members_repository.h index 47b023e34..ae6059630 100644 --- a/common/repositories/base/base_guild_members_repository.h +++ b/common/repositories/base/base_guild_members_repository.h @@ -21,7 +21,7 @@ public: struct GuildMembers { int32_t char_id; uint32_t guild_id; - uint8_t rank; + uint8_t rank_; uint8_t tribute_enable; uint32_t total_tribute; uint32_t last_tribute; @@ -41,7 +41,7 @@ public: return { "char_id", "guild_id", - "rank", + "`rank`", "tribute_enable", "total_tribute", "last_tribute", @@ -57,7 +57,7 @@ public: return { "char_id", "guild_id", - "rank", + "`rank`", "tribute_enable", "total_tribute", "last_tribute", @@ -107,7 +107,7 @@ public: e.char_id = 0; e.guild_id = 0; - e.rank = 0; + e.rank_ = 0; e.tribute_enable = 0; e.total_tribute = 0; e.last_tribute = 0; @@ -153,7 +153,7 @@ public: e.char_id = row[0] ? static_cast(atoi(row[0])) : 0; e.guild_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.tribute_enable = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; e.total_tribute = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.last_tribute = row[5] ? static_cast(strtoul(row[5], nullptr, 10)) : 0; @@ -196,7 +196,7 @@ public: v.push_back(columns[0] + " = " + std::to_string(e.char_id)); v.push_back(columns[1] + " = " + std::to_string(e.guild_id)); - v.push_back(columns[2] + " = " + std::to_string(e.rank)); + v.push_back(columns[2] + " = " + std::to_string(e.rank_)); v.push_back(columns[3] + " = " + std::to_string(e.tribute_enable)); v.push_back(columns[4] + " = " + std::to_string(e.total_tribute)); v.push_back(columns[5] + " = " + std::to_string(e.last_tribute)); @@ -227,7 +227,7 @@ public: v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.tribute_enable)); v.push_back(std::to_string(e.total_tribute)); v.push_back(std::to_string(e.last_tribute)); @@ -266,7 +266,7 @@ public: v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.tribute_enable)); v.push_back(std::to_string(e.total_tribute)); v.push_back(std::to_string(e.last_tribute)); @@ -309,7 +309,7 @@ public: e.char_id = row[0] ? static_cast(atoi(row[0])) : 0; e.guild_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.tribute_enable = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; e.total_tribute = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.last_tribute = row[5] ? static_cast(strtoul(row[5], nullptr, 10)) : 0; @@ -343,7 +343,7 @@ public: e.char_id = row[0] ? static_cast(atoi(row[0])) : 0; e.guild_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; - e.rank = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; + e.rank_ = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.tribute_enable = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; e.total_tribute = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.last_tribute = row[5] ? static_cast(strtoul(row[5], nullptr, 10)) : 0; @@ -427,7 +427,7 @@ public: v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.tribute_enable)); v.push_back(std::to_string(e.total_tribute)); v.push_back(std::to_string(e.last_tribute)); @@ -459,7 +459,7 @@ public: v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.tribute_enable)); v.push_back(std::to_string(e.total_tribute)); v.push_back(std::to_string(e.last_tribute)); diff --git a/common/repositories/base/base_guild_ranks_repository.h b/common/repositories/base/base_guild_ranks_repository.h index 5068e5204..67b410268 100644 --- a/common/repositories/base/base_guild_ranks_repository.h +++ b/common/repositories/base/base_guild_ranks_repository.h @@ -20,7 +20,7 @@ class BaseGuildRanksRepository { public: struct GuildRanks { uint32_t guild_id; - uint8_t rank; + uint8_t rank_; std::string title; }; @@ -33,7 +33,7 @@ public: { return { "guild_id", - "rank", + "`rank`", "title", }; } @@ -42,7 +42,7 @@ public: { return { "guild_id", - "rank", + "`rank`", "title", }; } @@ -85,7 +85,7 @@ public: GuildRanks e{}; e.guild_id = 0; - e.rank = 0; + e.rank_ = 0; e.title = ""; return e; @@ -124,7 +124,7 @@ public: GuildRanks e{}; e.guild_id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.rank = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.title = row[2] ? row[2] : ""; return e; @@ -160,7 +160,7 @@ public: auto columns = Columns(); v.push_back(columns[0] + " = " + std::to_string(e.guild_id)); - v.push_back(columns[1] + " = " + std::to_string(e.rank)); + v.push_back(columns[1] + " = " + std::to_string(e.rank_)); v.push_back(columns[2] + " = '" + Strings::Escape(e.title) + "'"); auto results = db.QueryDatabase( @@ -184,7 +184,7 @@ public: std::vector v; v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back("'" + Strings::Escape(e.title) + "'"); auto results = db.QueryDatabase( @@ -216,7 +216,7 @@ public: std::vector v; v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back("'" + Strings::Escape(e.title) + "'"); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); @@ -252,7 +252,7 @@ public: GuildRanks e{}; e.guild_id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.rank = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.title = row[2] ? row[2] : ""; all_entries.push_back(e); @@ -279,7 +279,7 @@ public: GuildRanks e{}; e.guild_id = row[0] ? static_cast(strtoul(row[0], nullptr, 10)) : 0; - e.rank = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.rank_ = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.title = row[2] ? row[2] : ""; all_entries.push_back(e); @@ -356,7 +356,7 @@ public: std::vector v; v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back("'" + Strings::Escape(e.title) + "'"); auto results = db.QueryDatabase( @@ -381,7 +381,7 @@ public: std::vector v; v.push_back(std::to_string(e.guild_id)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back("'" + Strings::Escape(e.title) + "'"); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); diff --git a/common/repositories/base/base_spells_new_repository.h b/common/repositories/base/base_spells_new_repository.h index 40f490580..019e8eaea 100644 --- a/common/repositories/base/base_spells_new_repository.h +++ b/common/repositories/base/base_spells_new_repository.h @@ -227,7 +227,7 @@ public: int32_t no_block; int32_t field206; int32_t spellgroup; - int32_t rank; + int32_t rank_; int32_t field209; int32_t field210; int32_t CastRestriction; @@ -474,7 +474,7 @@ public: "no_block", "field206", "spellgroup", - "rank", + "`rank`", "field209", "field210", "CastRestriction", @@ -717,7 +717,7 @@ public: "no_block", "field206", "spellgroup", - "rank", + "`rank`", "field209", "field210", "CastRestriction", @@ -994,7 +994,7 @@ public: e.no_block = 0; e.field206 = -1; e.spellgroup = 0; - e.rank = 0; + e.rank_ = 0; e.field209 = 0; e.field210 = 1; e.CastRestriction = 0; @@ -1267,7 +1267,7 @@ public: e.no_block = row[205] ? static_cast(atoi(row[205])) : 0; e.field206 = row[206] ? static_cast(atoi(row[206])) : -1; e.spellgroup = row[207] ? static_cast(atoi(row[207])) : 0; - e.rank = row[208] ? static_cast(atoi(row[208])) : 0; + e.rank_ = row[208] ? static_cast(atoi(row[208])) : 0; e.field209 = row[209] ? static_cast(atoi(row[209])) : 0; e.field210 = row[210] ? static_cast(atoi(row[210])) : 1; e.CastRestriction = row[211] ? static_cast(atoi(row[211])) : 0; @@ -1537,7 +1537,7 @@ public: v.push_back(columns[205] + " = " + std::to_string(e.no_block)); v.push_back(columns[206] + " = " + std::to_string(e.field206)); v.push_back(columns[207] + " = " + std::to_string(e.spellgroup)); - v.push_back(columns[208] + " = " + std::to_string(e.rank)); + v.push_back(columns[208] + " = " + std::to_string(e.rank_)); v.push_back(columns[209] + " = " + std::to_string(e.field209)); v.push_back(columns[210] + " = " + std::to_string(e.field210)); v.push_back(columns[211] + " = " + std::to_string(e.CastRestriction)); @@ -1795,7 +1795,7 @@ public: v.push_back(std::to_string(e.no_block)); v.push_back(std::to_string(e.field206)); v.push_back(std::to_string(e.spellgroup)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.field209)); v.push_back(std::to_string(e.field210)); v.push_back(std::to_string(e.CastRestriction)); @@ -2061,7 +2061,7 @@ public: v.push_back(std::to_string(e.no_block)); v.push_back(std::to_string(e.field206)); v.push_back(std::to_string(e.spellgroup)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.field209)); v.push_back(std::to_string(e.field210)); v.push_back(std::to_string(e.CastRestriction)); @@ -2331,7 +2331,7 @@ public: e.no_block = row[205] ? static_cast(atoi(row[205])) : 0; e.field206 = row[206] ? static_cast(atoi(row[206])) : -1; e.spellgroup = row[207] ? static_cast(atoi(row[207])) : 0; - e.rank = row[208] ? static_cast(atoi(row[208])) : 0; + e.rank_ = row[208] ? static_cast(atoi(row[208])) : 0; e.field209 = row[209] ? static_cast(atoi(row[209])) : 0; e.field210 = row[210] ? static_cast(atoi(row[210])) : 1; e.CastRestriction = row[211] ? static_cast(atoi(row[211])) : 0; @@ -2592,7 +2592,7 @@ public: e.no_block = row[205] ? static_cast(atoi(row[205])) : 0; e.field206 = row[206] ? static_cast(atoi(row[206])) : -1; e.spellgroup = row[207] ? static_cast(atoi(row[207])) : 0; - e.rank = row[208] ? static_cast(atoi(row[208])) : 0; + e.rank_ = row[208] ? static_cast(atoi(row[208])) : 0; e.field209 = row[209] ? static_cast(atoi(row[209])) : 0; e.field210 = row[210] ? static_cast(atoi(row[210])) : 1; e.CastRestriction = row[211] ? static_cast(atoi(row[211])) : 0; @@ -2903,7 +2903,7 @@ public: v.push_back(std::to_string(e.no_block)); v.push_back(std::to_string(e.field206)); v.push_back(std::to_string(e.spellgroup)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.field209)); v.push_back(std::to_string(e.field210)); v.push_back(std::to_string(e.CastRestriction)); @@ -3162,7 +3162,7 @@ public: v.push_back(std::to_string(e.no_block)); v.push_back(std::to_string(e.field206)); v.push_back(std::to_string(e.spellgroup)); - v.push_back(std::to_string(e.rank)); + v.push_back(std::to_string(e.rank_)); v.push_back(std::to_string(e.field209)); v.push_back(std::to_string(e.field210)); v.push_back(std::to_string(e.CastRestriction)); diff --git a/utils/scripts/generators/repository-generator.pl b/utils/scripts/generators/repository-generator.pl index b6f10d149..6d7554f59 100644 --- a/utils/scripts/generators/repository-generator.pl +++ b/utils/scripts/generators/repository-generator.pl @@ -599,6 +599,7 @@ sub get_reserved_cpp_variable_names "class", "int", "key", + "rank", "range" ); } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index adb732059..66a8f54fb 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -739,7 +739,7 @@ bool ZoneDatabase::LoadCharacterLeadershipAbilities(uint32 character_id, PlayerP ); for (const auto& e : l) { - pp->leader_abilities.ranks[e.slot] = e.rank; + pp->leader_abilities.ranks[e.slot] = e.rank_; } return true; @@ -1098,9 +1098,9 @@ bool ZoneDatabase::SaveCharacterLeadershipAbilities(uint32 character_id, PlayerP for (int slot_id = 0; slot_id < MAX_LEADERSHIP_AA_ARRAY; slot_id++) { if (pp->leader_abilities.ranks[slot_id] > 0) { - e.id = character_id; - e.slot = slot_id; - e.rank = pp->leader_abilities.ranks[slot_id]; + e.id = character_id; + e.slot = slot_id; + e.rank_ = pp->leader_abilities.ranks[slot_id]; v.emplace_back(e); }