diff --git a/Zennysoft.Game.Ma/src/items/jewels/JewelStats.cs b/Zennysoft.Game.Ma/src/items/jewels/JewelStats.cs index a4b5e4cb..a955725a 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/JewelStats.cs +++ b/Zennysoft.Game.Ma/src/items/jewels/JewelStats.cs @@ -11,4 +11,12 @@ public partial class JewelStats : InventoryItemStats [Save("jewel_tag")] [Export] public JewelTags JewelTag { get; set; } + + [Export(PropertyHint.MultilineText)] + [Save("equipment_stat_text")] + public string WeaponAugmentDescription { get; set; } + + [Export(PropertyHint.MultilineText)] + [Save("equipment_stat_text")] + public string ArmorAugmentDescription { get; set; } } diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres index 30d6c195..e752b3f0 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("2_1at78") JewelTag = 1 +WeaponAugmentDescription = "Bestows Aeolic properties." +ArmorAugmentDescription = "Grants Aeolic resistance." Name = "Aeolic Jewel" StatDescription = "When attached to a weapon; bestows Aeolic properties. When attached to armor or mask; grants Resistance to Aeolic damage. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/AnabolicJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/AnabolicJewel.tres index 9b045317..625f4fd9 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/AnabolicJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/AnabolicJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_6xlbl") JewelTag = 2 +WeaponAugmentDescription = "Increases HP Recovery Speed." +ArmorAugmentDescription = "Increases HP Recovery Speed." Name = "Anabolic Jewel" StatDescription = "When attached to equipment; increases HP Recovery Speed." FlavorText = "A jewel prized for it's beneficial properties. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/BlackEgg.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/BlackEgg.tres index 53be72ec..2bb61086 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/BlackEgg.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/BlackEgg.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_dxj8h") JewelTag = 15 +WeaponAugmentDescription = "Increases ATK, DEF and LUCK." +ArmorAugmentDescription = "Increases ATK, DEF and LUCK." Name = "Black Egg" StatDescription = "When attached to equipment; increases ATK, DEF and LUCK." FlavorText = "A royal stone that grants a way of life aloft with power. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/CatsEye.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/CatsEye.tres index 4be4ec79..4ac40434 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/CatsEye.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/CatsEye.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_vvfsu") JewelTag = 16 +WeaponAugmentDescription = "Dramatically improves LUCK." +ArmorAugmentDescription = "Dramatically improves LUCK." Name = "Cat's Eye" StatDescription = "When attached to equipment; dramatically improves LUCK." FlavorText = "Many types of beings find their way to the Tower beyond just humans and their successors. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/CinnabarStructure.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/CinnabarStructure.tres index cc8dea0a..e238451b 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/CinnabarStructure.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/CinnabarStructure.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_k60ln") JewelTag = 3 +WeaponAugmentDescription = "Hastens VT drain and adds or improves Rust capabilities." +ArmorAugmentDescription = "Hastens VT drain and improves Rust capabilities." Name = "Cinnabar Structure" StatDescription = "When attached to a Weapon; Hastens VT drain and adds or improves Rust capabilities. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/FoolishOrb.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/FoolishOrb.tres index 8bd71b99..dbda6753 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/FoolishOrb.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/FoolishOrb.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_pn071") JewelTag = 4 +WeaponAugmentDescription = "Lowers XP gained." +ArmorAugmentDescription = "Lowers XP gained." Name = "Foolish Orb" StatDescription = "Lowers XP gained. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/GlueOrb.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/GlueOrb.tres index fb4ab095..5729d66f 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/GlueOrb.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/GlueOrb.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_c23yr") JewelTag = 5 +WeaponAugmentDescription = "Prevents item from being unequipped" +ArmorAugmentDescription = "Prevents item from being unequipped" Name = "Glue Orb" StatDescription = "When attached to equipment; prevents item from being unequipped. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/HeirloomStone.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/HeirloomStone.tres index 732c2fb7..1700c201 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/HeirloomStone.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/HeirloomStone.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_7gwjj") JewelTag = 6 +WeaponAugmentDescription = "Sends item to the surface upon death." +ArmorAugmentDescription = "Sends item to the surface upon death." Name = "Heirloom Stone" StatDescription = "When attached to equipment; sends the item to the surface upon death. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres index 36c8d340..a2260a2e 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_cyti8") JewelTag = 7 +WeaponAugmentDescription = "Bestows Hydric properties." +ArmorAugmentDescription = "Grants Resistance to Hydric damage." Name = "Hydric Jewel" StatDescription = "When attached to a weapon; bestows Hydric properties. When attached to armor or mask; grants Resistance to Hydric damage. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres index a8b53ec1..2d9c997f 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_qh03l") JewelTag = 8 +WeaponAugmentDescription = "Bestows Igneous properties." +ArmorAugmentDescription = "Grants Resistance to Igneous damage." Name = "Igneous Jewel" StatDescription = "When attached to a weapon; bestows Igneous properties. When attached to armor or mask; grants Resistance to Igneous damage. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/MeditativeOrb.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/MeditativeOrb.tres index ce0af7de..b1c3cc1c 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/MeditativeOrb.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/MeditativeOrb.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_6e2y5") JewelTag = 9 +WeaponAugmentDescription = "Increases XP gain." +ArmorAugmentDescription = "Increases XP gain." Name = "Meditative Stone" StatDescription = "When attached to equipment; increases XP gain. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/MercuryPrism.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/MercuryPrism.tres index 66763c93..292a727c 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/MercuryPrism.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/MercuryPrism.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_ivvck") JewelTag = 10 +WeaponAugmentDescription = "Adds or improves the ability to inflict Rust while also lowering HP recovery speed." +ArmorAugmentDescription = "Improves the ability to inflict Rust while also lowering HP recovery speed." Name = "Mercury Prism" StatDescription = "When attached to a weapon; adds or improves the ability to inflict Rust while also lowering HP recovery speed. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/MetabolicJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/MetabolicJewel.tres index 31724024..f3cb7b33 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/MetabolicJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/MetabolicJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_cabnq") JewelTag = 11 +WeaponAugmentDescription = "Slows VT gain." +ArmorAugmentDescription = "Slows VT gain." Name = "Metabolic Jewel" StatDescription = "When attached to equipment; slows VT drain. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/OssifiedCortex.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/OssifiedCortex.tres index 5d4f8414..07c4fcc0 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/OssifiedCortex.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/OssifiedCortex.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_75k4l") JewelTag = 12 +WeaponAugmentDescription = "Automatically identifies obtained items." +ArmorAugmentDescription = "Automatically identifies obtained items." Name = "Ossified Cortex" StatDescription = "When attached to equipment; automatically identifies obtained items. " diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/RejectionStone.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/RejectionStone.tres index fdfb005c..896b14b7 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/RejectionStone.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/RejectionStone.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("1_fkhpb") JewelTag = 13 +WeaponAugmentDescription = "Prevents the user from death once." +ArmorAugmentDescription = "Prevents the user from death once." Name = "Rejection Stone" StatDescription = "When attached to equipment; prevents the user from death once." FlavorText = "A rare stone solidified from the souls of those who cling most lovingly to life. diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres index bca0c0f1..fee0d10c 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres @@ -6,6 +6,8 @@ [resource] script = ExtResource("2_c8kww") JewelTag = 14 +WeaponAugmentDescription = "Bestows Telluric properties." +ArmorAugmentDescription = "Grants Resistance to Telluric damage." Name = "Telluric Jewel" StatDescription = "When attached to a weapon; bestows Telluric properties. When attached to armor or mask; grants Resistance to Telluric damage. diff --git a/Zennysoft.Game.Ma/src/player/Player.cs b/Zennysoft.Game.Ma/src/player/Player.cs index d110ff47..14ac72ca 100644 --- a/Zennysoft.Game.Ma/src/player/Player.cs +++ b/Zennysoft.Game.Ma/src/player/Player.cs @@ -421,26 +421,26 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide { case JewelTags.AeolicElement: weapon.Stats.WeaponElement = ElementType.Aeolic; - weapon.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.HydricElement: weapon.Stats.WeaponElement = ElementType.Hydric; - weapon.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.SlowVTReduction: - weapon.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.HastenVT: - weapon.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.ReviveUserOnce: - weapon.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseHPRecovery: - weapon.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.LowerEXPGain: - weapon.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.ItemRescue: if (!_game.RescuedItems.TryAdd(weapon)) @@ -454,24 +454,24 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide if (!EquipmentComponent.IsItemEquipped(weapon)) break; weapon.Glued = true; - weapon.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.TelluricElement: weapon.Stats.WeaponElement = ElementType.Telluric; - weapon.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.AutoIdentifyAllItems: - weapon.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseAtkDefLuck: weapon.IncreaseAttack(jewel.Stats.BonusAttack); weapon.IncreaseDefense(jewel.Stats.BonusDefense); weapon.IncreaseLuck(jewel.Stats.BonusLuck); - weapon.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseLuck: weapon.IncreaseLuck(25); - weapon.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + weapon.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.WeaponAugmentDescription, jewel.GetTexture()); break; } EquipmentComponent.UpdateEquipment(weapon); @@ -483,26 +483,26 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide { case JewelTags.AeolicElement: armor.Stats.AeolicResistance += jewel.Stats.AeolicResistance; - armor.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.HydricElement: armor.Stats.HydricResistance += jewel.Stats.HydricResistance; - armor.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.SlowVTReduction: - armor.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.HastenVT: - armor.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.ReviveUserOnce: - armor.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseHPRecovery: - armor.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.LowerEXPGain: - armor.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.ItemRescue: if (!_game.RescuedItems.TryAdd(armor)) @@ -516,24 +516,24 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide if (!EquipmentComponent.IsItemEquipped(armor)) break; armor.Glued = true; - armor.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.TelluricElement: armor.Stats.TelluricResistance += jewel.Stats.TelluricResistance; - armor.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.AutoIdentifyAllItems: - armor.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseAtkDefLuck: armor.IncreaseAttack(jewel.Stats.BonusAttack); armor.IncreaseDefense(jewel.Stats.BonusDefense); armor.IncreaseLuck(jewel.Stats.BonusLuck); - armor.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseLuck: armor.IncreaseLuck(jewel.Stats.BonusLuck); - armor.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + armor.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; } EquipmentComponent.UpdateEquipment(armor); @@ -545,26 +545,26 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide { case JewelTags.AeolicElement: accessory.Stats.AeolicResistance += jewel.Stats.AeolicResistance; - accessory.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.AeolicElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.HydricElement: accessory.Stats.HydricResistance += jewel.Stats.HydricResistance; - accessory.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.HydricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.SlowVTReduction: - accessory.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.SlowVTReduction, new SlowVTReductionAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.HastenVT: - accessory.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.HastenVT, new HastenVTAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.ReviveUserOnce: - accessory.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.ReviveUserOnce, new RevivePlayerAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseHPRecovery: - accessory.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.IncreaseHPRecovery, new HPRecoverySpeedAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.LowerEXPGain: - accessory.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.LowerEXPGain, new LowerEXPRateAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.ItemRescue: if (!_game.RescuedItems.TryAdd(accessory)) @@ -578,24 +578,24 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide if (!EquipmentComponent.IsItemEquipped(accessory)) break; accessory.Glued = true; - accessory.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.Glue, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.TelluricElement: accessory.Stats.TelluricResistance += jewel.Stats.TelluricResistance; - accessory.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.TelluricElement, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.AutoIdentifyAllItems: - accessory.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.AutoIdentifyAllItems, new IdentifyAllItemsAugment(this), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseAtkDefLuck: accessory.IncreaseAttack(jewel.Stats.BonusAttack); accessory.IncreaseDefense(jewel.Stats.BonusDefense); accessory.IncreaseLuck(jewel.Stats.BonusLuck); - accessory.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.IncreaseAtkDefLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; case JewelTags.IncreaseLuck: accessory.IncreaseLuck(jewel.Stats.BonusLuck); - accessory.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.StatDescription, jewel.GetTexture()); + accessory.Augment = new Augment(JewelTags.IncreaseLuck, new BasicAugment(), jewel.ItemName, jewel.Stats.ArmorAugmentDescription, jewel.GetTexture()); break; } EquipmentComponent.UpdateEquipment(accessory); diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn index b1b21d25..fa5e363f 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn @@ -2308,7 +2308,6 @@ unique_name_in_owner = true custom_minimum_size = Vector2(500, 10) layout_mode = 2 size_flags_horizontal = 8 -text = "Black Egg:" label_settings = SubResource("LabelSettings_unikd") autowrap_mode = 2 @@ -2317,7 +2316,6 @@ unique_name_in_owner = true custom_minimum_size = Vector2(500, 10) layout_mode = 2 size_flags_horizontal = 8 -text = "Augment" label_settings = SubResource("LabelSettings_i34wf") autowrap_mode = 2 @@ -2332,7 +2330,6 @@ layout_mode = 2 size_flags_horizontal = 8 theme_override_fonts/font = ExtResource("5_7co7g") theme_override_font_sizes/font_size = 19 -text = "When attached to equipment etc" autowrap_mode = 2 [node name="ActionPanelContainer" type="PanelContainer" parent="Panel/MarginContainer/PanelContainer/MenuPanel/VBoxContainer"]