From 51fd143a6efcacc3233b81d2d46f8124e25d8071 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 20 Oct 2020 17:30:39 -0400 Subject: [PATCH] v0.9.1: added an icon and description to the pincushion buff --- core/src/main/assets/interfaces/buffs.png | Bin 1242 -> 1274 bytes .../main/assets/interfaces/large_buffs.png | Bin 2533 -> 2592 bytes .../assets/messages/actors/actors.properties | 3 +++ .../actors/buffs/PinCushion.java | 22 ++++++++++++++++++ .../ui/BuffIndicator.java | 1 + 5 files changed, 26 insertions(+) diff --git a/core/src/main/assets/interfaces/buffs.png b/core/src/main/assets/interfaces/buffs.png index abe8292e0769d57a23f56069a6f898a3171bf8ad..30c06e58fcea1fdc70e9ea2a321770001119d35c 100644 GIT binary patch delta 984 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 delta 2284 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 ((Collection) bundle.getCollection(ITEMS))); super.restoreFromBundle( bundle ); } + + @Override + public int icon() { + return BuffIndicator.PINCUSHION; + } + + @Override + public String toString() { + return Messages.get(this, "name"); + } + + @Override + public String desc() { + String desc = Messages.get(this, "desc"); + for (Item i : items){ + desc += "\n" + i.toString(); + } + return desc; + } + } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 8da6fb749..1c19a5d38 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -94,6 +94,7 @@ public class BuffIndicator extends Component { public static final int VULNERABLE = 46; public static final int HEX = 47; public static final int DEGRADE = 48; + public static final int PINCUSHION = 49; public static final int SIZE = 7;