konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.0: improved new 'thrown wep has broken' message for tipped darts

Browse Source
This commit is contained in:
Evan Debenham
2024-04-10 12:40:01 -04:00
parent dafbb6f859
commit d9f777afcb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/assets/messages/items/items.properties
View File

@@ -1893,7 +1893,8 @@ items.weapon.missiles.darts.tippeddart.cancel=cancel
items.weapon.missiles.darts.tippeddart.durability=Tipped darts will lose their tips and become regular darts when used.
items.weapon.missiles.darts.tippeddart.uses_left=This stack of darts has _%d/%d_ uses left before one tip wears off.
items.weapon.missiles.darts.tippeddart.unlimited_uses=_But these are of such high quality that they will effectively last forever._
items.weapon.missiles.darts.tippeddart.about_to_break=Your dart tip is about to expire.
items.weapon.missiles.darts.tippeddart.about_to_break=Your dart's tip is about to expire.
items.weapon.missiles.darts.tippeddart.has_broken=Your dart's tip has expired.
items.weapon.missiles.bolas.name=bolas

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java
View File

@@ -351,7 +351,9 @@ abstract public class MissileWeapon extends Weapon {
if (parent.durability <= parent.durabilityPerUse()){
durability = 0;
parent.durability = MAX_DURABILITY;
GLog.n(Messages.get(this, "has_broken"));
if (parent.durabilityPerUse() < 100f) {
GLog.n(Messages.get(this, "has_broken"));
}
} else {
parent.durability -= parent.durabilityPerUse();
if (parent.durability > 0 && parent.durability <= parent.durabilityPerUse()){
@@ -363,7 +365,7 @@ abstract public class MissileWeapon extends Weapon {
durability -= durabilityPerUse();
if (durability > 0 && durability <= durabilityPerUse()){
GLog.w(Messages.get(this, "about_to_break"));
} else if (durability <= 0){
} else if (durabilityPerUse() < 100f && durability <= 0){
GLog.n(Messages.get(this, "has_broken"));
}
}