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

v0.6.3: standardized the string ID for equipping a cursed item

Browse Source
This commit is contained in:
Evan Debenham 2017-12-20 02:00:25 -05:00
parent 409af754ec
commit 9f78c6b6c2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
View File

@ -51,7 +51,7 @@ abstract public class KindOfWeapon extends EquipableItem {
cursedKnown = true; cursedKnown = true;
if (cursed) { if (cursed) {
equipCursed( hero ); equipCursed( hero );
GLog.n( Messages.get(KindOfWeapon.class, "cursed") ); GLog.n( Messages.get(KindOfWeapon.class, "equip_cursed") );
} }
hero.spendAndNext( TIME_TO_EQUIP ); hero.spendAndNext( TIME_TO_EQUIP );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java
View File

@ -77,7 +77,7 @@ public abstract class KindofMisc extends EquipableItem {
cursedKnown = true; cursedKnown = true;
if (cursed) { if (cursed) {
equipCursed( hero ); equipCursed( hero );
GLog.n( Messages.get(this, "cursed", this) ); GLog.n( Messages.get(this, "equip_cursed", this) );
} }
hero.spendAndNext( TIME_TO_EQUIP ); hero.spendAndNext( TIME_TO_EQUIP );

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

@ -130,7 +130,7 @@ items.artifacts.alchemiststoolkit.ac_brew=BREW
##this one isn't dropped, so for now no i18n ##this one isn't dropped, so for now no i18n
items.artifacts.artifact.cannot_wear_two=You cannot wear two of the same artifact. items.artifacts.artifact.cannot_wear_two=You cannot wear two of the same artifact.
items.artifacts.artifact.cursed=The artifact painfully binds itself to you. items.artifacts.artifact.equip_cursed=The artifact painfully binds itself to you.
items.artifacts.artifact.curse_known=You can feel a malevolent magic lurking within the artifact. items.artifacts.artifact.curse_known=You can feel a malevolent magic lurking within the artifact.
items.artifacts.artifact.need_to_equip=You need to equip your artifact to do that. items.artifacts.artifact.need_to_equip=You need to equip your artifact to do that.
@ -526,7 +526,7 @@ items.rings.ring.emerald=emerald ring
items.rings.ring.sapphire=sapphire ring items.rings.ring.sapphire=sapphire ring
items.rings.ring.quartz=quartz ring items.rings.ring.quartz=quartz ring
items.rings.ring.agate=agate ring items.rings.ring.agate=agate ring
items.rings.ring.cursed=The ring tightens around your finger painfully! items.rings.ring.equip_cursed=The ring tightens around your finger painfully!
items.rings.ring.unknown_desc=This metal band is adorned with a large gem that glitters in the darkness. Who knows what effect it has when worn? items.rings.ring.unknown_desc=This metal band is adorned with a large gem that glitters in the darkness. Who knows what effect it has when worn?
items.rings.ring.known=This is a %s items.rings.ring.known=This is a %s
items.rings.ring.identify=You are now familiar enough with your ring to identify it. It is a %s. items.rings.ring.identify=You are now familiar enough with your ring to identify it. It is a %s.
@ -1051,7 +1051,7 @@ items.item.curse=curse
items.kindofmisc.unequip_title=Unequip one item items.kindofmisc.unequip_title=Unequip one item
items.kindofmisc.unequip_message=You can only wear two misc items at a time. items.kindofmisc.unequip_message=You can only wear two misc items at a time.
items.kindofweapon.cursed=Your grip involuntarily tightens around the weapon. items.kindofweapon.equip_cursed=Your grip involuntarily tightens around the weapon.
items.merchantsbeacon.name=merchant's beacon items.merchantsbeacon.name=merchant's beacon
items.merchantsbeacon.ac_use=USE items.merchantsbeacon.ac_use=USE