Merge pull request #10037 from Skold177/Automaton-WS-Refactor

Xaver-DaRed · web-flow · commit 443a16fdeae1 · 2026-05-15T21:10:24.000+02:00
[core] [C++] Fix Automaton mobSkill lookup
diff --git a/src/map/ai/controllers/automaton_controller.cpp b/src/map/ai/controllers/automaton_controller.cpp
@@ -1493,7 +1493,7 @@ auto CAutomatonController::TryTPMove() -> bool
 {
     if (PAutomaton->health.tp >= 1000)
     {
-        const auto& FamilySkills = battleutils::GetMobSkillList(PAutomaton->m_Family);
+        const auto& FrameSkills = battleutils::GetMobSkillList(PAutomaton->m_MobSkillList);
 
         std::vector<CMobSkill*> validSkills;
 
@@ -1505,7 +1505,7 @@ auto CAutomatonController::TryTPMove() -> bool
             skilltype = SKILL_AUTOMATON_RANGED;
         }
 
-        for (auto skillid : FamilySkills)
+        for (auto skillid : FrameSkills)
         {
             auto* PSkill = battleutils::GetMobSkill(skillid);
             if (PSkill && PAutomaton->GetSkill(skilltype) > PSkill->getParam() && PSkill->getParam() != -1 &&

Original file line number	Diff line number	Diff line change
`@@ -1493,7 +1493,7 @@ auto CAutomatonController::TryTPMove() -> bool`
`1493`	`1493`	`{`
`1494`	`1494`	`if (PAutomaton->health.tp >= 1000)`
`1495`	`1495`	`{`
`1496`		`- const auto& FamilySkills = battleutils::GetMobSkillList(PAutomaton->m_Family);`
	`1496`	`+ const auto& FrameSkills = battleutils::GetMobSkillList(PAutomaton->m_MobSkillList);`
`1497`	`1497`
`1498`	`1498`	`std::vector<CMobSkill*> validSkills;`
`1499`	`1499`
`@@ -1505,7 +1505,7 @@ auto CAutomatonController::TryTPMove() -> bool`
`1505`	`1505`	`skilltype = SKILL_AUTOMATON_RANGED;`
`1506`	`1506`	`}`
`1507`	`1507`
`1508`		`- for (auto skillid : FamilySkills)`
	`1508`	`+ for (auto skillid : FrameSkills)`
`1509`	`1509`	`{`
`1510`	`1510`	`auto* PSkill = battleutils::GetMobSkill(skillid);`
`1511`	`1511`	`if (PSkill && PAutomaton->GetSkill(skilltype) > PSkill->getParam() && PSkill->getParam() != -1 &&`