diff --git a/pre-edited-cs/data/Stage/Hell2.pxe b/pre-edited-cs/data/Stage/Hell2.pxe index 4c858ea..84165e7 100644 Binary files a/pre-edited-cs/data/Stage/Hell2.pxe and b/pre-edited-cs/data/Stage/Hell2.pxe differ diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index 74de4ca..f9c85be 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -510,6 +510,8 @@ function worldGraph:new(items) } self.hintregion = hintRegion(self) + + self.noFallingBlocks = false end function worldGraph:_dboost(items, key) diff --git a/src/randomizer.lua b/src/randomizer.lua index c601230..a55d6a7 100644 --- a/src/randomizer.lua +++ b/src/randomizer.lua @@ -169,6 +169,7 @@ function C:_shuffleItems(tscFiles) obj.name = obj.name .. (", %s"):format(self.worldGraph.spawn) obj.script = obj.script .. self.worldGraph:getSpawnScript() if self.worldGraph.seqbreak and self.worldGraph.dboosts.rocket.enabled then obj.script = "> 1 - Screen:loadSpawn(bit.brshift(bit.band(sharesettings, 112), 4)) -- (settings & 0b01110000) >> 4 + Screen:loadPuppy(bit.band(sharesettings, 1) ~= 0) -- settings & 0b000000001 + Screen:loadObjective(bit.brshift(bit.band(sharesettings, 14), 1)) -- (settings & 0b000001110) >> 1 + Screen:loadSpawn(bit.brshift(bit.band(sharesettings, 112), 4)) -- (settings & 0b001110000) >> 4 Screen:loadSeed(seed:gsub("^%s*(.-)%s*$", "%1")) -- trim any leading or trailing whitespace - Screen:loadSeqSettings(bit.band(sharesettings, 128) ~= 0, { -- (settings & 0b10000000) + Screen:loadSeqSettings(bit.band(sharesettings, 128) ~= 0, { -- (settings & 0b010000000) cthulhu = bit.band(seq, 1) ~= 0, chaco = bit.band(seq, 2) ~= 0, paxChaco = bit.band(seq, 4) ~= 0, @@ -292,6 +300,7 @@ settings.importshare:onPress(function() plantation = bit.band(seq, 64) ~= 0, rocket = bit.band(seq, 128) ~= 0 }) + Screen:loadNoFallingBlocks(bit.band(sharesettings, 256) ~= 0) -- (settings & 0b100000000) else settings.importshare.text = "Invalid Sharecode!" end diff --git a/src/ui/settings.lua b/src/ui/settings.lua index 21e0aae..09c51f8 100644 --- a/src/ui/settings.lua +++ b/src/ui/settings.lua @@ -52,7 +52,8 @@ return { style = 'dialog', { text = " Start\r\n Point", value = "Start Point", icon = "assets/icon/StartPoint2.png" }, { text = " Arthur's\r\n House", value = "Arthur's House", icon = "assets/icon/Arthur2.png" }, { text = " Camp", value = "Camp", icon = "assets/icon/Camp.png" } - } + }, + { type = 'check', value = false, id = 'noFallingBlocks', text = "No Falling Blocks in Hell", minheight = 27 } }, }, {