Merge pull request LandSandBoat#10523 from Xaver-DaRed/sc-cleanup

[Cleanup] Old skillchain code

Author: WinterSolstice8

scripts/globals/combat/skillchain.lua

@@ -41,7 +41,7 @@ local function getSkillchainElementToUse(target, skillchainType)
     -- Build skillchain available elements table.
     local elementTable = {}
     for i = xi.element.FIRE, xi.element.DARK do
-        if xi.data.element.skillchainElementTable[i][skillchainType + 1] > 0 then
+        if xi.data.element.skillchainElementTable[i][skillchainType] > 0 then
             table.insert(elementTable, #elementTable + 1, i)
         end
     end

sql/skillchain_damage_modifiers.sql

@@ -224,8 +224,6 @@ enum SKILLCHAIN_ELEMENT : uint8
     SC_DARKNESS_II = 16, // Lv4 Darkness
 };
 
-#define MAX_SKILLCHAIN_LEVEL (4)
-#define MAX_SKILLCHAIN_COUNT (5)
 DECLARE_FORMAT_AS_UNDERLYING(SKILLCHAIN_ELEMENT);
 
 enum IMMUNITY : uint32

src/map/entities/battle_entity.h

@@ -192,7 +192,6 @@ auto MapEngine::init() -> Task<void>
     battleutils::LoadWeaponSkillsList();
     battleutils::LoadMobSkillsList();
     battleutils::LoadPetSkillsList();
-    battleutils::LoadSkillChainDamageModifiers();
     petutils::LoadPetList();
     trustutils::LoadTrustList();
     mobutils::LoadSqlModifiers();

src/map/map_engine.cpp

@@ -82,9 +82,8 @@
  *                                                                       *
  ************************************************************************/
 
-std::array<std::array<uint16, 14>, 100>                                            g_SkillTable;
-std::array<std::array<uint8, MAX_JOBTYPE>, MAX_SKILLTYPE>                          g_SkillRanks;
-std::array<std::array<uint16, MAX_SKILLCHAIN_COUNT + 1>, MAX_SKILLCHAIN_LEVEL + 1> g_SkillChainDamageModifiers;
+std::array<std::array<uint16, 14>, 100>                   g_SkillTable;
+std::array<std::array<uint8, MAX_JOBTYPE>, MAX_SKILLTYPE> g_SkillRanks;
 
 std::array<CWeaponSkill*, MAX_WEAPONSKILL_ID> g_PWeaponSkillList; // Holds all Weapon skills
 std::array<CMobSkill*, MAX_MOBSKILL_ID>       g_PMobSkillList;    // List of mob skills
@@ -281,21 +280,6 @@ void LoadPetSkillsList()
     }
 }
 
-void LoadSkillChainDamageModifiers()
-{
-    const auto rset = db::preparedStmt("SELECT chain_level, chain_count, initial_modifier, magic_burst_modifier "
-                                       "FROM skillchain_damage_modifiers "
-                                       "ORDER BY chain_level, chain_count");
-    FOR_DB_MULTIPLE_RESULTS(rset)
-    {
-        const auto level = rset->get<uint16>("chain_level");
-        const auto count = rset->get<uint16>("chain_count");
-        const auto value = rset->get<uint16>("initial_modifier");
-
-        g_SkillChainDamageModifiers[level][count] = value;
-    }
-}
-
 /************************************************************************
  *                                                                       *
  *  Clear Up (Free) Skills List                                          *

src/map/utils/battleutils.cpp

@@ -107,7 +107,6 @@ void LoadSkillTable();
 void LoadWeaponSkillsList();
 void LoadMobSkillsList();
 void LoadPetSkillsList();
-void LoadSkillChainDamageModifiers();
 
 uint8 CheckMultiHits(CBattleEntity* PEntity, CItemWeapon* PWeapon);