Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
95c30cb
boss适配
Materialistic989286067 Feb 9, 2026
dd66cc8
boss适配
Materialistic989286067 Feb 9, 2026
ca692b7
boss适配
Materialistic989286067 Feb 9, 2026
188fa9c
boss适配
Materialistic989286067 Feb 9, 2026
f5f9123
饰品适配
Materialistic989286067 Feb 9, 2026
12acbb8
饰品适配
Materialistic989286067 Feb 9, 2026
7ff8358
饰品适配
Materialistic989286067 Feb 9, 2026
a5fec7d
饰品适配
Materialistic989286067 Feb 9, 2026
4b7c3bd
饰品适配
Materialistic989286067 Feb 9, 2026
4251a23
饰品适配
Materialistic989286067 Feb 9, 2026
2fe65b9
饰品适配
Materialistic989286067 Feb 9, 2026
2e7feae
盔甲适配
Materialistic989286067 Feb 9, 2026
8b6e970
盔甲适配
Materialistic989286067 Feb 9, 2026
c8c3cee
盔甲适配
Materialistic989286067 Feb 9, 2026
33d8ae5
盔甲适配
Materialistic989286067 Feb 9, 2026
1ccd1ba
盔甲适配
Materialistic989286067 Feb 9, 2026
44c9ea6
盔甲适配
Materialistic989286067 Feb 9, 2026
f9b9209
盔甲适配
Materialistic989286067 Feb 9, 2026
e010a75
盔甲适配
Materialistic989286067 Feb 9, 2026
f46d415
盔甲适配
Materialistic989286067 Feb 9, 2026
25c5920
盔甲适配
Materialistic989286067 Feb 9, 2026
5e466aa
盔甲适配
Materialistic989286067 Feb 9, 2026
e937f59
buff适配
Materialistic989286067 Feb 9, 2026
71b61ef
适配
Materialistic989286067 Feb 9, 2026
a33d3a9
Update EModPlayer.cs
Materialistic989286067 Feb 9, 2026
865e20f
buff适配
Materialistic989286067 Feb 9, 2026
2d9fb21
buff适配
Materialistic989286067 Feb 9, 2026
1189cb7
buff适配
Materialistic989286067 Feb 9, 2026
7170652
buff适配
Materialistic989286067 Feb 9, 2026
0e94a5b
文本
Materialistic989286067 Feb 9, 2026
653590a
文本
Materialistic989286067 Feb 9, 2026
f3cac14
Merge branch 'WarmurCle:master' into master
Materialistic989286067 Feb 9, 2026
ae780b9
Merge branch 'WarmurCle:master' into master
Materialistic989286067 Feb 9, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common/EDamageOverTimeNPC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public override void UpdateLifeRegen(NPC npc, ref int damage)
npc.lifeRegen = 0;
if (npc.HasBuff<LifeOppress>())
{
damageApply += 1600;
damageApply += 4500;
}
var dict = DotBuff.InstanceByType();
for(int i = 0; i < npc.buffType.Length; i++)
Expand Down
2 changes: 1 addition & 1 deletion Common/EGlobalNPC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public static float DamageReduceMult(NPC npc)
mult = 0;

if (npc.HasBuff<LifeOppress>())
mult -= 0.65f;
mult -= 0.35f;

return mult;
}
Expand Down
9 changes: 5 additions & 4 deletions Common/EModPlayer.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

