remove preview/stable stuff

Ouroel · May 1, 2022 · 1b440e2 · 1b440e2
1 parent d8a57c5
commit 1b440e2
Show file tree

Hide file tree

Showing 67 changed files with 1 addition and 634 deletions.
diff --git a/AssPlayer.cs b/AssPlayer.cs
@@ -303,11 +303,7 @@ private void SpawnSoulTemp()
 
 				if (!checkIfAlive)
 				{
-#if TML_2022_03
-					AssUtils.NewProjectile(Player.GetProjectileSource_Item(tempSoulMinion), Player.Center.X, Player.Center.Y, -Player.velocity.X, Player.velocity.Y - 6f, spawnedType, spawnedDamage, EverhallowedLantern.BaseKB, preSync: PreSyncSoulTemp);
-#else
 					AssUtils.NewProjectile(Player.GetSource_Accessory(tempSoulMinion), Player.Center.X, Player.Center.Y, -Player.velocity.X, Player.velocity.Y - 6f, spawnedType, spawnedDamage, EverhallowedLantern.BaseKB, preSync: PreSyncSoulTemp);
-#endif
 				}
 			}
 		}
@@ -726,26 +722,15 @@ public override void ModifyHitPvpWithProj(Projectile proj, Player target, ref in
 			assPlayer.SpawnSoulTemp();
 		}
 
-#if TML_2022_03
-		public override void ModifyWeaponDamage(Item item, ref StatModifier damage, ref float flat)
-#else
 		public override void ModifyWeaponDamage(Item item, ref StatModifier damage)
-#endif
 		{
 			if (empoweringBuff && !item.CountsAsClass(DamageClass.Summon) && item.damage > 0) damage += empoweringStep; //summon damage gets handled in EmpoweringBuffGlobalProjectile
 		}
 
-#if TML_2022_03
-		public override void ModifyWeaponCrit(Item item, ref int crit)
-		{
-			crit += (int)(10 * empoweringStep);
-		}
-#else
 		public override void ModifyWeaponCrit(Item item, ref float crit)
 		{
 			crit += 10 * empoweringStep;
 		}
