Minor fixes

ControlPanel left/right skills will change to aura color if aura
Moved yoffset down a bit for weapon alternates
This commit is contained in:
Collin Smith 2019-03-21 15:57:47 -07:00
parent 0aa620d79b
commit a649639e3a
2 changed files with 5 additions and 2 deletions

View File

@ -24,6 +24,7 @@ import com.riiablo.codec.DC;
import com.riiablo.codec.DC6; import com.riiablo.codec.DC6;
import com.riiablo.codec.excel.SkillDesc; import com.riiablo.codec.excel.SkillDesc;
import com.riiablo.codec.excel.Skills; import com.riiablo.codec.excel.Skills;
import com.riiablo.graphics.BlendMode;
import com.riiablo.key.MappedKey; import com.riiablo.key.MappedKey;
import com.riiablo.loader.DC6Loader; import com.riiablo.loader.DC6Loader;
import com.riiablo.screen.GameScreen; import com.riiablo.screen.GameScreen;
@ -119,6 +120,7 @@ public class ControlPanel extends Table implements Disposable {
} }
leftSkill = new HotkeyButton(icons, iconCel, skill.Id); leftSkill = new HotkeyButton(icons, iconCel, skill.Id);
if (skill.aura) leftSkill.setBlendMode(BlendMode.DARKEN, Riiablo.colors.darkenGold);
int index = ArrayUtils.indexOf(gameScreen.player.skillBar, leftSkillId); int index = ArrayUtils.indexOf(gameScreen.player.skillBar, leftSkillId);
if (index != ArrayUtils.INDEX_NOT_FOUND) { if (index != ArrayUtils.INDEX_NOT_FOUND) {
MappedKey mapping = Keys.Skill[index]; MappedKey mapping = Keys.Skill[index];
@ -146,6 +148,7 @@ public class ControlPanel extends Table implements Disposable {
} }
rightSkill = new HotkeyButton(icons, iconCel, skill.Id); rightSkill = new HotkeyButton(icons, iconCel, skill.Id);
if (skill.aura) rightSkill.setBlendMode(BlendMode.DARKEN, Riiablo.colors.darkenGold);
int index = ArrayUtils.indexOf(gameScreen.player.skillBar, rightSkillId); int index = ArrayUtils.indexOf(gameScreen.player.skillBar, rightSkillId);
if (index != ArrayUtils.INDEX_NOT_FOUND) { if (index != ArrayUtils.INDEX_NOT_FOUND) {
MappedKey mapping = Keys.Skill[index]; MappedKey mapping = Keys.Skill[index];

View File

@ -136,7 +136,7 @@ public class InventoryPanel extends WidgetGroup implements Disposable {
getHeight() - inventory.rArmBottom); getHeight() - inventory.rArmBottom);
rArm.yOffs = 2; rArm.yOffs = 2;
rArm.xOffsAlt = 4; rArm.xOffsAlt = 4;
rArm.yOffsAlt = 5; rArm.yOffsAlt = 4;
addActor(rArm); addActor(rArm);
BodyPart lArm = bodyParts[BodyLocs.LARM] = new BodyPart(BodyLoc.LARM, inv_weapons.getTexture()); BodyPart lArm = bodyParts[BodyLocs.LARM] = new BodyPart(BodyLoc.LARM, inv_weapons.getTexture());
@ -146,7 +146,7 @@ public class InventoryPanel extends WidgetGroup implements Disposable {
getHeight() - inventory.lArmBottom); getHeight() - inventory.lArmBottom);
lArm.yOffs = 2; lArm.yOffs = 2;
lArm.xOffsAlt = 4; lArm.xOffsAlt = 4;
lArm.yOffsAlt = 5; lArm.yOffsAlt = 4;
addActor(lArm); addActor(lArm);
BodyPart head = bodyParts[BodyLocs.HEAD] = new BodyPart(BodyLoc.HEAD, inv_helm_glove.getTexture(1)); BodyPart head = bodyParts[BodyLocs.HEAD] = new BodyPart(BodyLoc.HEAD, inv_helm_glove.getTexture(1));