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

v2.4.2: fixed cases where champion ability tag sprites wouldn't update

Browse Source
This commit is contained in:
Evan Debenham
2024-06-02 16:04:59 -04:00
parent d636d6420d
commit bee9767987
4 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
View File

@@ -33,7 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
import com.watabou.noosa.audio.Sample;
@@ -120,7 +119,6 @@ abstract public class KindOfWeapon extends EquipableItem {
activate( hero );
Talent.onItemEquipped(hero, this);
Badges.validateDuelistUnlock();
ActionIndicator.refresh();
updateQuickslot();
cursedKnown = true;
@@ -168,7 +166,6 @@ abstract public class KindOfWeapon extends EquipableItem {
activate( hero );
Talent.onItemEquipped(hero, this);
Badges.validateDuelistUnlock();
ActionIndicator.refresh();
updateQuickslot();
cursedKnown = true;

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

@@ -147,33 +147,6 @@ public class MeleeWeapon extends Weapon {
}
}
@Override
public boolean doEquip(Hero hero) {
if (super.doEquip(hero)){
ActionIndicator.refresh();
return true;
}
return false;
}
@Override
public boolean equipSecondary(Hero hero) {
if (super.equipSecondary(hero)){
ActionIndicator.refresh();
return true;
}
return false;
}
@Override
public boolean doUnequip(Hero hero, boolean collect, boolean single) {
if (super.doUnequip(hero, collect, single)){
ActionIndicator.refresh();
return true;
}
return false;
}
//leave null for no targeting
public String targetingPrompt(){
return null;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java
View File

@@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.PathFinder;
@@ -95,7 +94,6 @@ public class DisarmingTrap extends Trap{
hero.belongings.weapon = null;
Dungeon.quickslot.clearItem(weapon);
ActionIndicator.refresh();
weapon.updateQuickslot();
Dungeon.level.drop(weapon, cell).seen = true;

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@@ -61,6 +61,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.DimensionalSundial;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.MimicTooth;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.journal.Document;
import com.shatteredpixel.shatteredpixeldungeon.journal.Journal;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
@@ -694,6 +695,10 @@ public class GameScene extends PixelScene {
updateItemDisplays = false;
QuickSlotButton.refresh();
InventoryPane.refresh();
if (ActionIndicator.action instanceof MeleeWeapon.Charger) {
//Champion weapon swap uses items, needs refreshing whenever item displays are updated
ActionIndicator.refresh();
}
}
if (Dungeon.hero == null || scene == null) {