Merge pull request #8 from SoulstoneAddons/dev

Issues fixed

Author: NadeonCH

SoulstoneSurvivorsSkada/Bootstrapper.cs

@@ -82,6 +82,11 @@ private void Update()
 		{
 			// order the spells by damage in ascending order
 			PlayerSkadaHistory.DamageBySpellsOrdered = PlayerSkadaHistory.SortDamageBySpellsOrdered();
+
+			if (PlayerSkadaHistory.IsEmpty)
+			{
+				PlayerSkadaHistory.Reset();
+			}
 		}
 	}
 

SoulstoneSurvivorsSkada/History/PlayerSkadaHistory.cs

@@ -16,7 +16,7 @@ internal static class PlayerSkadaHistory
 	/// <summary>
 	/// If the history is empty or not
 	/// </summary>
-	public static bool IsEmpty => GameManagerUtil.GameStats.TotalDamageDonePerSkillIdNew.Count == 0;
+	public static bool IsEmpty => GameManagerUtil.GameStats.TotalDamageDonePerSkillIdNewCount == 0;
 
 	public static bool IsStarted => SkadaTime.PlayerStartTime > 0;
 

SoulstoneSurvivorsSkada/Interfaces/ISkadaView.cs

@@ -23,4 +23,14 @@ public interface ISkadaView
 	/// <param name="windowRect">Rectangle of the Window</param>
 	/// <param name="windowID">ID of the Window</param>
 	public void OnGUI(ref Rect windowRect, int windowID);
+	
+	/// <summary>
+	/// Called when the View is enabled
+	/// </summary>
+	public void OnEnable();
+	
+	/// <summary>
+	/// Called when the View is disabled
+	/// </summary>
+	public void OnDisable();
 }

SoulstoneSurvivorsSkada/Patchers/GamePatches.cs

@@ -26,10 +26,10 @@ public static void DoApplyEffects(ChangeHealthEffect __instance,
 	}
 
 	// Hook into the ConfirmationPanel.OnConfirmSelected method to reset the SkadaHistory when the player restarts the game
-	[HarmonyPatch(typeof(ConfirmationPanel), nameof(ConfirmationPanel.OnConfirmSelected))]
-	[HarmonyPostfix]
-	public static void OnRestartPressed()
-	{
-		PlayerSkadaHistory.Reset();
-	}
+	// [HarmonyPatch(typeof(ConfirmationPanel), nameof(ConfirmationPanel.OnConfirmSelected))]
+	// [HarmonyPostfix]
+	// public static void OnRestartPressed()
+	// {
+	// 	PlayerSkadaHistory.Reset();
+	// }
 }

SoulstoneSurvivorsSkada/SkadaPlugin.cs

@@ -37,6 +37,7 @@ public override void Load()
 		try
 		{
 			_bootstrapper = AddComponent<Bootstrapper>();
+			Object.DontDestroyOnLoad(_bootstrapper.gameObject);
 		}
 		catch (Exception ex)
 		{

SoulstoneSurvivorsSkada/Utilities/TextureUtility.cs

@@ -0,0 +1,26 @@
+using UnityEngine;
+
+namespace SoulstoneSurvivorsSkada;
+
+public class TextureUtility
+{
+	/// <summary>
+	/// Texture for the Bar
+	/// </summary>
+	public static Texture2D BarTexture
+	{
+		get
+		{
+			// create a 1x1 texture with red color
+			Texture2D texture = new Texture2D(1, 1, TextureFormat.RGBA32, false);
+			// set the pixel to red
+			texture.SetPixel(0, 0, Color.red);
+			texture.wrapMode = TextureWrapMode.Repeat;
+			// apply the changes
+			texture.Apply();
+			texture.hideFlags = HideFlags.DontSave;
+			// return the texture
+			return texture;
+		}
+	}
+}

SoulstoneSurvivorsSkada/Views/PlayerDamageMeterSkadaView.cs

@@ -12,40 +12,26 @@ public sealed class PlayerDamageMeterSkadaView : ISkadaView
 {
 	public int ScrollPosition { get; set; }
 	public string Title { get; set; } = "Skada - Player Damage";
-
-	/// <summary>
-	/// Style for the Bar
-	/// </summary>
-	private static readonly GUIStyle BarStyle = new(GUI.skin.box)
+	
+	private static GUIStyle BarStyle = new GUIStyle(GUI.skin.box)
 	{
 		normal =
 		{
-			background = BarTexture
+			background = TextureUtility.BarTexture
 		},
 		overflow = new RectOffset(0,0,0,0),
 		fixedHeight = ResUtility.GetHeight(20)
 	};
 
-	private static readonly Texture2D Texture = BarTexture;
-	
-	/// <summary>
-	/// Texture for the Bar
-	/// </summary>
-	private static Texture2D BarTexture
+	public void OnEnable()
 	{
-		get
-		{
-			// create a 1x1 texture with red color
-			Texture2D texture = new Texture2D(1, 1, TextureFormat.RGBA32, false);
-			// set the pixel to red
-			texture.SetPixel(0, 0, Color.red);
-			// apply the changes
-			texture.Apply();
-			// return the texture
-			return texture;
-		}
 	}
-	
+
+	public void OnDisable()
+	{
+		
+	}
+
 	public void OnGUI(ref Rect windowRect, int windowID)
 	{
 		GUILayout.BeginVertical();
@@ -74,10 +60,12 @@ public void OnGUI(ref Rect windowRect, int windowID)
 				Rect position = GUILayoutUtility.GetRect(0, ResUtility.GetHeight(20));
 
 				BarStyle.fixedHeight = ResUtility.GetHeight(20);
+
+				var barRect = new Rect(0, position.y, ResUtility.GetWidth(320) * percent, position.height);
 
 				// draw the percentage bar
-				GUI.Box(new Rect(0, position.y, windowRect.width * percent, position.height), 
-					"", BarStyle);
+				GUI.Box(barRect, 
+					GUIContent.none, BarStyle);
 
 				string text = $"{skillData.SkillName} - {damage.ToHumanReadableString()} - {percent:P2}";
 

SoulstoneSurvivorsSkada/Views/PlayerDpsSkadaView.cs

@@ -28,4 +28,17 @@ public void OnGUI(ref Rect windowRect, int windowID)
 		float dps = PlayerSkadaHistory.PlayerDps;
 		GUILayout.Label($"DPS: {dps.ToHumanReadableString()}");
 	}
+	
+	public void OnEnable()
+	{
+		// TODO implement view logic
+	}
+
+	/// <summary>
+	/// Called when the View is disabled
+	/// </summary>
+	public void OnDisable()
+	{
+		// TODO implement view logic
+	}
 }

SoulstoneSurvivorsSkada/Views/Window.cs

@@ -28,14 +28,18 @@ public static void ChangeView<T>()
 		if (Views.TryGetValue(typeof(T), out ISkadaView view))
 		{
 			// set the current view to the cached view
+			_currentView?.OnDisable();
 			_currentView = view;
+			view?.OnEnable();
 			return; // return early to avoid creating a new instance
 		}
 		// create a new instance of the view
 		ISkadaView instance = Activator.CreateInstance<T>();
 		// cache the view
 		Views.Add(typeof(T), instance);
+		_currentView?.OnDisable();
 		// set the current view to the new instance
 		_currentView = instance;
+		instance?.OnEnable();
 	}
 }