update to new d_init structure layout

Author: myk002

deep-embark.lua

@@ -1,6 +1,3 @@
--- Embark underground.
--- author: Atomic Chicken
-
 --@ module = true
 
 local utils = require 'utils'
@@ -50,8 +47,8 @@ function getFeatureBlocks(featureID)
 end
 
 function isValidTiletype(tiletype)
-  local tiletype = df.tiletype[tiletype]
-  local tiletypeAttrs = df.tiletype.attrs[tiletype]
+  local tt = df.tiletype[tiletype]
+  local tiletypeAttrs = df.tiletype.attrs[tt]
   local material = tiletypeAttrs.material
   local forbiddenMaterials = {
     df.tiletype_material.TREE, -- so as not to embark stranded on top of a tree
@@ -95,7 +92,7 @@ function blockGlowingBarrierAnnouncements(recenter)
   dfhack.timeout(1,'ticks', function() -- barrier disappears after 1 tick
     announcementFlags:assign(oldFlags) -- restore announcement settings
     if recenter then
---    Remove glowing barrier notifications:
+      -- Remove glowing barrier notifications:
       local status = df.global.world.status
       local announcements = status.announcements
       for i = #announcements-1, 0, -1 do

open-legends.lua

@@ -75,7 +75,7 @@ function LegendsManager:onDestroy()
         dfhack.run_script('devel/pop-screen')
 
         -- disable autosaves for the remainder of this session
-        df.global.d_init.autosave = df.d_init_autosave.NONE
+        df.global.d_init.feature.autosave = df.d_init_autosave.NONE
     end
 end
 

quicksave.lua

@@ -22,18 +22,9 @@ if not dfhack.world.isFortressMode() then
     qerror('This script can only be used in fortress mode')
 end
 
-local ui_main = df.global.plotinfo.main
-local flags4 = df.global.d_init.flags4
-
-local function restore_autobackup()
-    if ui_main.autosave_request and dfhack.isMapLoaded() then
-        dfhack.timeout(10, 'frames', restore_autobackup)
-    else
-        flags4.AUTOBACKUP = true
-    end
-end
-
 function save()
+    local ui_main = df.global.plotinfo.main
+
     -- Request auto-save (preparation steps below discovered from rev eng)
     ui_main.autosave_request = true
     ui_main.autosave_timer = 5
@@ -45,13 +36,6 @@ function save()
     ui_main.save_progress.info.cur_unit_chunk = nil
     ui_main.save_progress.info.cur_unit_chunk_num = -1
     ui_main.save_progress.info.units_offloaded = -1
-
-    -- And since it will overwrite the backup, disable it temporarily
-    if flags4.AUTOBACKUP then
-        flags4.AUTOBACKUP = false
-        restore_autobackup()
-    end
-
     print 'The game should autosave now.'
 end
 

toggle-kbd-cursor.lua

@@ -1,13 +1,13 @@
 local guidm = require('gui.dwarfmode')
 
-local flags4 = df.global.d_init.flags4
+local flags = df.global.d_init.feature.flags
 
-if flags4.KEYBOARD_CURSOR then
-    flags4.KEYBOARD_CURSOR = false
+if flags.KEYBOARD_CURSOR then
+    flags.KEYBOARD_CURSOR = false
     guidm.setCursorPos(xyz2pos(-30000, -30000, -30000))
     print('Keyboard cursor disabled.')
 else
     guidm.setCursorPos(guidm.Viewport.get():getCenter())
-    flags4.KEYBOARD_CURSOR = true
+    flags.KEYBOARD_CURSOR = true
     print('Keyboard cursor enabled.')
 end

twaterlvl.lua

@@ -1,3 +1,3 @@
-
-df.global.d_init.flags1.SHOW_FLOW_AMOUNTS = not df.global.d_init.flags1.SHOW_FLOW_AMOUNTS
+local flags = df.global.d_init.display.flags
+flags.SHOW_FLOW_AMOUNTS = not flags.SHOW_FLOW_AMOUNTS
 print('Water level display toggled.')