From 5acd3492edc8de0a97c2b0ace379cb1f5011d2f9 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 20 Oct 2026 09:54:46 -0400 Subject: [PATCH] Build BaseClass from its class rune and compare every field Adds BaseClass(RuneTemplate): attributes from rune_attr_adj, health/mana/stamina from rune_health/mana/stamina, token = SBStringHash(rune_sub_type), description from rune_dsc. Skills, powers and effects still load from the DB by rune id (tasks 2.8, 2.9, 2.10). The static_rune_baseclass comparator now checks every field against a JSON-built BaseClass. Offline parity (scripts/p21.py, 4 rows vs the CLASS runes with rune_is_standard_character_creation = 2500-2503): 0 differences except description, which is '' in the DB and the class blurb in rune_dsc. Nothing reads BaseClass.getDescription(). Co-Authored-By: Claude Opus 5.5 --- src/engine/objects/BaseClass.java | 25 +++++++++++++++++++++++ src/engine/parsers/cache/ParityCheck.java | 22 +++++++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/engine/objects/BaseClass.java b/src/engine/objects/BaseClass.java index 5e381338..db1c750e 100644 --- a/src/engine/objects/BaseClass.java +++ b/src/engine/objects/BaseClass.java @@ -10,7 +10,10 @@ package engine.objects; import engine.gameManager.DbManager; +import engine.mbEnums; import engine.net.ByteBufferWriter; +import engine.parsers.objects.RuneTemplate; +import engine.util.Hasher; import java.sql.ResultSet; import java.sql.SQLException; @@ -104,6 +107,28 @@ public class BaseClass extends AbstractGameObject { } + /** + * Rune Template Constructor + */ + public BaseClass(RuneTemplate rune) { + super(rune.template_id); + + this.name = rune.obj_name; + this.description = rune.rune_dsc; + this.strMod = rune.rune_attr_adj.getOrDefault(mbEnums.AttributeType.Strength, 0).byteValue(); + this.dexMod = rune.rune_attr_adj.getOrDefault(mbEnums.AttributeType.Dexterity, 0).byteValue(); + this.conMod = rune.rune_attr_adj.getOrDefault(mbEnums.AttributeType.Constitution, 0).byteValue(); + this.intMod = rune.rune_attr_adj.getOrDefault(mbEnums.AttributeType.Intelligence, 0).byteValue(); + this.spiMod = rune.rune_attr_adj.getOrDefault(mbEnums.AttributeType.Spirit, 0).byteValue(); + this.token = Hasher.SBStringHash(rune.rune_sub_type); + this.healthMod = rune.rune_health; + this.manaMod = rune.rune_mana; + this.staminaMod = rune.rune_stamina; + this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.getObjectUUID()); + this.powersGranted = PowerReq.getPowerReqsForRune(this.getObjectUUID()); + this.effectsList = (DbManager.MobBaseQueries.GET_RUNEBASE_EFFECTS(this.getObjectUUID())); + } + public static void LoadAllBaseClasses() { DbManager.BaseClassQueries.GET_ALL_BASE_CLASSES(); } diff --git a/src/engine/parsers/cache/ParityCheck.java b/src/engine/parsers/cache/ParityCheck.java index 25b9425e..eaad078c 100644 --- a/src/engine/parsers/cache/ParityCheck.java +++ b/src/engine/parsers/cache/ParityCheck.java @@ -96,7 +96,9 @@ public class ParityCheck { ConcurrentHashMap cache; BaseClass baseClass; + BaseClass jsonClass; RuneTemplate rune; + int id; cache = DbManager.getMap(mbEnums.GameObjectType.BaseClass); @@ -107,12 +109,26 @@ public class ParityCheck { for (AbstractGameObject cached : cache.values()) { baseClass = (BaseClass) cached; - rune = RuneTemplate._runes.get(baseClass.getObjectUUID()); + id = baseClass.getObjectUUID(); + rune = RuneTemplate._runes.get(id); - if (!check.compareRow(baseClass.getObjectUUID(), rune)) + if (!check.compareRow(id, rune)) continue; - check.compareField(baseClass.getObjectUUID(), "name", baseClass.getName(), rune.obj_name); + jsonClass = new BaseClass(rune); + + check.compareField(id, "name", baseClass.getName(), jsonClass.getName()); + check.compareField(id, "strMod", baseClass.getStrMod(), jsonClass.getStrMod()); + check.compareField(id, "dexMod", baseClass.getDexMod(), jsonClass.getDexMod()); + check.compareField(id, "conMod", baseClass.getConMod(), jsonClass.getConMod()); + check.compareField(id, "intMod", baseClass.getIntMod(), jsonClass.getIntMod()); + check.compareField(id, "spiMod", baseClass.getSpiMod(), jsonClass.getSpiMod()); + check.compareField(id, "token", baseClass.getToken(), jsonClass.getToken()); + check.compareField(id, "healthMod", baseClass.getHealthMod(), jsonClass.getHealthMod()); + check.compareField(id, "manaMod", baseClass.getManaMod(), jsonClass.getManaMod()); + check.compareField(id, "staminaMod", baseClass.getStaminaMod(), jsonClass.getStaminaMod()); + check.compareField(id, "isStandardCreation", true, rune.rune_type == mbEnums.RuneType.CLASS + && rune.rune_is_standard_character_creation); } } }