From 9e32c18807f8b3a17dd8caeb2d136c5260aa97b0 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 4 Dec 2023 14:04:07 -0500 Subject: [PATCH] v2.3.0: added damage icons for frost and water (for fiery enemies) --- core/src/main/assets/effects/text_icons.png | Bin 396 -> 424 bytes .../shatteredpixeldungeon/actors/Char.java | 30 +++++++++++------- .../effects/FloatingText.java | 14 ++++---- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/core/src/main/assets/effects/text_icons.png b/core/src/main/assets/effects/text_icons.png index 7599d464751a16ffb7b48d4d8da7c58292d76173..a03de99bc692b8d2cb48b15a7fc474ad9f6a4568 100644 GIT binary patch delta 374 zcmV-+0g3*M1E>R#BqKRcOjJbx000000L%aYG@1YM{4tZ8PWB^VMWi7{%_u-orQIH<9s;Dm6d4-1#e1+LdC+-|ql z1@8AdStc+D6QW0r-B-X);y}NTQ++s}f6p++z@^|?a4RG{9^6ZTEEA(&G<^{@md3tl z3lPUIIGy_aFN}gqeO&9~R-b-B!|(tkloZHWP=+k*cVFz<=jo8pvS`2~%Q>ni`j{ z3kg>>Tl96|cDup4uCQ$zNr3zPP7Z-Vn24U5%R9hD;!3{{V+`C1Yhf!A9uMx7Kn^kb zMe|M6EX`Nx28iX2QMlD%t;1GFzyHSo{eCcEFm@WaUIhzA*>8YH2f&{i$eT$`@VNsW zAQqw$&=u$kbZP}W%CQ~TUv%t!1i!97h!&8ekZ1{Z1LQoO65mBwNE)x#i!jMa@I(i| z&+SHYa;CGadd089A{FpHBLs00o)aMlil?|%c@LH9I(UeVA$7mNY`FdYe8h<5$@ P00000NkvXXu0mjf5uBkK diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 3f0607e89..61e38a64e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Electricity; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.StormCloud; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Adrenaline; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff; @@ -99,6 +100,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Chilling; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Kinetic; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking; @@ -108,6 +110,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.darts.Shoc import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GeyserTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; @@ -788,19 +791,22 @@ public abstract class Char extends Actor { if (sprite != null) { //defaults to normal damage icon if no other ones apply - int icon = FloatingText.PHYS_DMG; - if (AntiMagic.RESISTS.contains(src.getClass())) icon = FloatingText.MAGIC_DMG; - if (src instanceof Pickaxe) icon = FloatingText.PICK_DMG; + int icon = FloatingText.PHYS_DMG; + if (AntiMagic.RESISTS.contains(src.getClass())) icon = FloatingText.MAGIC_DMG; + if (src instanceof Pickaxe) icon = FloatingText.PICK_DMG; - if (src instanceof Hunger) icon = FloatingText.HUNGER; - if (src instanceof Burning) icon = FloatingText.BURNING; - if (src instanceof Electricity) icon = FloatingText.SHOCKING; - if (src instanceof Bleeding) icon = FloatingText.BLEEDING; - if (src instanceof ToxicGas) icon = FloatingText.TOXIC; - if (src instanceof Corrosion) icon = FloatingText.CORROSION; - if (src instanceof Poison) icon = FloatingText.POISON; - if (src instanceof Ooze) icon = FloatingText.OOZE; - if (src instanceof Viscosity.DeferedDamage) icon = FloatingText.DEFERRED; + if (src instanceof Hunger) icon = FloatingText.HUNGER; + if (src instanceof Burning) icon = FloatingText.BURNING; + if (src instanceof Chilling || src instanceof Frost) icon = FloatingText.FROST; + if (src instanceof GeyserTrap || src instanceof StormCloud) icon = FloatingText.WATER; + if (src instanceof Burning) icon = FloatingText.BURNING; + if (src instanceof Electricity) icon = FloatingText.SHOCKING; + if (src instanceof Bleeding) icon = FloatingText.BLEEDING; + if (src instanceof ToxicGas) icon = FloatingText.TOXIC; + if (src instanceof Corrosion) icon = FloatingText.CORROSION; + if (src instanceof Poison) icon = FloatingText.POISON; + if (src instanceof Ooze) icon = FloatingText.OOZE; + if (src instanceof Viscosity.DeferedDamage) icon = FloatingText.DEFERRED; sprite.showStatusWithIcon(HP > HT / 2 ? CharSprite.WARNING : diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java index 0b12a1ba6..60603b3cd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java @@ -55,12 +55,14 @@ public class FloatingText extends RenderedTextBlock { public static int HUNGER = 4; public static int BURNING = 5; public static int SHOCKING = 6; - public static int BLEEDING = 7; - public static int TOXIC = 8; - public static int CORROSION = 9; - public static int POISON = 10; - public static int OOZE = 11; - public static int DEFERRED = 12; + public static int FROST = 7; + public static int WATER = 8; + public static int BLEEDING = 9; + public static int TOXIC = 10; + public static int CORROSION = 11; + public static int POISON = 12; + public static int OOZE = 13; + public static int DEFERRED = 14; //positive icons public static int HEALING = 18;