From 95c30cb74069bc0aefb96cfcd7f2ef76501d8c3d Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 15:53:29 +0800 Subject: [PATCH 01/31] =?UTF-8?q?boss=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/NPCs/Cruiser/CruiserHead.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/NPCs/Cruiser/CruiserHead.cs b/Content/NPCs/Cruiser/CruiserHead.cs index 5444d265c..708bcfc0b 100644 --- a/Content/NPCs/Cruiser/CruiserHead.cs +++ b/Content/NPCs/Cruiser/CruiserHead.cs @@ -142,22 +142,22 @@ public override void SetDefaults() NPC.damage = 225; if (Main.expertMode) { - NPC.damage += 10; + NPC.damage += 5; } if (Main.masterMode) { - NPC.damage += 4; + NPC.damage += 5; } NPC.defense = 90; NPC.lifeMax = 1500000; if (CalamityWorld.death) { - NPC.damage += 25; + NPC.damage += 5; length += 4; } else if (CalamityWorld.revenge) { - NPC.damage += 20; + NPC.damage += 5; length += 2; } tdamage = NPC.damage; From dd66cc8328251796a7b76af5b1fb756f03951124 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:06:27 +0800 Subject: [PATCH 02/31] =?UTF-8?q?boss=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduced damage and lifeMax for The Prophet NPC. --- Content/NPCs/Prophet/TheProphet.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/NPCs/Prophet/TheProphet.cs b/Content/NPCs/Prophet/TheProphet.cs index 416d82671..4c20ef726 100644 --- a/Content/NPCs/Prophet/TheProphet.cs +++ b/Content/NPCs/Prophet/TheProphet.cs @@ -115,20 +115,20 @@ public override void SetDefaults() NPC.boss = true; NPC.width = 80; NPC.height = 80; - NPC.damage = 76; + NPC.damage = 70; NPC.Calamity().DR = 0.10f; - NPC.lifeMax = 52000; + NPC.lifeMax = 50000; if (BossRushEvent.BossRushActive) { NPC.lifeMax += 350000; } if (CalamityWorld.death) { - NPC.damage += 12; + NPC.damage += 4; } else if (CalamityWorld.revenge) { - NPC.damage += 6; + NPC.damage += 2; } var snd = CEUtils.GetSound("prophet_hurt", maxIns: 1); var snd2 = CEUtils.GetSound("prophet_death"); From ca692b72ed2a5477098d7d904f99d280cd8ff100 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:09:05 +0800 Subject: [PATCH 03/31] =?UTF-8?q?boss=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/NPCs/NihilityTwin/ChaoticCell.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/NPCs/NihilityTwin/ChaoticCell.cs b/Content/NPCs/NihilityTwin/ChaoticCell.cs index d6c80721d..e20c5793d 100644 --- a/Content/NPCs/NihilityTwin/ChaoticCell.cs +++ b/Content/NPCs/NihilityTwin/ChaoticCell.cs @@ -50,8 +50,8 @@ public override void SetDefaults() NPC.boss = true; NPC.width = 110; NPC.height = 110; - NPC.damage = 110; - NPC.Calamity().DR = 0.20f; + NPC.damage = 105; + NPC.Calamity().DR = 0.15f; if (Main.expertMode) { NPC.damage += 2; @@ -68,11 +68,11 @@ public override void SetDefaults() } if (CalamityWorld.death) { - NPC.damage += 12; + NPC.damage += 8; } else if (CalamityWorld.revenge) { - NPC.damage += 8; + NPC.damage += 4; } NPC.HitSound = SoundID.NPCHit1; NPC.DeathSound = SoundID.NPCHit1; From 188fa9c034a49ff4b80c95c6135b44453ac95175 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:11:41 +0800 Subject: [PATCH 04/31] =?UTF-8?q?boss=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/NPCs/NihilityTwin/NihilityActeriophage.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content/NPCs/NihilityTwin/NihilityActeriophage.cs b/Content/NPCs/NihilityTwin/NihilityActeriophage.cs index 063a96579..e66cf967c 100644 --- a/Content/NPCs/NihilityTwin/NihilityActeriophage.cs +++ b/Content/NPCs/NihilityTwin/NihilityActeriophage.cs @@ -66,8 +66,8 @@ public override void SetDefaults() NPC.boss = true; NPC.width = 140; NPC.height = 140; - NPC.damage = 125; - NPC.Calamity().DR = 0.12f; + NPC.damage = 115; + NPC.Calamity().DR = 0.10f; if (Main.expertMode) { NPC.damage += 2; @@ -76,7 +76,7 @@ public override void SetDefaults() { NPC.damage += 2; } - NPC.defense = 75; + NPC.defense = 60; NPC.lifeMax = 360000; if (BossRushEvent.BossRushActive) { @@ -84,11 +84,11 @@ public override void SetDefaults() } if (CalamityWorld.death) { - NPC.damage += 12; + NPC.damage += 8; } else if (CalamityWorld.revenge) { - NPC.damage += 8; + NPC.damage += 4; } NPC.HitSound = SoundID.NPCHit4; NPC.DeathSound = SoundID.NPCHit4; From f5f912399c2b000c1dfd3e65c4044fc76861f2d8 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:12:59 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/CelestialRing.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Accessories/CelestialRing.cs b/Content/Items/Accessories/CelestialRing.cs index baf43be74..e68e9a5bc 100644 --- a/Content/Items/Accessories/CelestialRing.cs +++ b/Content/Items/Accessories/CelestialRing.cs @@ -15,7 +15,7 @@ public class CelestialRing : ModItem public override void SetDefaults() { Item.width = 26; - Item.defense = 20; + Item.defense = 15; Item.height = 26; Item.value = CalamityGlobalItem.RarityTurquoiseBuyPrice; Item.rare = ModContent.RarityType(); From 12acbb831bdcfa0c091cf33694133821eda832da Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:13:35 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/OdinsRefuge.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Accessories/OdinsRefuge.cs b/Content/Items/Accessories/OdinsRefuge.cs index 2e37f7e63..683a611cf 100644 --- a/Content/Items/Accessories/OdinsRefuge.cs +++ b/Content/Items/Accessories/OdinsRefuge.cs @@ -18,7 +18,7 @@ public override void SetDefaults() Item.value = CalamityGlobalItem.RarityTurquoiseBuyPrice; Item.rare = ModContent.RarityType(); Item.accessory = true; - Item.defense = 30; + Item.defense = 24; } From 7ff8358bef7c36624257af398c54d774a00381fd Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:14:29 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/AzafureDetectionEquipment.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Accessories/AzafureDetectionEquipment.cs b/Content/Items/Accessories/AzafureDetectionEquipment.cs index 0a8cd46ec..adb63f793 100644 --- a/Content/Items/Accessories/AzafureDetectionEquipment.cs +++ b/Content/Items/Accessories/AzafureDetectionEquipment.cs @@ -16,7 +16,7 @@ public override void SetDefaults() Item.value = CalamityGlobalItem.RarityOrangeBuyPrice; Item.rare = ItemRarityID.Orange; Item.accessory = true; - Item.defense = 4; + Item.defense = 2; } public static string ID = "AzafureDetectorEquipment"; From a5fec7da0e2b6c6fd65b144dfab81c68b197a735 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:15:02 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/AzafureChargeShield.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Accessories/AzafureChargeShield.cs b/Content/Items/Accessories/AzafureChargeShield.cs index 255b0c401..85e95bb2c 100644 --- a/Content/Items/Accessories/AzafureChargeShield.cs +++ b/Content/Items/Accessories/AzafureChargeShield.cs @@ -31,7 +31,7 @@ public override void SetDefaults() Item.width = 60; Item.height = 54; Item.value = CalamityGlobalItem.RarityOrangeBuyPrice; - Item.defense = 6; + Item.defense = 4; Item.accessory = true; Item.rare = ModContent.RarityType(); } From 4b7c3bdb8e59c8d25919ee1d21fa2424d81524a3 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:22:56 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/AzafureDriverCore.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Items/Accessories/AzafureDriverCore.cs b/Content/Items/Accessories/AzafureDriverCore.cs index 92156dab5..edb3d9a31 100644 --- a/Content/Items/Accessories/AzafureDriverCore.cs +++ b/Content/Items/Accessories/AzafureDriverCore.cs @@ -23,17 +23,17 @@ public class AzafureDriverCore : ModItem, IAzafureEnhancable public const int ShieldSlamDamage = 240; public const float ShieldSlamKnockback = 8f; public const int ShieldSlamIFrames = 16; - public static int DashDelay = 18; + public static int DashDelay = 20; public float charge = 0; public float maxCharge = 5f; - public static int RechargeTime = 18 * 60; - public static int MaxShield = 80; + public static int RechargeTime = 20 * 60; + public static int MaxShield = 50; public override void SetDefaults() { Item.width = 60; Item.height = 54; Item.value = CalamityGlobalItem.RarityPinkBuyPrice; - Item.defense = 10; + Item.defense = 6; Item.accessory = true; Item.rare = ItemRarityID.Pink; } From 4251a230de5b5e21a90422f34f1e710ce8c4f3f9 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:29:10 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/VoidCore.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Content/Items/Accessories/VoidCore.cs b/Content/Items/Accessories/VoidCore.cs index cc897bf57..f9447ae29 100644 --- a/Content/Items/Accessories/VoidCore.cs +++ b/Content/Items/Accessories/VoidCore.cs @@ -22,19 +22,20 @@ namespace CalamityEntropy.Content.Items.Accessories { public class VoidCore : ModItem { - public const int ShieldSlamDamage = 1800; + public const int ShieldSlamDamage = 1200; public const float ShieldSlamKnockback = 8f; public const int ShieldSlamIFrames = 18; - public static int DashDelay = 18; + public static int DashDelay = 20; public float charge = 0; - public static int MaxShield = 120; - public static int ShieldRecharge = 16 * 60; - public static float CritDamage = 0.16f; + public static int MaxShield = 100; + public static int ShieldRecharge = 20 * 60; + public static float CritDamage = 0.12f; public override void SetDefaults() { Item.width = 60; Item.height = 60; Item.value = CalamityGlobalItem.RarityVioletBuyPrice; + Item.defense = 8; Item.accessory = true; Item.rare = ModContent.RarityType(); } @@ -84,7 +85,7 @@ public class VoidCoreDash : PlayerDashEffect public override float CalculateDashSpeed(Player player) { - return 38f; + return 26f; } public override void OnDashEffects(Player player) @@ -132,7 +133,7 @@ public override void MidDashEffects(Player player, ref float dashSpeed, ref floa GeneralParticleHandler.SpawnParticle(new LineParticle(CEUtils.randomPointInCircle(18) + player.Center - player.velocity * Main.rand.NextFloat(), -player.velocity * Main.rand.NextFloat(0.4f, 0.6f), false, 8, Main.rand.NextFloat(0.6f, 1), Color.LightBlue)); } EParticle.spawnNew(new AbyssalLine() { xadd = 0.84f, lx = 0.84f }, player.Center - player.velocity, Vector2.Zero, Color.LightBlue, 1, 1, true, BlendState.Additive, player.velocity.ToRotation(), 26); - dashSpeed = 30f; + dashSpeed = 20f; } } From 2fe65b9e5719ed698972e3338f05885f623892c5 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:36:16 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E9=A5=B0=E5=93=81=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Accessories/ExquisiteCrown.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content/Items/Accessories/ExquisiteCrown.cs b/Content/Items/Accessories/ExquisiteCrown.cs index 5880779a8..804d82fa4 100644 --- a/Content/Items/Accessories/ExquisiteCrown.cs +++ b/Content/Items/Accessories/ExquisiteCrown.cs @@ -1,4 +1,4 @@ -using CalamityMod.Items; +using CalamityMod.Items; using CalamityMod.Particles; using System.Collections.Generic; using Terraria; @@ -13,6 +13,7 @@ public override void SetDefaults() { Item.width = 26; Item.height = 16; + Item.defense = 1; Item.rare = ItemRarityID.Orange; Item.value = CalamityGlobalItem.RarityOrangeBuyPrice; Item.accessory = true; @@ -61,7 +62,7 @@ public override void AI() if (target != null) { Projectile.ai[0] = 0; - int dmg = ((int)(player.GetTotalDamage(DamageClass.Summon).ApplyTo(90))).ApplyAccArmorDamageBonus(Projectile.GetOwner()); + int dmg = ((int)(player.GetTotalDamage(DamageClass.Summon).ApplyTo(30))).ApplyAccArmorDamageBonus(Projectile.GetOwner()); Projectile.NewProjectile(Projectile.GetSource_FromAI(), Projectile.Center, (target.Center - Projectile.Center).normalize() * 12, ModContent.ProjectileType(), dmg, 6, player.whoAmI); CEUtils.PlaySound("soulshine", Main.rand.NextFloat(0.6f, 1), Projectile.Center, 60, 0.5f); } From 2e7feaeaaf79d302a471beacdee83a3adb3bf30c Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:38:03 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs b/Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs index 8d65927aa..949d71973 100644 --- a/Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs +++ b/Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs @@ -1,4 +1,4 @@ -using CalamityEntropy.Content.Rarities; +using CalamityEntropy.Content.Rarities; using CalamityEntropy.Content.Tiles; using CalamityMod.Items; using CalamityMod.Items.Armor.OmegaBlue; @@ -25,7 +25,6 @@ public override void UpdateEquip(Player player) player.Entropy().mariviniumBody = true; player.GetDamage(DamageClass.Generic) += 0.15f; player.GetCritChance(DamageClass.Generic) += 15; - player.statManaMax2 += 250; } public override void AddRecipes() From 8b6e9706ce5a942dd285e6ec3aa5497b5f7a1844 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:40:27 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Marivinium/MariviniumHelmet.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Items/Armor/Marivinium/MariviniumHelmet.cs b/Content/Items/Armor/Marivinium/MariviniumHelmet.cs index 764a0bef5..15bcab485 100644 --- a/Content/Items/Armor/Marivinium/MariviniumHelmet.cs +++ b/Content/Items/Armor/Marivinium/MariviniumHelmet.cs @@ -16,14 +16,14 @@ namespace CalamityEntropy.Content.Items.Armor.Marivinium [AutoloadEquip(EquipType.Head)] public class MariviniumHelmet : ModItem { - public static int ShieldCd = 20 * 60; + public static int ShieldCd = 30 * 60; public static int MaxShield = 2; public override void SetDefaults() { Item.width = 48; Item.height = 48; Item.value = CalamityGlobalItem.RarityHotPinkBuyPrice; - Item.defense = 58; + Item.defense = 50; Item.rare = ModContent.RarityType(); } @@ -43,7 +43,6 @@ public override void UpdateArmorSet(Player player) player.whipRangeMultiplier += 0.2f; player.GetAttackSpeed(DamageClass.Summon) += 0.2f; player.Entropy().summonCrit += 5; - player.GetArmorPenetration(DamageClass.Generic) += 50; player.Entropy().MariviniumSet = true; if (!ModContent.GetInstance().MariviumArmorSetOnlyProvideStealthBarWhenHoldingRogueWeapons || player.HeldItem.DamageType.CountsAsClass(CEUtils.RogueDC)) { @@ -58,8 +57,8 @@ public override void UpdateArmorSet(Player player) ApplyBuffImmune(player); if (player.HeldItem.DamageType.CountsAsClass(ModContent.GetInstance())) { - player.Entropy().damageReduce += 0.15f; - player.statDefense += 25; + player.Entropy().damageReduce += 0.10f; + player.statDefense += 15; } } public static void ApplyBuffImmune(Player player) @@ -102,7 +101,8 @@ public override void UpdateEquip(Player player) player.GetDamage(DamageClass.Generic) += 0.2f; player.GetCritChance(DamageClass.Generic) += 20; player.GetAttackSpeed(DamageClass.Melee) += 0.30f; - player.statLifeMax2 += 250; + player.statLifeMax2 += 200; + player.statManaMax2 += 200; } public override void AddRecipes() From c8c3cee91942d9a446c862fe5a54448a93a78eae Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:42:29 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Marivinium/MariviniumLeggings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/Marivinium/MariviniumLeggings.cs b/Content/Items/Armor/Marivinium/MariviniumLeggings.cs index a7f4366d1..d735cd678 100644 --- a/Content/Items/Armor/Marivinium/MariviniumLeggings.cs +++ b/Content/Items/Armor/Marivinium/MariviniumLeggings.cs @@ -23,7 +23,7 @@ public override void UpdateEquip(Player player) { player.Entropy().moveSpeed += 0.36f; player.Entropy().ManaCost -= 0.2f; - player.GetDamage(DamageClass.Generic) += 0.2f; + player.GetDamage(DamageClass.Generic) += 0.15f; player.GetCritChance(DamageClass.Generic) += 5; } From 33d8ae557513c978aa03120ac83bccf0503dacdd Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:43:12 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs b/Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs index b771adad3..ab9efbbda 100644 --- a/Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs +++ b/Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs @@ -173,7 +173,7 @@ public override void PostUpdateEquips() if (DurabilityActive) { Player.Entropy().moveSpeed -= durability * 0.05f; - Player.Entropy().EDamageReduce += durability * 0.25f; + Player.Entropy().EDamageReduce += durability * 0.16f; Player.statDefense += (int)(durability * 12); Player.noKnockback = true; } From 1ccd1ba6ce6e97a782d48feb0141765e12333466 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:45:05 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs b/Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs index 26faaf629..1a9e2d882 100644 --- a/Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs +++ b/Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs @@ -21,7 +21,7 @@ public override void SetDefaults() Item.width = 48; Item.height = 48; Item.value = CalamityGlobalItem.RarityPinkBuyPrice; - Item.defense = 18; + Item.defense = 12; Item.rare = ItemRarityID.Pink; } @@ -177,11 +177,11 @@ public override void PostUpdateEquips() DeathExplosionCD--; if (ArmorSetBonus) { - Player.Entropy().moveSpeed += 0.2f; + Player.Entropy().moveSpeed += 0.1f; DurabilityRegenDelay--; if (DurabilityActive) { - Player.Entropy().EDamageReduce += durability * 0.3f; + Player.Entropy().EDamageReduce += durability * 0.2f; Player.statDefense += (int)(durability * 24); Player.noKnockback = true; } From 44c9ea6a05358c6f14d426a9642926becc2f430e Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:45:47 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs b/Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs index 65659c490..5a5e0129e 100644 --- a/Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs +++ b/Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs @@ -13,7 +13,7 @@ public override void SetDefaults() Item.width = 34; Item.height = 18; Item.value = CalamityGlobalItem.RarityPinkBuyPrice; - Item.defense = 26; + Item.defense = 15; Item.rare = ItemRarityID.Pink; } From f9b9209b3800d5b76207da371ef572582da3d459 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:46:11 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs b/Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs index 7b6ac83b6..4fbebaff6 100644 --- a/Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs +++ b/Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs @@ -13,7 +13,7 @@ public override void SetDefaults() Item.width = 34; Item.height = 18; Item.value = CalamityGlobalItem.RarityPinkBuyPrice; - Item.defense = 16; + Item.defense = 10; Item.rare = ItemRarityID.Pink; } From e010a75746c6803ebe83865af77ee21c4b4a4f53 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:50:16 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Armor/AzafureT3/AcropolisHeavyHelmet.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Content/Items/Armor/AzafureT3/AcropolisHeavyHelmet.cs b/Content/Items/Armor/AzafureT3/AcropolisHeavyHelmet.cs index 191e14b3e..aa90cea3a 100644 --- a/Content/Items/Armor/AzafureT3/AcropolisHeavyHelmet.cs +++ b/Content/Items/Armor/AzafureT3/AcropolisHeavyHelmet.cs @@ -27,7 +27,7 @@ public override void SetDefaults() Item.width = 28; Item.height = 30; Item.value = CalamityGlobalItem.RarityRedBuyPrice; - Item.defense = 32; + Item.defense = 22; Item.rare = ItemRarityID.Red; } @@ -48,8 +48,6 @@ public override void UpdateArmorSet(Player player) player.Entropy().NoAdrenalineTime = 1; player.maxMinions += 1; - player.GetDamage(DamageClass.Generic) += 0.15f; - player.GetCritChance(DamageClass.Generic) += 5f; player.noKnockback = true; var mp = player.GetModPlayer(); if (mp.MechFrame > 18) @@ -615,7 +613,7 @@ public void MechUpdate() { HarpoonDelay = 32; harpoon.PointAPos(Player.Calamity().mouseWorld, 1); - int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(3200))).ApplyAccArmorDamageBonus(Player); + int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(1500))).ApplyAccArmorDamageBonus(Player); Projectile.NewProjectile(Player.GetSource_FromThis(), harpoon.TopPos, harpoon.Seg2Rot.ToRotationVector2() * 48, ModContent.ProjectileType(), damage, 12, Player.whoAmI); } } @@ -636,7 +634,7 @@ public void MechUpdate() cannon.PointAPos(Player.Calamity().mouseWorld, 1); CEUtils.PlaySound("AcropolisShoot", Main.rand.NextFloat(0.8f, 1.2f), cannon.TopPos); ShootDelay = (int)(5f / Player.GetTotalAttackSpeed(Player.GetBestClass())); - int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(820))).ApplyAccArmorDamageBonus(Player); + int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(400))).ApplyAccArmorDamageBonus(Player); if(!Main.dedServ) { Gore.NewGoreDirect(Player.GetSource_FromThis(), cannon.TopPos - cannon.Seg2Rot.ToRotationVector2() * 46, Player.velocity + (cannon.Seg2Rot + Player.direction * -2.4f).ToRotationVector2() * 12 + CEUtils.randomPointInCircle(3), Mod.Find("AcropolisShell").Type).timeLeft = 0; @@ -649,7 +647,7 @@ public void MechUpdate() if (SlashP == 0 && ShootDelay <= 0) { SlashP += 0.01f; - int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(2800))).ApplyAccArmorDamageBonus(Player); + int damage = ((int)(Player.GetTotalDamage(Player.GetBestClass()).ApplyTo(1500))).ApplyAccArmorDamageBonus(Player); Projectile.NewProjectile(Player.GetSource_FromThis(), cannon.TopPos, cannon.Seg2Rot.ToRotationVector2() * 8, ModContent.ProjectileType(), damage, 10, Player.whoAmI); CEUtils.PlaySound("throw", Main.rand.NextFloat(1.2f, 1.5f), Player.Center, 10, 0.4f); @@ -876,11 +874,11 @@ public override void PostUpdateEquips() DeathExplosionCD--; if (ArmorSetBonus) { - Player.Entropy().moveSpeed += 0.2f; + Player.Entropy().moveSpeed += 0.1f; DurabilityRegenDelay--; if (DurabilityActive) { - Player.Entropy().EDamageReduce += durability * 0.32f; + Player.Entropy().EDamageReduce += durability * 0.24f; Player.statDefense += (int)(durability * 36); Player.noKnockback = true; } @@ -901,8 +899,8 @@ public override void PostUpdateEquips() } if (MechTrans) { - Player.Entropy().EDamageReduce += 0.45f; - Player.statDefense += 12; + Player.Entropy().EDamageReduce += 0.10f; + Player.statDefense += 15; Player.Entropy().FallSpeed += 0.5f; } } From f46d41576caec937eca5a49b72546037d75022f1 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:51:09 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs b/Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs index 5fc1d0ccf..78c806599 100644 --- a/Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs +++ b/Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs @@ -15,7 +15,7 @@ public override void SetDefaults() Item.width = 34; Item.height = 18; Item.value = CalamityGlobalItem.RarityRedBuyPrice; - Item.defense = 26; + Item.defense = 18; Item.rare = ItemRarityID.Red; } From 25c592021b456f3be4dd1dc6ddf0c843b6687853 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:51:30 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs b/Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs index a9f74d3d4..d73b5150c 100644 --- a/Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs +++ b/Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs @@ -15,7 +15,7 @@ public override void SetDefaults() Item.width = 42; Item.height = 30; Item.value = CalamityGlobalItem.RarityRedBuyPrice; - Item.defense = 32; + Item.defense = 24; Item.rare = ItemRarityID.Red; } From 5e466aad16b4074436b47ef8f3d9dda55f2d51ae Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 16:52:17 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E7=9B=94=E7=94=B2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Items/Armor/NihTwins/VoidEaterHelmet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Items/Armor/NihTwins/VoidEaterHelmet.cs b/Content/Items/Armor/NihTwins/VoidEaterHelmet.cs index 0b1d5d161..85ef19ea3 100644 --- a/Content/Items/Armor/NihTwins/VoidEaterHelmet.cs +++ b/Content/Items/Armor/NihTwins/VoidEaterHelmet.cs @@ -17,7 +17,7 @@ namespace CalamityEntropy.Content.Items.Armor.NihTwins public class VoidEaterHelmet : ModItem { public static int ShieldRecharge = 10 * 60; - public static int MaxShield = 150; + public static int MaxShield = 80; public static int LaserDamage = 250; public override void SetDefaults() { From e937f59435610b8c2353e866f47aa821b78b605c Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:02:10 +0800 Subject: [PATCH 23/31] =?UTF-8?q?buff=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/EDamageOverTimeNPC.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/EDamageOverTimeNPC.cs b/Common/EDamageOverTimeNPC.cs index c8643ee0f..97ebd20ec 100644 --- a/Common/EDamageOverTimeNPC.cs +++ b/Common/EDamageOverTimeNPC.cs @@ -15,7 +15,7 @@ public override void UpdateLifeRegen(NPC npc, ref int damage) npc.lifeRegen = 0; if (npc.HasBuff()) { - damageApply += 1600; + damageApply += 4500; } var dict = DotBuff.InstanceByType(); for(int i = 0; i < npc.buffType.Length; i++) From 71b61ef1679ac3cb301a776d62070b707e8eb541 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:03:49 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/EModPlayer.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Common/EModPlayer.cs b/Common/EModPlayer.cs index 7ec45da69..1ea764e93 100644 --- a/Common/EModPlayer.cs +++ b/Common/EModPlayer.cs @@ -1,4 +1,4 @@ -using CalamityEntropy.Common.LoreReworks; +using CalamityEntropy.Common.LoreReworks; using CalamityEntropy.Content.Buffs; using CalamityEntropy.Content.Cooldowns; using CalamityEntropy.Content.ILEditing; @@ -108,7 +108,6 @@ public void HealFloat(float amount) public bool oracleDeckInInv = false; public bool taintedDeckInInv = false; public bool hasSM = false; - public bool yuzuCheck = false; public bool summonerVF; public bool magiVF; public bool rogueVF; @@ -1847,9 +1846,9 @@ public override bool ConsumableDodge(Player.HurtInfo info) { immune = 45; MariviniumShieldCount--; - Player.Heal(140); + Player.Heal(100); CEUtils.PlaySound("crystalShieldBreak", 1, Player.Center, 1, 0.7f); - Player.AddBuff(ModContent.BuffType(), 300); + Player.AddBuff(ModContent.BuffType(), 600); for (int i = 0; i < 42; i++) { Dust.NewDust(Player.Center, 1, 1, DustID.BlueCrystalShard, Main.rand.NextFloat(-6, 6), Main.rand.NextFloat(-6, 6), Scale: 2); @@ -2512,7 +2511,7 @@ public override void PostUpdate() } if (Player.GetModPlayer().flag) { - Player.GetModPlayer().Cooldown = 158.ApplyCdDec(Player); + Player.GetModPlayer().Cooldown = 180.ApplyCdDec(Player); Player.GetModPlayer().flag = false; if (hasAccVisual(ShadeCloak.ID)) { @@ -3360,7 +3359,7 @@ public override void PostUpdate() } else { - int magiShieldAddCount = (int)(Player.statManaMax2 * 0.5f); + int magiShieldAddCount = (int)(Player.statManaMax2 * 0.25f); magiShieldCd = 30 * 60; if (MagiShield < magiShieldAddCount) { @@ -3896,10 +3895,8 @@ public override void SaveData(TagCompound tag) boost.AddWithCondition("CruiserLore", CruiserLoreBonus); boost.AddWithCondition("NihTwinLore", NihilityTwinLoreBonus); boost.AddWithCondition("ProphetLore", ProphetLoreBonus); - tag["EntropyBoosts"] = boost; tag["LoreEnabled"] = enabledLoreItems; - tag["yuzuCheck"] = yuzuCheck; if (EBookStackItems != null) { int BookMarks = EBookStackItems.Count; @@ -3972,8 +3969,7 @@ public override void LoadData(TagCompound tag) ProphetLoreBonus = boost.Contains("ProphetLore"); enabledLoreItems = [.. tag.GetList("LoreEnabled")]; EBookStackItems = new List(); - if (tag.TryGet("yuzuCheck", out bool yz)) - yuzuCheck = yz; + if (tag.ContainsKey("EntropyBookMarks")) { int BookMarks = (int)tag["EntropyBookMarks"]; @@ -3991,3 +3987,4 @@ public override void LoadData(TagCompound tag) } } } + From a33d3a9e81ecf648f6b3828d98acfd6ea1687f37 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:10:11 +0800 Subject: [PATCH 25/31] Update EModPlayer.cs --- Common/EModPlayer.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Common/EModPlayer.cs b/Common/EModPlayer.cs index 1ea764e93..003b6486d 100644 --- a/Common/EModPlayer.cs +++ b/Common/EModPlayer.cs @@ -1,4 +1,5 @@ -using CalamityEntropy.Common.LoreReworks; + +using CalamityEntropy.Common.LoreReworks; using CalamityEntropy.Content.Buffs; using CalamityEntropy.Content.Cooldowns; using CalamityEntropy.Content.ILEditing; @@ -108,6 +109,7 @@ public void HealFloat(float amount) public bool oracleDeckInInv = false; public bool taintedDeckInInv = false; public bool hasSM = false; + public bool yuzuCheck = false; public bool summonerVF; public bool magiVF; public bool rogueVF; @@ -3895,8 +3897,10 @@ public override void SaveData(TagCompound tag) boost.AddWithCondition("CruiserLore", CruiserLoreBonus); boost.AddWithCondition("NihTwinLore", NihilityTwinLoreBonus); boost.AddWithCondition("ProphetLore", ProphetLoreBonus); + tag["EntropyBoosts"] = boost; tag["LoreEnabled"] = enabledLoreItems; + tag["yuzuCheck"] = yuzuCheck; if (EBookStackItems != null) { int BookMarks = EBookStackItems.Count; @@ -3969,7 +3973,8 @@ public override void LoadData(TagCompound tag) ProphetLoreBonus = boost.Contains("ProphetLore"); enabledLoreItems = [.. tag.GetList("LoreEnabled")]; EBookStackItems = new List(); - + if (tag.TryGet("yuzuCheck", out bool yz)) + yuzuCheck = yz; if (tag.ContainsKey("EntropyBookMarks")) { int BookMarks = (int)tag["EntropyBookMarks"]; @@ -3987,4 +3992,3 @@ public override void LoadData(TagCompound tag) } } } - From 865e20f1ea4e2e115655130903b7d1ba00e90a0a Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:11:20 +0800 Subject: [PATCH 26/31] =?UTF-8?q?buff=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/EGlobalNPC.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/EGlobalNPC.cs b/Common/EGlobalNPC.cs index ebd4bac16..02c27079a 100644 --- a/Common/EGlobalNPC.cs +++ b/Common/EGlobalNPC.cs @@ -143,7 +143,7 @@ public static float DamageReduceMult(NPC npc) mult = 0; if (npc.HasBuff()) - mult -= 0.65f; + mult -= 0.35f; return mult; } From 2d9fb21ef8f3385f0e67e96ae7726998c7dbca67 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:12:03 +0800 Subject: [PATCH 27/31] =?UTF-8?q?buff=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Buffs/SoulDisorder.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content/Buffs/SoulDisorder.cs b/Content/Buffs/SoulDisorder.cs index 0c4bef9a1..39ada3999 100644 --- a/Content/Buffs/SoulDisorder.cs +++ b/Content/Buffs/SoulDisorder.cs @@ -27,10 +27,10 @@ public override void ModifyIncomingHit(NPC npc, ref NPC.HitModifiers modifiers) { if (npc.HasBuff()) { - modifiers.ArmorPenetration += 50; - modifiers.FinalDamage *= 1.07f; + modifiers.ArmorPenetration += 15; + modifiers.FinalDamage *= 1.05f; } } } -} \ No newline at end of file +} From 1189cb79fc27ba5c245ca0fcd055f98247e04078 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:12:30 +0800 Subject: [PATCH 28/31] =?UTF-8?q?buff=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Buffs/VoidTouch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Buffs/VoidTouch.cs b/Content/Buffs/VoidTouch.cs index 94ee4708b..82d5b65dd 100644 --- a/Content/Buffs/VoidTouch.cs +++ b/Content/Buffs/VoidTouch.cs @@ -26,7 +26,7 @@ public override void Update(Player player, ref int buffIndex) { if (Main.GameUpdateCount % 20 == 0 && player.Entropy().voidResistance < 1) { - int dmg = (int)((1 - player.Entropy().voidResistance) * 15); + int dmg = (int)((1 - player.Entropy().voidResistance) * 12); player.statLife -= dmg; if (player.statLife <= dmg) { From 71706520353e1d7f797f0ccfc70d90d1260f3620 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:22:28 +0800 Subject: [PATCH 29/31] =?UTF-8?q?buff=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Buffs/AbyssalWrath.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/Buffs/AbyssalWrath.cs b/Content/Buffs/AbyssalWrath.cs index b91742f06..d2b322568 100644 --- a/Content/Buffs/AbyssalWrath.cs +++ b/Content/Buffs/AbyssalWrath.cs @@ -15,7 +15,7 @@ public override void SetStaticDefaults() public override void Update(Player player, ref int buffIndex) { - player.GetDamage(DamageClass.Generic) *= 2; + player.GetDamage(DamageClass.Generic) *= 1.5f; } } } From 0e94a5bb68da7b36f48c8df2adc61ae2e164e82f Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:31:35 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zh-Hans/Mods.CalamityEntropy.hjson | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Localization/zh-Hans/Mods.CalamityEntropy.hjson b/Localization/zh-Hans/Mods.CalamityEntropy.hjson index fb1ab58ff..53cb472e2 100644 --- a/Localization/zh-Hans/Mods.CalamityEntropy.hjson +++ b/Localization/zh-Hans/Mods.CalamityEntropy.hjson @@ -641,8 +641,8 @@ Items: { DisplayName: 圣洁月光 Tooltip: ''' - +10%魔法伤害 - 每三十秒获得一个魔力护盾，数值等同于魔力上限的50%， + +15%魔法伤害 + 每三十秒获得一个魔力护盾，数值等同于魔力上限的25%， 魔力护盾存在期间增加10%移动速度并降低10%魔力消耗， 护盾会对触碰到的敌人造成伤害， 魔力护盾被击破时消除自身魔力病减益并回满魔力值， @@ -843,7 +843,7 @@ Items: { Tooltip: ''' 给予你40%的额外魔力 - 每1点额外魔力提供0.1%魔法伤害加成 + 每1点额外魔力提供0.15%魔法伤害加成 ''' DisplayName: 大魔导师手镜 } @@ -1571,7 +1571,7 @@ Items: { Tooltip: ''' 增加15%伤害和暴击率 - 增加250点最大魔力值 + 使你能在深渊正常呼吸 ''' } @@ -1582,7 +1582,7 @@ Items: { ''' 增加20%伤害和暴击率 增加30%近战攻速 - 增加250点最大生命值 + 增加200点最大生命值和最大魔力值 ''' } @@ -1592,7 +1592,7 @@ Items: { ''' 大幅提升移动速度 减少20%魔力消耗 - 增加20%伤害和5%暴击率 + 增加15%伤害和5%暴击率 ''' } @@ -4082,16 +4082,16 @@ MariviniumSet: ''' 增加10%伤害减免并降低20%接触伤害 增加10最大仆从栏位，100%召唤伤害与5%召唤暴击率 - 给予玩家50点护甲穿透和135点潜行值 + 给予玩家135点潜行值 站立不动回复大量生命值 免疫绝大多数的减益 - 使用真近战武器时增加15%伤害减免和25防御 + 使用真近战武器时增加10%伤害减免和15防御 召唤师使用鞭子类武器获得额外辅助性加成 盗贼潜伏攻击有几率产生高伤害的水爆炸 - 获得2层可以抵挡伤害的护盾，第一层护盾恢复需要20秒的时间，第二层需要10秒 - 护盾破损会让玩家回复140点生命值，同时获得5秒“深渊狂怒”增益，增加100%伤害 + 获得2层可以抵挡伤害的护盾，第一层护盾恢复需要30秒的时间，第二层需要15秒 + 护盾破损会让玩家回复100点生命值，同时获得10秒“深渊狂怒”增益，增加50%伤害 护盾不会抵御造成伤害低于5%最大生命值的攻击 ''' DeathMode: 死亡模式 @@ -4870,7 +4870,7 @@ Buffs: { } AbyssalWrath: { - Description: 伤害翻倍 + Description: 伤害提升 DisplayName: 深渊狂怒 } @@ -5904,7 +5904,7 @@ AzafureSet: ''' 穿着此盔甲时所有阿萨福勒装备将获得部分强化 将肾上腺素替换为耐力条 - 耐力条会为你提供至多12点护甲与25%伤害减免，同时减慢你的移动速度 + 耐力条会为你提供至多12点护甲与16%伤害减免，同时减慢你的移动速度 在受到伤害时会根据伤害值扣除耐力，耐力减少同时会使你的防御和减伤暂时降低 耐力会在受击5秒后缓慢回复 当耐力清空时会失效，并需要一段时间重新启用 @@ -5914,20 +5914,20 @@ AzafureSet2: ''' 穿着此盔甲时所有阿萨福勒装备将获得部分强化 将肾上腺素替换为耐力条 - 耐力条会为你提供至多24点护甲与30%伤害减免 + 耐力条会为你提供至多24点护甲与20%伤害减免 在受到伤害时会根据伤害值扣除耐力，耐力减少同时会使你的防御和减伤暂时降低 耐力会在受击5秒后缓慢回复 当耐力清空时会失效，并需要一段时间重新启用 死亡后产生威力巨大的爆炸 提供80点潜行值 - 增加20%移动速度和1最大仆从栏位 + 增加10%移动速度和1最大仆从栏位 ''' AzafureSet3: ''' 免疫摔落伤害 穿着此盔甲时所有阿萨福勒装备将获得部分强化 将肾上腺素替换为耐力条 - 耐力条会为你提供至多36点护甲与32%伤害减免 + 耐力条会为你提供至多36点护甲与24%伤害减免 在受到伤害时会根据伤害值扣除耐力，耐力减少同时会使你的防御和减伤暂时降低 耐力会在受击5秒后缓慢回复 当耐力清空时会失效，并需要一段时间重新启用 From 653590ab6def8d306825ac5832c3e767c8258490 Mon Sep 17 00:00:00 2001 From: Materialistic989286067 <3608728857@qq.com> Date: Mon, 9 Feb 2026 17:35:23 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Localization/en-US/Mods.CalamityEntropy.hjson | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Localization/en-US/Mods.CalamityEntropy.hjson b/Localization/en-US/Mods.CalamityEntropy.hjson index c3e4501ae..5015f5c28 100644 --- a/Localization/en-US/Mods.CalamityEntropy.hjson +++ b/Localization/en-US/Mods.CalamityEntropy.hjson @@ -628,8 +628,8 @@ Items: { DisplayName: Holy Moonlight Tooltip: ''' - +10% Magic Damage - Get a magic shield every thirty seconds, which is equivalent to 50% of the magic limit, + +15% Magic Damage + Get a magic shield every thirty seconds, which is equivalent to 25% of the magic limit, During the existence of the Magic Shield, increase movement speed by 10% and reduce magic consumption by 10%, The shield will deal damage to the enemies it touches, When the magic shield is broken, it eliminates its own magic sickness and benefits, and returns to its full magic value, @@ -794,7 +794,7 @@ Items: { Tooltip: ''' Gives you 40% extra mana - Every 1 extra mana provides 0.1% magic damage bonus + Every 1 extra mana provides 0.15% magic damage bonus ''' DisplayName: Archmage's Handmirror } @@ -1417,7 +1417,7 @@ Items: { ''' +15% Damage +15 Crit Chance - +250 Max Mana + Now you can breath in the abyss ''' } @@ -1429,7 +1429,8 @@ Items: { +20% Damage +20% Crit Chance +30% Melee Speed - +250 Max Life + +200 Max Life + +200 Max Mana ''' } @@ -1439,7 +1440,7 @@ Items: { ''' +30% Speed -20% Mana Cost - +20 Damage + +15% Damage +5 Crit Chance ''' } @@ -3833,16 +3834,14 @@ MariviniumSet: +100% Summon Damage +5% Summon Crit +10% Damage Reduce - +50 Armor Penetration - if your crit chance is over 100%, convert excess crit chance into damage bonus +135 Rogue Stealth When standing, increase life regen Immunity to most debuffs - When using true melee weapons, +15% Damage reduce and 25 defense + When using true melee weapons, +10% Damage reduce and 15 defense When using a whip, enhance summoner attributes Stealth strike has a probability of causing an water explosion - Obtain 2 layers of shields, which will take 20 seconds to recover after being shattered - After shield shattered, treat 140 health points and +100% damage for 5 seconds + Obtain 2 layers of shields, which will take 30 seconds to recover after being shattered + After shield shattered, treat 100 health points and +50% damage for 10 seconds ''' DeathMode: Death Mode CdMantle: Holy Mantle Cooldown @@ -5683,7 +5682,7 @@ AzafureSet: When this armor is equipped, all Azafure equipment receives partial enhancements Remove adrenaline and gains a Durability bar - The Durability bar provides up to 12 defense and 25% damage reduction, + The Durability bar provides up to 12 defense and 16% damage reduction, while slowing your movement speed Durability is consumed based on damage taken when hit Durability slowly regenerates 5 seconds after taking damage @@ -5694,12 +5693,12 @@ AzafureSet2: When this armor is equipped, all Azafure equipment receives partial enhancements Remove adrenaline and gains a Durability bar - The Durability bar provides up to 24 defense and 30% damage reduction + The Durability bar provides up to 24 defense and 20% damage reduction Durability is consumed based on damage taken when hit Durability slowly regenerates 5 seconds after taking damage When the Durability bar is depleted, it becomes inactive and requires time to restore functionality Provide 80 rogue stealth - +20% Movement speed and +1 Max minion + +10% Movement speed and +1 Max minion ''' AzafureSet3: ''' @@ -5707,7 +5706,7 @@ AzafureSet3: When this armor is equipped, all Azafure equipment receives partial enhancements Remove adrenaline and gains a Durability bar - The Durability bar provides up to 36 defense and 32% damage reduction + The Durability bar provides up to 36 defense and 24% damage reduction Durability is consumed based on damage taken when hit Durability slowly regenerates 5 seconds after taking damage When the Durability bar is depleted, it becomes inactive and requires time to restore functionality