-#endif
 
 		public override bool PreKill(double damage, int hitDirection, bool pvp, ref bool playSound, ref bool genGore, ref PlayerDeathReason damageSource)
 		{

diff --git a/Base/AssExtensions.cs b/Base/AssExtensions.cs
@@ -96,11 +96,7 @@ public static void AssSpawnPetIfNeeded(this Player player, ref bool petBool, int
 
 			if (player.whoAmI == Main.myPlayer)
 			{
-#if TML_2022_03
-				Projectile.NewProjectile(player.GetProjectileSource_Buff(buffIndex), player.Center, -Vector2.UnitY.RotatedByRandom(MathHelper.PiOver2), petProjID, 0, 0f, player.whoAmI);
-#else
 				Projectile.NewProjectile(player.GetSource_Buff(buffIndex), player.Center, -Vector2.UnitY.RotatedByRandom(MathHelper.PiOver2), petProjID, 0, 0f, player.whoAmI);
-#endif
 			}
 		}
 

diff --git a/Base/AssUtils.cs b/Base/AssUtils.cs
@@ -530,11 +530,8 @@ private static void HandlePlayerStatModifiers(IEntitySource spawnSource, Project
 		{
 			if (spawnSource is EntitySource_ItemUse itemUseSource && itemUseSource.Entity is Player player)
 			{
-#if TML_2022_03
-#else
 				projectile.CritChance += player.GetWeaponCrit(itemUseSource.Item);
 				projectile.ArmorPenetration += player.GetWeaponArmorPenetration(itemUseSource.Item);
-#endif
 			}
 		}
 
@@ -547,11 +544,7 @@ public static void DropItemInstanced(NPC npc, Vector2 Position, Vector2 HitboxSi
 			{
 				if (Main.netMode == NetmodeID.Server)
 				{
-#if TML_2022_03
-					int item = Item.NewItem(npc.GetItemSource_Loot(), (int)Position.X, (int)Position.Y, (int)HitboxSize.X, (int)HitboxSize.Y, itemType, itemStack, true);
-#else
 					int item = Item.NewItem(npc.GetSource_Loot(), (int)Position.X, (int)Position.Y, (int)HitboxSize.X, (int)HitboxSize.Y, itemType, itemStack, true);
-#endif
 					Main.timeItemSlotCannotBeReusedFor[item] = 54000;
 					for (int p = 0; p < Main.maxPlayers; p++)
 					{
@@ -569,11 +562,7 @@ public static void DropItemInstanced(NPC npc, Vector2 Position, Vector2 HitboxSi
 					if (condition != null && condition(npc, Main.LocalPlayer) ||
 						condition == null)
 
-#if TML_2022_03
-						Item.NewItem(npc.GetItemSource_Loot(), (int)Position.X, (int)Position.Y, (int)HitboxSize.X, (int)HitboxSize.Y, itemType, itemStack);
-#else
 						Item.NewItem(npc.GetSource_Loot(), (int)Position.X, (int)Position.Y, (int)HitboxSize.X, (int)HitboxSize.Y, itemType, itemStack);
-#endif
 				}
 				//npc.value = 0f;
 			}

diff --git a/Base/SlimePets.cs b/Base/SlimePets.cs
@@ -114,11 +114,7 @@ public static float GetSpawnChance(Player player, SpawnConditionType type = Spaw
 		public static float CuteSlimeSpawnChance(NPCSpawnInfo spawnInfo, SpawnConditionType type, float customFactor = 1f)
 		{
 			//AssUtils.Print("spawn chance at " + (Main.netMode == NetmodeID.Server ? "Server" : "Client"));
-#if TML_2022_03
-			Player player = spawnInfo.player;
-#else
 			Player player = spawnInfo.Player;
-#endif
 			float spawnChance = GetSpawnChance(player, type) * customFactor;
 			if (AssUtils.AnyNPCs(x => x.ModNPC is CuteSlimeBaseNPC)) spawnChance *= 0.5f;
 			//AssUtils.Print(spawnChance);

diff --git a/Buffs/NPCs/Bosses/Harvester/BabyHarvesterBuff.cs b/Buffs/NPCs/Bosses/Harvester/BabyHarvesterBuff.cs
@@ -71,9 +71,6 @@ public override void ModifyBuffTip(ref string tip, ref int rare)
 			}
 		}
 
-#if TML_2022_03
-
-#else
 		public override bool PreDraw(SpriteBatch spriteBatch, int buffIndex, ref BuffDrawParams drawParams)
 		{
 			if (!TryGetBabyHarvester(out BabyHarvesterProj babyHarvester))
@@ -91,7 +88,6 @@ public override bool PreDraw(SpriteBatch spriteBatch, int buffIndex, ref BuffDra
 
 			return true;
 		}
-#endif
 
 		public override void Update(Player player, ref int buffIndex)
 		{

diff --git a/Buffs/Pets/ChunkyandMeatballBuff.cs b/Buffs/Pets/ChunkyandMeatballBuff.cs
@@ -23,11 +23,8 @@ public override void Update(Player player, ref int buffIndex)
 			PetBool(player) = true;
 			if (player.whoAmI == Main.myPlayer)
 			{
-#if TML_2022_03
-				var spawnSource = player.GetProjectileSource_Buff(buffIndex);
-#else
 				var spawnSource = player.GetSource_Buff(buffIndex);
-#endif
+
 				int chunky = ModContent.ProjectileType<ChunkyProj>();
 				bool chunkyNotSpawned = player.ownedProjectileCounts[chunky] <= 0;
 				int meatball = ModContent.ProjectileType<MeatballProj>();

diff --git a/Buffs/Pets/PetQueenSlimeBuff.cs b/Buffs/Pets/PetQueenSlimeBuff.cs
@@ -24,11 +24,7 @@ public override void Update(Player player, ref int buffIndex)
 			if (player.whoAmI == Main.myPlayer)
 			{
 				int air = ModContent.ProjectileType<PetQueenSlimeAirProj>();
-#if TML_2022_03
-				var spawnSource = player.GetProjectileSource_Buff(buffIndex);
-#else
 				var spawnSource = player.GetSource_Buff(buffIndex);
-#endif
 				if (player.ownedProjectileCounts[air] <= 0)
 				{
 					Projectile.NewProjectile(spawnSource, player.Center.X, player.Center.Y, 0, -0.5f, air, 0, 0f, player.whoAmI);

diff --git a/Buffs/Pets/PetSunMoonBuff.cs b/Buffs/Pets/PetSunMoonBuff.cs
@@ -28,11 +28,7 @@ public override void Update(Player player, ref int buffIndex)
 			petPlayer.PetMoon = true;
 			if (player.whoAmI == Main.myPlayer)
 			{
-#if TML_2022_03
-				var source = player.GetProjectileSource_Buff(buffIndex);
-#else
 				var source = player.GetSource_Buff(buffIndex);
-#endif
 
 				int sun = ModContent.ProjectileType<PetSunProj>();
 				bool moreThanOneSun = player.ownedProjectileCounts[sun] > 0;

diff --git a/Buffs/Pets/TinyTwinsBuff.cs b/Buffs/Pets/TinyTwinsBuff.cs
@@ -23,11 +23,7 @@ public override void Update(Player player, ref int buffIndex)
 			PetBool(player) = true;
 			if (player.whoAmI == Main.myPlayer)
 			{
-#if TML_2022_03
-				var source = player.GetProjectileSource_Buff(buffIndex);
-#else
 				var source = player.GetSource_Buff(buffIndex);
-#endif
 
 				int spaz = ModContent.ProjectileType<TinySpazmatismProj>();
 				if (player.ownedProjectileCounts[spaz] <= 0)

diff --git a/Buffs/Pets/WallFragmentBuff.cs b/Buffs/Pets/WallFragmentBuff.cs
@@ -25,11 +25,7 @@ public override void Update(Player player, ref int buffIndex)
 			PetBool(player) = true;
 			if (player.whoAmI == Main.myPlayer)
 			{
-#if TML_2022_03
-				var source = player.GetProjectileSource_Buff(buffIndex);
-#else
 				var source = player.GetSource_Buff(buffIndex);
-#endif
 
 				int eye1 = ModContent.ProjectileType<WallFragmentEye1>();
 				if (player.ownedProjectileCounts[eye1] <= 0)

diff --git a/Gores/PaperGore.cs b/Gores/PaperGore.cs
@@ -13,22 +13,12 @@ public override void SetStaticDefaults()
 			GoreID.Sets.DisappearSpeed[Type] = 6;
 		}
 
-#if TML_2022_03
-
-		public override void OnSpawn(Gore gore)
-		{
-			gore.Frame = new SpriteFrame(1, 8, 0, (byte)Main.rand.Next(8));
-			gore.frameCounter = (byte)Main.rand.Next(8);
-			gore.timeLeft = 120;
-		}
-#else
 		public override void OnSpawn(Gore gore, IEntitySource source)
 		{
 			gore.Frame = new SpriteFrame(1, 8, 0, (byte)Main.rand.Next(8));
 			gore.frameCounter = (byte)Main.rand.Next(8);
 			gore.timeLeft = 120;
 		}
-#endif
 
 		public override bool Update(Gore gore)
 		{

diff --git a/Gores/PaperScrapGore.cs b/Gores/PaperScrapGore.cs
@@ -15,23 +15,13 @@ public override void SetStaticDefaults()
 			GoreID.Sets.DisappearSpeed[Type] = 7;
 		}
 
-#if TML_2022_03
-		public override void OnSpawn(Gore gore)
-		{
-			gore.velocity += new Vector2(Main.rand.NextFloat() - 0.5f, Main.rand.NextFloat() * MathHelper.TwoPi);
-			gore.Frame = new SpriteFrame(1, 8, 0, (byte)Main.rand.Next(8));
-			gore.frameCounter = (byte)Main.rand.Next(8);
-			//UpdateType = 910;
-		}
-#else
 		public override void OnSpawn(Gore gore, IEntitySource source)
 		{
 			gore.velocity += new Vector2(Main.rand.NextFloat() - 0.5f, Main.rand.NextFloat() * MathHelper.TwoPi);
 			gore.Frame = new SpriteFrame(1, 8, 0, (byte)Main.rand.Next(8));
 			gore.frameCounter = (byte)Main.rand.Next(8);
 			//UpdateType = 910;
 		}
-#endif
 
 		public override bool Update(Gore gore)
 		{

diff --git a/Items/Accessories/Useful/SigilOfLastStand.cs b/Items/Accessories/Useful/SigilOfLastStand.cs
@@ -37,11 +37,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 				if (tooltips[i].Name == "SocialDesc")
 				{
 					inVanitySlot = true;
-#if TML_2022_03
-					tooltips[i].text = "Cooldown will go down while in social slot";
-#else
 					tooltips[i].Text = "Cooldown will go down while in social slot";
-#endif
 					break;
 				}
 			}

diff --git a/Items/Accessories/Useful/SigilOfPainSuppression.cs b/Items/Accessories/Useful/SigilOfPainSuppression.cs
@@ -35,11 +35,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 				if (tooltips[i].Name == "SocialDesc")
 				{
 					inVanitySlot = true;
-#if TML_2022_03
-					tooltips[i].text = "Cooldown will go down while in social slot";
-#else
 					tooltips[i].Text = "Cooldown will go down while in social slot";
-#endif
 					break;
 				}
 			}

diff --git a/Items/Accessories/Useful/SigilOfRetreat.cs b/Items/Accessories/Useful/SigilOfRetreat.cs
@@ -35,11 +35,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 				if (tooltips[i].Name == "SocialDesc")
 				{
 					inVanitySlot = true;
-#if TML_2022_03
-					tooltips[i].text = "Cooldown will go down while in social slot";
-#else
 					tooltips[i].Text = "Cooldown will go down while in social slot";
-#endif
 					break;
 				}
 			}

diff --git a/Items/Armor/SoulSaviorHeaddress.cs b/Items/Armor/SoulSaviorHeaddress.cs
@@ -47,11 +47,7 @@ public override void UpdateArmorSet(Player player)
 			mPlayer.soulSaviorArmor = true;
 
 			StatModifier summoner = player.GetDamage(DamageClass.Summon);
-#if TML_2022_03
-			float factor = (player.maxMinions / 10f) * player.GetDamage(DamageClass.Summon);
-#else
 			float factor = summoner.ApplyTo(player.maxMinions / 10f);
-#endif
 
 			player.thorns = factor;
 

diff --git a/Items/CaughtDungeonSoul.cs b/Items/CaughtDungeonSoul.cs
@@ -56,11 +56,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 				// Can use item
 				tooltips.Add(new TooltipLine(Mod, "MakeNPC", "Use it to spawn a soul for the Soul Harvester to eat")
 				{
-#if TML_2022_03
-					overrideColor = new Color(35, 200, 254)
-#else
 					OverrideColor = new Color(35, 200, 254)
-#endif
 				});
 			}
 			else

diff --git a/Items/Consumables/HarvesterTreasureBag.cs b/Items/Consumables/HarvesterTreasureBag.cs
@@ -42,11 +42,7 @@ public override bool CanRightClick()
 
 		public override void OpenBossBag(Player player)
 		{
-#if TML_2022_03
-			var source = player.GetItemSource_OpenItem(Type);
-#else
 			var source = player.GetSource_OpenItem(Type);
-#endif
 			//We have to replicate the expert drops from Harvester here via QuickSpawnItem
 			player.QuickSpawnItem(source, ItemID.Bone, Main.rand.Next(40, 61));
 			player.QuickSpawnItem(source, ModContent.ItemType<DesiccatedLeather>());

diff --git a/Items/EverburningGlobalItem.cs b/Items/EverburningGlobalItem.cs
@@ -86,11 +86,7 @@ private void ShootCandleDust(Item item, AssPlayer mPlayer)
 
 			//reduce but not prevent spam from boomerang related weapons or modded damage classes
 			if (player.ownedProjectileCounts[ModContent.ProjectileType<CandleDustDummy>()] < 2)
-#if TML_2022_03
-				Projectile.NewProjectile(player.GetProjectileSource_Item(item), pos, velo + player.velocity, ModContent.ProjectileType<CandleDustDummy>(), 0, 0f, player.whoAmI);
-#else
 				Projectile.NewProjectile(player.GetSource_ItemUse(item), pos, velo + player.velocity, ModContent.ProjectileType<CandleDustDummy>(), 0, 0f, player.whoAmI);
-#endif
 		}
 
 		public override void MeleeEffects(Item item, Player player, Rectangle hitbox)

diff --git a/Items/Fun/GuideVoodoorang.cs b/Items/Fun/GuideVoodoorang.cs
@@ -53,11 +53,7 @@ public override void PostUpdate()
 
 							byte plr = Player.FindClosest(Item.position, Item.width, Item.height);
 							Player player = Main.player[plr];
-#if TML_2022_03
-							Item.NewItem(player.GetItemSource_Misc(-1), player.getRect(), ModContent.ItemType<GuideVoodoorang>());
-#else
 							Item.NewItem(player.GetSource_Misc("GuideVoodoorang"), player.getRect(), ModContent.ItemType<GuideVoodoorang>());
-#endif
 
 							//despawns upon wof spawn
 							Item.TurnToAir();

diff --git a/Items/PetAccessories/PetAccessoryClass.cs b/Items/PetAccessories/PetAccessoryClass.cs
@@ -572,11 +572,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 				{
 					tooltips.Add(new TooltipLine(Mod, "NoUse", "You have no summoned slime to equip this on")
 					{
-#if TML_2022_03
-						overrideColor = Color.OrangeRed
-#else
 						OverrideColor = Color.OrangeRed
-#endif
 					});
 				}
 			}

diff --git a/Items/Pets/PetDestroyerItem.cs b/Items/Pets/PetDestroyerItem.cs
@@ -34,20 +34,6 @@ public static void Spawn(Player player, int buffIndex = -1, Item item = null)
 			}
 
 			IEntitySource source;
-#if TML_2022_03
-			if (buffIndex > -1)
-			{
-				source = player.GetProjectileSource_Buff(buffIndex);
-			}
-			else if (item != null)
-			{
-				source = player.GetProjectileSource_Item(item);
-			}
-			else
-			{
-				return;
-			}
-#else
 			if (buffIndex > -1)
 			{
 				source = player.GetSource_Buff(buffIndex);
@@ -60,7 +46,6 @@ public static void Spawn(Player player, int buffIndex = -1, Item item = null)
 			{
 				return;
 			}
-#endif
 
 			int probe = ModContent.ProjectileType<PetDestroyerProbe>();
 			for (int i = 0; i < Main.maxProjectiles; i++)

diff --git a/Items/Pets/PetEaterofWorldsItem.cs b/Items/Pets/PetEaterofWorldsItem.cs
@@ -34,20 +34,6 @@ public static void Spawn(Player player, int buffIndex = -1, Item item = null)
 			}
 
 			IEntitySource source;
-#if TML_2022_03
-			if (buffIndex > -1)
-			{
-				source = player.GetProjectileSource_Buff(buffIndex);
-			}
-			else if (item != null)
-			{
-				source = player.GetProjectileSource_Item(item);
-			}
-			else
-			{
-				return;
-			}
-#else
 			if (buffIndex > -1)
 			{
 				source = player.GetSource_Buff(buffIndex);
@@ -60,7 +46,6 @@ public static void Spawn(Player player, int buffIndex = -1, Item item = null)
 			{
 				return;
 			}
-#endif
 
 			for (int i = 0; i < Main.maxProjectiles; i++)
 			{