can now import sharecodes

This commit is contained in:
duncathan 2020-02-28 04:27:42 -06:00
parent d7969ecd65
commit f8f994b4ae
3 changed files with 51 additions and 19 deletions

View file

@ -151,8 +151,6 @@ function C:_shuffleItems(tscFiles)
-- place the bomb on MALCO for bad end -- place the bomb on MALCO for bad end
if self.obj == "objBadEnd" then if self.obj == "objBadEnd" then
self.worldGraph:getMALCO()[1]:setItem(self.itemDeck:getByKey("bomb")) self.worldGraph:getMALCO()[1]:setItem(self.itemDeck:getByKey("bomb"))
else
logWarning(self.obj)
end end

View file

@ -44,7 +44,11 @@ function C:loadSettings(puppy, obj, seed)
settings.best.value = true settings.best.value = true
end end
settings.customseed.value = seed or "" if seed ~= nil then
settings.customseed.value = seed or ""
settings.seedselect.value = true
settings.seedrandom.value = false
end
end end
layout.version.text = 'Cave Story Randomizer [Open Mode] v' .. VERSION layout.version.text = 'Cave Story Randomizer [Open Mode] v' .. VERSION
@ -58,7 +62,7 @@ layout.go:onPress(function()
if Randomizer:ready() then if Randomizer:ready() then
if settings.seedselect.value and settings.customseed.value ~= "" then if settings.seedselect.value and settings.customseed.value ~= "" then
Randomizer.customseed = settings.customseed.value Randomizer.customseed = settings.customseed.value:gsub("^%s*(.-)%s*$", "%1") -- trim any leading/trailing whitespace
end end
if settings.bad.value then if settings.bad.value then
@ -88,6 +92,7 @@ end)
settings.closeButton:onPress(function() settings.closeButton:onPress(function()
settings:hide() settings:hide()
layout:show() layout:show()
settings.sharecode.value = ""
end) end)
layout.sharecode:onPress(function() layout.sharecode:onPress(function()
@ -104,6 +109,28 @@ settings.customseed:onChange(function()
settings.seedcount.text = ("%s/20"):format(#settings.customseed.value) settings.seedcount.text = ("%s/20"):format(#settings.customseed.value)
end) end)
settings.importshare:onPress(function()
local success, seed, sharesettings = pcall(function()
local packed = love.data.decode("data", "base64", settings.sharecode.value)
local seed, settings = love.data.unpack("sB", packed)
return seed, settings
end)
if success then
settings.importshare.text = "Sharecode Imported"
local pup = bit.band(sharesettings, 4) ~= 0
local obj = bit.band(sharesettings, 3)
seed = seed:gsub("^%s*(.-)%s*$", "%1") -- trim any leading or trailing whitespace
Screen:loadSettings(pup, obj, seed)
else
settings.importshare.text = "Invalid Sharecode!"
end
end)
settings.sharecode:onChange(function()
settings.importshare.text = "Import Sharecode"
end)
function C:draw() function C:draw()
lg.draw(background, 0, 0) lg.draw(background, 0, 0)
--layout:show() --layout:show()

View file

@ -1,23 +1,30 @@
return { style = 'dialog', return { style = 'dialog',
{ style = 'dialogHead', text = 'Settings' }, { style = 'dialogHead', text = 'Settings' },
{ style = 'dialogBody', padding = 24, flow = 'x', { style = 'dialogBody', padding = 24,
{ { flow = 'x', minheight = 260,
{ type = 'label', text = 'Seed' },
{ {
{ type = 'radio', group = 'seed', text = 'Use random seed', value = true }, { type = 'label', text = 'Seed', minheight = 32 },
{ flow = 'y', { type = 'radio', group = 'seed', text = 'Use custom seed', id = 'seedselect'}, {{ type = 'text', id = 'customseed', width = 200}, flow = 'x', { type = 'label', id = 'seedcount' }}, {height = false} } {
{ type = 'radio', group = 'seed', text = 'Use random seed', value = true, id = 'seedrandom', minheight = 27 },
{ flow = 'y', { type = 'radio', group = 'seed', text = 'Use custom seed', id = 'seedselect', minheight = 27 }, {{ type = 'text', id = 'customseed', width = 200, minheight = 32}, flow = 'x', { type = 'label', id = 'seedcount' }} }
},
{ type = 'label', text = 'Randomization Options', minheight = 32 },
{ type = 'check', value = false, id = 'puppy', text = "Puppysanity", minheight = 27 },
{ height = 64 },
},
{
{ type = 'label', text = 'Objective', minheight = 32 },
{ type = 'radio', group = 'objective', text = 'Bad ending', id = 'bad', minheight = 27 },
{ type = 'radio', group = 'objective', text = 'Normal ending', id = 'norm', minheight = 27 },
{ type = 'radio', group = 'objective', text = 'Best ending', id = 'best', value = true, minheight = 27 },
{ type = 'radio', group = 'objective', text = 'All bosses', id = 'boss', minheight = 27 },
}, },
{ type = 'label', text = 'Randomization Options' },
{ type = 'check', value = false, id = 'puppy', text = "Puppysanity"},
{ height = false },
}, },
{ {
{ type = 'label', text = 'Objective' }, flow = 'x',
{ type = 'radio', group = 'objective', text = 'Bad ending', id = 'bad' }, { type = 'text', id = 'sharecode', width = 350 },
{ type = 'radio', group = 'objective', text = 'Normal ending', id = 'norm'}, { type = 'button', style = 'dialogButton', text = "Import Sharecode", id = 'importshare', width = 180 }
{ type = 'radio', group = 'objective', text = 'Best ending', id = 'best', value = true }, }
{ type = 'radio', group = 'objective', text = 'All bosses', id = 'boss' },
},
}, },
{ style = 'dialogFoot', { style = 'dialogFoot',
{}, {},