Add welfare caps, move backend to json

2 files changed, 39 insertions, 20 deletions

diff --git a/init.lua b/init.lua
index a8e39c2..36cfa0b 100644
--- a/init.lua
+++ b/init.lua
@@ -1,18 +1,20 @@
--- Copyright (c) 2016, 2017, 2018 Gabriel Pérez-Cerezo, licensed under WTFPL.
+-- Copyright (c) 2016-18, 2024 gpcf, licensed under WTFPL.
 -- Wire Transfers (c) 2018 Hans von Smacker
 -- Large ATMs (C) 2017 Hans von Smacker
 
 atm = {}
 atm.balance = {}
+atm.welfare = {}
+atm.default_welfare = 1000
 atm.pending_transfers = {}
 atm.completed_transactions = {}
 atm.pth = minetest.get_worldpath().."/atm_accounts"
+atm.json_pth = minetest.get_worldpath().."/atm_accounts.json"
 atm.pth_wt = minetest.get_worldpath().."/atm_wt_transactions"
 local modpath = minetest.get_modpath("atm")
 atm.startbalance = 30
 function atm.ensure_init(name)
    -- Ensure the atm account for the placer specified by name exists
-   atm.readaccounts()
    if not atm.balance[name] then
       atm.balance[name] = atm.startbalance
    end
@@ -239,6 +241,17 @@ end
 
 function atm.readaccounts ()
 	local b = atm.balance
+	local file = io.open(atm.json_pth, "r")
+	if file then
+		local res = minetest.parse_json(file:read("*a"))
+		file.close()
+		for k,v in pairs(res) do
+			atm.balance[k] = v[1]
+			atm.welfare[k] = v[2]
+		end
+		return
+	end
+	
 	local file = io.open(atm.pth, "r")
 	if file then
 		repeat
@@ -261,12 +274,9 @@ function atm.saveaccounts()
 	end
 	local data = {}
 	for k, v in pairs(atm.balance) do
-		table.insert(data, string.format("%d %s\n", v, k))
+		data[k] = {v, atm.welfare[k]}
 	end
-
-	local output = io.open(atm.pth, "w")
-	output:write(table.concat(data))
-	io.close(output)
+	minetest.safe_file_write(atm.json_pth, minetest.write_json(data, true))
 end
 
 
@@ -292,11 +302,6 @@ end
 
 
 
-minetest.register_on_joinplayer(function(player)
-	atm.readaccounts()
-end)
-
-
 -- ATM node definitions
 
 minetest.register_node("atm:atm", {
@@ -596,3 +601,6 @@ minetest.register_craft({
 })
 
 dofile(modpath .. "/interest.lua")
+
+atm.readaccounts()
+minetest.register_on_shutdown(atm.saveaccounts)
diff --git a/interest.lua b/interest.lua
index e492566..696b691 100644
--- a/interest.lua
+++ b/interest.lua
@@ -1,16 +1,27 @@
 -- adapted from the income.lua file from the currency mod.
 local timer = 0
+
+function atm.welfare_payout()
+	payout = false
+	for _,player in ipairs(minetest.get_connected_players()) do
+		local name = player:get_player_name()
+		local limit = atm.welfare[name] or atm.default_welfare
+		atm.ensure_init(name)
+		if limit > 5 then
+			atm.balance[name] = math.floor(atm.balance[name] + 5)
+			atm.welfare[name] = limit - 5
+			payout = true
+		end
+	end
+	if payout then
+		atm.saveaccounts()
+	end
+end
+
 minetest.register_globalstep(function(dtime)
 	timer = timer + dtime;
 	if timer >= 1000 then
 		timer = 0
-		atm.readaccounts()
-		for _,player in ipairs(minetest.get_connected_players()) do
-			local name = player:get_player_name()
-			if not (atm.balance[name] == nil) then
-				atm.balance[name] = math.floor(atm.balance[name] + 5)
-			end
-		end
-		atm.saveaccounts()
+		atm.welfare_payout()
 	end
 end)