BuildInPeace now fully disables NPCs execept for Town NPCs

Kirtle · Kirtle · commit ab5701ec7ec9 · 2020-06-29T17:11:14.000+01:00
Made the Utilities namespace a single static class. Made the mod release ready
diff --git a/Buffs/BuildInPeaceBuff.cs b/Buffs/BuildInPeaceBuff.cs
@@ -1,6 +1,8 @@
-﻿using System;
+﻿using Terraria.ID;
+using System;
 using Terraria;
 using Terraria.ModLoader;
+using BuilderEssentials.Utilities;
 using static BuilderEssentials.BuilderPlayer;
 
 namespace BuilderEssentials.Buffs
@@ -16,7 +18,6 @@ public override void SetDefaults()
             Main.buffNoTimeDisplay[Type] = true;
             canBeCleared = false;
         }
-
         public override void Update(Player player, ref int buffIndex)
         {
             BuilderPlayer modPlayer = player.GetModPlayer<BuilderPlayer>();
@@ -34,19 +35,13 @@ public override void Update(Player player, ref int buffIndex)
             Main.invasionSize = 0;
             Main.time = 27000; //mid day
             Main.fastForwardTime = false;
-        }
-    }
 
-    public class PeacefulNPCs : GlobalNPC
-    {
-        public override void EditSpawnRate(Player player, ref int spawnRate, ref int maxSpawns)
-        {
-            if (player.HasBuff(mod.BuffType("BuildInPeaceBuff")))
-                spawnRate = 0;
-            else
-                base.EditSpawnRate(player, ref spawnRate, ref maxSpawns);
+            foreach (var npc in Main.npc)
+            {
+                //Don't want to remove town NPC's
+                if (!Tools.IsTownNpc(npc))
+                    npc.active = false;
+            }
         }
     }
-
-
 }
diff --git a/Buffs/BuildInPeaceBuff.png b/Buffs/BuildInPeaceBuff.png
diff --git a/BuilderPlayer.cs b/BuilderPlayer.cs
@@ -100,7 +100,7 @@ public override void ResetEffects()
         public override void ProcessTriggers(TriggersSet triggersSet)
         {
             if (BuilderEssentials.ToggleBuildingMode.JustPressed)
-                BuildingMode.BuildingModeAccessoriesToggle();
+                Tools.BuildingModeAccessoriesToggle();
         }
 
         public override TagCompound Save()
@@ -168,8 +168,8 @@ public override void OnEnterWorld(Player player)
                 BasePanel.buildingModeButton.SetImage(BuilderEssentials.BuildingModeOff);
 
             //Loads (or populates) all lists on enter world
-            BuildingMode.BuildingModeAccessoriesToggle();
-            BuildingMode.BuildingModeAccessoriesToggle();
+            Tools.BuildingModeAccessoriesToggle();
+            Tools.BuildingModeAccessoriesToggle();
         }
     }
 }
diff --git a/Items/Accessories/BuildInPeace.png b/Items/Accessories/BuildInPeace.png
diff --git a/Items/Accessories/CreativeWrench.cs b/Items/Accessories/CreativeWrench.cs
@@ -47,7 +47,7 @@ public override void UpdateAccessory(Player player, bool hideVisual)
                 Player.tileRangeY = 55;
 
                 //Right click timer
-                if (Main.mouseRight && UIUtilities.IsUIAvailable()
+                if (Main.mouseRight && Tools.IsUIAvailable()
                     && (!player.mouseInterface || CreativeWheelRework.CreativeWheelReworkPanel.IsMouseHovering)
                     && !BasePanel.paintingUIOpen && player.inventory[player.selectedItem].IsAir)
                 {
@@ -61,15 +61,15 @@ public override void UpdateAccessory(Player player, bool hideVisual)
                 //ItemPicker
                 if (Main.mouseMiddle && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.ItemPicker)
                 && !player.mouseInterface && !Main.playerInventory)
-                    ItemPicker.PickItem(ref oldPosX, ref oldPosY);
+                    Tools.PickItem(ref oldPosX, ref oldPosY);
 
                 //AutoHammer
                 if (Main.mouseLeft && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.AutoHammer)
                 && player.inventory[player.selectedItem].IsAir && CreativeWheelRework.CreativeWheelReworkPanel != null && !player.mouseInterface
                 && !Main.playerInventory)
                 {
                     if (!CreativeWheelRework.CreativeWheelReworkPanel.IsMouseHovering)
-                        AutoHammer.ChangeSlope(ref oldPosX, ref oldPosY, ref previousClickedTile);
+                        Tools.ChangeSlope(ref oldPosX, ref oldPosY, ref previousClickedTile);
                 }
                 else if (Main.mouseLeft && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.AutoHammer)
                 && !player.inventory[player.selectedItem].IsAir && !player.mouseInterface && !Main.playerInventory)