using CalamityEntropy.Common.LoreReworks;
using CalamityEntropy.Content.Buffs;
using CalamityEntropy.Content.Cooldowns;
Expand Down Expand Up @@ -1847,9 +1848,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<AbyssalWrath>(), 300);
Player.AddBuff(ModContent.BuffType<AbyssalWrath>(), 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);
Expand Down Expand Up @@ -2512,7 +2513,7 @@ public override void PostUpdate()
}
if (Player.GetModPlayer<SCDashMP>().flag)
{
Player.GetModPlayer<SCDashMP>().Cooldown = 158.ApplyCdDec(Player);
Player.GetModPlayer<SCDashMP>().Cooldown = 180.ApplyCdDec(Player);
Player.GetModPlayer<SCDashMP>().flag = false;
if (hasAccVisual(ShadeCloak.ID))
{
Expand Down Expand Up @@ -3360,7 +3361,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)
{
Expand Down
2 changes: 1 addition & 1 deletion Content/Buffs/AbyssalWrath.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
6 changes: 3 additions & 3 deletions Content/Buffs/SoulDisorder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ public override void ModifyIncomingHit(NPC npc, ref NPC.HitModifiers modifiers)
{
if (npc.HasBuff<SoulDisorder>())
{
modifiers.ArmorPenetration += 50;
modifiers.FinalDamage *= 1.07f;
modifiers.ArmorPenetration += 15;
modifiers.FinalDamage *= 1.05f;
}
}
}

}
}
2 changes: 1 addition & 1 deletion Content/Buffs/VoidTouch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Accessories/AzafureChargeShield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<DarkOrange>();
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Accessories/AzafureDetectionEquipment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
8 changes: 4 additions & 4 deletions Content/Items/Accessories/AzafureDriverCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Accessories/CelestialRing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Turquoise>();
Expand Down
5 changes: 3 additions & 2 deletions Content/Items/Accessories/ExquisiteCrown.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using CalamityMod.Items;
using CalamityMod.Items;
using CalamityMod.Particles;
using System.Collections.Generic;
using Terraria;
Expand All @@ -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;
Expand Down Expand Up @@ -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<CrownRubyProj>(), dmg, 6, player.whoAmI);
CEUtils.PlaySound("soulshine", Main.rand.NextFloat(0.6f, 1), Projectile.Center, 60, 0.5f);
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Accessories/OdinsRefuge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public override void SetDefaults()
Item.value = CalamityGlobalItem.RarityTurquoiseBuyPrice;
Item.rare = ModContent.RarityType<Turquoise>();
Item.accessory = true;
Item.defense = 30;
Item.defense = 24;

}

Expand Down
15 changes: 8 additions & 7 deletions Content/Items/Accessories/VoidCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<VoidPurple>();
}
Expand Down Expand Up @@ -84,7 +85,7 @@ public class VoidCoreDash : PlayerDashEffect

public override float CalculateDashSpeed(Player player)
{
return 38f;
return 26f;
}

public override void OnDashEffects(Player player)
Expand Down Expand Up @@ -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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Armor/Azafure/AzafureHeavyHelmet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Armor/Azafure/AzafureSteamKnightArmor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions Content/Items/Armor/Azafure/AzafureSteamKnightHelmet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Armor/Azafure/AzafureSteamKnightLeggings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Armor/AzafureT3/AcropolisHeavyArmor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
18 changes: 8 additions & 10 deletions Content/Items/Armor/AzafureT3/AcropolisHeavyHelmet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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<AcropolisArmorPlayer>();
if (mp.MechFrame > 18)
Expand Down Expand Up @@ -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<AcropolisHarpoon>(), damage, 12, Player.whoAmI);
}
}
Expand All @@ -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<ModGore>("AcropolisShell").Type).timeLeft = 0;
Expand All @@ -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<AcropolisSlash>(), damage, 10, Player.whoAmI);

CEUtils.PlaySound("throw", Main.rand.NextFloat(1.2f, 1.5f), Player.Center, 10, 0.4f);
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Armor/AzafureT3/AcropolisHeavyLegArmor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 1 addition & 2 deletions Content/Items/Armor/Marivinium/MariviniumBodyArmor.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using CalamityEntropy.Content.Rarities;
using CalamityEntropy.Content.Rarities;
using CalamityEntropy.Content.Tiles;
using CalamityMod.Items;
using CalamityMod.Items.Armor.OmegaBlue;
Expand All @@ -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()
Expand Down
Loading
Loading