mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-08 23:07:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added workaround for invalid spell cast modes

Browse Source 
SQ defaults to SC when encountered until implemented
SpellsQuickPanel changes CharData actions for the time being
This commit is contained in:
Collin Smith
2020-08-20 22:47:26 -07:00
parent 8a820effc8
commit 0159615dba
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/riiablo/engine/server/Actioneer.java
View File

@ -26,6 +26,10 @@ public class Actioneer extends PassiveSystem {
byte mode = (byte) mClass.get(entityId).type.getMode(skill.anim); byte mode = (byte) mClass.get(entityId).type.getMode(skill.anim);
log.trace("mode: {}", mode); log.trace("mode: {}", mode);
if (mode == -1) { // TODO: replace -1 with some const INVALID_SKILL
mode = (byte) mClass.get(entityId).type.getMode("SC");
log.trace("changed mode to {} because it was invalid", mode);
}
mSequence.create(entityId).sequence(mode, mMovementModes.get(entityId).NU); mSequence.create(entityId).sequence(mode, mMovementModes.get(entityId).NU);
} }

6
core/src/com/riiablo/screen/panel/SpellsQuickPanel.java
View File

@ -106,8 +106,12 @@ public class SpellsQuickPanel extends Table implements Disposable, CharData.Skil
public void onPressed(MappedKey key, int keycode) { public void onPressed(MappedKey key, int keycode) {
HotkeyButton button = keyMappings.get(key); HotkeyButton button = keyMappings.get(key);
if (button == null) return; if (button == null) return;
// TODO: Replace Riiablo.charData.action with this button's action
observer.copy(button); observer.copy(button);
// FIXME: it isn't appropriate to have this call here -- should separate into a controller
Riiablo.charData.setAction(
Riiablo.charData.getItems().getAlternate(),
leftSkills ? Input.Buttons.LEFT : Input.Buttons.RIGHT,
button.getSkill());
} }
}; };
for (MappedKey Skill : Keys.Skill) Skill.addStateListener(mappedKeyListener); for (MappedKey Skill : Keys.Skill) Skill.addStateListener(mappedKeyListener);