Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
421 commits
Select commit Hold shift + click to select a range
a585cf5
Cirrus now sells the Interlude Music Boxes.
Ozzatron May 31, 2024
0a3090e
Disabled Gimme Swag Plushie Campaign message. Removed unused Music Mo…
Ozzatron May 31, 2024
8ffc6d9
Crab fix and targeting change.
mountaindrew10 May 31, 2024
e776e6d
Updated Cryogen targeting.
mountaindrew10 May 31, 2024
9a5906e
Fixed leviathan Ambergris knockback
Xyk475 May 31, 2024
382b874
Aquatic Scourge, Brimstone Elemental, and Cal Clone targeting changes.
mountaindrew10 Jun 1, 2024
1ac2092
Safer music box locating for Cirrus' shop
apotofkoolaid May 31, 2024
524af51
Slab Crabs cannot spawn (#42)
serpensta Jun 1, 2024
95bcc71
612 actually shows up on Respiteblock
Altixal Jun 1, 2024
4825a2a
respiteblock balancing... as a tool
Altixal Jun 1, 2024
6ef43dd
accidentally snuck the dll during mod load oops
Altixal Jun 1, 2024
38103ea
a little faster actually
Altixal Jun 1, 2024
541e6c4
Removed funky line in summon weapons.
Mr-Memes Jun 1, 2024
20b3a09
1 - Reimplementation of Cirrus Candles as permanent buff stations.
Ozzatron May 31, 2024
9f4d3e2
Yellow Candle now applies to projectiles, no longer restricted to Use…
Ozzatron Jun 1, 2024
882ad61
1 - Nerfed Yellow Candle from 1.07x to 1.04x but it ignores DR again …
Ozzatron Jun 1, 2024
71da0a3
Reverted Pink Candle buff from 0.6% HP/s to 0.4% HP/s
Ozzatron Jun 1, 2024
ebb57d6
Spiteful Candle buff
CongratsIsTrash Jun 1, 2024
9267575
Version bump
mountaindrew10 Jun 1, 2024
adb3e7b
Fixed Spiteful Candle's tooltip
CongratsIsTrash Jun 2, 2024
c140748
Pretty sure this is everything.
mountaindrew10 Oct 17, 2024
90b92f8
Pretty sure this is everything, once again. I'll release this in an h…
mountaindrew10 Nov 1, 2024
8b13708
CalamityNetImportantNPC now uses Attribute.
mountaindrew10 Nov 1, 2024
425dcea
Abyss Layer 4 lag hell fix.
mountaindrew10 Nov 1, 2024
b68469a
Remnants compatibility for the old Sunken Sea. It will now be centere…
Ozzatron Nov 4, 2024
69e399c
1 - Removed Bird/Mr.Small references.
mountaindrew10 Dec 2, 2024
d4194df
Rain stoppage.
mountaindrew10 Dec 7, 2024
487ed5c
A ton of minor tooltip and localization fixes
CongratsIsTrash Dec 27, 2024
31bfc92
1 - Fixed Artemis and Apollo charge telegraphs not appearing
CongratsIsTrash Jan 3, 2025
970450b
Removed "Markie" Arms Dealer name
CongratsIsTrash Jan 6, 2025
dec4026
1 - Fixed Craw Carapace line thorns damage being able to hit invincib…
CongratsIsTrash Jan 31, 2025
f92ebe7
Final stuff from me: Secret seed things
CongratsIsTrash Jan 31, 2025
d04b128
Fixed Amalgam making buff duration flicker when using infinite buff f…
CongratsIsTrash Feb 10, 2025
f7e7331
1 - Removed Yharon plush promotional messages.
mountaindrew10 Feb 11, 2025
654d96b
Merge branch '1.4.4-release-patches' of https://github.com/CalamityTe…
mountaindrew10 Feb 11, 2025
1cc67ef
Version bump.
mountaindrew10 Feb 11, 2025
8debdd7
Final compile error fixes
CongratsIsTrash Feb 11, 2025
8690aa9
Merge of 1.4.4-release-patches branch into 1.4.4-release.
Ozzatron Feb 11, 2025
a07ce54
Minor description updates mirrored from dev branch
Ozzatron Feb 11, 2025
d0d6b3f
Pretty sure this is everything.
mountaindrew10 Oct 17, 2024
26b0688
Pretty sure this is everything, once again. I'll release this in an h…
mountaindrew10 Nov 1, 2024
9be25fd
CalamityNetImportantNPC now uses Attribute.
mountaindrew10 Nov 1, 2024
36bade6
Abyss Layer 4 lag hell fix.
mountaindrew10 Nov 1, 2024
0d37506
Remnants compatibility for the old Sunken Sea. It will now be centere…
Ozzatron Nov 4, 2024
ee80a44
1 - Removed Bird/Mr.Small references.
mountaindrew10 Dec 2, 2024
96ac614
Rain stoppage.
mountaindrew10 Dec 7, 2024
8dcbe75
1 - Removed Yharon plush promotional messages.
mountaindrew10 Feb 11, 2025
4adf1fd
A ton of minor tooltip and localization fixes
CongratsIsTrash Dec 27, 2024
a8cbf25
1 - Fixed Artemis and Apollo charge telegraphs not appearing
CongratsIsTrash Jan 3, 2025
113dcec
Removed "Markie" Arms Dealer name
CongratsIsTrash Jan 6, 2025
4cac806
1 - Fixed Craw Carapace line thorns damage being able to hit invincib…
CongratsIsTrash Jan 31, 2025
6c32d52
Final stuff from me: Secret seed things
CongratsIsTrash Jan 31, 2025
c848023
Fixed Amalgam making buff duration flicker when using infinite buff f…
CongratsIsTrash Feb 10, 2025
decce45
Version bump.
mountaindrew10 Feb 11, 2025
972e6de
Final compile error fixes
CongratsIsTrash Feb 11, 2025
0fbf36f
Minor description updates mirrored from dev branch
Ozzatron Feb 11, 2025
c7c6b5e
Add csproj file to interim branch
Ozzatron May 26, 2025
695b638
Removed Cirrus
GinYuH May 26, 2025
3c1a3f4
Supreme Ultramage Permafrost
GinYuH May 26, 2025
792495e
removed Crystal Heart Vodka
GinYuH May 26, 2025
6e1c917
Removed Cirrus Couch and Dress
GinYuH May 26, 2025
854adbb
Making all drinks craftable at kegs
sunny-raindrops May 26, 2025
f9d9f9c
Removed Cirrus flavor text for drinks
sunny-raindrops May 26, 2025
15e967e
Added homing Calamity projectiles to CultistIsResistantTo
CongratsIsTrash May 26, 2025
cf793b0
Mass fix batch #1
CongratsIsTrash May 26, 2025
50580e3
Mass fix batch #2
CongratsIsTrash May 26, 2025
c7450c5
Fix batch #3
CongratsIsTrash May 26, 2025
84bd8b5
Ampoule + Radiance life regen buff
CongratsIsTrash May 26, 2025
1ecefb0
coldheart hold tweaks
GinYuH May 26, 2025
b8e9d3d
Replace all alcohol buff icons to not have a unified pink background.…
Ozzatron May 26, 2025
ed8b3ee
removed Alicorn mount
GinYuH May 26, 2025
614d3aa
Pot of Pain internal rename
GinYuH May 26, 2025
538b8e6
alicorn remnants
GinYuH May 26, 2025
064ecf2
Merge branch '1.4.4-interim' into Cirrus-erasure
GinYuH May 26, 2025
98af1dd
cirrus dress vestiges
GinYuH May 26, 2025
026f80d
...Ozzathoth.
GinYuH May 26, 2025
36eac4e
candle localization fix
GinYuH May 27, 2025
011b83a
Milkshake, Shroom, and Candle redistribution
GinYuH May 27, 2025
50b34fe
Slight update to the Old Fashioned icon by Dia
Ozzatron May 27, 2025
d9ff93a
Change TML build metadata author to The Calamity Dev Team
Ozzatron May 27, 2025
a734752
renamed Fabsol's Vodka, princess sells boxes
GinYuH May 27, 2025
baf68bc
Mirror removals of dedicated items on main branch (Scarlet Devil is p…
Ozzatron May 27, 2025
0c23147
No thank you!
GinYuH May 27, 2025
edc488c
Fixed Purple Haze buff localization
CongratsIsTrash May 27, 2025
2b7fd1c
what + lava chicken
GinYuH May 28, 2025
4ffb557
remove haze tip
GinYuH May 28, 2025
9c73477
Purge of B00BA5
Altixal May 28, 2025
e7674bd
Supreme Permafrost projectile names
Ozzatron May 28, 2025
a6b8250
Merge (Interim branch): Cirrus erasure
Ozzatron May 28, 2025
c4d71a5
Moved donor chat to Brimstone Witch
CongratsIsTrash May 27, 2025
e066ecd
OUR mod.
Altixal May 28, 2025
02cb78e
Merge branch '1.4.4-interim' of https://github.com/CalamityTeam/Calam…
Altixal May 28, 2025
cb741f1
Removed trace comments
Altixal May 28, 2025
1452ccf
Wings of Rebirth code
GinYuH May 28, 2025
af2a977
Wings of Rebirth sprites
GinYuH May 28, 2025
c790146
removed stink potion sell for consistency
GinYuH May 28, 2025
5f256bf
Sylvestaff (#89)
LucilleKarma May 28, 2025
0e6174b
Two Sylvestaff fixes
CongratsIsTrash May 29, 2025
7ffce47
Also made it not use mana from spawning holdout
CongratsIsTrash May 29, 2025
3bd4d03
Princess no longer misgenders Bandit
CongratsIsTrash May 30, 2025
6f2c7e4
Buzzkill
CongratsIsTrash May 28, 2025
b22a4ac
Superradiant Slaughterer
CongratsIsTrash May 28, 2025
5bed030
Rewritten tooltips
CongratsIsTrash May 29, 2025
91eacad
Sup Sl tol clr
CongratsIsTrash May 29, 2025
b2234be
Super Slau uses Galac Sing for consistency with public elemental set
CongratsIsTrash May 29, 2025
39ee2da
Changed texture to Sylvestaff
CongratsIsTrash May 30, 2025
8c388f1
Fuck me I forgot player Laceration draw effects
CongratsIsTrash May 30, 2025
2a97528
Remove old Patreon from README and GitHub funding hook (interim)
Ozzatron May 30, 2025
d6e458a
Version bump to 2.0.5 (Permanently discarding 4th number)
Ozzatron May 30, 2025
95c7e0d
Fixed Sylvestaff displaying 0 mana cost in its tooltip
CongratsIsTrash May 30, 2025
c70ff68
Sulphurous Sea Rain theme code for interim
apotofkoolaid May 30, 2025
b0fa931
Add new Patreon link to GitHub
Ozzatron May 31, 2025
9cda8f5
Thank You dev changes
CongratsIsTrash May 31, 2025
0ed5329
Old Fashioned resprite
CongratsIsTrash Jun 1, 2025
2c1f8b7
sylvestaff sound updates
GinYuH Jun 1, 2025
e24ffff
remove lillies' dedicated rarity
GinYuH Jun 1, 2025
f51931a
miniboss demotions
Altixal Jun 1, 2025
a8f7f21
oh wait its here too
Altixal Jun 1, 2025
a0eb720
Port recent NPC Patreon names to hotfix
Ozzatron Jun 1, 2025
cc99a85
Add Bandit name Ishmael for donor (interim)
Ozzatron Jun 1, 2025
b587969
1 - Fix Calamitas' donor name recital. (INTERIM)
Ozzatron Jun 1, 2025
29e78c5
Change Cyborg donor name XL-39 Nemesis to Nemesis at donor request
Ozzatron Jun 1, 2025
290358c
What a Calamity Hotfix merge to public release branch
Ozzatron Jun 1, 2025
760b782
What a Calamity Hotfix merge (actually this time)
Ozzatron Jun 1, 2025
dacb2a7
Some NPC.HitModifiers.SourceDamage patches:
Habble53 Oct 14, 2025
0d3eb42
delete broken & unnecessary IL edit
Ozzatron Oct 26, 2025
8d27082
version bump, title change for temporary preview build
Ozzatron Oct 26, 2025
24a11d2
remove name change because that's not how that works
Ozzatron Oct 26, 2025
5979138
Removed the Drunk Princess game tip
CongratsIsTrash Oct 27, 2025
c74b3a7
Fixed Flight Bar config item icon
CongratsIsTrash Oct 27, 2025
5cb32fd
Fixed Buzzkill firing multiple saws in multiplayer
CongratsIsTrash Oct 27, 2025
2161d19
Fixed Sup Slaughterer bug
CongratsIsTrash Oct 27, 2025
e2a1608
1 - Fixed Coin of Deceit tooltip
CongratsIsTrash Oct 27, 2025
7752d55
Fixed Lava Slime config
CongratsIsTrash Oct 27, 2025
d6bd9c6
Several boss fixes:
CongratsIsTrash Oct 27, 2025
07bd5ee
Fixed cooldown end sounds being audible through the entire world
CongratsIsTrash Oct 27, 2025
c4893f5
Fixed Chalice causing more things to not proc
CongratsIsTrash Oct 27, 2025
8969917
Updated Thank You
CongratsIsTrash Oct 27, 2025
f19c45b
Updated Brimstone Witch donor list
CongratsIsTrash Oct 27, 2025
7b67235
Updated donor Town NPC names
CongratsIsTrash Oct 27, 2025
d4e9139
Apparently "Vorbis" is in the donor list twice
CongratsIsTrash Oct 27, 2025
3daaa41
Oops it's Angel Wings
CongratsIsTrash Oct 27, 2025
dc911ca
Fixed mistakes I made with donor names
CongratsIsTrash Oct 27, 2025
9f56a9b
Fixed stealth bar saying stealth increases crit
CongratsIsTrash Oct 27, 2025
3fc0cb5
Updated donor list
CongratsIsTrash Oct 28, 2025
11369d5
Fixed Difficulty Indicator text going beyond the bounds of the box
CongratsIsTrash Oct 29, 2025
cfc9ddc
Version bump to 2.0.6.1 (sadly required)
Ozzatron Oct 30, 2025
95a21d0
fixed frame 1 was never shown in wings of rebirth's animation
DimHaze Oct 27, 2025
db16ba4
fixed the visuals of Auralis' aurora never worked
DimHaze Oct 28, 2025
da19025
fixed world ore type-based systems never worked
DimHaze Oct 30, 2025
61d1ca4
fixed reflect dodges using a wrong incoming damage
DimHaze Nov 1, 2025
d3b11c5
Fixed enjoying rage benefits from Gael's greatsword without holding it
DimHaze Nov 1, 2025
6721d44
SpawnBlocker effect now sync properly
Flowaria Nov 1, 2025
8f8afa5
Using Straightforward tooltip for SpawnBlockers
Flowaria Nov 1, 2025
49a0540
Version bump to 2.0.6.2. Last patch release for TML 1.4.4.
Ozzatron Nov 1, 2025
99f42f1
Public 2.0.6.2 release, merge of public repo commits
Ozzatron Nov 1, 2025
a27a746
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Nov 3, 2025
2af0577
Fix: AnySolidTileInSelection always returns false due to inverted log…
CactusDuper Nov 13, 2025
91f71ea
Fix Aureate Booster and MOAB playing wing flap sounds (#90)
adsuth Nov 13, 2025
c9b7fa4
Fix inconsistent spacing for tooltip of the biome blade (and variants…
adsuth Nov 13, 2025
70e56bd
Fix: Remove ManagedTargets reinitialization in OnModLoad (#93)
WxoGit Nov 13, 2025
49429af
Kill Chronomancer's Scythe projectiles on casters death (#92)
adsuth Nov 13, 2025
44eeae6
Safety check
Habble53 Nov 17, 2025
ab45b7b
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Nov 17, 2025
4e376c4
Removed Seared Pan
CongratsIsTrash Nov 22, 2025
92bd7c4
Updated Thank You for all dev changes
CongratsIsTrash Nov 22, 2025
b8bfef1
Reverted Gold Chest Meteorite Bar fix
CongratsIsTrash Nov 22, 2025
86d6167
Pharaoh's set returns to pyramids
CongratsIsTrash Nov 22, 2025
c715526
Striking Moment no longer gets removed if not holding Brand of the In…
CongratsIsTrash Nov 22, 2025
96fdde5
Vents no longer fire steam while a boss is alive
CongratsIsTrash Nov 22, 2025
54a0de8
All sentries have "Summons a sentry" tooltip line
CongratsIsTrash Nov 22, 2025
7a88f40
Fixed jelly auras not triggering with Display Vanilla Cooldowns confi…
CongratsIsTrash Nov 22, 2025
eb42b0d
Fixed Astral Infection giving 5% flight time
CongratsIsTrash Nov 22, 2025
911f177
Fixed Dragon Rage spawning fireballs every eleven hits instead of ten
CongratsIsTrash Nov 22, 2025
9050179
Fixed Gauss Dagger not requiring the schematic to craft
CongratsIsTrash Nov 22, 2025
b9ddd96
Fixed Harvest Staff not having minion targeting
CongratsIsTrash Nov 22, 2025
7a0d2bb
Removed a period from Plague Reaper armor tooltip
CongratsIsTrash Nov 22, 2025
5ffa1e3
Fixed VHex lasting half the intended duration on enemies
CongratsIsTrash Nov 22, 2025
934a5f6
Fixed typo in text when unable to decrypt a schematic
CongratsIsTrash Nov 22, 2025
314368a
Removed remaining instances from repo
CongratsIsTrash Nov 20, 2025
9f54c4e
Fixed Abyssal Warhammer missing pixels
CongratsIsTrash Nov 22, 2025
60bc158
Restored Sans Undertale with different dedication
CongratsIsTrash Nov 20, 2025
064215c
Merge branch '1.4.4-release-deshayy-hotfix' of https://github.com/Cal…
Altixal Nov 22, 2025
2fb7067
Fixed stray pixel in Photosynthesis
CongratsIsTrash Nov 22, 2025
884b179
manually edited donator list in CalamityLists
Altixal Nov 22, 2025
1ccd3d6
Fixed Vivid Clarity explosions having wrong damage type
CongratsIsTrash Nov 22, 2025
6f955e7
Fixed structures not being properly protected from Fargo's Mutant items
CongratsIsTrash Nov 22, 2025
077d9c7
Fixed Brimflame Frenzy using the wrong sound
CongratsIsTrash Nov 22, 2025
3497995
Merge branch '1.4.4-release-deshayy-hotfix' of https://github.com/Cal…
CongratsIsTrash Nov 22, 2025
af0952f
Fixed Draedon bursting into gores even if not attacked
CongratsIsTrash Nov 22, 2025
4c045bb
Fixed a boatload of holdouts not having owner checks for multiplayer
CongratsIsTrash Nov 22, 2025
0549b60
Fixed Wulfrum Treasure Pinger lighting
CongratsIsTrash Nov 22, 2025
21085e9
Added new donor town NPC names
CongratsIsTrash Nov 22, 2025
73bab62
Fixed Skyline Wings horizontal flight speed being hardcapped
CongratsIsTrash Nov 22, 2025
3645027
Deerclops screenshake is now affected by our screenshake config
CongratsIsTrash Nov 22, 2025
e0b9447
Unstrawberried Brimstone Witch
CongratsIsTrash Nov 22, 2025
31d4864
Liquid Edits Rewrite (#52)
Lion8cake Aug 28, 2024
6494ca4
Manual fixes to the rewrite
Altixal Nov 22, 2025
338d5b4
cleanup on aisle local variable
Altixal Nov 10, 2025
7c7838a
Fixed Infinity and Svantechnical right clicks breaking certain bullets
CongratsIsTrash Nov 22, 2025
5c9ba01
Fixed Infinity and Svantechnical not stating their chance to not cons…
CongratsIsTrash Nov 22, 2025
e08e70e
Fixed GSD not properly cleansing debuffs or preventing negative life …
CongratsIsTrash Nov 22, 2025
ee235b4
Fixed Fiery Draconid buff still giving life regen
CongratsIsTrash Nov 22, 2025
263135b
Fixed some buffs having corners on their buff icon
CongratsIsTrash Nov 22, 2025
557d69f
Fixed Draedon's Forge recipe unlock not being triggered when used wit…
CongratsIsTrash Nov 22, 2025
1d9878d
Betsy's Curse no longer reduces enemy DR
CongratsIsTrash Nov 22, 2025
4cb248c
Removed all vanilla item auto-use tweaks
CongratsIsTrash Nov 22, 2025
faf3d7c
Shredder is also missing ammo saving tooltip
CongratsIsTrash Nov 22, 2025
8b93e49
Split client and server configs
CongratsIsTrash Nov 22, 2025
a059666
Added VCMM status message config
CongratsIsTrash Nov 22, 2025
00c90ec
Removed Yharon plushie message localization
CongratsIsTrash Nov 22, 2025
c87e464
Fixed Mining armor's set bonus cooldown not working
CongratsIsTrash Nov 23, 2025
bd97996
Fixed Rusty Beacon Prototype not being classified as a sentry
CongratsIsTrash Nov 23, 2025
6146d72
GFB Aquatic Scourge poisoning nerf
CongratsIsTrash Nov 23, 2025
3c83fb6
The public shall no longer suffer through Oblivion
CongratsIsTrash Nov 24, 2025
8413d07
Fixed rippers persisting forever if Revengeance is toggled off while …
CongratsIsTrash Nov 24, 2025
6cc141c
Fixed LiquidDrawColors IL Edit
Flowaria Nov 25, 2025
f77d99a
Lantern Center syncing
Altixal Aug 10, 2024
4bc5a81
Plagued 'Bed' fixes
Altixal Aug 10, 2024
ac09e91
scope fix
Altixal Oct 8, 2025
abe6152
living fire tile drop fix
Altixal Oct 19, 2024
b78a390
fixed drill containment unit running CanUseItem by frame
Altixal Oct 14, 2024
12de8fd
merge gore
Altixal Nov 26, 2025
1eff672
Merged the three interlude configs
CongratsIsTrash Nov 26, 2025
5d15472
Sweeping changes to crate loot
CongratsIsTrash Nov 26, 2025
7a82749
Correct loot rule
CongratsIsTrash Nov 26, 2025
7e59c44
double correct
Altixal Nov 26, 2025
9513ea5
Version 2.0.7
Altixal Nov 26, 2025
ee78139
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Nov 26, 2025
68b083b
Fixed VCMM message spam
CongratsIsTrash Nov 26, 2025
6cf126c
2.0.7.1 version bump
Ozzatron Nov 27, 2025
13abe40
Fixed Type Casting Exception on CalamityModWaterStyle
Flowaria Nov 27, 2025
87035e5
Fixed IL code for stopping lava retro rendering
Lion8cake Nov 27, 2025
ce51e8d
Fixed CalamityModWaterStyle crashing the game
Lion8cake Nov 27, 2025
cf3930b
Capture and normal rendering fixes
Lion8cake Nov 27, 2025
497de3a
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Nov 27, 2025
62375b4
Fixed Lavafall Coloring to not be overly bright for 0 reason
Lion8cake Nov 27, 2025
1baa63f
Fixed Lava droplets being super bright for no reason
Lion8cake Nov 27, 2025
71dbc6c
Future proofed some IL edits
Lion8cake Nov 27, 2025
c30911b
Slight touch ups
Lion8cake Nov 27, 2025
66e7303
attempted fixes with vertex colors and slope rendering
Lion8cake Nov 27, 2025
457e06c
Merge branch 'LiquidEditFixes' into tomatliquidfix
steviegt6 Nov 27, 2025
525155b
merge flo's
Flowaria Nov 27, 2025
31d2915
Cleaning CalamityWaterLoader methods
Flowaria Nov 28, 2025
652e225
Added Base System for Modifying WaterFallAlpha
Flowaria Nov 28, 2025
1470f3d
Merge: Flo + Lion + Tomat liquid rendering fixes
Ozzatron Nov 28, 2025
3366c36
2.0.7.2 version bump
Ozzatron Nov 28, 2025
0b75b6d
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Nov 29, 2025
56b1e39
Updates to the Sulphurous bg and sky (#104)
Lion8cake Dec 25, 2025
2e41fa0
Merge branch 'CalamityTeam:1.4.4' into 1.4.4
Habble53 Jan 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
patreon: Fabsol
patreon: CalamityMod
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ cronpull.sh

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
*.csproj
*.sln

# User-specific files
Expand Down
75 changes: 68 additions & 7 deletions Backgrounds/SulphurSeaSurfaceBGStyle.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using Terraria.ModLoader;
using System;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Terraria;
using Terraria.Graphics.Effects;
using Terraria.ModLoader;

namespace CalamityMod.Backgrounds
{
public class SulphurSeaSurfaceBGStyle : ModSurfaceBackgroundStyle
{
public override int ChooseCloseTexture(ref float scale, ref double parallax, ref float a, ref float b)
{
b -= 100f;
return BackgroundTextureLoader.GetBackgroundSlot("CalamityMod/Backgrounds/BlankPixel");
}

public override void ModifyFarFades(float[] fades, float transitionSpeed)
{
//This just fades in the background and fades out other backgrounds.
Expand All @@ -33,5 +32,67 @@ public override void ModifyFarFades(float[] fades, float transitionSpeed)
}
}
}

public override int ChooseCloseTexture(ref float scale, ref double parallax, ref float a, ref float b)
{
return BackgroundTextureLoader.GetBackgroundSlot("CalamityMod/Backgrounds/SulphurSeaSurfaceClose");
}

public override bool PreDrawCloseBackground(SpriteBatch spriteBatch) //Taken from astral bg so the sulphur sea bg doesn't overlap other backgrounds
{
float screenOff = (float)AstralSurfaceBGStyle.screenOffField.GetValue(Main.instance);
float scAdj = (float)AstralSurfaceBGStyle.scAdjField.GetValue(Main.instance);
Color ColorOfSurfaceBackgroundsModified = (Color)AstralSurfaceBGStyle.COSBMAplhaField.GetValue(null);
bool canBGDraw = false;
if ((!Main.remixWorld || (Main.gameMenu && !WorldGen.remixWorldGen)) && (!WorldGen.remixWorldGen || !WorldGen.drunkWorldGen))
canBGDraw = true;
if (Main.mapFullscreen)
canBGDraw = false;
int offset = 30;
if (Main.gameMenu)
offset = 0;
if (WorldGen.drunkWorldGen)
offset = -180;
float surfacePosition = (float)Main.worldSurface;
if (surfacePosition == 0f)
surfacePosition = 1f;
float screenPosition = Main.screenPosition.Y + (float)(Main.screenHeight / 2) - 600f;
double backgroundTopMagicNumber = (0f - screenPosition + screenOff / 2f) / (surfacePosition * 16f);
float bgGlobalScaleMultiplier = 2f;
int pushBGTopHack;
int offset2 = -180;
int menuOffset = 0;
if (Main.gameMenu)
{
menuOffset -= offset2;
}
pushBGTopHack = menuOffset;
pushBGTopHack += offset;
pushBGTopHack += offset2; //Offsets to the background placement
if (canBGDraw) //If the background can draw (player is not in a remix world or is not in a map). This can probably be removed since backgrounds already go through these checks
{
var bgScale = 1.25f; //Scale of the furthest of the closest background layers
var bgParallax = 0.4; //The parallax of the background layer
var bgTopY = (int)(backgroundTopMagicNumber * 1800.0 + 1500.0) + (int)scAdj + pushBGTopHack; //the Y position of the background
bgScale *= bgGlobalScaleMultiplier; //Scale of the background
var bgWidthScaled = (int)((float)CalamityMod.SulphurSeaSurface.Width * bgScale); //The Width of the bg texture scaled to the correct size
SkyManager.Instance.DrawToDepth(Main.spriteBatch, 1.2f / (float)bgParallax);
var bgStartX = (int)(0.0 - Math.IEEERemainder((double)Main.screenPosition.X * bgParallax, bgWidthScaled) - (double)(bgWidthScaled / 2)); //The starting position of the background layer
if (Main.gameMenu)
bgTopY = 320 + pushBGTopHack; //increases the height in the main menu

var bgLoops = Main.screenWidth / bgWidthScaled + 2;
if ((double)Main.screenPosition.Y < Main.worldSurface * 16.0 + 16.0)
{
for (int i = 0; i < bgLoops; i++)
{
//Draw the texture and its glowmask to each loop of the texture
Main.spriteBatch.Draw(CalamityMod.SulphurSeaSurface, new Vector2(bgStartX + bgWidthScaled * i, bgTopY + 400), new Rectangle(0, 0, CalamityMod.SulphurSeaSurface.Width, CalamityMod.SulphurSeaSurface.Height), ColorOfSurfaceBackgroundsModified, 0f, default(Vector2), bgScale, SpriteEffects.None, 0f);
Main.spriteBatch.Draw(CalamityMod.SulphurSeaSkyFront, new Vector2(bgStartX + bgWidthScaled * i, bgTopY + 400), new Rectangle(0, 0, CalamityMod.SulphurSeaSkyFront.Width, CalamityMod.SulphurSeaSkyFront.Height), new Color(Color.LightSeaGreen.R, Color.LightSeaGreen.G, Color.LightSeaGreen.B, ColorOfSurfaceBackgroundsModified.A) * 0.5f, 0f, default(Vector2), bgScale, SpriteEffects.None, 0f);
}
}
}
return false; //Stop the drawing of the base close background texture (note: does NOT stop the drawing of the Middle and Far textures because tmodloader is slight stupid :blushing:)
}
}
}
7 changes: 2 additions & 5 deletions Balancing/BalancingChangesManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ bool AotCThrowCombo(Projectile p) =>
// 20% vulnerability to The Hive's bees.
NPCSpecificBalancingChanges.Add(new NPCBalancingChange(NPCID.DukeFishron, Do(new ProjectileResistBalancingRule(1.2f, ProjectileType<BasicPlagueBee>()))));

// 35% vulnerability to Resurrection Butterfly.
NPCSpecificBalancingChanges.Add(new NPCBalancingChange(NPCID.DukeFishron, Do(new ProjectileResistBalancingRule(1.35f, ProjectileType<SakuraBullet>(), ProjectileType<PurpleButterfly>()))));
// 25% vulnerability to Resurrection Butterfly.
NPCSpecificBalancingChanges.Add(new NPCBalancingChange(NPCID.DukeFishron, Do(new ProjectileResistBalancingRule(1.25f, ProjectileType<SakuraBullet>(), ProjectileType<PurpleButterfly>()))));
#endregion

#region Empress of Light
Expand All @@ -240,9 +240,6 @@ bool AotCThrowCombo(Projectile p) =>

// 20% resist to Nightglow.
NPCSpecificBalancingChanges.Add(new NPCBalancingChange(NPCID.CultistBoss, Do(new ProjectileResistBalancingRule(0.8f, ProjectileID.FairyQueenMagicItemShot))));

// 20% resist to Resurrection Butterfly.
NPCSpecificBalancingChanges.Add(new NPCBalancingChange(NPCID.CultistBoss, Do(new ProjectileResistBalancingRule(0.8f, ProjectileType<SakuraBullet>(), ProjectileType<PurpleButterfly>()))));
#endregion

#region Astrum Deus
Expand Down
16 changes: 13 additions & 3 deletions BiomeManagers/SulphurousSeaBiome.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public override int Music
if (!CalamityPlayer.areThereAnyDamnBosses)
{
bool acidRain = AcidRainEvent.AcidRainEventIsOngoing;
bool normalRain = Main.cloudAlpha > 0f;

// Acid Rain themes
if (acidRain)
Expand All @@ -41,9 +42,18 @@ public override int Music

// Regular Sulphur Sea themes, when Acid Rain is not occurring
else
music = !Main.dayTime
? CalamityMod.Instance.GetMusicFromMusicMod("SulphurousSeaNight") ?? MusicID.Desert // Nighttime
: CalamityMod.Instance.GetMusicFromMusicMod("SulphurousSeaDay") ?? MusicID.Desert; // Daytime
{
if (normalRain)
{
music = CalamityMod.Instance.GetMusicFromMusicMod("SulphurousSeaRain") ?? MusicID.Desert; // Normal Rain
}
else
{
music = !Main.dayTime
? CalamityMod.Instance.GetMusicFromMusicMod("SulphurousSeaNight") ?? MusicID.Desert // Nighttime
: CalamityMod.Instance.GetMusicFromMusicMod("SulphurousSeaDay") ?? MusicID.Desert; // Daytime
}
}
}

return music;
Expand Down
Binary file modified Buffs/Alcohol/AlcoholPoisoning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/BloodyMaryBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/CaribbeanRumBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/CinnamonRollBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/EverclearBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/EvergreenGinBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/FireballBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/GrapeBeerBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/MargaritaBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/MoonshineBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/MoscowMuleBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/OldFashionedBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace CalamityMod.Buffs.Alcohol
{
public class FabsolVodkaBuff : ModBuff
public class PurpleHazeBuff : ModBuff
{
public override void SetStaticDefaults()
{
Expand All @@ -16,7 +16,7 @@ public override void SetStaticDefaults()

public override void Update(Player player, ref int buffIndex)
{
player.Calamity().fabsolVodka = true;
player.Calamity().purpleHaze = true;
}
}
}
File renamed without changes
Binary file modified Buffs/Alcohol/RedWineBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/RumBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/ScrewdriverBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/StarBeamRyeBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/TequilaBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/TequilaSunriseBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/VodkaBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/WhiskeyBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Buffs/Alcohol/WhiteWineBuff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions Buffs/DamageOverTime/HeavyBleeding.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using CalamityMod.Particles;
using Microsoft.Xna.Framework;
using System;
using Terraria;
using Terraria.DataStructures;
using Terraria.ID;
using Terraria.ModLoader;

namespace CalamityMod.Buffs.DamageOverTime
{
public class HeavyBleeding : ModBuff
{
public override void SetStaticDefaults()
{
Main.debuff[Type] = true;
Main.pvpBuff[Type] = true;
Main.buffNoSave[Type] = true;
BuffID.Sets.LongerExpertDebuff[Type] = true;
}

public override void Update(Player player, ref int buffIndex)
{
player.Calamity().heavybleeding = true;
}

public override void Update(NPC npc, ref int buffIndex)
{
if (npc.Calamity().heavybleeding < npc.buffTime[buffIndex])
npc.Calamity().heavybleeding = npc.buffTime[buffIndex];
npc.DelBuff(buffIndex);
buffIndex--;
}
internal static void DrawEffects(PlayerDrawSet drawInfo)
{
Player player = drawInfo.drawPlayer;
var modPlayer = player.Calamity();

if (Main.rand.NextBool(3))
{
Vector2 randVel = new Vector2(5, 5).RotatedByRandom(100) * Main.rand.NextFloat(0.3f, 1f);
Dust dust = Dust.NewDustPerfect(modPlayer.RandomDebuffVisualSpot, 5, randVel * Main.rand.NextFloat(0.1f, 0.8f), 100, default, Main.rand.NextFloat(0.6f, 0.9f));
dust.noGravity = false;
Particle spark = new AltSparkParticle(modPlayer.RandomDebuffVisualSpot, randVel + new Vector2(0, -4), true, 12, Main.rand.NextFloat(0.25f, 0.6f), Color.DarkRed * 0.5f);
GeneralParticleHandler.SpawnParticle(spark);
}
if (Main.rand.NextBool(8))
{
Particle spark = new GlowOrbParticle(modPlayer.RandomDebuffVisualSpot, new Vector2(0, 4) * Main.rand.NextFloat(0.5f, 0.7f), true, 16, Main.rand.NextFloat(0.55f, 0.8f), Color.DarkRed * 0.8f, false, false, false);
GeneralParticleHandler.SpawnParticle(spark);
}
}

internal static void DrawEffects(NPC npc, ref Color drawColor)
{
Vector2 npcSize = npc.Center + new Vector2(Main.rand.NextFloat(-npc.width / 2, npc.width / 2), Main.rand.NextFloat(-npc.height / 2, npc.height / 2));
Vector2 randVel = new Vector2(5, 5).RotatedByRandom(100) * Main.rand.NextFloat(0.3f, 1f);
if (Main.rand.NextBool(5))
{
Particle spark = new AltSparkParticle(npcSize, randVel + new Vector2(0, -4), true, 12, Main.rand.NextFloat(0.25f, 0.6f), Color.DarkRed * 0.5f);
GeneralParticleHandler.SpawnParticle(spark);
}
else
{
Dust dust = Dust.NewDustPerfect(npcSize, 5, randVel * Main.rand.NextFloat(0.1f, 0.8f), 100, default, Main.rand.NextFloat(0.2f, 0.6f));
dust.noGravity = false;
}
if (Main.rand.NextBool(8))
{
Particle spark = new GlowOrbParticle(npcSize, new Vector2(0, 4) * Main.rand.NextFloat(0.5f, 0.7f), true, 16, Main.rand.NextFloat(0.55f, 0.8f), Color.DarkRed * 0.8f, false, false, false);
GeneralParticleHandler.SpawnParticle(spark);
}
}
}
}
Binary file added Buffs/DamageOverTime/HeavyBleeding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions Buffs/DamageOverTime/Laceration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using CalamityMod.Particles;
using Microsoft.Xna.Framework;
using System;
using Terraria;
using Terraria.DataStructures;
using Terraria.ID;
using Terraria.ModLoader;

namespace CalamityMod.Buffs.DamageOverTime
{
public class Laceration : ModBuff
{
public override void SetStaticDefaults()
{
Main.debuff[Type] = true;
Main.pvpBuff[Type] = true;
Main.buffNoSave[Type] = true;
BuffID.Sets.LongerExpertDebuff[Type] = true;
}

public override void Update(Player player, ref int buffIndex)
{
player.Calamity().laceration = true;
}

public override void Update(NPC npc, ref int buffIndex)
{
if (npc.Calamity().laceration < npc.buffTime[buffIndex])
npc.Calamity().laceration = npc.buffTime[buffIndex];
npc.DelBuff(buffIndex);
buffIndex--;
}
internal static void DrawEffects(PlayerDrawSet drawInfo)
{
Player player = drawInfo.drawPlayer;
var modPlayer = player.Calamity();

if (Main.rand.NextBool())
{
Vector2 randVel = new Vector2(6, 6).RotatedByRandom(100) * Main.rand.NextFloat(0.3f, 1f);
Dust dust = Dust.NewDustPerfect(modPlayer.RandomDebuffVisualSpot, 5, randVel * Main.rand.NextFloat(0.1f, 0.8f), 100, default, Main.rand.NextFloat(0.6f, 0.9f));
dust.noGravity = false;
Particle spark = new AltSparkParticle(modPlayer.RandomDebuffVisualSpot, randVel + new Vector2(0, -4), true, 12, Main.rand.NextFloat(0.25f, 0.6f), Color.DarkRed * 0.5f);
GeneralParticleHandler.SpawnParticle(spark);
}
if (Main.rand.NextBool(8))
{
Particle spark = new GlowOrbParticle(modPlayer.RandomDebuffVisualSpot, new Vector2(0, 4) * Main.rand.NextFloat(0.5f, 0.7f), true, 16, Main.rand.NextFloat(0.55f, 0.8f), Color.DarkRed * 0.8f, false, false, false);
GeneralParticleHandler.SpawnParticle(spark);
}
}

internal static void DrawEffects(NPC npc, ref Color drawColor)
{
Vector2 npcSize = npc.Center + new Vector2(Main.rand.NextFloat(-npc.width / 2, npc.width / 2), Main.rand.NextFloat(-npc.height / 2, npc.height / 2));
Vector2 randVel = new Vector2(6, 6).RotatedByRandom(100) * Main.rand.NextFloat(0.3f, 1f);
if (Main.rand.NextBool(3))
{
Particle spark = new AltSparkParticle(npcSize, randVel + new Vector2(0, -4), true, 12, Main.rand.NextFloat(0.25f, 0.6f), Color.DarkRed * 0.5f);
GeneralParticleHandler.SpawnParticle(spark);
}
else
{
Dust dust = Dust.NewDustPerfect(npcSize, 5, randVel * Main.rand.NextFloat(0.1f, 0.8f), 100, default, Main.rand.NextFloat(0.2f, 0.6f));
dust.noGravity = false;
}
if (Main.rand.NextBool(8))
{
Particle spark = new GlowOrbParticle(npcSize, new Vector2(0, 4) * Main.rand.NextFloat(0.5f, 0.7f), true, 16, Main.rand.NextFloat(0.55f, 0.8f), Color.DarkRed * 0.8f, false, false, false);
GeneralParticleHandler.SpawnParticle(spark);
}
}
}
}
Binary file added Buffs/DamageOverTime/Laceration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 0 additions & 21 deletions Buffs/Mounts/AlicornBuff.cs

This file was deleted.

Binary file removed Buffs/Mounts/AlicornBuff.png
Binary file not shown.
2 changes: 1 addition & 1 deletion Buffs/Mounts/BrimroseMount.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public override void SetStaticDefaults()

public override void Update(Player player, ref int buffIndex)
{
player.mount.SetMount(ModContent.MountType<PhuppersChair>(), player);
player.mount.SetMount(ModContent.MountType<BrimroseChair>(), player);
player.buffTime[buffIndex] = 10;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace CalamityMod.Buffs.Placeables
{
public class CirrusBlueCandleBuff : ModBuff
public class BlueCandleBuff : ModBuff
{
public static float MoveSpeedBoost = 0.1f;
public static double WingTimeBoost = 0.1D;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace CalamityMod.Buffs.Placeables
{
public class CirrusPinkCandleBuff : ModBuff
public class PinkCandleBuff : ModBuff
{
public static double PercentHealthPerSecond = 0.004D;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace CalamityMod.Buffs.Placeables
{
public class CirrusPurpleCandleBuff : ModBuff
public class PurpleCandleBuff : ModBuff
{
public static float DefenseRatioBonus = 0.1f;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace CalamityMod.Buffs.Placeables
{
public class CirrusYellowCandleBuff : ModBuff
public class YellowCandleBuff : ModBuff
{
public static float ExtraChipDamageRatio = 0.07f;

Expand Down
2 changes: 1 addition & 1 deletion Buffs/Potions/ShadowBuff.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.Calamity().shadow = true;
if (player.yoraiz0rEye < 2 && CalamityConfig.Instance.StealthInvisibility)
if (player.yoraiz0rEye < 2 && CalamityClientConfig.Instance.StealthInvisibility)
player.yoraiz0rEye = 2;
}
}
Expand Down
Loading