v1.2.0 - Added check for wire mode to view emitters/holograms

hamstar0 · May 24, 2020 · 077ced1 · 077ced1
1 parent 2769d65
commit 077ced1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 48 deletions.
diff --git a/Emitters todo.txt b/Emitters todo.txt
@@ -22,9 +22,9 @@ v1.3
 -	Add hologram modes (NPC, item, projectile)
 -	Add shader modes
 -	Add tabs
+
 v1.2
 -	Show all emitter/holograms while in wire mode
-
 -	Re-implement color and alpha for CRT fx
 -	Add hologram CRT fx dialog field (imported from Chloe)
 -	Fix wire activations

diff --git a/Emitters/Effects/ScanlinesWaves.fx b/Emitters/Effects/ScanlinesWaves.fx
diff --git a/Emitters/Effects/ScanlinesWaves.xnb b/Emitters/Effects/ScanlinesWaves.xnb
diff --git a/Emitters/Items/EmitterItem_Interactivity.cs b/Emitters/Items/EmitterItem_Interactivity.cs
@@ -2,6 +2,7 @@
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
+using Terraria.GameContent.UI;
 using HamstarHelpers.Services.Timers;
 using HamstarHelpers.Helpers.Items;
 using HamstarHelpers.Helpers.Players;
@@ -22,9 +23,10 @@ public static void OpenUI( Item emitterItem ) {
 		////////////////
 
 		public static bool CanViewEmitters( Player plr ) {
-			return plr.HeldItem != null
-				&& !plr.HeldItem.IsAir
-				&& plr.HeldItem.type == ModContent.ItemType<EmitterItem>();
+			return WiresUI.Settings.DrawWires || (
+					plr.HeldItem != null
+					&& !plr.HeldItem.IsAir
+					&& plr.HeldItem.type == ModContent.ItemType<EmitterItem>() );
 		}
 
 

diff --git a/Emitters/Items/HologramItem_Interactivity.cs b/Emitters/Items/HologramItem_Interactivity.cs
@@ -2,6 +2,7 @@
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
+using Terraria.GameContent.UI;
 using static Terraria.ModLoader.ModContent;
 using HamstarHelpers.Services.Timers;
 using HamstarHelpers.Helpers.Items;
@@ -23,9 +24,10 @@ public static void OpenUI( Item HologramItem ) {
 		////////////////
 
 		public static bool CanViewHolograms( Player plr ) {
-			return plr.HeldItem != null
-				&& !plr.HeldItem.IsAir
-				&& plr.HeldItem.type == ModContent.ItemType<HologramItem>();
+			return WiresUI.Settings.DrawWires || (
+					plr.HeldItem != null
+					&& !plr.HeldItem.IsAir
+					&& plr.HeldItem.type == ModContent.ItemType<HologramItem>() );
 		}
 
 

diff --git a/Emitters/Items/SoundEmitterItem_Interactivity.cs b/Emitters/Items/SoundEmitterItem_Interactivity.cs
@@ -2,6 +2,7 @@
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
+using Terraria.GameContent.UI;
 using HamstarHelpers.Helpers.Items;
 using HamstarHelpers.Helpers.Players;
 using HamstarHelpers.Services.Timers;
@@ -34,9 +35,10 @@ public static void OpenUI( Item soundEmitterItem ) {
 		////////////////
 
 		public static bool CanViewSoundEmitters( Player plr ) {
-			return plr.HeldItem != null
-				&& !plr.HeldItem.IsAir
-				&& plr.HeldItem.type == ModContent.ItemType<SoundEmitterItem>();
+			return WiresUI.Settings.DrawWires || (
+					plr.HeldItem != null
+					&& !plr.HeldItem.IsAir
+					&& plr.HeldItem.type == ModContent.ItemType<SoundEmitterItem>() );
 		}
 
 

diff --git a/Emitters/MyMod.cs b/Emitters/MyMod.cs
@@ -57,7 +57,7 @@ public override void Unload() {
 		////
 
 		public override void PostSetupContent() {
-			if( !Main.dedServ ) {
+			if( !Main.dedServ && Main.netMode != 2 ) {
 				this.EmitterTex = this.GetTexture( "Definitions/Emitter" );
 				this.SoundEmitterTex = this.GetTexture( "Definitions/SoundEmitter" );
 				this.HologramTex = this.GetTexture( "Definitions/Hologram" );
@@ -81,7 +81,6 @@ public override void PostSetupContent() {
 		//		},
 		//			InterfaceScaleType.UI)
 		//		);
-
 		//}
 	}
 }