pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-13 19:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Chris Miles 2025-06-28 20:06:52 -05:00
parent 9d1fe011a7
commit ea1195972d
2 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/world_content_service.h
View File

@ -18,8 +18,10 @@ struct ContentFlags {
}; };
namespace Expansion { namespace Expansion {
static const int EXPANSION_ALL = -1; static constexpr int8 EXPANSION_ZERO_VALUE = -2;
static const int EXPANSION_FILTER_MAX = 99; static constexpr int8 EXPANSION_MAX = 98;
static const int EXPANSION_ALL = -1;
static const int EXPANSION_FILTER_MAX = 99;
enum ExpansionNumber { enum ExpansionNumber {
Classic = 0, Classic = 0,

96
common/content/world_content_service_rulesets.cpp
View File

@ -8,8 +8,6 @@ struct RuleSet {
std::vector<RuleValuesRepository::RuleValues> rules; std::vector<RuleValuesRepository::RuleValues> rules;
}; };
constexpr int8 EXPANSION_ZERO_VALUE = -2;
inline RuleSet GetClassicRuleset() inline RuleSet GetClassicRuleset()
{ {
return { return {
@ -20,8 +18,8 @@ inline RuleSet GetClassicRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 0, .min_expansion = Expansion::Classic,
.max_expansion = 0, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "Classic client-based ruleset", .notes = "Classic client-based ruleset",
}, },
.rules = { .rules = {
@ -169,8 +167,8 @@ inline RuleSet GetKunarkRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 1, .min_expansion = Expansion::TheRuinsOfKunark,
.max_expansion = 1, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "Kunark client-based ruleset. Level 60 cap until PoP.", .notes = "Kunark client-based ruleset. Level 60 cap until PoP.",
}, },
.rules = { .rules = {
@ -213,8 +211,8 @@ inline RuleSet GetVeliousRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 2, .min_expansion = Expansion::TheScarsOfVelious,
.max_expansion = 2, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "Velious client-based ruleset. Level 60 cap until PoP." .notes = "Velious client-based ruleset. Level 60 cap until PoP."
}, },
.rules = { .rules = {
@ -257,8 +255,8 @@ inline RuleSet GetLuclinRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 3, .min_expansion = Expansion::TheShadowsOfLuclin,
.max_expansion = 3, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "Luclin client-based ruleset. Level 60 cap. Added Wiz crits." .notes = "Luclin client-based ruleset. Level 60 cap. Added Wiz crits."
}, },
.rules = { .rules = {
@ -296,8 +294,8 @@ inline RuleSet GetPlanesRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 4, .min_expansion = Expansion::ThePlanesOfPower,
.max_expansion = 4, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "PoP client-based ruleset. Level 65 cap. Stat cap increased. Bind Wound changed." .notes = "PoP client-based ruleset. Level 65 cap. Stat cap increased. Bind Wound changed."
}, },
.rules = { .rules = {
@ -351,8 +349,8 @@ inline RuleSet GetLegacyOfYkeshaRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 5, .min_expansion = Expansion::TheLegacyOfYkesha,
.max_expansion = 5, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "LoY client-based ruleset. Shared bank introduced. Stat cap raised to 350." .notes = "LoY client-based ruleset. Shared bank introduced. Stat cap raised to 350."
}, },
.rules = { .rules = {
@ -405,8 +403,8 @@ inline RuleSet GetLDoNRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 6, .min_expansion = Expansion::LostDungeonsOfNorrath,
.max_expansion = 6, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "LDoN client-based ruleset. Stat cap raised to 400." .notes = "LDoN client-based ruleset. Stat cap raised to 400."
}, },
.rules = { .rules = {
@ -444,8 +442,8 @@ inline RuleSet GetGatesOfDiscordRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 7, .min_expansion = Expansion::GatesOfDiscord,
.max_expansion = 7, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "GoD client-based ruleset. Voice macros introduced." .notes = "GoD client-based ruleset. Voice macros introduced."
}, },
.rules = { .rules = {
@ -483,8 +481,8 @@ inline RuleSet GetOmensOfWarRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 8, .min_expansion = Expansion::OmensOfWar,
.max_expansion = 8, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "OoW client-based ruleset. Level cap raised to 70. Bard AE nerfed. Task system enabled." .notes = "OoW client-based ruleset. Level cap raised to 70. Bard AE nerfed. Task system enabled."
}, },
.rules = { .rules = {
@ -537,8 +535,8 @@ inline RuleSet GetDragonsOfNorrathRuleset()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = 9, .min_expansion = Expansion::DragonsOfNorrath,
.max_expansion = 9, .max_expansion = Expansion::EXPANSION_MAX,
.notes = "DoN client-based ruleset. Mail system introduced. Accursed Nest unlockable." .notes = "DoN client-based ruleset. Mail system introduced. Accursed Nest unlockable."
}, },
.rules = { .rules = {
@ -577,8 +575,8 @@ inline std::vector<RuleSet> GetCustomRulesets()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = EXPANSION_ZERO_VALUE, .min_expansion = Expansion::EXPANSION_ZERO_VALUE,
.max_expansion = EXPANSION_ZERO_VALUE, .max_expansion = Expansion::EXPANSION_ZERO_VALUE,
.notes = "Doubles EXP globally", .notes = "Doubles EXP globally",
}, },
.rules = { .rules = {
@ -596,8 +594,8 @@ inline std::vector<RuleSet> GetCustomRulesets()
.instance_versions = "", .instance_versions = "",
.content_flags = "", .content_flags = "",
.content_flags_disabled = "", .content_flags_disabled = "",
.min_expansion = EXPANSION_ZERO_VALUE, .min_expansion = Expansion::EXPANSION_ZERO_VALUE,
.max_expansion = EXPANSION_ZERO_VALUE, .max_expansion = Expansion::EXPANSION_ZERO_VALUE,
.notes = "You may add your own rulesets above 1000+" .notes = "You may add your own rulesets above 1000+"
}, },
}, },
@ -630,10 +628,10 @@ void WorldContentService::SeedDefaultRulesets() const
{ {
LogInfo("Seeding default rulesets"); LogInfo("Seeding default rulesets");
// Load all existing rule_sets once // Load existing rule_sets into a map for fast lookup
std::unordered_set<uint32_t> existing_ruleset_ids; std::unordered_map<uint32_t, RuleSetsRepository::RuleSets> existing_rulesets_map;
for (const auto& r : RuleSetsRepository::All(*m_database)) { for (const auto& r : RuleSetsRepository::All(*m_database)) {
existing_ruleset_ids.insert(r.ruleset_id); existing_rulesets_map[r.ruleset_id] = r;
} }
// Load all existing rule_values once // Load all existing rule_values once
@ -642,20 +640,42 @@ void WorldContentService::SeedDefaultRulesets() const
existing_rule_keys.insert(fmt::format("{}|{}", r.ruleset_id, r.rule_name)); existing_rule_keys.insert(fmt::format("{}|{}", r.ruleset_id, r.rule_name));
} }
// Process in-memory
for (const auto& entry : GetDefaultRulesets()) { for (const auto& entry : GetDefaultRulesets()) {
const auto& ruleset = entry.rule_set; const auto& new_ruleset = entry.rule_set;
if (!existing_ruleset_ids.count(ruleset.ruleset_id)) { bool should_insert = !existing_rulesets_map.count(new_ruleset.ruleset_id);
RuleSetsRepository::InsertOne(*m_database, ruleset); bool should_update = false;
LogInfo("Inserted ruleset [{}] {}", ruleset.ruleset_id, ruleset.name);
if (!should_insert) {
const auto& existing = existing_rulesets_map[new_ruleset.ruleset_id];
// Compare metadata fields
should_update = (
new_ruleset.name != existing.name ||
new_ruleset.zone_ids != existing.zone_ids ||
new_ruleset.instance_versions != existing.instance_versions ||
new_ruleset.content_flags != existing.content_flags ||
new_ruleset.content_flags_disabled != existing.content_flags_disabled ||
new_ruleset.min_expansion != existing.min_expansion ||
new_ruleset.max_expansion != existing.max_expansion ||
new_ruleset.notes != existing.notes
);
}
if (should_insert) {
RuleSetsRepository::InsertOne(*m_database, new_ruleset);
LogInfo("Inserted ruleset [{}] {}", new_ruleset.ruleset_id, new_ruleset.name);
}
else if (should_update) {
RuleSetsRepository::UpdateOne(*m_database, new_ruleset);
LogInfo("Updated ruleset metadata [{}] {}", new_ruleset.ruleset_id, new_ruleset.name);
} }
if (!entry.rules.empty()) { if (!entry.rules.empty()) {
std::vector<RuleValuesRepository::RuleValues> to_insert; std::vector<RuleValuesRepository::RuleValues> to_insert;
for (auto rule : entry.rules) { for (auto rule : entry.rules) {
rule.ruleset_id = ruleset.ruleset_id; rule.ruleset_id = new_ruleset.ruleset_id;
if (rule.notes.empty()) { if (rule.notes.empty()) {
rule.notes = m_rule_manager->GetRuleNotesByName(rule.rule_name); rule.notes = m_rule_manager->GetRuleNotesByName(rule.rule_name);
@ -669,7 +689,7 @@ void WorldContentService::SeedDefaultRulesets() const
if (!to_insert.empty()) { if (!to_insert.empty()) {
RuleValuesRepository::InsertMany(*m_database, to_insert); RuleValuesRepository::InsertMany(*m_database, to_insert);
LogInfo("Inserted [{}] rule(s) into ruleset [{}]", to_insert.size(), ruleset.ruleset_id); LogInfo("Inserted [{}] rule(s) into ruleset [{}]", to_insert.size(), new_ruleset.ruleset_id);
} }
} }
} }
@ -694,8 +714,8 @@ void WorldContentService::LoadTargetedRulesets()
!e.instance_versions.empty() || !e.instance_versions.empty() ||
!e.content_flags.empty() || !e.content_flags.empty() ||
!e.content_flags_disabled.empty() || !e.content_flags_disabled.empty() ||
e.min_expansion != EXPANSION_ZERO_VALUE || e.min_expansion != Expansion::EXPANSION_ZERO_VALUE ||
e.max_expansion != EXPANSION_ZERO_VALUE; e.max_expansion != Expansion::EXPANSION_ZERO_VALUE;
if (!has_filters) { if (!has_filters) {
continue; // not a targeted ruleset continue; // not a targeted ruleset
} }