diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 295182911..aa23cfe22 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -300,7 +300,7 @@ actors.buffs.snipersmark.name=Sniper's mark actors.buffs.snipersmark.desc=The Sniper is honed in on the target she most recently attacked. She is able to perform a special attack with her bow which will vary based on how the bow is augmented.\n\nAn unaugmented bow will fire a _snapshot,_ which deals reduced damage but does not take any time to fire.\n\nA bow augmented for speed will fire a _volley_ of three arrows. Each arrow will deal reduced damage, but can still activate enchantment. This volley takes 1 turn to shoot.\n\nA bow augmented for damage will fire a _sniper shot._ This shot is guaranteed to hit, deals bonus damage based on distance from the target, and takes 2 turns to fire. actors.buffs.soulmark.name=Soul Marked -actors.buffs.soulmark.desc=The warlock has tapped into the soul of this creature. He will heal and satisfy his hunger as it takes physical damage.\n\nTurns of soul mark remaining: %s. +actors.buffs.soulmark.desc=The warlock has tapped into the soul of this creature, allowing him to heal as it takes physical damage.\n\nTurns of soul mark remaining: %s. actors.buffs.stamina.name=Stamina actors.buffs.stamina.desc=You have unending stamina, allowing for faster movement!\n\nWhile under the effects of stamina you will run at +50%% speed, but will perform all other actions at normal speed.\n\nTurns of stamina remaining: %s. @@ -657,7 +657,7 @@ actors.hero.talent.speedy_stealth.desc=_+1:_ The Freerunner gains 2 stacks of mo actors.hero.talent.hasty_retreat.title=hasty retreat actors.hero.talent.hasty_retreat.desc=_+1:_ After blinking the Rogue gains _1 turn_ of haste and invisibility.\n\n_+2:_ After blinking the Rogue gains _2 turns_ of haste and invisibility.\n\n_+3:_ After blinking the Rogue gains _3 turns_ of haste and invisibility.\n\n_+4:_ After blinking the Rogue gains _4 turns_ of haste and invisibility. actors.hero.talent.body_replacement.title=body replacement -actors.hero.talent.body_replacement.desc=_+1:_ After blinking, the Rogue leaves a wooden decoy behind that has _20 health and 1-3 armor_.\n\n_+2:_ After blinking, the Rogue leaves a wooden decoy behind that has _40 health and 2-6 armor_.\n\n_+3:_ After blinking, the Rogue leaves a wooden decoy behind that has _60 health and 3-19 armor_.\n\n_+4:_ After blinking, the Rogue leaves a wooden decoy behind that has _80 health and 4-12 armor_.\n\nOnly one decoy can be active at a time. +actors.hero.talent.body_replacement.desc=_+1:_ After blinking, the Rogue leaves a wooden decoy behind that has _20 health and 1-3 armor_.\n\n_+2:_ After blinking, the Rogue leaves a wooden decoy behind that has _40 health and 2-6 armor_.\n\n_+3:_ After blinking, the Rogue leaves a wooden decoy behind that has _60 health and 3-9 armor_.\n\n_+4:_ After blinking, the Rogue leaves a wooden decoy behind that has _80 health and 4-12 armor_.\n\nOnly one decoy can be active at a time. actors.hero.talent.shadow_step.title=shadow step actors.hero.talent.shadow_step.desc=_+1:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _20% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+2:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _36% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+3:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _50% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+4:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _60% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents. diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index b48b2c1b3..b04421a5e 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1631,7 +1631,7 @@ items.amulet.desc=The Amulet of Yendor is the most powerful artifact known to hu items.ankh.name=ankh items.ankh.ac_bless=BLESS items.ankh.bless=You bless the ankh with magical water. -items.ankh.desc=This ancient symbol of immortality grants the ability to return to life after death. Most equipment will be dropped where you died, but can be reclaimed if you return to it. Using a full waterskin, the ankh can be blessed with extra strength. +items.ankh.desc=This ancient symbol of immortality grants the ability to return to life after death. Most items will be dropped where you died, but can be reclaimed if you return to it. Using a full waterskin, the ankh can be blessed with extra strength. items.ankh.desc_blessed=This ancient symbol of immortality grants the ability to return to life after death. The ankh has been blessed and is now much stronger. The Ankh will sacrifice itself to save you in a moment of deadly peril. items.arcaneresin.name=arcane resin @@ -1688,7 +1688,6 @@ items.honeypot.desc=This large honeypot is only really lined with honey, instead items.honeypot$shatteredpot.name=shattered honeypot items.honeypot$shatteredpot.desc=The pot has been shattered, only the sticky honey that lines its walls is holding it together, and it is slowly coming apart.\n\nDespite its broken state, the bee still seems to want to protect the pot. -items.item.pack_full=Your %s is full. items.item.prompt=Choose direction of throw items.item.ac_drop=DROP items.item.ac_throw=THROW diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 720d60372..68332f998 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -188,7 +188,6 @@ public class Item implements Bundlable { } if (!container.canHold(this)){ - GLog.n( Messages.get(Item.class, "pack_full", container.name()) ); return false; }