From 31ccd854ab327be081d1f3ef2bd50deb3ecfa97a Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 31 Jul 2022 14:28:07 -0400
Subject: [PATCH] v1.4.0: added new text to better communicate curse state on
 wep/arm

---
 core/src/main/assets/messages/items/items.properties        | 2 ++
 .../shatteredpixeldungeon/items/armor/Armor.java            | 6 +++++-
 .../items/weapon/melee/MeleeWeapon.java                     | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties
index 0ecb9d567..a127cb202 100644
--- a/core/src/main/assets/messages/items/items.properties
+++ b/core/src/main/assets/messages/items/items.properties
@@ -88,6 +88,7 @@ items.armor.armor.defense=It is augmented to enhance _defense._
 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.
 items.armor.armor.not_cursed=This armor is free of malevolent magic.
 items.armor.armor.seal_attached=The Warrior's broken seal is attached to this armor, it is providing him up to _%d shielding_.
 items.armor.armor$glyph.glyph=glyph
@@ -1695,6 +1696,7 @@ items.weapon.weapon.excess_str=Because of your excess strength, you will deal up
 items.weapon.weapon.incompatible=Interaction of different types of magic has negated the enchantment on this weapon!
 items.weapon.weapon.cursed_worn=Because this weapon is cursed, you are powerless to remove it.
 items.weapon.weapon.cursed=You can feel a malevolent magic lurking within this weapon.
+items.weapon.weapon.weak_cursed=Despite the curse, you are able to unequip this weapon.
 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._
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 71c1309a9..b6d2f5385 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
@@ -494,7 +494,11 @@ public class Armor extends EquipableItem {
 		} else if (seal != null) {
 			info += "\n\n" + Messages.get(Armor.class, "seal_attached", seal.maxShield(tier, level()));
 		} else if (!isIdentified() && cursedKnown){
-			info += "\n\n" + Messages.get(Armor.class, "not_cursed");
+			if (glyph != null && glyph.curse()) {
+				info += "\n\n" + Messages.get(Armor.class, "weak_cursed");
+			} else {
+				info += "\n\n" + Messages.get(Armor.class, "not_cursed");
+			}
 		}
 		
 		return info;
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 d9c5889d7..75b87f2c6 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
@@ -104,7 +104,11 @@ public class MeleeWeapon extends Weapon {
 		} else if (cursedKnown && cursed) {
 			info += "\n\n" + Messages.get(Weapon.class, "cursed");
 		} else if (!isIdentified() && cursedKnown){
-			info += "\n\n" + Messages.get(Weapon.class, "not_cursed");
+			if (enchantment != null && enchantment.curse()) {
+				info += "\n\n" + Messages.get(Weapon.class, "weak_cursed");
+			} else {
+				info += "\n\n" + Messages.get(Weapon.class, "not_cursed");
+			}
 		}
 		
 		return info;