From 17f559e3675af499bcec2af52958abf2762dda56 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 8 Mar 2019 01:23:20 -0500 Subject: [PATCH] v0.7.2: adjusted stones of aggression to no longer allow use on bosses --- .../com/shatteredpixel/shatteredpixeldungeon/actors/Char.java | 3 ++- .../shatteredpixeldungeon/messages/items/items.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 23f456a9f..f6fb4defb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -62,6 +62,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Potential; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRetribution; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfAggression; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing; @@ -595,7 +596,7 @@ public abstract class Char extends Actor { public enum Property{ BOSS ( new HashSet( Arrays.asList(Grim.class, ScrollOfRetribution.class, ScrollOfPsionicBlast.class)), - new HashSet( Arrays.asList(Corruption.class) )), + new HashSet( Arrays.asList(Corruption.class, StoneOfAggression.Aggression.class) )), MINIBOSS ( new HashSet(), new HashSet( Arrays.asList(Corruption.class) )), UNDEAD, diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 3153235d3..f84b8d7a7 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -997,7 +997,7 @@ items.stones.inventorystone.ac_use=USE items.stones.runestone$placeholder.name=runestone items.stones.stoneofaggression.name=stone of aggression -items.stones.stoneofaggression.desc=When this stone is thrown at an ally or enemy, all nearby enemies will be forced to attack that character for a short time.\n\nWhen used on enemies, the magic will only last for a few moments, but when used on yourself or allies it will last significantly longer. +items.stones.stoneofaggression.desc=When this stone is thrown at an ally or enemy, all nearby enemies will be forced to attack that character for a short time.\n\nWhen used on enemies, the magic will only last for a few moments, but when used on yourself or allies it will last significantly longer. Powerful enemies will resist the effect as well. items.stones.stoneofaggression$aggression.name=Targeted items.stones.stoneofaugmentation.name=stone of augmentation