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

v2.3.0: replaced recent uses of String.valueOf with Integer.toString

Browse Source
This commit is contained in:
Evan Debenham
2023-12-10 16:34:52 -05:00
parent 85ed79cd1f
commit b859b7a9ea
35 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class WaterOfHealth extends WellWater {
hero.HP = hero.HT; hero.HP = hero.HT;
hero.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.4f, 4 ); hero.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.4f, 4 );
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(hero.HT), FloatingText.HEALING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(hero.HT), FloatingText.HEALING);
CellEmitter.get( hero.pos ).start( ShaftParticle.FACTORY, 0.2f, 3 ); CellEmitter.get( hero.pos ).start( ShaftParticle.FACTORY, 0.2f, 3 );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AllyBuff.java
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class AllyBuff extends Buff{
int exp = hero.lvl <= enemy.maxLvl ? enemy.EXP : 0; int exp = hero.lvl <= enemy.maxLvl ? enemy.EXP : 0;
if (exp > 0) { if (exp > 0) {
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(exp), FloatingText.EXPERIENCE); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(exp), FloatingText.EXPERIENCE);
} }
hero.earnExp(exp, enemy.getClass()); hero.earnExp(exp, enemy.getClass());
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class Berserk extends Buff implements ActionIndicator.Action {
WarriorShield shield = target.buff(WarriorShield.class); WarriorShield shield = target.buff(WarriorShield.class);
int shieldAmount = Math.round(shield.maxShield() * shieldMultiplier); int shieldAmount = Math.round(shield.maxShield() * shieldMultiplier);
shield.supercharge(shieldAmount); shield.supercharge(shieldAmount);
target.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(shieldAmount), FloatingText.SHIELDING ); target.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(shieldAmount), FloatingText.SHIELDING );
BuffIndicator.refreshHero(); BuffIndicator.refreshHero();
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
+2 -2
View File
@@ -393,7 +393,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
BrokenSeal.WarriorShield shield = hero.buff(BrokenSeal.WarriorShield.class); BrokenSeal.WarriorShield shield = hero.buff(BrokenSeal.WarriorShield.class);
int shieldAmt = Math.round(shield.maxShield() * hero.pointsInTalent(Talent.LETHAL_DEFENSE) / 3f); int shieldAmt = Math.round(shield.maxShield() * hero.pointsInTalent(Talent.LETHAL_DEFENSE) / 3f);
shield.supercharge(shieldAmt); shield.supercharge(shieldAmt);
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldAmt), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldAmt), FloatingText.SHIELDING);
} }
} }
} }
@@ -450,7 +450,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
BrokenSeal.WarriorShield shield = hero.buff(BrokenSeal.WarriorShield.class); BrokenSeal.WarriorShield shield = hero.buff(BrokenSeal.WarriorShield.class);
int shieldAmt = Math.round(shield.maxShield() * hero.pointsInTalent(Talent.LETHAL_DEFENSE) / 3f); int shieldAmt = Math.round(shield.maxShield() * hero.pointsInTalent(Talent.LETHAL_DEFENSE) / 3f);
shield.supercharge(shieldAmt); shield.supercharge(shieldAmt);
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldAmt), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldAmt), FloatingText.SHIELDING);
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class Corruption extends AllyBuff {
//corrupted enemies are usually fully healed and cleansed of most debuffs //corrupted enemies are usually fully healed and cleansed of most debuffs
public static void corruptionHeal(Char target){ public static void corruptionHeal(Char target){
target.HP = target.HT; target.HP = target.HT;
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(target.HT), FloatingText.HEALING); target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(target.HT), FloatingText.HEALING);
for (Buff buff : target.buffs()) { for (Buff buff : target.buffs()) {
if (buff.type == Buff.buffType.NEGATIVE if (buff.type == Buff.buffType.NEGATIVE
&& !(buff instanceof SoulMark)) { && !(buff instanceof SoulMark)) {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class Healing extends Buff {
} }
} }
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(healingThisTick()), FloatingText.HEALING); target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healingThisTick()), FloatingText.HEALING);
healingLeft -= healingThisTick(); healingLeft -= healingThisTick();
if (healingLeft <= 0){ if (healingLeft <= 0){
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
+4 -4
View File
@@ -473,7 +473,7 @@ public enum Talent {
hero.HP = Math.min(hero.HP + healing, hero.HT); hero.HP = Math.min(hero.HP + healing, hero.HT);
hero.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1); hero.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(healing), FloatingText.HEALING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healing), FloatingText.HEALING);
} }
} }
@@ -557,13 +557,13 @@ public enum Talent {
if (shield != null) { if (shield != null) {
// 50/75% of total shield // 50/75% of total shield
int shieldToGive = Math.round(factor * shield.maxShield() * 0.25f * (1 + hero.pointsInTalent(LIQUID_WILLPOWER))); int shieldToGive = Math.round(factor * shield.maxShield() * 0.25f * (1 + hero.pointsInTalent(LIQUID_WILLPOWER)));
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldToGive), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldToGive), FloatingText.SHIELDING);
shield.supercharge(shieldToGive); shield.supercharge(shieldToGive);
} }
} else { } else {
// 5/7.5% of max HP // 5/7.5% of max HP
int shieldToGive = Math.round( factor * hero.HT * (0.025f * (1+hero.pointsInTalent(LIQUID_WILLPOWER)))); int shieldToGive = Math.round( factor * hero.HT * (0.025f * (1+hero.pointsInTalent(LIQUID_WILLPOWER))));
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldToGive), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldToGive), FloatingText.SHIELDING);
Buff.affect(hero, Barrier.class).setShield(shieldToGive); Buff.affect(hero, Barrier.class).setShield(shieldToGive);
} }
} }
@@ -671,7 +671,7 @@ public enum Talent {
if (hero.sprite != null) { if (hero.sprite != null) {
Emitter e = hero.sprite.emitter(); Emitter e = hero.sprite.emitter();
if (e != null) e.burst(Speck.factory(Speck.HEALING), hero.pointsInTalent(TEST_SUBJECT)); if (e != null) e.burst(Speck.factory(Speck.HEALING), hero.pointsInTalent(TEST_SUBJECT));
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(1 + hero.pointsInTalent(TEST_SUBJECT)), FloatingText.HEALING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(1 + hero.pointsInTalent(TEST_SUBJECT)), FloatingText.HEALING);
} }
} }
if (hero.hasTalent(TESTED_HYPOTHESIS)){ if (hero.hasTalent(TESTED_HYPOTHESIS)){
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Challenge.java
+1 -1
View File
@@ -270,7 +270,7 @@ public class Challenge extends ArmorAbility {
if (hpToHeal > 0){ if (hpToHeal > 0){
Dungeon.hero.HP += hpToHeal; Dungeon.hero.HP += hpToHeal;
Dungeon.hero.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.33f, 6 ); Dungeon.hero.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.33f, 6 );
Dungeon.hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(hpToHeal), FloatingText.HEALING ); Dungeon.hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(hpToHeal), FloatingText.HEALING );
} }
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/ElementalStrike.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class ElementalStrike extends ArmorAbility {
if (targetsHit > 0){ if (targetsHit > 0){
int shield = Math.round(Math.round(6f*targetsHit*powerMulti)); int shield = Math.round(Math.round(6f*targetsHit*powerMulti));
Buff.affect(hero, Barrier.class).setShield(Math.round(6f*targetsHit*powerMulti)); Buff.affect(hero, Barrier.class).setShield(Math.round(6f*targetsHit*powerMulti));
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shield), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shield), FloatingText.SHIELDING);
} }
//*** Vampiric *** //*** Vampiric ***
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/ElementalBlast.java
+3 -3
View File
@@ -347,10 +347,10 @@ public class ElementalBlast extends ArmorAbility {
mob.sprite.emitter().burst(Speck.factory(Speck.HEALING), 4); mob.sprite.emitter().burst(Speck.factory(Speck.HEALING), 4);
if (healing > 0) { if (healing > 0) {
mob.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(healing), FloatingText.HEALING); mob.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healing), FloatingText.HEALING);
} }
if (shielding > 0){ if (shielding > 0){
mob.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shielding), FloatingText.SHIELDING); mob.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shielding), FloatingText.SHIELDING);
} }
} else { } else {
if (!mob.properties().contains(Char.Property.UNDEAD)) { if (!mob.properties().contains(Char.Property.UNDEAD)) {
@@ -415,7 +415,7 @@ public class ElementalBlast extends ArmorAbility {
charsHit = Math.min(4 + hero.pointsInTalent(Talent.REACTIVE_BARRIER), charsHit); charsHit = Math.min(4 + hero.pointsInTalent(Talent.REACTIVE_BARRIER), charsHit);
if (charsHit > 0 && hero.hasTalent(Talent.REACTIVE_BARRIER)){ if (charsHit > 0 && hero.hasTalent(Talent.REACTIVE_BARRIER)){
int shielding = Math.round(charsHit*2.5f*hero.pointsInTalent(Talent.REACTIVE_BARRIER)); int shielding = Math.round(charsHit*2.5f*hero.pointsInTalent(Talent.REACTIVE_BARRIER));
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shielding), FloatingText.SHIELDING); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shielding), FloatingText.SHIELDING);
Buff.affect(hero, Barrier.class).setShield(shielding); Buff.affect(hero, Barrier.class).setShield(shielding);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/DeathMark.java
+1 -1
View File
@@ -200,7 +200,7 @@ public class DeathMark extends ArmorAbility {
target.die(this); target.die(this);
int shld = Math.round(initialHP * (0.125f*Dungeon.hero.pointsInTalent(Talent.DEATHLY_DURABILITY))); int shld = Math.round(initialHP * (0.125f*Dungeon.hero.pointsInTalent(Talent.DEATHLY_DURABILITY)));
if (shld > 0 && target.alignment != Char.Alignment.ALLY){ if (shld > 0 && target.alignment != Char.Alignment.ALLY){
Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shld), FloatingText.SHIELDING); Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shld), FloatingText.SHIELDING);
Buff.affect(Dungeon.hero, Barrier.class).setShield(shld); Buff.affect(Dungeon.hero, Barrier.class).setShield(shld);
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ArmoredBrute extends Brute {
@Override @Override
protected void triggerEnrage () { protected void triggerEnrage () {
Buff.affect(this, ArmoredRage.class).setShield(HT/2 + 1); Buff.affect(this, ArmoredRage.class).setShield(HT/2 + 1);
sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(HT/2 + 1), FloatingText.SHIELDING ); sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(HT/2 + 1), FloatingText.SHIELDING );
if (Dungeon.level.heroFOV[pos]) { if (Dungeon.level.heroFOV[pos]) {
sprite.showStatus( CharSprite.NEGATIVE, Messages.get(this, "enraged") ); sprite.showStatus( CharSprite.NEGATIVE, Messages.get(this, "enraged") );
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class Bat extends Mob {
if (reg > 0) { if (reg > 0) {
HP += reg; HP += reg;
sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(reg), FloatingText.HEALING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(reg), FloatingText.HEALING);
} }
return damage; return damage;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class Brute extends Mob {
protected void triggerEnrage(){ protected void triggerEnrage(){
Buff.affect(this, BruteRage.class).setShield(HT/2 + 4); Buff.affect(this, BruteRage.class).setShield(HT/2 + 4);
sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(HT/2 + 4), FloatingText.SHIELDING ); sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(HT/2 + 4), FloatingText.SHIELDING );
if (Dungeon.level.heroFOV[pos]) { if (Dungeon.level.heroFOV[pos]) {
SpellSprite.show( this, SpellSprite.BERSERK); SpellSprite.show( this, SpellSprite.BERSERK);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java
+1 -1
View File
@@ -336,7 +336,7 @@ public class DM300 extends Mob {
} }
Sample.INSTANCE.play(Assets.Sounds.LIGHTNING); Sample.INSTANCE.play(Assets.Sounds.LIGHTNING);
sprite.emitter().start(SparkParticle.STATIC, 0.05f, 20); sprite.emitter().start(SparkParticle.STATIC, 0.05f, 20);
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(30 + (HT - HP)/10), FloatingText.SHIELDING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(30 + (HT - HP)/10), FloatingText.SHIELDING);
} }
Buff.affect(this, Barrier.class).setShield( 30 + (HT - HP)/10); Buff.affect(this, Barrier.class).setShield( 30 + (HT - HP)/10);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class Ghoul extends Mob {
Dungeon.level.mobs.add(ghoul); Dungeon.level.mobs.add(ghoul);
Dungeon.level.occupyCell( ghoul ); Dungeon.level.occupyCell( ghoul );
ghoul.sprite.idle(); ghoul.sprite.idle();
ghoul.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(Math.round(ghoul.HT/10f)), FloatingText.HEALING); ghoul.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(Math.round(ghoul.HT/10f)), FloatingText.HEALING);
super.detach(); super.detach();
return true; return true;
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class Goo extends Mob {
if (Dungeon.level.heroFOV[pos] ){ if (Dungeon.level.heroFOV[pos] ){
sprite.emitter().burst( Speck.factory( Speck.HEALING ), healInc ); sprite.emitter().burst( Speck.factory( Speck.HEALING ), healInc );
sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(healInc), FloatingText.HEALING ); sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(healInc), FloatingText.HEALING );
} }
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES) && healInc < 3) { if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES) && healInc < 3) {
healInc++; healInc++;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+1 -1
View File
@@ -789,7 +789,7 @@ public abstract class Mob extends Char {
} }
if (exp > 0) { if (exp > 0) {
Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(exp), FloatingText.EXPERIENCE); Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(exp), FloatingText.EXPERIENCE);
} }
Dungeon.hero.earnExp(exp, getClass()); Dungeon.hero.earnExp(exp, getClass());
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class RotLasher extends Mob {
@Override @Override
protected boolean act() { protected boolean act() {
if (HP < HT && (enemy == null || !Dungeon.level.adjacent(pos, enemy.pos))) { if (HP < HT && (enemy == null || !Dungeon.level.adjacent(pos, enemy.pos))) {
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(Math.min(5, HT - HP)), FloatingText.HEALING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(Math.min(5, HT - HP)), FloatingText.HEALING);
HP = Math.min(HT, HP + 5); HP = Math.min(HT, HP + 5);
} }
return super.act(); return super.act();
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java
+2 -2
View File
@@ -82,11 +82,11 @@ public class Succubus extends Mob {
if (shield > 0){ if (shield > 0){
HP = HT; HP = HT;
if (shield < 5){ if (shield < 5){
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(5-shield), FloatingText.HEALING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(5-shield), FloatingText.HEALING);
} }
Buff.affect(this, Barrier.class).setShield(shield); Buff.affect(this, Barrier.class).setShield(shield);
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shield), FloatingText.SHIELDING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shield), FloatingText.SHIELDING);
} else { } else {
HP += 5 + damage; HP += 5 + damage;
sprite.showStatusWithIcon(CharSprite.POSITIVE, "5", FloatingText.HEALING); sprite.showStatusWithIcon(CharSprite.POSITIVE, "5", FloatingText.HEALING);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java
+2 -2
View File
@@ -87,10 +87,10 @@ public class Dewdrop extends Item {
hero.HP += effect; hero.HP += effect;
if (shield > 0) Buff.affect(hero, Barrier.class).incShield(shield); if (shield > 0) Buff.affect(hero, Barrier.class).incShield(shield);
if (effect > 0){ if (effect > 0){
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(effect), FloatingText.HEALING); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(effect), FloatingText.HEALING);
} }
if (shield > 0) { if (shield > 0) {
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(effect), FloatingText.SHIELDING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(shield), FloatingText.SHIELDING );
} }
} else if (!force) { } else if (!force) {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EnergyCrystal.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class EnergyCrystal extends Item {
//TODO track energy collected maybe? We do already track recipes crafted though.. //TODO track energy collected maybe? We do already track recipes crafted though..
GameScene.pickUp( this, pos ); GameScene.pickUp( this, pos );
hero.sprite.showStatusWithIcon( 0x44CCFF, String.valueOf(quantity), FloatingText.ENERGY ); hero.sprite.showStatusWithIcon( 0x44CCFF, Integer.toString(quantity), FloatingText.ENERGY );
hero.spendAndNext( TIME_TO_PICK_UP ); hero.spendAndNext( TIME_TO_PICK_UP );
Sample.INSTANCE.play( Assets.Sounds.ITEM ); Sample.INSTANCE.play( Assets.Sounds.ITEM );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class Gold extends Item {
Badges.validateGoldCollected(); Badges.validateGoldCollected();
GameScene.pickUp( this, pos ); GameScene.pickUp( this, pos );
hero.sprite.showStatusWithIcon( CharSprite.NEUTRAL, String.valueOf(quantity), FloatingText.GOLD ); hero.sprite.showStatusWithIcon( CharSprite.NEUTRAL, Integer.toString(quantity), FloatingText.GOLD );
hero.spendAndNext( TIME_TO_PICK_UP ); hero.spendAndNext( TIME_TO_PICK_UP );
Sample.INSTANCE.play( Assets.Sounds.GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) ); Sample.INSTANCE.play( Assets.Sounds.GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class ChaliceOfBlood extends Artifact {
} }
if (heal >= 1f) { if (heal >= 1f) {
target.HP = Math.min(target.HT, target.HP + (int)heal); target.HP = Math.min(target.HT, target.HP + (int)heal);
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(heal), FloatingText.HEALING); target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString((int)heal), FloatingText.HEALING);
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+1 -1
View File
@@ -313,7 +313,7 @@ public class DriedRose extends Artifact {
} else { } else {
int heal = Math.round((1 + level()/3f)*amount); int heal = Math.round((1 + level()/3f)*amount);
ghost.HP = Math.min( ghost.HT, ghost.HP + heal); ghost.HP = Math.min( ghost.HT, ghost.HP + heal);
ghost.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(heal), FloatingText.HEALING); ghost.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(heal), FloatingText.HEALING);
updateQuickslot(); updateQuickslot();
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class FrozenCarpaccio extends Food {
GLog.i( Messages.get(FrozenCarpaccio.class, "better") ); GLog.i( Messages.get(FrozenCarpaccio.class, "better") );
hero.HP = Math.min( hero.HP + hero.HT / 4, hero.HT ); hero.HP = Math.min( hero.HP + hero.HT / 4, hero.HT );
hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(hero.HT / 4), FloatingText.HEALING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(hero.HT / 4), FloatingText.HEALING );
break; break;
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class Pasty extends Food {
int toHeal = Math.max(3, hero.HT/20); int toHeal = Math.max(3, hero.HT/20);
hero.HP = Math.min(hero.HP + toHeal, hero.HT); hero.HP = Math.min(hero.HP + toHeal, hero.HT);
hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(toHeal), FloatingText.HEALING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(toHeal), FloatingText.HEALING );
break; break;
case WINTER_HOLIDAYS: case WINTER_HOLIDAYS:
hero.belongings.charge(0.5f); //2 turns worth hero.belongings.charge(0.5f); //2 turns worth
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/PhantomMeat.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class PhantomMeat extends Food {
Buff.affect( hero, Invisibility.class, Invisibility.DURATION ); Buff.affect( hero, Invisibility.class, Invisibility.DURATION );
hero.HP = Math.min( hero.HP + hero.HT / 4, hero.HT ); hero.HP = Math.min( hero.HP + hero.HT / 4, hero.HT );
hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(hero.HT / 4), FloatingText.HEALING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(hero.HT / 4), FloatingText.HEALING );
PotionOfHealing.cure(hero); PotionOfHealing.cure(hero);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class PotionOfExperience extends Potion {
@Override @Override
public void apply( Hero hero ) { public void apply( Hero hero ) {
identify(); identify();
hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(hero.maxExp()), FloatingText.EXPERIENCE); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(hero.maxExp()), FloatingText.EXPERIENCE);
hero.earnExp( hero.maxExp(), getClass() ); hero.earnExp( hero.maxExp(), getClass() );
new Flare( 6, 32 ).color(0xFFFF00, true).show( curUser.sprite, 2f ); new Flare( 6, 32 ).color(0xFFFF00, true).show( curUser.sprite, 2f );
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShielding.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class PotionOfShielding extends ExoticPotion {
} else { } else {
//~75% of a potion of healing //~75% of a potion of healing
Buff.affect(hero, Barrier.class).setShield((int) (0.6f * hero.HT + 10)); Buff.affect(hero, Barrier.class).setShield((int) (0.6f * hero.HT + 10));
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf((int) (0.6f * hero.HT + 10)), FloatingText.SHIELDING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString((int) (0.6f * hero.HT + 10)), FloatingText.SHIELDING );
} }
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/remains/SealShard.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class SealShard extends RemainsItem {
@Override @Override
protected void doEffect(Hero hero) { protected void doEffect(Hero hero) {
Buff.affect(hero, Barrier.class).incShield(hero.HT/10); Buff.affect(hero, Barrier.class).incShield(hero.HT/10);
hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, String.valueOf(hero.HT/10), FloatingText.SHIELDING ); hero.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(hero.HT/10), FloatingText.SHIELDING );
Sample.INSTANCE.play(Assets.Sounds.UNLOCK); Sample.INSTANCE.play(Assets.Sounds.UNLOCK);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+3 -3
View File
@@ -603,7 +603,7 @@ public abstract class Wand extends Item {
float shield = curUser.HT * (0.04f*curWand.curCharges); float shield = curUser.HT * (0.04f*curWand.curCharges);
if (curUser.pointsInTalent(Talent.SHIELD_BATTERY) == 2) shield *= 1.5f; if (curUser.pointsInTalent(Talent.SHIELD_BATTERY) == 2) shield *= 1.5f;
Buff.affect(curUser, Barrier.class).setShield(Math.round(shield)); Buff.affect(curUser, Barrier.class).setShield(Math.round(shield));
curUser.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shield), FloatingText.SHIELDING); curUser.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(Math.round(shield)), FloatingText.SHIELDING);
curWand.curCharges = 0; curWand.curCharges = 0;
curUser.sprite.operate(curUser.pos); curUser.sprite.operate(curUser.pos);
Sample.INSTANCE.play(Assets.Sounds.CHARGEUP); Sample.INSTANCE.play(Assets.Sounds.CHARGEUP);
@@ -639,7 +639,7 @@ public abstract class Wand extends Item {
//grants 3/5 shielding //grants 3/5 shielding
int shieldToGive = 1 + 2 * Dungeon.hero.pointsInTalent(Talent.BACKUP_BARRIER); int shieldToGive = 1 + 2 * Dungeon.hero.pointsInTalent(Talent.BACKUP_BARRIER);
Buff.affect(Dungeon.hero, Barrier.class).setShield(shieldToGive); Buff.affect(Dungeon.hero, Barrier.class).setShield(shieldToGive);
Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldToGive), FloatingText.SHIELDING); Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldToGive), FloatingText.SHIELDING);
//metamorphed. Triggers if wand is highest level hero has //metamorphed. Triggers if wand is highest level hero has
} else if (curUser.heroClass != HeroClass.MAGE) { } else if (curUser.heroClass != HeroClass.MAGE) {
@@ -653,7 +653,7 @@ public abstract class Wand extends Item {
//grants 3/5 shielding //grants 3/5 shielding
int shieldToGive = 1 + 2 * Dungeon.hero.pointsInTalent(Talent.BACKUP_BARRIER); int shieldToGive = 1 + 2 * Dungeon.hero.pointsInTalent(Talent.BACKUP_BARRIER);
Buff.affect(Dungeon.hero, Barrier.class).setShield(shieldToGive); Buff.affect(Dungeon.hero, Barrier.class).setShield(shieldToGive);
Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shieldToGive), FloatingText.SHIELDING); Dungeon.hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldToGive), FloatingText.SHIELDING);
} }
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java
+1 -1
View File
@@ -332,7 +332,7 @@ public class WandOfLivingEarth extends DamageWand {
HT = 16 + 8 * wandLevel; HT = 16 + 8 * wandLevel;
} }
if (HP != 0){ if (HP != 0){
sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(healthToAdd), FloatingText.HEALING); sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healthToAdd), FloatingText.HEALING);
} }
HP = Math.min(HT, HP + healthToAdd); HP = Math.min(HT, HP + healthToAdd);
//half of hero's evasion //half of hero's evasion
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java
+2 -2
View File
@@ -95,10 +95,10 @@ public class WandOfTransfusion extends Wand {
ch.sprite.emitter().burst(Speck.factory(Speck.HEALING), 2 + buffedLvl() / 2); ch.sprite.emitter().burst(Speck.factory(Speck.HEALING), 2 + buffedLvl() / 2);
if (healing > 0) { if (healing > 0) {
ch.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(healing), FloatingText.HEALING); ch.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healing), FloatingText.HEALING);
} }
if (shielding > 0){ if (shielding > 0){
ch.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shielding), FloatingText.SHIELDING); ch.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shielding), FloatingText.SHIELDING);
} }
if (!freeCharge) { if (!freeCharge) {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class Blocking extends Weapon.Enchantment {
BlockBuff b = Buff.affect(attacker, BlockBuff.class); BlockBuff b = Buff.affect(attacker, BlockBuff.class);
int shield = Math.round(powerMulti * (2 + weapon.buffedLvl())); int shield = Math.round(powerMulti * (2 + weapon.buffedLvl()));
b.setShield(shield); b.setShield(shield);
attacker.sprite.showStatusWithIcon(CharSprite.POSITIVE, String.valueOf(shield), FloatingText.SHIELDING); attacker.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shield), FloatingText.SHIELDING);
attacker.sprite.emitter().burst(Speck.factory(Speck.LIGHT), 5); attacker.sprite.emitter().burst(Speck.factory(Speck.LIGHT), 5);
} }