empathicqubit/neat-donk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle banana wrapping

Browse source
This commit is contained in:
Empathic Qubit 2021-05-03 05:20:52 -04:00
parent 317578611d
commit 2a96f6d9eb
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.lua
View file

@ -40,7 +40,7 @@ _M.StartPowerup = 0
_M.NeatConfig = { _M.NeatConfig = {
DisableSound = false, DisableSound = false,
Threads = 1, Threads = 7,
--Filename = "DP1.state", --Filename = "DP1.state",
SaveFile = _M.Filename .. ".pool", SaveFile = _M.Filename .. ".pool",

22
runner.lua
View file

@ -287,7 +287,7 @@ local function displayForm(_M)
gui.text(230, 5, "Genome: " .. _M.currentGenomeIndex) gui.text(230, 5, "Genome: " .. _M.currentGenomeIndex)
gui.text(130, 30, "Max: " .. math.floor(_M.maxFitness)) gui.text(130, 30, "Max: " .. math.floor(_M.maxFitness))
--gui.text(330, 5, "Measured: " .. math.floor(measured/total*100) .. "%") --gui.text(330, 5, "Measured: " .. math.floor(measured/total*100) .. "%")
gui.text(5, 65, "Bananas: " .. (game.getBananas() - _M.startBananas)) gui.text(5, 65, "Bananas: " .. _M.totalBananas)
gui.text(5, 80, "KONG: " .. (game.getKong() - _M.startKong)) gui.text(5, 80, "KONG: " .. (game.getKong() - _M.startKong))
gui.text(5, 95, "Krem: " .. (game.getKremCoins() - _M.startKrem)) gui.text(5, 95, "Krem: " .. (game.getKremCoins() - _M.startKrem))
gui.text(130, 65, "Coins: " .. (game.getCoins() - _M.startCoins)) gui.text(130, 65, "Coins: " .. (game.getCoins() - _M.startCoins))
@ -488,7 +488,8 @@ local function initializeRun(_M)
end) end)
game.clearJoypad() game.clearJoypad()
_M.startKong = game.getKong() _M.startKong = game.getKong()
_M.startBananas = game.getBananas() _M.totalBananas = 0
_M.lastBananas = game.getBananas()
_M.startKrem = game.getKremCoins() _M.startKrem = game.getKremCoins()
_M.lastKrem = _M.startKrem _M.lastKrem = _M.startKrem
_M.startCoins = game.getCoins() _M.startCoins = game.getCoins()
@ -608,6 +609,13 @@ local function mainLoop(_M, genome)
_M.lastKrem = krem _M.lastKrem = krem
_M.timeout = _M.timeout + 60 * 10 _M.timeout = _M.timeout + 60 * 10
end end
local currentBananas = game.getBananas()
local moreBananas = currentBananas - _M.lastBananas
if moreBananas > 0 then
_M.totalBananas = _M.totalBananas + moreBananas
end
_M.lastBananas = currentBananas
_M.timeout = _M.timeout - 1 _M.timeout = _M.timeout - 1
@ -624,14 +632,13 @@ local function mainLoop(_M, genome)
-- Timeout calculations beyond this point -- Timeout calculations beyond this point
-- Manipulating the timeout value won't have -- Manipulating the timeout value won't have
-- any effect -- any effect
local bananas = game.getBananas() - _M.startBananas
local coins = game.getCoins() - _M.startCoins local coins = game.getCoins() - _M.startCoins
local kong = game.getKong() local kong = game.getKong()
message(_M, string.format("Bananas: %d, coins: %d, Krem: %d, KONG: %d", bananas, coins, krem, kong)) message(_M, string.format("Bananas: %d, coins: %d, Krem: %d, KONG: %d", _M.totalBananas, coins, krem, kong))
local bananaCoinsFitness = (krem * 100) + (kong * 60) + (bananas * 50) + (coins * 0.2) local bananaCoinsFitness = (krem * 100) + (kong * 60) + (_M.totalBananas * 50) + (coins * 0.2)
if (bananas + coins) > 0 then if (_M.totalBananas + coins) > 0 then
message(_M, "Bananas, Coins, KONG added " .. bananaCoinsFitness .. " fitness") message(_M, "Bananas, Coins, KONG added " .. bananaCoinsFitness .. " fitness")
end end
@ -880,7 +887,8 @@ return function(promise)
timeout = 0, timeout = 0,
bumps = 0, bumps = 0,
startKong = 0, startKong = 0,
startBananas = 0, lastBananas = 0,
totalBananas = 0,
startKrem = 0, startKrem = 0,
lastKrem = 0, lastKrem = 0,
startCoins = 0, startCoins = 0,