diff --git a/SINoCOLO/GameLogic.cs b/SINoCOLO/GameLogic.cs index d954748..99a84b8 100644 --- a/SINoCOLO/GameLogic.cs +++ b/SINoCOLO/GameLogic.cs @@ -28,7 +28,9 @@ public enum ETargetingMode Deselect, CycleAll, CycleTop3, + CycleHiding, LockStrongest, + LockWeakest, } public delegate void MouseClickDelegate(int posX, int posY); diff --git a/SINoCOLO/MainForm.cs b/SINoCOLO/MainForm.cs index a8dd529..f735690 100644 --- a/SINoCOLO/MainForm.cs +++ b/SINoCOLO/MainForm.cs @@ -359,12 +359,14 @@ private void MainForm_Load(object sender, EventArgs e) comboBoxStoryMode.SelectedIndex = (int)GameLogic.EStoryMode.FarmStage; } { - string[] itemDesc = new string[5]; + string[] itemDesc = new string[7]; itemDesc[(int)GameLogic.ETargetingMode.None] = "Manual"; itemDesc[(int)GameLogic.ETargetingMode.Deselect] = "Deselect"; itemDesc[(int)GameLogic.ETargetingMode.CycleAll] = "Cycle All"; itemDesc[(int)GameLogic.ETargetingMode.CycleTop3] = "Cycle Front"; + itemDesc[(int)GameLogic.ETargetingMode.CycleHiding] = "Cycle Hiding"; itemDesc[(int)GameLogic.ETargetingMode.LockStrongest] = "Lock Strongest"; + itemDesc[(int)GameLogic.ETargetingMode.LockWeakest] = "Lock Weakest"; comboBoxColoTarget.Items.Clear(); comboBoxColoTarget.Items.AddRange(itemDesc); diff --git a/SINoCOLO/Properties/AssemblyInfo.cs b/SINoCOLO/Properties/AssemblyInfo.cs index 58b38a1..9be8796 100644 --- a/SINoCOLO/Properties/AssemblyInfo.cs +++ b/SINoCOLO/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("28.0.0.0")] -[assembly: AssemblyFileVersion("28.0.0.0")] +[assembly: AssemblyVersion("29.0.0.0")] +[assembly: AssemblyFileVersion("29.0.0.0")] diff --git a/SINoCOLO/TrackerTargeting.cs b/SINoCOLO/TrackerTargeting.cs index 0315480..4ebd3ad 100644 --- a/SINoCOLO/TrackerTargeting.cs +++ b/SINoCOLO/TrackerTargeting.cs @@ -12,6 +12,7 @@ class TrackerTargeting private int[] rotationPatternAll = { 0, 1, 2, 3, 4 }; private int[] rotationPattern3 = { 0, 1, 2 }; + private int[] rotationPatternHiding = { 4, 3, 0 }; private int rotationIdx = -1; private int delay = 0; private GameLogic.ETargetingMode mode; @@ -44,6 +45,10 @@ public void Update() pendingActionBox = rectTargets[0]; break; + case GameLogic.ETargetingMode.LockWeakest: + pendingActionBox = rectTargets[4]; + break; + case GameLogic.ETargetingMode.CycleAll: rotationIdx = (rotationIdx + 1) % rotationPatternAll.Length; pendingActionBox = rectTargets[rotationPatternAll[rotationIdx]]; @@ -54,6 +59,11 @@ public void Update() pendingActionBox = rectTargets[rotationPattern3[rotationIdx]]; break; + case GameLogic.ETargetingMode.CycleHiding: + rotationIdx = (rotationIdx + 1) % rotationPatternHiding.Length; + pendingActionBox = rectTargets[rotationPatternHiding[rotationIdx]]; + break; + default: break; } }