add spell string

hatersgit · Nov 20, 2023 · b3792a7 · b3792a7
1 parent d637163
commit b3792a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/modules/mod-Forge/src/ForgeCache.cpp b/modules/mod-Forge/src/ForgeCache.cpp
@@ -142,6 +142,7 @@ struct ForgeTalentTab
     std::string Background;
     std::string Description;
     uint8 Role;
+    std::string SpellString;
     CharacterPointType TalentType;
     uint32 TabIndex;
     std::unordered_map<uint32 /*spellId*/, ForgeTalent*> Talents;
@@ -1262,8 +1263,9 @@ class ForgeCache : public DatabaseScript
             newTab->Background = talentFields[5].Get<std::string>();
             newTab->Description = talentFields[6].Get<std::string>();
             newTab->Role = talentFields[7].Get<uint8>();
-            newTab->TalentType = (CharacterPointType)talentFields[8].Get<uint8>();
-            newTab->TabIndex = talentFields[9].Get<uint32>();
+            newTab->SpellString = talentFields[8].Get<std::string>();
+            newTab->TalentType = (CharacterPointType)talentFields[9].Get<uint8>();
+            newTab->TabIndex = talentFields[10].Get<uint32>();
 
             for (auto& race : RaceAndClassTabMap)
             {

diff --git a/modules/mod-Forge/src/ForgeCommonMessage.cpp b/modules/mod-Forge/src/ForgeCommonMessage.cpp
@@ -51,30 +51,13 @@ std::string ForgeCommonMessage::BuildTree(Player* player, CharacterPointType poi
 
         msg = msg + std::to_string(tab->Id) + "^" +
             tab->Name + "^" + std::to_string(tab->SpellIconId) + "^" +
-            tab->Background + "^" + tab->Description +
-            "^" + std::to_string(tab->Role) + "^" +
+            tab->Background + "^" +
+            tab->Description + "^" +
+            std::to_string(tab->Role) + "^" +
+            tab->SpellString + "^" +
             std::to_string((int)tab->TalentType) + "^" +
             std::to_string(tab->TabIndex) + "^";
 
-        auto level10s = fc->_levelClassSpellMap.find(sConfigMgr->GetIntDefault("Forge.StrictSpecs.TalentLevelReq", 10));
-        if (level10s != fc->_levelClassSpellMap.end()) {
-            auto pClass = level10s->second.find(player->getClass());
-            if (pClass != level10s->second.end())
-            {
-                auto spec = pClass->second.find(tab->Id);
-                if (spec != pClass->second.end()) {
-                    auto spells = spec->second;
-                    int j = 0;
-                    for (auto spell : spells) {
-                        auto spellSep = j ? "§" : "";
-                        msg += spellSep + std::to_string(spell);
-                        j++;
-                    }
-                    msg += "^";
-                }
-            }
-        }
-
         int i = 0;
 
         for (auto& talentKvp : tab->Talents)