LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.1: fixed a text error in missile weapons

Browse Source
This commit is contained in:
Evan Debenham 2018-11-24 20:45:59 -05:00
parent da38e0bb81
commit 650f10983e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,17 +201,17 @@ abstract public class MissileWeapon extends Weapon {
parent.durability = MAX_DURABILITY; parent.durability = MAX_DURABILITY;
} else { } else {
parent.durability -= parent.durabilityPerUse(); parent.durability -= parent.durabilityPerUse();
if (parent.durability <= parent.durabilityPerUse()){ if (parent.durability > 0 && parent.durability <= parent.durabilityPerUse()){
if (level() <= 0)GLog.w(Messages.get(Weapon.class, "about_to_break")); if (level() <= 0)GLog.w(Messages.get(MissileWeapon.class, "about_to_break"));
else GLog.n(Messages.get(Weapon.class, "about_to_break")); else GLog.n(Messages.get(MissileWeapon.class, "about_to_break"));
} }
} }
parent = null; parent = null;
} else { } else {
durability -= durabilityPerUse(); durability -= durabilityPerUse();
if (durability <= durabilityPerUse()){ if (durability > 0 && durability <= durabilityPerUse()){
if (level() <= 0)GLog.w(Messages.get(Weapon.class, "about_to_break")); if (level() <= 0)GLog.w(Messages.get(MissileWeapon.class, "about_to_break"));
else GLog.n(Messages.get(Weapon.class, "about_to_break")); else GLog.n(Messages.get(MissileWeapon.class, "about_to_break"));
} }
} }
if (durability > 0){ if (durability > 0){

2
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -1386,7 +1386,7 @@ items.weapon.missiles.missileweapon.distance=This weapon is designed to be used
items.weapon.missiles.missileweapon.durability=Missile weapons will wear out and break as they are used. items.weapon.missiles.missileweapon.durability=Missile weapons will wear out and break as they are used.
items.weapon.missiles.missileweapon.uses_left=This stack of weapons has _%d/%d_ uses left before one breaks. items.weapon.missiles.missileweapon.uses_left=This stack of weapons has _%d/%d_ uses left before one breaks.
items.weapon.missiles.missileweapon.unlimited_uses=_But these are of such high quality that they will effectively last forever._ items.weapon.missiles.missileweapon.unlimited_uses=_But these are of such high quality that they will effectively last forever._
ttems.weapon.missiles.missileweapon.about_to_break=Your thrown weapon is about to break. items.weapon.missiles.missileweapon.about_to_break=Your thrown weapon is about to break.
items.weapon.missiles.shuriken.name=shuriken items.weapon.missiles.shuriken.name=shuriken
items.weapon.missiles.shuriken.desc=Star-shaped pieces of metal with razor-sharp blades. They are lightweight and easy to use on the move. A single shuriken can be thrown instantly after moving. items.weapon.missiles.shuriken.desc=Star-shaped pieces of metal with razor-sharp blades. They are lightweight and easy to use on the move. A single shuriken can be thrown instantly after moving.