Merge pull request #5 from SoulstoneMeter/dev

Fixed bugs

Author: NadeonCH

SoulstoneSurvivorsSkada/Bootstrapper.cs

@@ -8,6 +8,7 @@
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using Il2CppSystem.Collections.Generic;
 using Il2CppSystem.IO;
+using SoulstoneSurvivorsSkada.Logging;
 using SoulstoneSurvivorsSkada.Patchers;
 using SoulstoneSurvivorsSkada.Views;
 using UnityEngine;
@@ -77,10 +78,10 @@ private void Update()
 			return;
 
 		// every second order the spells by damage to reduce the calls
-		if (Time.time % 1.0f < 0.01f)
+		if (Time.frameCount % 60 == 0)
 		{
 			// order the spells by damage in ascending order
-			PlayerSkadaHistory.DamageBySpellsOrdered = PlayerSkadaHistory.Sort();
+			PlayerSkadaHistory.DamageBySpellsOrdered = PlayerSkadaHistory.SortDamageBySpellsOrdered();
 		}
 	}
 

SoulstoneSurvivorsSkada/History/PlayerSkadaHistory.cs

@@ -36,27 +36,23 @@ internal static class PlayerSkadaHistory
 	/// <summary>
 	/// Ordered array of spells by damage
 	/// </summary>
-	public static Il2CppReferenceArray<GameStatsSkillData> DamageBySpellsOrdered { get; set; } = Sort();
-		
-	/// <summary>
-	/// Sort the spells by damage in ascending order
-	/// </summary>
-	/// <returns></returns>
-	public static Il2CppReferenceArray<GameStatsSkillData> Sort()
+	public static Il2CppReferenceArray<GameStatsSkillData> DamageBySpellsOrdered =
+		SortDamageBySpellsOrdered();
+	
+	public static Il2CppReferenceArray<GameStatsSkillData> SortDamageBySpellsOrdered()
 	{
-		// get the array of spells
 		Il2CppReferenceArray<GameStatsSkillData> spells = DamageBySpells;
-		// get the length of the array
-		int length = spells.Length;
-		// if the array is empty or has only one element
-		if (length <= 1)
-			// return the array
-			return spells;
-		
-		// sort the array
-		Array.Sort<GameStatsSkillData>(spells, (a, b) => b.FloatValue.CompareTo(a.FloatValue));
-		
-		// return the ordered array
+		for (int a = 0; a < spells.Count - 1; a++)
+		{
+			for (int b = 0; b < spells.Count - a - 1; b++)
+			{
+				if (spells[b].FloatValue > spells[b + 1].FloatValue)
+				{
+					(spells[b], spells[b + 1]) = (spells[b + 1], spells[b]);
+				}
+			}
+		}
+
 		return spells;
 	}
 

SoulstoneSurvivorsSkada/Utilities/ResUtility.cs

@@ -19,6 +19,6 @@ public static float GetHeight(float height)
 
 	public static int GetFontSize(int i)
 	{
-		return (int) (i * (Screen.width / DefaultWidth));
+		return (int) (i * (Screen.height / DefaultHeight));
 	}
 }

SoulstoneSurvivorsSkada/Views/PlayerDamageMeterSkadaView.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using Il2CppSystem.Collections.Generic;
 using SoulstoneSurvivorsSkada.Extensions;
@@ -21,9 +22,12 @@ public sealed class PlayerDamageMeterSkadaView : ISkadaView
 		{
 			background = BarTexture
 		},
-		fixedHeight = 20
+		overflow = new RectOffset(0,0,0,0),
+		fixedHeight = ResUtility.GetHeight(20)
 	};
 
+	private static readonly Texture2D Texture = BarTexture;
+	
 	/// <summary>
 	/// Texture for the Bar
 	/// </summary>
@@ -48,6 +52,7 @@ public void OnGUI(ref Rect windowRect, int windowID)
 		{
 			// save spells into a variable to avoid multiple calls
 			float totalDamage = PlayerSkadaHistory.PlayerTotalDamage;
+			
 			Il2CppReferenceArray<GameStatsSkillData> spells = PlayerSkadaHistory.DamageBySpellsOrdered;
 
 			GUILayout.Label($"DPS: {PlayerSkadaHistory.PlayerDps.ToHumanReadableString()}");
@@ -62,23 +67,27 @@ public void OnGUI(ref Rect windowRect, int windowID)
 				if (skillData.SkillNameHash == 0) continue;
 				// get the damage value and make it positive
 				float damage = Mathf.Abs(skillData.FloatValue);
-				
 				// calculate the percentage of the damage
 				float percent = skillData.GetPercent(totalDamage);
 
 				// get the position of the GUI
 				Rect position = GUILayoutUtility.GetRect(0, ResUtility.GetHeight(20));
+
+				BarStyle.fixedHeight = ResUtility.GetHeight(20);
 
 				// draw the percentage bar
-				GUI.Box(new Rect(position.x, position.y, windowRect.width * percent, position.height), 
+				GUI.Box(new Rect(0, position.y, windowRect.width * percent, position.height), 
 					"", BarStyle);
-				
-				// set font size scaled by the resolution
-				GUI.skin.label.fontSize = ResUtility.GetFontSize(14);
 
+				string text = $"{skillData.SkillName} - {damage.ToHumanReadableString()} - {percent:P2}";
+
+				// set font size
+				GUI.skin.label.fontSize = ResUtility.GetFontSize(12);
+				
 				// write the spell name, damage, and percentage to the GUI
-				GUI.Label(new Rect(position.x, position.y, position.width, position.height),
-					$"{skillData.SkillName} - {damage.ToHumanReadableString()} - {percent:P2}");
+				// allow overflow to the next line
+				GUI.Label(new Rect(0, position.y, windowRect.width, position.height),
+					text);
 
 				// Add some space between the bars
 				GUILayout.Space(ResUtility.GetHeight(5));