@@ -135,7 +135,7 @@ public override bool CanPlace(int i, int j, int type)
                     NetMessage.SendTileSquare(-1, Player.tileTargetX, Player.tileTargetY, 1);
 
                 if (modPlayer.mirrorWandEffects)
-                    UIUtilities.MirrorWandPlacement(Player.tileTargetX, Player.tileTargetY, selectedItem, -1);
+                    Tools.MirrorWandPlacement(Player.tileTargetX, Player.tileTargetY, selectedItem, -1);
 
                 return base.CanPlace(i, j, type);
             }
@@ -182,7 +182,7 @@ public override void PlaceInWorld(int i, int j, Item item)
             }
 
             if (modPlayer.mirrorWandEffects)
-                UIUtilities.MirrorWandPlacement(i, j, item, -1);
+                Tools.MirrorWandPlacement(i, j, item, -1);
 
             if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement) ||
                 modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
@@ -204,7 +204,7 @@ public override void PlaceInWorld(int i, int j, int type, Item item)
                 item.consumable = true;
 
             if (modPlayer.mirrorWandEffects)
-                UIUtilities.MirrorWandPlacement(i, j, item, type);
+                Tools.MirrorWandPlacement(i, j, item, type);
         }
     }
 }
diff --git a/Items/SuperPaintingTool.cs b/Items/SuperPaintingTool.cs
@@ -57,7 +57,7 @@ public override void UpdateInventory(Player player)
                     BasePanel.paintingUIOpen = false;
                 }
 
-                if (Main.mouseRight && UIUtilities.IsUIAvailable()
+                if (Main.mouseRight && Tools.IsUIAvailable()
                         && (!player.mouseInterface || (BasePanel.paintingUIOpen && BasePanel.paintingPanel.IsMouseHovering))
                         && player.inventory[player.selectedItem].IsTheSameAs(item)
                         && !BasePanel.creativeWheelUIOpen)
diff --git a/UI/BasePanel.cs b/UI/BasePanel.cs
@@ -4,7 +4,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
 using BuilderEssentials.Utilities;
-using static BuilderEssentials.BuilderPlayer;
 using System.Collections.Generic;
 
 namespace BuilderEssentials.UI
@@ -137,7 +136,7 @@ public override void Update(GameTime gameTime)
         public void ChangeAccessories_OnClick(UIMouseEvent evt, UIElement listeningElement)
         {
             if (isBuildingModeButtonVisible)
-                BuildingMode.BuildingModeAccessoriesToggle();
+                Tools.BuildingModeAccessoriesToggle();
         }
     }
 }
