Merge experimental into master for 52.01

df.d_interface.xml

@@ -5898,6 +5898,7 @@
         <enum-item name='START'/>
         <enum-item name='LOAD_OBJECT_FILES'/>
         <enum-item name='LOAD_MUSICSOUND'/>
+        <enum-item name='LOAD_LUA'/>
         <enum-item name='PROCESS_LANGUAGES'/>
         <enum-item name='PROCESS_INORGANICS'/>
         <enum-item name='PROCESS_PLANTS'/>

df.datafile.xml

@@ -74,6 +74,8 @@
         <compound type-name='shared_world_headerst' name='world_header'/>
 
         <stl-string name='filename_noext'/>
+        <stl-fs-path name='full_path'/>
+        <bool name='is_portable'/>
     </struct-type>
 </data-definition>
 

df.g_src.init.xml

@@ -76,7 +76,7 @@
 
     <enum-type type-name='init_media_flags'> bay12: InitMediaFlag
         <enum-item name='SOUND_OFF'/>
-        <enum-item name='UNUSED_01_02'/>
+        <enum-item name='PORTABLE_MODE'/>
         <enum-item name='COMPRESS_SAVES'/>
     </enum-type>
 

df.itemdef.xml

@@ -116,6 +116,7 @@
             <vmethod name='categorize' comment='add to world.raws.itemdefs.whatever'/>
             <vmethod name='finalize' comment='calculate stuff like base value'/>
             <vmethod name='init_material_information'/>
+            <vmethod name='push_to_lua'><pointer name='lua_state'/></vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
     </class-type>

df.random_objects.xml

@@ -0,0 +1,12 @@
+<data-definition>
+    <struct-type type-name='random_object_handlerst'>
+        <pointer name='state' comment='actually a LuaState structure that contains a lua_State pointer'/>
+    </struct-type>
+</data-definition>
+
+<!--
+Local Variables:
+indent-tabs-mode: nil
+nxml-child-indent: 4
+End:
+-->

df.reaction.xml

@@ -187,6 +187,8 @@
         <enum-item name='AUTOMATIC'/>
         <enum-item name='ADVENTURE_MODE_ENABLED'/>
         <enum-item name='GENERATED'/>
+        <enum-item name='FORTRESS_MODE_ENABLED'/>
+        <enum-item name='WORLDGEN_ENABLED'/>
     </enum-type>
 
     <struct-type type-name='reaction' original-name='reactionst'

df.region.xml

@@ -509,6 +509,8 @@
         </compound>
         <compound type-name='shared_world_headerst' name='world_header'/>
         <stl-string name='filename_noext'/>
+        <stl-fs-path name='full_path'/>
+        <bool name='is_portable'/>
     </struct-type>
 
     -- Unused: map_generatorst

df.world.xml

@@ -25,7 +25,7 @@
         <stl-vector name='dependency_type' type-name='mod_header_required_id_flag'/>
         <stl-vector pointer-type='stl-string' name='conflicts'/>
         <bitfield name='flags' base-type='uint32_t' type-name='mod_header_flag'/>
-        <stl-string name='src_dir'/>
+        <stl-fs-path name='src_dir'/>
         <uint64_t name='steam_file_id'/>
         <stl-string name='steam_title'/>
         <stl-string name='steam_description'/>
@@ -320,7 +320,7 @@
     <struct-type type-name='object_loaderst'>
         <enum name='load_object_stage' type-name='load_object_stage_type'/>
         <int32_t name='load_object_stage_count'/>
-        <stl-vector name='object_files' since='v0.40.01' type-name='ptr-string'/>
+        <stl-vector name='object_files' since='v0.40.01' type-name='stl-fs-path'/>
         <int32_t name='object_file_index' since='v0.40.01' refers-to='$$._parent.object_files[$]'/>
 
         <int32_t name='current_load_order_index'/>
@@ -356,6 +356,7 @@
         <enum-item name='SortMusic'/>
         <enum-item name='SortSound'/>
 
+        <enum-item name='PreprocessLua'/>
         <enum-item name='ProcessLanguages'/>
         <enum-item name='ProcessInorganics'/>
         <enum-item name='ProcessPlants'/>
@@ -392,6 +393,7 @@
         <enum-item name='CustomEntities'/>
         <enum-item name='CustomReactions'/>
         <enum-item name='CustomInteractions'/>
+        <enum-item name='CustomLua'/>
         <enum-item name='FinalizeCustomObjects'/>
         <enum-item name='Graphics'/>
         <enum-item name='Done'/>
@@ -625,6 +627,7 @@
             <compound name='text_set' type-name='text_set_handlerst'/>
             <compound name='music' type-name='music_handlerst'/>
             <compound name='sound' type-name='sound_handlerst'/>
+            <compound name='random_object' type-name='random_object_handlerst'/>
             <compound name='mat_table' type-name='special_mat_table'/>
         </compound>
 
@@ -748,6 +751,8 @@
         <compound name='attack_chance_info' type-name='attack_chance_infost'/>
 
         <compound name='active_tutorial' type-name='active_tutorialst'/>
+
+        <stl-fs-path name='loaded_save_path'/>
     </struct-type>
 </data-definition>