Skip to content

CalClone's arena now scales for Boss Rush #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FounderSqueaker wants to merge 1 commit into
base: 1.4.4
Choose a base branch
from
Open

CalClone's arena now scales for Boss Rush #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions NPCs/CalClone/CalamitasClone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public static Vector4 GetArenaSize(bool brothersActive = false, float lifeRatio
baseSize *= 1.25f;
if (NPC.AnyNPCs(ModContent.NPCType<SoulSeeker>()))
baseSize *= new Vector4(1.5f, 0.75f, 1.5f, 0.75f);
if (!CalamityWorld.death)
if (!(CalamityWorld.death || BossRushEvent.BossRushActive))
baseSize *= 1.25f;
if (lifeRatio < 0.1f && !inBulletHell && CalamityWorld.death)
if (lifeRatio < 0.1f && !inBulletHell && (CalamityWorld.death || BossRushEvent.BossRushActive))
baseSize *= MathHelper.Lerp(Main.getGoodWorld ? 0.22f : 0.4f, 1f, lifeRatio * 10f); // Scale down the lower health calclone has. Much lower bound on FTW.

return baseSize + new Vector4(-22, 0, 22, 0);
Expand Down