diff --git a/Utilities/AutoHammer.cs b/Utilities/AutoHammer.cs
@@ -4,7 +4,7 @@
 namespace BuilderEssentials.Utilities
 {
 
-    public static class AutoHammer
+    public static partial class Tools
     {
         public static void ChangeSlope(ref int oldPosX, ref int oldPosY, ref Tile previousClickedTile)
         {
diff --git a/Utilities/BuildingMode.cs b/Utilities/BuildingMode.cs
@@ -8,7 +8,7 @@
 
 namespace BuilderEssentials.Utilities
 {
-    public static class BuildingMode
+    public static partial class Tools
     {
         public static void BuildingModeAccessoriesToggle()
         {
diff --git a/Utilities/FurnitureFinder.cs b/Utilities/FurnitureFinder.cs
@@ -3,7 +3,7 @@
 
 namespace BuilderEssentials.Utilities
 {
-    public static class FurnitureFinder
+    public static partial class Tools
     {
         public static void FindFurniture(Tile tile, ref Item item)
         {
diff --git a/Utilities/ItemPicker.cs b/Utilities/ItemPicker.cs
@@ -4,7 +4,7 @@
 namespace BuilderEssentials.Utilities
 {
 
-    public class ItemPicker
+    public static partial class Tools
     {
         public static void PickItem(ref int oldPosX, ref int oldPosY)
         {
@@ -48,7 +48,7 @@ public static void PickItem(ref int oldPosX, ref int oldPosY)
                 {
                     //Furniture Check
                     //If it is a furniture and has a different frame, item will be changed to the correct frame item
-                    FurnitureFinder.FindFurniture(tile, ref item);
+                    FindFurniture(tile, ref item);
 
                     bool isItemInInventory = false;
                     for (int i = 0; i < 50; i++)
diff --git a/Utilities/MiscUtilities.cs b/Utilities/MiscUtilities.cs
@@ -6,7 +6,7 @@
 
 namespace BuilderEssentials.Utilities
 {
-    public static class UIUtilities
+    public static partial class Tools
     {
         public static bool IsUIAvailable()
         {
@@ -126,5 +126,18 @@ bool IsWithinRange(float number, float value1, float value2)
                 }
             }
         }
+
+        public static bool IsTownNpc(NPC npc)
+        {
+            return (npc.type == NPCID.Guide || npc.type == NPCID.Merchant || npc.type == NPCID.Nurse ||
+                    npc.type == NPCID.Demolitionist || npc.type == NPCID.DyeTrader || npc.type == NPCID.Angler ||
+                    npc.type == NPCID.Dryad || npc.type == NPCID.Painter || npc.type == NPCID.ArmsDealer ||
+                    npc.type == NPCID.DD2Bartender || npc.type == NPCID.Stylist || npc.type == NPCID.GoblinTinkerer ||
+                    npc.type == NPCID.WitchDoctor || npc.type == NPCID.Clothier || npc.type == NPCID.Mechanic ||
+                    npc.type == NPCID.PartyGirl || npc.type == NPCID.Wizard || npc.type == NPCID.TaxCollector ||
+                    npc.type == NPCID.Truffle || npc.type == NPCID.Pirate || npc.type == NPCID.Steampunker ||
+                    npc.type == NPCID.Cyborg || npc.type == NPCID.SantaClaus || npc.type == NPCID.TravellingMerchant ||
+                    npc.type == NPCID.OldMan || npc.type == NPCID.SkeletonMerchant);
+        }
     }
 }
diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 displayName = Builder Essentials
 author = Kirtle
-version = 0.1.11.3
+version = 0.1.12
 buildIgnore = *.csproj, *.user, obj\*, bin\*, .vs\*
 homepage = https://discord.gg/wQYMbQq
diff --git a/description.txt b/description.txt
@@ -17,6 +17,7 @@ Happy Building!
 
 Latest Changelog:
   - Introduced the Mirror Wand
+  - Introduced the BuildInPeace accessory and buff
   - Fixed a few more bugs and edge cases
 
 Dev Team

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public override void ResetEffects()`
`100`	`100`	`public override void ProcessTriggers(TriggersSet triggersSet)`
`101`	`101`	`{`
`102`	`102`	`if (BuilderEssentials.ToggleBuildingMode.JustPressed)`
`103`		`- BuildingMode.BuildingModeAccessoriesToggle();`
	`103`	`+ Tools.BuildingModeAccessoriesToggle();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public override TagCompound Save()`
`@@ -168,8 +168,8 @@ public override void OnEnterWorld(Player player)`
`168`	`168`	`BasePanel.buildingModeButton.SetImage(BuilderEssentials.BuildingModeOff);`
`169`	`169`
`170`	`170`	`//Loads (or populates) all lists on enter world`
`171`		`- BuildingMode.BuildingModeAccessoriesToggle();`
`172`		`- BuildingMode.BuildingModeAccessoriesToggle();`
	`171`	`+ Tools.BuildingModeAccessoriesToggle();`
	`172`	`+ Tools.BuildingModeAccessoriesToggle();`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override void UpdateAccessory(Player player, bool hideVisual)`
`47`	`47`	`Player.tileRangeY = 55;`
`48`	`48`
`49`	`49`	`//Right click timer`
`50`		`- if (Main.mouseRight && UIUtilities.IsUIAvailable()`
	`50`	`+ if (Main.mouseRight && Tools.IsUIAvailable()`
`51`	`51`	`&& (!player.mouseInterface \|\| CreativeWheelRework.CreativeWheelReworkPanel.IsMouseHovering)`
`52`	`52`	`&& !BasePanel.paintingUIOpen && player.inventory[player.selectedItem].IsAir)`
`53`	`53`	`{`
`@@ -61,15 +61,15 @@ public override void UpdateAccessory(Player player, bool hideVisual)`
`61`	`61`	`//ItemPicker`
`62`	`62`	`if (Main.mouseMiddle && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.ItemPicker)`
`63`	`63`	`&& !player.mouseInterface && !Main.playerInventory)`
`64`		`- ItemPicker.PickItem(ref oldPosX, ref oldPosY);`
	`64`	`+ Tools.PickItem(ref oldPosX, ref oldPosY);`
`65`	`65`
`66`	`66`	`//AutoHammer`
`67`	`67`	`if (Main.mouseLeft && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.AutoHammer)`
`68`	`68`	`&& player.inventory[player.selectedItem].IsAir && CreativeWheelRework.CreativeWheelReworkPanel != null && !player.mouseInterface`
`69`	`69`	`&& !Main.playerInventory)`
`70`	`70`	`{`
`71`	`71`	`if (!CreativeWheelRework.CreativeWheelReworkPanel.IsMouseHovering)`
`72`		`- AutoHammer.ChangeSlope(ref oldPosX, ref oldPosY, ref previousClickedTile);`
	`72`	`+ Tools.ChangeSlope(ref oldPosX, ref oldPosY, ref previousClickedTile);`
`73`	`73`	`}`
`74`	`74`	`else if (Main.mouseLeft && modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.AutoHammer)`
`75`	`75`	`&& !player.inventory[player.selectedItem].IsAir && !player.mouseInterface && !Main.playerInventory)`
`@@ -135,7 +135,7 @@ public override bool CanPlace(int i, int j, int type)`
`135`	`135`	`NetMessage.SendTileSquare(-1, Player.tileTargetX, Player.tileTargetY, 1);`
`136`	`136`
`137`	`137`	`if (modPlayer.mirrorWandEffects)`
`138`		`- UIUtilities.MirrorWandPlacement(Player.tileTargetX, Player.tileTargetY, selectedItem, -1);`
	`138`	`+ Tools.MirrorWandPlacement(Player.tileTargetX, Player.tileTargetY, selectedItem, -1);`
`139`	`139`
`140`	`140`	`return base.CanPlace(i, j, type);`
`141`	`141`	`}`
`@@ -182,7 +182,7 @@ public override void PlaceInWorld(int i, int j, Item item)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (modPlayer.mirrorWandEffects)`
`185`		`- UIUtilities.MirrorWandPlacement(i, j, item, -1);`
	`185`	`+ Tools.MirrorWandPlacement(i, j, item, -1);`
`186`	`186`
`187`	`187`	`if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement) \|\|`
`188`	`188`	`modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))`
`@@ -204,7 +204,7 @@ public override void PlaceInWorld(int i, int j, int type, Item item)`
`204`	`204`	`item.consumable = true;`
`205`	`205`
`206`	`206`	`if (modPlayer.mirrorWandEffects)`
`207`		`- UIUtilities.MirrorWandPlacement(i, j, item, type);`
	`207`	`+ Tools.MirrorWandPlacement(i, j, item, type);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override void UpdateInventory(Player player)`
`57`	`57`	`BasePanel.paintingUIOpen = false;`
`58`	`58`	`}`
`59`	`59`
`60`		`- if (Main.mouseRight && UIUtilities.IsUIAvailable()`
	`60`	`+ if (Main.mouseRight && Tools.IsUIAvailable()`
`61`	`61`	`&& (!player.mouseInterface \|\| (BasePanel.paintingUIOpen && BasePanel.paintingPanel.IsMouseHovering))`
`62`	`62`	`&& player.inventory[player.selectedItem].IsTheSameAs(item)`
`63`	`63`	`&& !BasePanel.creativeWheelUIOpen)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using Microsoft.Xna.Framework.Graphics;`
`5`	`5`	`using Microsoft.Xna.Framework;`
`6`	`6`	`using BuilderEssentials.Utilities;`
`7`		`-using static BuilderEssentials.BuilderPlayer;`
`8`	`7`	`using System.Collections.Generic;`
`9`	`8`
`10`	`9`	`namespace BuilderEssentials.UI`
`@@ -137,7 +136,7 @@ public override void Update(GameTime gameTime)`
`137`	`136`	`public void ChangeAccessories_OnClick(UIMouseEvent evt, UIElement listeningElement)`
`138`	`137`	`{`
`139`	`138`	`if (isBuildingModeButtonVisible)`
`140`		`- BuildingMode.BuildingModeAccessoriesToggle();`
	`139`	`+ Tools.BuildingModeAccessoriesToggle();`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace BuilderEssentials.Utilities`
`5`	`5`	`{`
`6`	`6`
`7`		`- public static class AutoHammer`
	`7`	`+ public static partial class Tools`
`8`	`8`	`{`
`9`	`9`	`public static void ChangeSlope(ref int oldPosX, ref int oldPosY, ref Tile previousClickedTile)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace BuilderEssentials.Utilities`
`10`	`10`	`{`
`11`		`- public static class BuildingMode`
	`11`	`+ public static partial class Tools`
`12`	`12`	`{`
`13`	`13`	`public static void BuildingModeAccessoriesToggle()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace BuilderEssentials.Utilities`
`5`	`5`	`{`
`6`		`- public static class FurnitureFinder`
	`6`	`+ public static partial class Tools`
`7`	`7`	`{`
`8`	`8`	`public static void FindFurniture(Tile tile, ref Item item)`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace BuilderEssentials.Utilities`
`5`	`5`	`{`
`6`	`6`
`7`		`- public class ItemPicker`
	`7`	`+ public static partial class Tools`
`8`	`8`	`{`
`9`	`9`	`public static void PickItem(ref int oldPosX, ref int oldPosY)`
`10`	`10`	`{`
`@@ -48,7 +48,7 @@ public static void PickItem(ref int oldPosX, ref int oldPosY)`
`48`	`48`	`{`
`49`	`49`	`//Furniture Check`
`50`	`50`	`//If it is a furniture and has a different frame, item will be changed to the correct frame item`
`51`		`- FurnitureFinder.FindFurniture(tile, ref item);`
	`51`	`+ FindFurniture(tile, ref item);`
`52`	`52`
`53`	`53`	`bool isItemInInventory = false;`
`54`	`54`	`for (int i = 0; i < 50; i++)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace BuilderEssentials.Utilities`
`8`	`8`	`{`
`9`		`- public static class UIUtilities`
	`9`	`+ public static partial class Tools`
`10`	`10`	`{`
`11`	`11`	`public static bool IsUIAvailable()`
`12`	`12`	`{`
`@@ -126,5 +126,18 @@ bool IsWithinRange(float number, float value1, float value2)`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ public static bool IsTownNpc(NPC npc)`
	`131`	`+ {`
	`132`	`+ return (npc.type == NPCID.Guide \|\| npc.type == NPCID.Merchant \|\| npc.type == NPCID.Nurse \|\|`
	`133`	`+ npc.type == NPCID.Demolitionist \|\| npc.type == NPCID.DyeTrader \|\| npc.type == NPCID.Angler \|\|`
	`134`	`+ npc.type == NPCID.Dryad \|\| npc.type == NPCID.Painter \|\| npc.type == NPCID.ArmsDealer \|\|`
	`135`	`+ npc.type == NPCID.DD2Bartender \|\| npc.type == NPCID.Stylist \|\| npc.type == NPCID.GoblinTinkerer \|\|`
	`136`	`+ npc.type == NPCID.WitchDoctor \|\| npc.type == NPCID.Clothier \|\| npc.type == NPCID.Mechanic \|\|`
	`137`	`+ npc.type == NPCID.PartyGirl \|\| npc.type == NPCID.Wizard \|\| npc.type == NPCID.TaxCollector \|\|`
	`138`	`+ npc.type == NPCID.Truffle \|\| npc.type == NPCID.Pirate \|\| npc.type == NPCID.Steampunker \|\|`
	`139`	`+ npc.type == NPCID.Cyborg \|\| npc.type == NPCID.SantaClaus \|\| npc.type == NPCID.TravellingMerchant \|\|`
	`140`	`+ npc.type == NPCID.OldMan \|\| npc.type == NPCID.SkeletonMerchant);`
	`141`	`+ }`
`129`	`142`	`}`
`130`	`143`	`}`