Merge branch 'master' into shader-workflow

ProjectStarlight · Oct 11, 2024 · ced5b7b · ced5b7b
2 parents a21b18c + 24b2c74
commit ced5b7b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Content/Buffs/CoughDropsBuff.cs b/Content/Buffs/CoughDropsBuff.cs
@@ -9,6 +9,7 @@ public CoughDropsBuff() : base("Cough Drops", "Your speed and damage are boosted
 		public override void Update(Player Player, ref int buffIndex)
 		{
 			Player.maxRunSpeed += 2;
+			Player.GetDamage(DamageClass.Generic) += 0.15f;
 		}
 	}
 }
diff --git a/Content/Items/Misc/Accessories.CoughDrops.cs b/Content/Items/Misc/Accessories.CoughDrops.cs
@@ -1,5 +1,6 @@
 using StarlightRiver.Content.Buffs;
 using StarlightRiver.Content.Items.BaseTypes;
+using Terraria.ID;
 
 namespace StarlightRiver.Content.Items.Misc
 {
@@ -21,7 +22,8 @@ public override void Unload()
 
 		private void DelBuff(On_Player.orig_DelBuff orig, Player self, int buffId)
 		{
-			if (Main.debuff[self.buffType[buffId]] && Equipped(self))
+			int buffType = self.buffType[buffId];
+			if (Main.debuff[buffType] && !Main.buffNoTimeDisplay[buffType] && !BuffID.Sets.NurseCannotRemoveDebuff[buffType] && Equipped(self))
 				self.AddBuff(ModContent.BuffType<CoughDropsBuff>(), 180);
 
 			orig(self, buffId);

diff --git a/Content/WorldGeneration/PermafrostGen.cs b/Content/WorldGeneration/PermafrostGen.cs
@@ -86,6 +86,7 @@ bool TryToGenerateArena(out int xPosition)
 			{
 				int arenaWidth = 109;
 				int stepSpacing = 20;
+				int arenaHeight = 180;
 				int stepsToLeft = (centerX - iceLeft) / stepSpacing;
 				int stepsToRight = (iceRight - centerX) / stepSpacing;
 				int startX = centerX - stepsToLeft * stepSpacing;
@@ -98,7 +99,7 @@ bool TryToGenerateArena(out int xPosition)
 					randomIndices[i] = i;
 				}
 
-				randomIndices = Helper.RandomizeList(randomIndices.ToList()).ToArray();
+				randomIndices = Helper.RandomizeList(randomIndices.ToList(), WorldGen.genRand).ToArray();
 
 				for (int i = 0; i < spotsToCheck; i++)
 				{
@@ -108,7 +109,7 @@ bool TryToGenerateArena(out int xPosition)
 					bool invalidLocation = false;
 					for (int x1 = 0; x1 < arenaWidth; x1++)
 					{
-						for (int y1 = 0; y1 < 180; y1++)
+						for (int y1 = 0; y1 < arenaHeight; y1++)
 						{
 							Tile tile = Framing.GetTileSafely(xPos - 40 + x1, centerY + 100 + y1);
 
@@ -262,7 +263,7 @@ bool TryToGenerateArena(out int xPosition)
 		/// <param name="center">Where to place the ore, in tile coordinates</param>
 		private void PlaceOre(Point16 center)
 		{
-			int radius = Main.rand.Next(2, 5);
+			int radius = WorldGen.genRand.Next(2, 5);
 
 			int frameStartX = radius == 4 ? 5 : radius == 3 ? 2 : 0;
 			int frameStartY = radius == 4 ? 0 : radius == 3 ? 1 : 2;