Update emigration.lua

wsfsbvchr · web-flow · commit 756350bb6098 · 2023-06-10T13:26:11.000+03:00
Proper fix for stuff, hopefully.
diff --git a/emigration.lua b/emigration.lua
@@ -1,35 +1,28 @@
 --Allow stressed dwarves to emigrate from the fortress
 -- For 34.11 by IndigoFenix; update and cleanup by PeridexisErrant
 -- old version:  http://dffd.bay12games.com/file.php?id=8404
---[====[
-emigration
-==========
-Allows dwarves to emigrate from the fortress when stressed,
-in proportion to how badly stressed they are and adjusted
-for who they would have to leave with - a dwarven merchant
-being more attractive than leaving alone (or with an elf).
-The check is made monthly.
+--@module = true
+--@enable = true
 
-A happy dwarf (ie with negative stress) will never emigrate.
+local json = require('json')
+local persist = require('persist-table')
 
-Usage::
-
-    emigration enable|disable
-]====]
+local GLOBAL_KEY = 'emigration' -- used for state change hooks and persistence
 
 enabled = enabled or false
 
-local args = {...}
-if args[1] == "enable" then
-    enabled = true
-elseif args[1] == "disable" then
-    enabled = false
+function isEnabled()
+    return enabled
+end
+
+local function persist_state()
+    persist.GlobalTable[GLOBAL_KEY] = json.encode({enabled=enabled})
 end
 
 function desireToStay(unit,method,civ_id)
     -- on a percentage scale
     local value = 100 - unit.status.current_soul.personality.stress / 5000
-    if method == 'merchant' or method == 'diplomat' then
+    if method == 'merchant' then
         if civ_id ~= unit.civ_id then value = value*2 end end
     if method == 'wild' then
         value = value*5 end
@@ -50,42 +43,40 @@ function desert(u,method,civ)
         u.flags2.visitor = true
         u.animal.leave_countdown = 2
     end
-
     local hf_id = u.hist_figure_id
     local hf = df.historical_figure.find(u.hist_figure_id)
-    local fort_ent = df.global.plotinfo.main.fortress_entity
+    local fort_ent = df.global.ui.main.fortress_entity
     local civ_ent = df.historical_entity.find(hf.civ_id)
-
     local newent_id = -1
     local newsite_id = -1
-
+    
     -- free owned rooms
     for i = #u.owned_buildings-1, 0, -1 do
         local temp_bld = df.building.find(u.owned_buildings[i].id)
         dfhack.buildings.setOwner(temp_bld, nil)
     end
-
+    
     -- erase the unit from the fortress entity
     for k,v in ipairs(fort_ent.histfig_ids) do
         if v == hf_id then
-            df.global.plotinfo.main.fortress_entity.histfig_ids:erase(k)
+            df.global.ui.main.fortress_entity.histfig_ids:erase(k)
             break
         end
     end
     for k,v in ipairs(fort_ent.hist_figures) do
         if v.id == hf_id then
-            df.global.plotinfo.main.fortress_entity.hist_figures:erase(k)
+            df.global.ui.main.fortress_entity.hist_figures:erase(k)
             break
         end
     end
     for k,v in ipairs(fort_ent.nemesis) do
         if v.figure.id == hf_id then
-            df.global.plotinfo.main.fortress_entity.nemesis:erase(k)
-            df.global.plotinfo.main.fortress_entity.nemesis_ids:erase(k)
+            df.global.ui.main.fortress_entity.nemesis:erase(k)
+            df.global.ui.main.fortress_entity.nemesis_ids:erase(k)
             break
         end
     end
-
+    
     -- remove the old entity link and create new one to indicate former membership
     hf.entity_links:insert("#", {new = df.histfig_entity_link_former_memberst, entity_id = fort_ent.id, link_strength = 100})
     for k,v in ipairs(hf.entity_links) do
@@ -94,15 +85,15 @@ function desert(u,method,civ)
             break
         end
     end
-
+    
     -- try to find a new entity for the unit to join
     for k,v in ipairs(civ_ent.entity_links) do
         if v.type == df.entity_entity_link_type.CHILD and v.target ~= fort_ent.id then
             newent_id = v.target
             break
         end
     end
-
+    
     if newent_id > -1 then
         hf.entity_links:insert("#", {new = df.histfig_entity_link_memberst, entity_id = newent_id, link_strength = 100})
 
@@ -113,11 +104,9 @@ function desert(u,method,civ)
                 break
             end
         end
-
         local newent = df.historical_entity.find(newent_id)
         newent.histfig_ids:insert('#', hf_id)
         newent.hist_figures:insert('#', hf)
-
         local hf_event_id = df.global.hist_event_next_id
         df.global.hist_event_next_id = df.global.hist_event_next_id+1
         df.global.world.history.events:insert("#", {new = df.history_event_add_hf_entity_linkst, year = df.global.cur_year, seconds = df.global.cur_year_tick, id = hf_event_id, civ = newent_id, histfig = hf_id, link_type = 0})
@@ -127,7 +116,6 @@ function desert(u,method,civ)
             df.global.world.history.events:insert("#", {new = df.history_event_change_hf_statest, year = df.global.cur_year, seconds = df.global.cur_year_tick, id = hf_event_id, hfid = hf_id, state = 1, reason = -1, site = newsite_id})
         end
     end
-
     print(line)
     dfhack.gui.showAnnouncement(line, COLOR_WHITE)
 end
@@ -175,9 +163,10 @@ function checkmigrationnow()
     end
 
     if #merchant_civ_ids == 0 then
-        checkForDeserters('wild', df.global.plotinfo.main.fortress_entity.entity_links[0].target)
+        checkForDeserters('wild', df.global.ui.main.fortress_entity.entity_links[0].target)
+    else
+        for _, civ_id in pairs(merchant_civ_ids) do checkForDeserters('merchant', civ_id) end
     end
-    for _, civ_id in pairs(merchant_civ_ids) do checkForDeserters('merchant', civ_id) end
 end
 
 local function event_loop()
@@ -187,17 +176,42 @@ local function event_loop()
     end
 end
 
-dfhack.onStateChange.loadEmigration = function(code)
-    if code==SC_MAP_LOADED then
-        if enabled then
-            print("Emigration enabled.")
-            event_loop()
-        else
-            print("Emigration disabled.")
-        end
+dfhack.onStateChange[GLOBAL_KEY] = function(sc)
+    if sc == SC_MAP_UNLOADED then
+        enabled = false
+        return
+    end
+
+    if sc ~= SC_MAP_LOADED or df.global.gamemode ~= df.game_mode.DWARF then
+        return
     end
+
+    local persisted_data = json.decode(persist.GlobalTable[GLOBAL_KEY] or '')
+    enabled = (persisted_data or {enabled=false})['enabled']
+    event_loop()
+end
+
+if dfhack_flags.module then
+    return
+end
+
+if df.global.gamemode ~= df.game_mode.DWARF or not dfhack.isMapLoaded() then
+    dfhack.printerr('emigration needs a loaded fortress map to work')
+    return
 end
 
-if dfhack.isMapLoaded() then
-    dfhack.onStateChange.loadEmigration(SC_MAP_LOADED)
+local args = {...}
+if dfhack_flags and dfhack_flags.enable then
+    args = {dfhack_flags.enable_state and 'enable' or 'disable'}
 end
+
+if args[1] == "enable" then
+    enabled = true
+elseif args[1] == "disable" then
+    enabled = false
+else
+    return
+end
+
+event_loop()
+persist_state()
