project reorg

Author: phughesion

api.lua

@@ -1,27 +1,30 @@
 --- STEAMODDED HEADER
 --- MOD_NAME: Balatrobot
---- MOD_ID: Balatrobot-v0.2
+--- MOD_ID: Balatrobot-v0.3
 --- MOD_AUTHOR: [Besteon]
 --- MOD_DESCRIPTION: A botting API for Balatro
 
 function SMODS.INIT.BALATROBOT()
-	mw = SMODS.findModByID("Balatrobot-v0.2")
+	mw = SMODS.findModByID("Balatrobot-v0.3")
 
-	assert(load(NFS.read(mw.path .. "list.lua")))()
-	assert(load(NFS.read(mw.path .. "hook.lua")))()
-	assert(load(NFS.read(mw.path .. "bitser.lua")))()
-	assert(load(NFS.read(mw.path .. "sock.lua")))()
-	assert(load(NFS.read(mw.path .. "api.lua")))()
-	assert(load(NFS.read(mw.path .. "bot.lua")))()
-	assert(load(NFS.read(mw.path .. "middleware.lua")))()
-	assert(load(NFS.read(mw.path .. "botlogger.lua")))()
+	-- External libraries
+	assert(load(NFS.read(mw.path .. "lib/list.lua")))()
+	assert(load(NFS.read(mw.path .. "lib/hook.lua")))()
+	assert(load(NFS.read(mw.path .. "lib/bitser.lua")))()
+	assert(load(NFS.read(mw.path .. "lib/sock.lua")))()
 
-	sendDebugMessage("Balatrobot v0.2 loaded")
+	-- Mod specific files
+	assert(load(NFS.read(mw.path .. "src/utils.lua")))()
+	assert(load(NFS.read(mw.path .. "src/bot.lua")))()
+	assert(load(NFS.read(mw.path .. "src/middleware.lua")))()
+	assert(load(NFS.read(mw.path .. "src/botlogger.lua")))()
+	assert(load(NFS.read(mw.path .. "src/api.lua")))()
+
+	sendDebugMessage("Balatrobot v0.3 loaded")
 
 	Middleware.hookbalatro()
 
 	Botlogger.path = mw.path
-	Botlogger.inithooks()
-
+	Botlogger.init()
 	BalatrobotAPI.init()
 end

bitser.lua lib/bitser.luabitser.lua renamed to lib/bitser.lua

@@ -0,0 +1,72 @@
+
+local socket = require "socket"
+
+local data, msg_or_ip, port_or_nil
+
+BalatrobotAPI = { }
+BalatrobotAPI.socket = nil
+
+function BalatrobotAPI.notifyapiclient(...)
+    -- TODO Generate gamestate json object
+    local _gamestate = Utils.getgamestate()
+
+
+    str = "json gamestate"
+
+    if BalatrobotAPI.socket then
+        BalatrobotAPI.socket:sendto(string.format("%s\n", str), msg_or_ip, port_or_nil)
+    end
+end
+
+function BalatrobotAPI.respond(str)
+    if BalatrobotAPI.socket then
+        BalatrobotAPI.socket:sendto(string.format("%s\n", str), msg_or_ip, port_or_nil)
+    end
+end
+
+function BalatrobotAPI.queueaction(action)
+    local _params = Bot.ACTIONPARAMS[action[1]]
+    List.pushleft(Botlogger['q_'.._params.func], { 0, action })
+end
+
+function BalatrobotAPI.update(dt)
+    if not BalatrobotAPI.socket then
+        BalatrobotAPI.socket = socket.udp()
+        BalatrobotAPI.socket:settimeout(0)
+        BalatrobotAPI.socket:setsockname('*', 12345)
+    end
+
+    data, msg_or_ip, port_or_nil = BalatrobotAPI.socket:receivefrom()
+	if data then
+
+        local _action = Utils.parseaction(data)
+
+        if _action and #_action > 1 and #_action > Bot.ACTIONPARAMS[_action[1]].num_args then
+            BalatrobotAPI.respond("Error: Incorrect number of params for action " .. action)
+        elseif not _action then
+            BalatrobotAPI.respond("Error: Incorrect message format. Should be ACTION|arg1|arg2")
+        else
+            BalatrobotAPI.queueaction(_action)
+        end
+
+	elseif msg_or_ip ~= 'timeout' then
+		sendDebugMessage("Unknown network error: "..tostring(msg))
+	end
+	
+	socket.sleep(0.01)
+end
+
+function BalatrobotAPI.init()
+
+    love.update = Hook.addcallback(love.update, BalatrobotAPI.update)
+
+    if Bot.SETTINGS.api == true then
+        for k,v in pairs(Bot) do
+            if type(Bot[k]) == 'function' then
+                Bot[k] = Hook.addbreakpoint(Bot[k], BalatrobotAPI.notifyapiclient)
+            end
+        end
+    end
+end
+
+return BalatrobotAPI

hook.lua lib/hook.luahook.lua renamed to lib/hook.lua

@@ -84,7 +84,7 @@ function Botlogger.start_run()
     end
 end
 
-function Botlogger.inithooks()
+function Botlogger.init()
 
     Botlogger.q_skip_or_select_blind = List.new()
     Botlogger.q_select_cards_from_hand = List.new()
@@ -142,7 +142,7 @@ function Botlogger.inithooks()
             for line in io.lines(_replayfile) do
                 _num_action = _num_action + 1
 
-                local _action = BalatrobotAPI.parseaction(line)
+                local _action = Utils.parseaction(line)
                 sendDebugMessage(line)
                 local _params = Bot.ACTIONPARAMS[_action[1]]
                 for i = 2, #_action do

list.lua lib/list.lualist.lua renamed to lib/list.lua

@@ -529,7 +529,6 @@ local function c_initgamehooks()
         firewhenready(function()
             return G.buttons and G.STATE_COMPLETE and G.STATE == G.STATES.SELECTING_HAND
         end, function()
-            sendDebugMessage("drawn to hand")
             c_sell_jokers()
             c_rearrange_jokers()
             c_use_or_sell_consumables()