konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: changed the icon for weapon swapping to be more informative

Browse Source
This commit is contained in:
Evan Debenham
2023-03-06 17:14:29 -05:00
parent 3f21e3ce5f
commit 8a888eaca3
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
View File

@@ -36,12 +36,15 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.effects.Transmuting;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon; import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -146,6 +149,33 @@ public class MeleeWeapon extends Weapon {
} }
} }
@Override
public boolean doEquip(Hero hero) {
if (super.doEquip(hero)){
ActionIndicator.updateIcon();
return true;
}
return false;
}
@Override
public boolean equipSecondary(Hero hero) {
if (super.equipSecondary(hero)){
ActionIndicator.updateIcon();
return true;
}
return false;
}
@Override
public boolean doUnequip(Hero hero, boolean collect, boolean single) {
if (super.doUnequip(hero, collect, single)){
ActionIndicator.updateIcon();
return true;
}
return false;
}
//leave null for no targeting //leave null for no targeting
public String targetingPrompt(){ public String targetingPrompt(){
return null; return null;
@@ -520,7 +550,11 @@ public class MeleeWeapon extends Weapon {
@Override @Override
public Image actionIcon() { public Image actionIcon() {
return new HeroIcon(HeroSubClass.CHAMPION); if (Dungeon.hero.belongings.weapon == null){
return new ItemSprite(ItemSpriteSheet.WEAPON_HOLDER);
} else {
return new ItemSprite(Dungeon.hero.belongings.weapon);
}
} }
@Override @Override
@@ -541,6 +575,7 @@ public class MeleeWeapon extends Weapon {
Dungeon.hero.sprite.operate(Dungeon.hero.pos); Dungeon.hero.sprite.operate(Dungeon.hero.pos);
Sample.INSTANCE.play(Assets.Sounds.UNLOCK); Sample.INSTANCE.play(Assets.Sounds.UNLOCK);
ActionIndicator.setAction(this);
Item.updateQuickslot(); Item.updateQuickslot();
} }
} }