UI Files: Many more components

Nenkai · May 31, 2024 · 73775ce · 73775ce
1 parent 2216658
commit 73775ce
Show file tree

Hide file tree

Showing 157 changed files with 2,851 additions and 131 deletions.
diff --git a/GBFRDataTools.Files/UI/BulkReader.cs b/GBFRDataTools.Files/UI/BulkReader.cs
@@ -89,6 +89,13 @@ public UIObject ReadObject(List<UIPropertyTypeDef> validProperties)
                         prop = @byte;
                     }
                     break;
+                case FieldType.U32:
+                    {
+                        var uint32 = new UI_U32();
+                        uint32.Value = this.ReadUInt32();
+                        prop = uint32;
+                    }
+                    break;
                 case FieldType.Object:
                     prop = ReadObject(childProperties);
                     break;

diff --git a/GBFRDataTools.Files/UI/BulkWriter.cs b/GBFRDataTools.Files/UI/BulkWriter.cs
@@ -245,6 +245,14 @@ private long WriteScalar(BinaryStream bs, YamlScalarNode scalarNode, UIPropertyT
             else
                 scalarOffset = _writtenIntegers[value];
         }
+        else if (def.Type == FieldType.U32)
+        {
+            uint value = uint.Parse(scalarNode.Value);
+            if (_writtenIntegers.TryAdd((int)value, scalarOffset))
+                bs.WriteUInt32(value);
+            else
+                scalarOffset = _writtenIntegers[(int)value];
+        }
         else if (def.Type == FieldType.CyanStringHash)
         {
             uint value = uint.Parse(scalarNode.Value, NumberStyles.HexNumber);

diff --git a/GBFRDataTools.Files/UI/Components/Dissolve.cs b/GBFRDataTools.Files/UI/Components/Dissolve.cs
@@ -13,22 +13,22 @@ public class Dissolve // : Component
 {
     public static List<UIPropertyTypeDef> Properties { get; set; } = new()
     {
-         new UIPropertyTypeDef("DissolveTexture", FieldType.ObjectRef,
+         new("DissolveTexture", FieldType.Object,
          [
              // ui::SpriteRef
-             new UIPropertyTypeDef("TexturePath", FieldType.String),
-             new UIPropertyTypeDef("SpriteName", FieldType.CyanStringHash),
+             new("TexturePath", FieldType.String),
+             new("SpriteName", FieldType.CyanStringHash),
          ]),
-         new UIPropertyTypeDef("Cutoff", FieldType.F32),
-         new UIPropertyTypeDef("AddColor1Enabled", FieldType.Bool),
-         new UIPropertyTypeDef("AddColor1", FieldType.CVec4),
-         new UIPropertyTypeDef("BorderWidth1", FieldType.F32),
-         new UIPropertyTypeDef("AddColor2Enabled", FieldType.Bool),
-         new UIPropertyTypeDef("AddColor2", FieldType.CVec4),
-         new UIPropertyTypeDef("BorderWidth2", FieldType.F32),
-         new UIPropertyTypeDef("TrailEnabled", FieldType.Bool),
-         new UIPropertyTypeDef("TrailWidth", FieldType.F32),
-         new UIPropertyTypeDef("RenderType", FieldType.S32),
+         new("Cutoff", FieldType.F32),
+         new("AddColor1Enabled", FieldType.Bool),
+         new("AddColor1", FieldType.CVec4),
+         new("BorderWidth1", FieldType.F32),
+         new("AddColor2Enabled", FieldType.Bool),
+         new("AddColor2", FieldType.CVec4),
+         new("BorderWidth2", FieldType.F32),
+         new("TrailEnabled", FieldType.Bool),
+         new("TrailWidth", FieldType.F32),
+         new("RenderType", FieldType.S32),
     };
 
     public static List<UIPropertyTypeDef> GetAllProperties()

diff --git a/GBFRDataTools.Files/UI/Components/GaugeFill.cs b/GBFRDataTools.Files/UI/Components/GaugeFill.cs
@@ -0,0 +1,26 @@
+using GBFRDataTools.Hashing;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GBFRDataTools.Files.UI.Components;
+
+// ui::component::GaugeFill
+public class GaugeFill // : Gauge
+{
+    public static List<UIPropertyTypeDef> Properties { get; set; } =
+    [
+        new("Image", FieldType.ObjectRef),
+    ];
+
+    public static List<UIPropertyTypeDef> GetAllProperties()
+    {
+        var list = new List<UIPropertyTypeDef>();
+        list.AddRange(Gauge.GetAllProperties());
+        list.AddRange(Properties);
+        return list;
+    }
+}
diff --git a/GBFRDataTools.Files/UI/Components/Gauss.cs b/GBFRDataTools.Files/UI/Components/Gauss.cs
@@ -13,14 +13,14 @@ public class Gauss // : Component
 {
     public static List<UIPropertyTypeDef> Properties { get; set; } =
     [
-        new UIPropertyTypeDef("Sprite", FieldType.ObjectRef,
+        new("Sprite", FieldType.Object,
         [
             // ui::SpriteRef
-            new UIPropertyTypeDef("TexturePath", FieldType.String),
-            new UIPropertyTypeDef("SpriteName", FieldType.CyanStringHash),
+            new("TexturePath", FieldType.String),
+            new("SpriteName", FieldType.CyanStringHash),
         ]),
-        new UIPropertyTypeDef("Rate", FieldType.F32),
-        new UIPropertyTypeDef("IsFullscreen", FieldType.Bool)
+        new("Rate", FieldType.F32),
+        new("IsFullscreen", FieldType.Bool)
     ];
 
     public static List<UIPropertyTypeDef> GetAllProperties()

diff --git a/GBFRDataTools.Files/UI/Components/Image.cs b/GBFRDataTools.Files/UI/Components/Image.cs
@@ -26,7 +26,7 @@ public class Image // : Component
          new("FillCenter", FieldType.Bool),
          new("FillMethod", FieldType.S32),
          new("FillOrigin", FieldType.S32),
-         new("FillAmount", FieldType.S32),
+         new("FillAmount", FieldType.F32),
          new("UvRect", FieldType.CVec4),
          new("RawImage", FieldType.Bool),
          new("Clockwise", FieldType.Bool),

diff --git a/GBFRDataTools.Files/UI/Components/LanguageSetter.cs b/GBFRDataTools.Files/UI/Components/LanguageSetter.cs
@@ -16,7 +16,7 @@ public class LanguageSetter // : Component
          new("MultiData", FieldType.Bool),
          new("LanguageData", FieldType.String),
          new("LanguageOverwriteData", FieldType.String),
-         new("ContainerData", FieldType.String),
+         new("ContainerData", FieldType.StringVector),
 
          // ui::component::LanguageOverwrite
          new("Overwrites", FieldType.ObjectArray,

diff --git a/GBFRDataTools.Files/UI/Components/SelectEntranceMenu.cs b/GBFRDataTools.Files/UI/Components/SelectEntranceMenu.cs
@@ -13,12 +13,12 @@ public class SelectEntranceMenu // : Component
 {
     public static List<UIPropertyTypeDef> Properties { get; set; } =
     [
-        new("Base03ImageSetters", FieldType.ObjectRef),
-        new("Add01ImageSetters", FieldType.ObjectRef),
-        new("Add02ImageSetters", FieldType.ObjectRef),
-        new("Add03ImageSetters", FieldType.ObjectRef),
-        new("Add04ImageSetters", FieldType.ObjectRef),
-        new("ChangeColorImages", FieldType.ObjectRef),
+        new("Base03ImageSetters", FieldType.ObjectRefVector),
+        new("Add01ImageSetters", FieldType.ObjectRefVector),
+        new("Add02ImageSetters", FieldType.ObjectRefVector),
+        new("Add03ImageSetters", FieldType.ObjectRefVector),
+        new("Add04ImageSetters", FieldType.ObjectRefVector),
+        new("ChangeColorImages", FieldType.ObjectRefVector),
     ];
 
     public static List<UIPropertyTypeDef> GetAllProperties()

diff --git a/GBFRDataTools.Files/UI/Components/Shortcut.cs b/GBFRDataTools.Files/UI/Components/Shortcut.cs
@@ -13,7 +13,7 @@ public class Shortcut // : Component
 {
     public static List<UIPropertyTypeDef> Properties { get; set; } =
     [
-         new UIPropertyTypeDef("ButtonTypes", FieldType.StringVector),
+         new UIPropertyTypeDef("ButtonTypes", FieldType.S32Vector),
          new UIPropertyTypeDef("ItemButton", FieldType.ObjectRef),
          new UIPropertyTypeDef("Button", FieldType.ObjectRef),
          new UIPropertyTypeDef("ButtonType", FieldType.S32),

diff --git a/GBFRDataTools.Files/UI/Components/SoundContainer.cs b/GBFRDataTools.Files/UI/Components/SoundContainer.cs
@@ -33,8 +33,19 @@ public class SoundContainer // : Component
         new("Other6", FieldType.String),
         new("CursorUd", FieldType.String),
         new("SelectCancel", FieldType.String),
-        new(0x7BD8E28E, FieldType.String),
+        new("TabLr", FieldType.String),
         new("CursorLr", FieldType.String),
+        new("Choice", FieldType.String),
+        new("Sort", FieldType.String),
+        new("Remove", FieldType.String),
+        new("Index", FieldType.String),
+        new("SelectLock", FieldType.String),
+        new("Max", FieldType.String),
+        new(0x691BDEFB, FieldType.String),
+        new(0x8C106E4D, FieldType.String),
+        new(0xA033C91A, FieldType.String),
+        new(0xDA6FFB4E, FieldType.String),
+        new(0xFBBE3946, FieldType.String),
     ];
 
     public static List<UIPropertyTypeDef> GetAllProperties()

diff --git a/...Controllers/ControllerBlacksmithResult.cs → .../Blacksmith/ControllerBlacksmithResult.cs b/...Controllers/ControllerBlacksmithResult.cs → .../Blacksmith/ControllerBlacksmithResult.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Blacksmith;
 
 // ui::component::ControllerBlacksmithResult
 public class ControllerBlacksmithResult // : Controller

diff --git a/...rollers/ControllerBlacksmithWeaponList.cs → ...cksmith/ControllerBlacksmithWeaponList.cs b/...rollers/ControllerBlacksmithWeaponList.cs → ...cksmith/ControllerBlacksmithWeaponList.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Blacksmith;
 
 // ui::component::ControllerBlacksmithResult
 public class ControllerBlacksmithWeaponList // : Controller

diff --git a/.../UI/Controllers/ControllerCursorAction.cs → .../CursorAction01/ControllerCursorAction.cs b/.../UI/Controllers/ControllerCursorAction.cs → .../CursorAction01/ControllerCursorAction.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.CursorAction01;
 
 // ui::component::ControllerCursorAction
 public class ControllerCursorAction // : Controller

diff --git a/.../Controllers/ControllerCursorMission01.cs → ...ursorMission/ControllerCursorMission01.cs b/.../Controllers/ControllerCursorMission01.cs → ...ursorMission/ControllerCursorMission01.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.CursorMission;
 
 // ui::component::ControllerCursorMission01
 public class ControllerCursorMission01 // : Controller

diff --git a/...UI/Controllers/ControllerBlacksmithTop.cs → ...ommon/Entrance/ControllerBlacksmithTop.cs b/...UI/Controllers/ControllerBlacksmithTop.cs → ...ommon/Entrance/ControllerBlacksmithTop.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Entrance;
 
 // ui::component::ControllerBlacksmithTop
 public class ControllerBlacksmithTop // : Controller

diff --git a/...Controllers/ControllerQuestCounterMenu.cs → ...on/Entrance/ControllerQuestCounterMenu.cs b/...Controllers/ControllerQuestCounterMenu.cs → ...on/Entrance/ControllerQuestCounterMenu.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Entrance;
 
 // ui::component::ControllerQuestCounterMenu
 public class ControllerQuestCounterMenu // : Controller

diff --git a/...UI/Controllers/ControllerSavePointTips.cs → ...ommon/Entrance/ControllerSavePointTips.cs b/...UI/Controllers/ControllerSavePointTips.cs → ...ommon/Entrance/ControllerSavePointTips.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Entrance;
 
 // ui::component::ControllerSavePointTips
 public class ControllerSavePointTips // : Controller

diff --git a/...les/UI/Controllers/ControllerTrialTips.cs → ...rs/Common/Entrance/ControllerTrialTips.cs b/...les/UI/Controllers/ControllerTrialTips.cs → ...rs/Common/Entrance/ControllerTrialTips.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Entrance;
 
 // ui::component::ControllerTrialTips
 public class ControllerTrialTips // : Controller

diff --git a/...iles/UI/Controllers/ControllerTrialTop.cs → ...ers/Common/Entrance/ControllerTrialTop.cs b/...iles/UI/Controllers/ControllerTrialTop.cs → ...ers/Common/Entrance/ControllerTrialTop.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Entrance;
 
 // ui::component::ControllerTrialTop
 public class ControllerTrialTop // : Controller

diff --git a/...Controllers/ControllerInformationToast.cs → ...mon/InfoCmn/ControllerInformationToast.cs b/...Controllers/ControllerInformationToast.cs → ...mon/InfoCmn/ControllerInformationToast.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.InfoCmn;
 
 // ui::component::ControllerInformationToast
 public class ControllerInformationToast // : Controller
@@ -17,7 +17,7 @@ public class ControllerInformationToast // : Controller
         new(0x3F3DDC33, FieldType.ObjectRefVector),
         new(0x4A793E4F, FieldType.ObjectRefVector),
         new(0x6C95FBA8, FieldType.ObjectRef),
-        new(0x849799EB, FieldType.ObjectRef),
+        new(0x849799EB, FieldType.ObjectRefVector),
         new("Canvas", FieldType.ObjectRef),
         new(0x9C794271, FieldType.ObjectRefVector),
         new(0xB4B9959A, FieldType.ObjectRefVector),

diff --git a/...Files/UI/Controllers/ControllerMission.cs → ...llers/Common/Mission/ControllerMission.cs b/...Files/UI/Controllers/ControllerMission.cs → ...llers/Common/Mission/ControllerMission.cs
diff --git a/...es/UI/Controllers/ControllerSubTitle01.cs → ...Common/Subtitle01/ControllerSubTitle01.cs b/...es/UI/Controllers/ControllerSubTitle01.cs → ...Common/Subtitle01/ControllerSubTitle01.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Subtitle01;
 
 // ui::component::ControllerSubTitle01
 public class ControllerSubTitle01 // : Controller

diff --git a/.../UI/Controllers/ControllerSubtitleSkip.cs → ...mmon/Subtitle01/ControllerSubtitleSkip.cs b/.../UI/Controllers/ControllerSubtitleSkip.cs → ...mmon/Subtitle01/ControllerSubtitleSkip.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Subtitle01;
 
 // ui::component::ControllerSubTitleSkip
 public class ControllerSubtitleSkip // : Controller

diff --git a/...ontrollers/ControllerSubtitleSkipGuide.cs → ...Subtitle01/ControllerSubtitleSkipGuide.cs b/...ontrollers/ControllerSubtitleSkipGuide.cs → ...Subtitle01/ControllerSubtitleSkipGuide.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Subtitle01;
 
 // ui::component::ControllerSubtitleSkipGuide
 public class ControllerSubtitleSkipGuide // : Controller

diff --git a/...Controllers/ControllerSubtitleSkipWait.cs → .../Subtitle01/ControllerSubtitleSkipWait.cs b/...Controllers/ControllerSubtitleSkipWait.cs → .../Subtitle01/ControllerSubtitleSkipWait.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.Subtitle01;
 
 // ui::component::ControllerSubtitleSkipWait
 public class ControllerSubtitleSkipWait // : Controller

diff --git a/....Files/UI/Controllers/ControllerWinCut.cs → ...rollers/Common/WinCut/ControllerWinCut.cs b/....Files/UI/Controllers/ControllerWinCut.cs → ...rollers/Common/WinCut/ControllerWinCut.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCut
 public class ControllerWinCut // : Controller

diff --git a/.../UI/Controllers/ControllerWinCutChoice.cs → ...s/Common/WinCut/ControllerWinCutChoice.cs b/.../UI/Controllers/ControllerWinCutChoice.cs → ...s/Common/WinCut/ControllerWinCutChoice.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutChoice
 public class ControllerWinCutChoice // : Controller

diff --git a/...les/UI/Controllers/ControllerWinCutLog.cs → ...lers/Common/WinCut/ControllerWinCutLog.cs b/...les/UI/Controllers/ControllerWinCutLog.cs → ...lers/Common/WinCut/ControllerWinCutLog.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutLog
 public class ControllerWinCutLog // : Controller

diff --git a/...I/Controllers/ControllerWinCutWordList.cs → ...Common/WinCut/ControllerWinCutWordList.cs b/...I/Controllers/ControllerWinCutWordList.cs → ...Common/WinCut/ControllerWinCutWordList.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutWordList
 public class ControllerWinCutWordList // : Controller

diff --git a/...rollers/ControllerWinCutWordListButton.cs → .../WinCut/ControllerWinCutWordListButton.cs b/...rollers/ControllerWinCutWordListButton.cs → .../WinCut/ControllerWinCutWordListButton.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutWordListButton
 public class ControllerWinCutWordListButton // : Controller

diff --git a/...rollers/ControllerWinCutWordListInfo01.cs → .../WinCut/ControllerWinCutWordListInfo01.cs b/...rollers/ControllerWinCutWordListInfo01.cs → .../WinCut/ControllerWinCutWordListInfo01.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutWordListInfo01
 public class ControllerWinCutWordListInfo01 // : Controller

diff --git a/...rollers/ControllerWinCutWordListInfo02.cs → .../WinCut/ControllerWinCutWordListInfo02.cs b/...rollers/ControllerWinCutWordListInfo02.cs → .../WinCut/ControllerWinCutWordListInfo02.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinCut;
 
 // ui::component::ControllerWinCutWordListInfo02
 public class ControllerWinCutWordListInfo02 // : Controller

diff --git a/...rollers/ControllerChallengeMissionIcon.cs → ...WinTalk/ControllerChallengeMissionIcon.cs b/...rollers/ControllerChallengeMissionIcon.cs → ...WinTalk/ControllerChallengeMissionIcon.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinTalk;
 
 // ui::component::ControllerChallengeMissionIcon
 public class ControllerChallengeMissionIcon // : Controller

diff --git a/...Files/UI/Controllers/ControllerWinTalk.cs → ...llers/Common/WinTalk/ControllerWinTalk.cs b/...Files/UI/Controllers/ControllerWinTalk.cs → ...llers/Common/WinTalk/ControllerWinTalk.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GBFRDataTools.Files.UI.Controllers;
+namespace GBFRDataTools.Files.UI.Controllers.Common.WinTalk;
 
 // ui::component::ControllerWinTalk
 public class ControllerWinTalk // : Controller