Read ids and save ids for enchantments (#38262)

CleverRaven · Apr 2, 2020 · 03365cd · 03365cd
1 parent 2a64a62
commit 03365cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/magic_enchantment.cpp b/src/magic_enchantment.cpp
@@ -241,6 +241,13 @@ void enchantment::serialize( JsonOut &jsout ) const
 {
     jsout.start_object();
 
+    if( !id.is_empty() ) {
+        jsout.member( "id", id );
+        jsout.end_object();
+        // if the enchantment has an id then it is defined elsewhere and does not need to be serialized.
+        return;
+    }
+
     jsout.member( "has", io::enum_to_string<has>( active_conditions.first ) );
     jsout.member( "condition", io::enum_to_string<condition>( active_conditions.second ) );
 

diff --git a/src/relic.cpp b/src/relic.cpp
@@ -37,6 +37,9 @@ void relic::load( const JsonObject &jo )
         for( JsonObject jobj : jo.get_array( "passive_effects" ) ) {
             enchantment ench;
             ench.load( jobj );
+            if( !ench.id.is_empty() ) {
+                ench = ench.id.obj();
+            }
             add_passive_effect( ench );
         }
     }