Support flat value instances in YAML sequences

psiberx · Jul 9, 2024 · 5da81cb · 5da81cb
1 parent fcbe56d
commit 5da81cb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
@@ -3,6 +3,7 @@
 namespace
 {
 constexpr auto InstanceAttrKey = "$instances";
+constexpr auto ValueAttrKey = "$value";
 
 constexpr auto AttrMark = '$';
 constexpr auto AttrOpen = "({";
@@ -212,7 +213,15 @@ void ProcessNode(const YAML::Node& aNode, const InstanceData& aInstanceData)
                             instanceNode.SetTag(subNode.Tag());
                             ProcessNode(instanceNode, instanceData);
 
-                            expandedNode.push_back(instanceNode);
+                            const auto& valueNode = instanceNode[ValueAttrKey];
+                            if (valueNode.IsDefined() && valueNode.IsScalar())
+                            {
+                                expandedNode.push_back(valueNode);
+                            }
+                            else
+                            {
+                                expandedNode.push_back(instanceNode);
+                            }
                         }
 
                         continue;

diff --git a/vendor/RED4ext.SDK b/vendor/RED4ext.SDK
diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("TweakXL")
-set_version("1.10.1", {build = "%y%m%d%H%M"})
+set_version("1.10.2", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")
+9 −0		include/RED4ext/Buffer-inl.hpp
+5 −3		include/RED4ext/Buffer.hpp
+4 −2		include/RED4ext/Scripting/Natives/AnimKeyFrames.hpp
+1 −1		include/RED4ext/Scripting/Natives/animAnimationBufferCompressed.hpp