diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 44828cb2d..f6bd74cf9 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -468,8 +468,8 @@ actors.hero.hero.new_level=Level up! +Accuracy, +Evasion, +5 HP! actors.hero.hero.new_talent=+1 Talent Point! actors.hero.hero.unspent=You have unspent talent points! actors.hero.hero.level_cap=You cannot grow stronger, but your experiences do give you a surge of power! -actors.hero.hero.you_now_have=You picked up: %s. -actors.hero.hero.you_cant_have=You can't carry: %s. +actors.hero.hero.you_now_have=you picked up: %s. +actors.hero.hero.you_cant_have=you can't carry: %s. actors.hero.hero.locked_chest=This chest is locked and you don't have a matching key. actors.hero.hero.locked_door=You don't have a matching key. actors.hero.hero.noticed_smth=You noticed something. @@ -1214,6 +1214,6 @@ actors.mobs.yogfist$darkfist.desc=This fist is formed out of pure dark energy. I actors.char.kill=%s killed you... -actors.char.defeat=You defeated %s. +actors.char.defeat=you defeated %s. actors.char.def_verb=dodged actors.char.invulnerable=invulnerable diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index b8286390b..b5eeee007 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -85,7 +85,7 @@ items.armor.armor.probably_too_heavy=Probably this armor is too heavy for you. items.armor.armor.excess_str=Because of your excess strength, you are _more evasive_ while wearing this armor. items.armor.armor.evasion=It is augmented to enhance _evasion._ items.armor.armor.defense=It is augmented to enhance _defense._ -items.armor.armor.inscribed=It is inscribed with a _%s._ +items.armor.armor.inscribed=it is inscribed with a _%s._ items.armor.armor.cursed_worn=Because this armor is cursed, you are powerless to remove it. items.armor.armor.cursed=You can feel a malevolent magic lurking within this armor. items.armor.armor.weak_cursed=Despite the curse, you are able to unequip this armor. @@ -1711,7 +1711,7 @@ items.weapon.weapon.weak_cursed=Despite the curse, you are able to unequip this items.weapon.weapon.not_cursed=This weapon is free of malevolent magic. items.weapon.weapon.faster=It is augmented to enhance _speed._ items.weapon.weapon.stronger=It is augmented to enhance _damage._ -items.weapon.weapon.enchanted=It has a _%s._ +items.weapon.weapon.enchanted=it has a _%s._ items.weapon.weapon$enchantment.enchant=enchantment diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index b24a6de25..9fc22bcda 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -890,9 +890,9 @@ public class Hero extends Char { boolean important = item.unique && item.isIdentified() && (item instanceof Scroll || item instanceof Potion); if (important) { - GLog.p( Messages.get(this, "you_now_have", item.name()) ); + GLog.p( Messages.capitalize(Messages.get(this, "you_now_have", item.name())) ); } else { - GLog.i( Messages.get(this, "you_now_have", item.name()) ); + GLog.i( Messages.capitalize(Messages.get(this, "you_now_have", item.name())) ); } } @@ -914,7 +914,7 @@ public class Hero extends Char { //Do Nothing } else { GLog.newLine(); - GLog.n(Messages.get(this, "you_cant_have", item.name())); + GLog.n(Messages.capitalize(Messages.get(this, "you_cant_have", item.name()))); } heap.sprite.drop(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index 78c7de34d..e1ca1532b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -100,7 +100,7 @@ public class Blacksmith extends NPC { Pickaxe pick = new Pickaxe(); if (pick.doPickUp( Dungeon.hero )) { - GLog.i( Messages.get(Dungeon.hero, "you_now_have", pick.name() )); + GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", pick.name()) )); } else { Dungeon.level.drop( pick, Dungeon.hero.pos ).sprite.drop(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 018aad03c..0a8380d6c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -483,7 +483,7 @@ public class Armor extends EquipableItem { } if (glyph != null && (cursedKnown || !glyph.curse())) { - info += "\n\n" + Messages.get(Armor.class, "inscribed", glyph.name()); + info += "\n\n" + Messages.capitalize(Messages.get(Armor.class, "inscribed", glyph.name())); info += " " + glyph.desc(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index 74ec24b25..265e3b3d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -121,7 +121,7 @@ public class Pickaxe extends Weapon { DarkGold gold = new DarkGold(); if (gold.doPickUp( Dungeon.hero )) { - GLog.i( Messages.get(Dungeon.hero, "you_now_have", gold.name()) ); + GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", gold.name())) ); } else { Dungeon.level.drop( gold, hero.pos ).sprite.drop(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 75b87f2c6..3bae46b8d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -95,7 +95,7 @@ public class MeleeWeapon extends Weapon { } if (enchantment != null && (cursedKnown || !enchantment.curse())){ - info += "\n\n" + Messages.get(Weapon.class, "enchanted", enchantment.name()); + info += "\n\n" + Messages.capitalize(Messages.get(Weapon.class, "enchanted", enchantment.name())); info += " " + enchantment.desc(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java index 9f486453d..68bc9e49d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java @@ -75,7 +75,7 @@ public class WndImp extends Window { reward.identify(false); if (reward.doPickUp( Dungeon.hero )) { - GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) ); + GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", reward.name())) ); } else { Dungeon.level.drop( reward, imp.pos ).sprite.drop(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java index 9c92c7284..dcd05bc67 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java @@ -112,7 +112,7 @@ public class WndSadGhost extends Window { reward.identify(false); if (reward.doPickUp( Dungeon.hero )) { - GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) ); + GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", reward.name())) ); } else { Dungeon.level.drop( reward, ghost.pos ).sprite.drop(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java index 6a9d8cbed..fab7ba83f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java @@ -103,7 +103,7 @@ public class WndWandmaker extends Window { reward.identify(false); if (reward.doPickUp( Dungeon.hero )) { - GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) ); + GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", reward.name())) ); } else { Dungeon.level.drop( reward, wandmaker.pos ).sprite.drop(); }