diff --git a/core/src/main/assets/interfaces/buffs.png b/core/src/main/assets/interfaces/buffs.png index 8772efc8e..9cf073063 100644 Binary files a/core/src/main/assets/interfaces/buffs.png and b/core/src/main/assets/interfaces/buffs.png differ diff --git a/core/src/main/assets/interfaces/large_buffs.png b/core/src/main/assets/interfaces/large_buffs.png index 520b4b6ec..0229db9a4 100644 Binary files a/core/src/main/assets/interfaces/large_buffs.png and b/core/src/main/assets/interfaces/large_buffs.png differ diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 7d5a37b72..8a662c027 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1462,6 +1462,8 @@ items.trinkets.shardofoblivion.identify_not_yet=That item isn't ready to be iden items.trinkets.shardofoblivion.identify=You identify the item! items.trinkets.shardofoblivion$wandusetracker.name=Unidentified Wand Used items.trinkets.shardofoblivion$wandusetracker.desc=You have recently used an unidentified wand, which counts as one piece of used unidentified equipment for the shard of oblivion for a little while.\n\nTurns remaining: %s +items.trinkets.shardofoblivion$thrownusetracker.name=Unidentified Thrown Weapon Used +items.trinkets.shardofoblivion$thrownusetracker.desc=You have recently used an unidentified thrown weapon, which counts as one piece of used unidentified equipment for the shard of oblivion for a little while.\n\nTurns remaining: %s items.trinkets.thirteenleafclover.name=thirteen leaf clover items.trinkets.thirteenleafclover.desc=Somehow stewing in the alchemy pot has caused this clover to grow a bunch of extra leaves! It's not really clear if this trinket is lucky or unlucky, perhaps this trinket will make your luck more chaotic? diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ShardOfOblivion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ShardOfOblivion.java index 0270af581..038177d76 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ShardOfOblivion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ShardOfOblivion.java @@ -164,6 +164,31 @@ public class ShardOfOblivion extends Trinket { } + public static class ThrownUseTracker extends FlavourBuff{ + + { + type = buffType.POSITIVE; + } + + public static float DURATION = 50f; + + @Override + public int icon() { + return BuffIndicator.THROWN_WEP; + } + + @Override + public void tintIcon(Image icon) { + icon.hardlight(0, 0.6f, 1); + } + + @Override + public float iconFadePercent() { + return Math.max(0, (DURATION - visualcooldown()) / DURATION); + } + + } + public static float lootChanceMultiplier(){ return lootChanceMultiplier(trinketLevel(ShardOfOblivion.class)); } @@ -187,6 +212,9 @@ public class ShardOfOblivion extends Trinket { if (Dungeon.hero.buff(WandUseTracker.class) != null){ wornUnIDed++; } + if (Dungeon.hero.buff(ThrownUseTracker.class) != null){ + wornUnIDed++; + } wornUnIDed = Math.min(wornUnIDed, level+1); return 1f + .2f*wornUnIDed; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index b004964c4..ac36aa401 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -297,6 +297,10 @@ abstract public class MissileWeapon extends Weapon { } } + if (!isIdentified() && ShardOfOblivion.passiveIDDisabled()){ + Buff.prolong(curUser, ShardOfOblivion.ThrownUseTracker.class, 50f); + } + return result; } 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 7d36ea0c8..23c665784 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -135,6 +135,7 @@ public class BuffIndicator extends Component { public static final int TRINITY_FORM= 82; public static final int MANY_POWER = 83; public static final int SEAL_SHIELD = 84; + public static final int THROWN_WEP = 85; public static final int SIZE_SMALL = 7; public static final int SIZE_LARGE = 16;