More byml serializer adjustments

shibbo · Nov 11, 2023 · 199ffdc · 199ffdc
1 parent 7093ba7
commit 199ffdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/Fushigi.Byml/Serializer/BymlProperty.cs b/Fushigi.Byml/Serializer/BymlProperty.cs
@@ -11,8 +11,6 @@ public class BymlProperty : Attribute
         public string Key { get; set; }
         public object DefaultValue { get; set; }
 
-        public bool Optional = true;
-
         public BymlProperty() { }
 
         public BymlProperty(string key)

diff --git a/Fushigi.Byml/Serializer/BymlSerialize.cs b/Fushigi.Byml/Serializer/BymlSerialize.cs
@@ -170,23 +170,15 @@ static BymlHashTable SetHashTable(object section)
                 var value = properties[i].GetValue(section);
 
                 if (byamlAttribute != null)
-                {
-                    //Skip null optional values
-                    if (byamlAttribute.Optional && value == null)
-                        continue;
-
-                    //If value is null, use a default value
-                    if (value == null)
-                        value = byamlAttribute.DefaultValue;
-                }
+                    value = byamlAttribute.DefaultValue;
 
                 //Set custom keys as property name if used
                 string name = byamlAttribute != null && byamlAttribute.Key != null ? byamlAttribute.Key : properties[i].Name;
 
                 if (value == null)
                     continue;
 
-                var node = SetBymlValue(properties[i].GetValue(section));
+                var node = SetBymlValue(value);
                 bymlProperties.AddNode(node.Id, node, name); 
             }
             return bymlProperties;