Some NPC.HitModifiers.SourceDamage patches:

.github/FUNDING.yml

@@ -1 +1 @@
-patreon: Fabsol
+patreon: CalamityMod

.gitignore

@@ -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

Backgrounds/SulphurSeaSurfaceBGStyle.cs

@@ -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.
@@ -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:)
+        }
     }
 }

Balancing/BalancingChangesManager.cs

@@ -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
@@ -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

BiomeManagers/SulphurousSeaBiome.cs

@@ -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)
@@ -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;

Buffs/Alcohol/FabsolVodkaBuff.cs → Buffs/Alcohol/PurpleHazeBuff.cs

@@ -4,7 +4,7 @@
 
 namespace CalamityMod.Buffs.Alcohol
 {
-    public class FabsolVodkaBuff : ModBuff
+    public class PurpleHazeBuff : ModBuff
     {
         public override void SetStaticDefaults()
         {
@@ -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;
         }
     }
 }

Buffs/DamageOverTime/HeavyBleeding.cs

@@ -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);
+            }
+        }
+    }
+}

Buffs/DamageOverTime/Laceration.cs

@@ -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);
+            }
+        }
+    }
+}

Buffs/Mounts/BrimroseMount.cs

@@ -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;
         }
     }

Buffs/Placeables/CirrusBlueCandleBuff.cs → Buffs/Placeables/BlueCandleBuff.cs

@@ -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;

Buffs/Placeables/CirrusPinkCandleBuff.cs → Buffs/Placeables/PinkCandleBuff.cs

@@ -4,7 +4,7 @@
 
 namespace CalamityMod.Buffs.Placeables
 {
-    public class CirrusPinkCandleBuff : ModBuff
+    public class PinkCandleBuff : ModBuff
     {
         public static double PercentHealthPerSecond = 0.004D;
 

Buffs/Placeables/CirrusPurpleCandleBuff.cs → Buffs/Placeables/PurpleCandleBuff.cs

@@ -4,7 +4,7 @@
 
 namespace CalamityMod.Buffs.Placeables
 {
-    public class CirrusPurpleCandleBuff : ModBuff
+    public class PurpleCandleBuff : ModBuff
     {
         public static float DefenseRatioBonus = 0.1f;
 

Buffs/Placeables/CirrusYellowCandleBuff.cs → Buffs/Placeables/YellowCandleBuff.cs

@@ -5,7 +5,7 @@
 
 namespace CalamityMod.Buffs.Placeables
 {
-    public class CirrusYellowCandleBuff : ModBuff
+    public class YellowCandleBuff : ModBuff
     {
         public static float ExtraChipDamageRatio = 0.07f;
 

Buffs/Potions/ShadowBuff.cs

@@ -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;
         }
     }