fix rangemod move preview

RogueCollab · May 15, 2024 · 0ff41ab · 0ff41ab
1 parent c3b8288
commit 0ff41ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
@@ -23,7 +23,7 @@ public void btnEditStartParams_Click()
 
         public void btnEditUniversal_Click()
         {
-            OpenItem<UniversalActiveEffect>("Universal Event", (UniversalActiveEffect)DataManager.Instance.UniversalEvent, (obj) => {
+            OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
                 DataManager.Instance.UniversalEvent = obj;
                 DataManager.SaveData(PathMod.HardMod(DataManager.DATA_PATH + "Universal" + DataManager.DATA_EXT), obj);
             });

diff --git a/RogueEssence/Data/ActiveEffect.cs b/RogueEssence/Data/ActiveEffect.cs
@@ -218,12 +218,14 @@ public int GetTotalCount()
     }
 
     [Serializable]
-    public class UniversalActiveEffect : ActiveEffect
+    public abstract  class UniversalBaseEffect : ActiveEffect
     {
         public List<ZoneStep> ZoneSteps;
-        public UniversalActiveEffect() : base()
+        public UniversalBaseEffect() : base()
         {
             this.ZoneSteps = new List<ZoneStep>();
         }
+
+        public abstract int GetRange(Character character, ref SkillData entry);
     }
 }
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
@@ -235,7 +235,7 @@ public static void InitInstance()
         /// </summary>
         public string GenUnbreakable;
 
-        public UniversalActiveEffect UniversalEvent;
+        public UniversalBaseEffect UniversalEvent;
 
         public TypeDict<BaseData> UniversalData;
 
@@ -333,7 +333,7 @@ public void InitBase()
 
 
             Version oldVersion = DevHelper.GetVersion(PathMod.ModPath(DATA_PATH + "Universal" + DATA_EXT));
-            UniversalEvent = LoadData<UniversalActiveEffect>(PathMod.ModPath(DATA_PATH + "Universal" + DATA_EXT));
+            UniversalEvent = LoadData<UniversalBaseEffect>(PathMod.ModPath(DATA_PATH + "Universal" + DATA_EXT));
 
             UniversalData = LoadData<TypeDict<BaseData>>(PathMod.ModPath(MISC_PATH + "Index" + DATA_EXT));
             LoadStartParams();

diff --git a/RogueEssence/Dungeon/DungeonScene.cs b/RogueEssence/Dungeon/DungeonScene.cs
@@ -876,7 +876,7 @@ public void CalculateMovePreviews(int previewMove)
 
 
             // TODO: figure out a way to calculate the rangeMod
-            int rangeMod = 0;
+            int rangeMod = DataManager.Instance.UniversalEvent.GetRange(FocusedCharacter, ref data);
             bool canViewPastWalls = false;
 
             if (hitbox is AreaAction)