v3.2.0: un-Ided thrown weapons now work with shard of oblivion

This commit is contained in:
Evan Debenham
2025-07-09 23:05:32 -04:00
parent 954340216d
commit b85953e760
6 changed files with 35 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -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.identify=You identify the item!
items.trinkets.shardofoblivion$wandusetracker.name=Unidentified Wand Used 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$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.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? 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?

View File

@@ -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(){ public static float lootChanceMultiplier(){
return lootChanceMultiplier(trinketLevel(ShardOfOblivion.class)); return lootChanceMultiplier(trinketLevel(ShardOfOblivion.class));
} }
@@ -187,6 +212,9 @@ public class ShardOfOblivion extends Trinket {
if (Dungeon.hero.buff(WandUseTracker.class) != null){ if (Dungeon.hero.buff(WandUseTracker.class) != null){
wornUnIDed++; wornUnIDed++;
} }
if (Dungeon.hero.buff(ThrownUseTracker.class) != null){
wornUnIDed++;
}
wornUnIDed = Math.min(wornUnIDed, level+1); wornUnIDed = Math.min(wornUnIDed, level+1);
return 1f + .2f*wornUnIDed; return 1f + .2f*wornUnIDed;

View File

@@ -297,6 +297,10 @@ abstract public class MissileWeapon extends Weapon {
} }
} }
if (!isIdentified() && ShardOfOblivion.passiveIDDisabled()){
Buff.prolong(curUser, ShardOfOblivion.ThrownUseTracker.class, 50f);
}
return result; return result;
} }

View File

@@ -135,6 +135,7 @@ public class BuffIndicator extends Component {
public static final int TRINITY_FORM= 82; public static final int TRINITY_FORM= 82;
public static final int MANY_POWER = 83; public static final int MANY_POWER = 83;
public static final int SEAL_SHIELD = 84; 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_SMALL = 7;
public static final int SIZE_LARGE = 16; public static final int SIZE_LARGE = 16;