Compare commits
39 Commits
Author | SHA1 | Date |
---|---|---|
Ishaan Bhardwaj | d0fdaf30ab | |
Aymir Dmitrievich Danilov | 8062f6e3fa | |
Ishaan Bhardwaj | 7c3cf0b1bd | |
aur9ra | 52ddbbc174 | |
Ishaan Bhardwaj | 5f81c35677 | |
Tetro48 | 635ef6270f | |
Tetro48 | 649dd5f31d | |
Ishaan Bhardwaj | 34fcc3f659 | |
Kirby703 | 4caa268adc | |
Ishaan Bhardwaj | a79552a6f3 | |
Ishaan Bhardwaj | cd90405865 | |
Ishaan Bhardwaj | e69659b2ad | |
Ishaan Bhardwaj | d90e382037 | |
infinifen | ba6f5bb837 | |
Ishaan Bhardwaj | 39e9dc3303 | |
Ishaan Bhardwaj | a1f0dfd9f2 | |
Ishaan Bhardwaj | 2a21484137 | |
Ishaan Bhardwaj | 50410958f0 | |
Ishaan Bhardwaj | 6fb583e463 | |
Ishaan Bhardwaj | 91c8dc3dcc | |
Ishaan Bhardwaj | 2166a3c6d8 | |
Ishaan Bhardwaj | 1556b247fe | |
Ishaan Bhardwaj | 23d9feb357 | |
Ishaan Bhardwaj | c693871621 | |
aur9ra | 2ba3611c56 | |
aur9ra | 602e7105ab | |
Ishaan Bhardwaj | 7199aa7ef6 | |
Ishaan Bhardwaj | a972c31d9a | |
aur9ra | 02f314997d | |
aur9ra | 4769daedf4 | |
aur9ra | 4478c07acf | |
Ishaan Bhardwaj | 52d4aeb3d0 | |
Ishaan Bhardwaj | 91279c9f38 | |
Ishaan Bhardwaj | 0572803627 | |
Tetro48 | 1fef7b4880 | |
Ishaan Bhardwaj | e09b044de4 | |
Kirby703 | 7d6f783c40 | |
Ishaan Bhardwaj | 9d365f61a7 | |
Kirby703 | 082697c3cd |
|
@ -60,6 +60,9 @@ function formatTime(frames)
|
|||
min = math.floor(frames/3600)
|
||||
sec = math.floor(frames/60) % 60
|
||||
hund = math.floor(frames/.6) % 100
|
||||
if frames == 15641 then
|
||||
hund = math.ceil(frames/.6) % 100
|
||||
end
|
||||
str = string.format("%02d:%02d.%02d", min, sec, hund)
|
||||
return str
|
||||
end
|
||||
|
|
30
load/bgm.lua
30
load/bgm.lua
|
@ -6,14 +6,17 @@ bgm = {
|
|||
}
|
||||
|
||||
local current_bgm = nil
|
||||
local pitch = 1
|
||||
local bgm_locked = false
|
||||
local unfocused = false
|
||||
|
||||
function switchBGM(sound, subsound)
|
||||
if bgm_locked then
|
||||
return
|
||||
end
|
||||
if current_bgm ~= nil then
|
||||
current_bgm:stop()
|
||||
end
|
||||
if bgm_locked or config.bgm_volume <= 0 then
|
||||
if config.bgm_volume <= 0 then
|
||||
current_bgm = nil
|
||||
elseif sound ~= nil then
|
||||
if subsound ~= nil then
|
||||
|
@ -67,25 +70,28 @@ function processBGMFadeout(dt)
|
|||
fadeout_time = 0
|
||||
fading_bgm = false
|
||||
end
|
||||
current_bgm:setVolume(fadeout_time * config.bgm_volume / total_fadeout_time)
|
||||
current_bgm:setVolume(
|
||||
fadeout_time * config.bgm_volume / total_fadeout_time
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
function pauseBGM(f)
|
||||
if f then
|
||||
unfocused = true
|
||||
end
|
||||
function pauseBGM()
|
||||
if current_bgm ~= nil then
|
||||
current_bgm:pause()
|
||||
end
|
||||
end
|
||||
|
||||
function resumeBGM(f)
|
||||
if f and scene.paused and unfocused then
|
||||
unfocused = false
|
||||
return
|
||||
end
|
||||
function resumeBGM()
|
||||
if current_bgm ~= nil then
|
||||
current_bgm:play()
|
||||
current_bgm:setPitch(pitch)
|
||||
end
|
||||
end
|
||||
|
||||
function pitchBGM(new_pitch)
|
||||
pitch = new_pitch
|
||||
if current_bgm ~= nil then
|
||||
current_bgm:setPitch(pitch)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,17 +1,105 @@
|
|||
backgrounds = {
|
||||
title = love.graphics.newImage("res/backgrounds/title.png"),
|
||||
title_no_icon = love.graphics.newImage("res/backgrounds/title-no-icon.jpg"),
|
||||
title_night = love.graphics.newImage("res/backgrounds/title-night.jpg"),
|
||||
snow = love.graphics.newImage("res/backgrounds/snow.png"),
|
||||
input_config = love.graphics.newImage("res/backgrounds/options-input.png"),
|
||||
game_config = love.graphics.newImage("res/backgrounds/options-game.png"),
|
||||
named_backgrounds = {
|
||||
"title", "title_no_icon", "title_night",
|
||||
"snow", "options_input", "options_game"
|
||||
}
|
||||
current_playing_bgs = {}
|
||||
extended_bgs = {}
|
||||
image_formats = {".jpg", ".png"}
|
||||
bgpath = "res/backgrounds/"
|
||||
dir = love.filesystem.getDirectoryItems(bgpath)
|
||||
|
||||
local i = 0
|
||||
local bgpath = "res/backgrounds/%d.png"
|
||||
while love.filesystem.getInfo(bgpath:format(i*100)) do
|
||||
backgrounds[i] = love.graphics.newImage(bgpath:format(i*100))
|
||||
i = i + 1
|
||||
backgrounds = {}
|
||||
|
||||
local function loadExtendedBgs()
|
||||
extended_bgs = require("res.backgrounds.extend_section_bg")
|
||||
end
|
||||
|
||||
-- error handling for if there is no extend_section_bg
|
||||
if pcall(loadExtendedBgs) then end
|
||||
|
||||
-- helper method to populate backgrounds
|
||||
local function createBackgroundIfExists(name, file_name)
|
||||
local format_index = 1
|
||||
|
||||
-- see if background is an extension of another background
|
||||
if extended_bgs[file_name] ~= nil then
|
||||
copy_bg = extended_bgs[file_name]
|
||||
copy_bg = copy_bg / 100
|
||||
backgrounds[name] = backgrounds[copy_bg]
|
||||
return true
|
||||
end
|
||||
|
||||
-- try creating image backgrounds
|
||||
while format_index <= #image_formats do
|
||||
for num, existing_file in pairs(dir) do
|
||||
if existing_file == (file_name..image_formats[format_index]) then
|
||||
local tempBgPath = bgpath .. file_name .. image_formats[format_index]
|
||||
backgrounds[name] = love.graphics.newImage(tempBgPath)
|
||||
return true
|
||||
end
|
||||
end
|
||||
format_index = format_index + 1
|
||||
end
|
||||
|
||||
-- try creating video background
|
||||
if love.filesystem.getInfo(bgpath .. file_name .. ".ogv") then
|
||||
for num, existing_file in pairs(dir) do
|
||||
if existing_file == (file_name..".ogv") then
|
||||
local tempBgPath = bgpath .. file_name .. ".ogv"
|
||||
backgrounds[name] = love.graphics.newVideo(
|
||||
tempBgPath, {["audio"] = false}
|
||||
)
|
||||
-- you can set audio to true, but the video will not loop
|
||||
-- properly if audio extends beyond video frames
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
local function stopOtherBgs(bg)
|
||||
if #current_playing_bgs == 0 and bg:typeOf("Video") then
|
||||
current_playing_bgs[#current_playing_bgs+1] = bg
|
||||
end
|
||||
|
||||
if #current_playing_bgs >= 1 then
|
||||
while current_playing_bgs[1] ~= bg and #current_playing_bgs >= 1 do
|
||||
current_playing_bgs[1]:pause()
|
||||
current_playing_bgs[1]:rewind()
|
||||
table.remove(current_playing_bgs, 1)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function fetchBackgroundAndLoop(id)
|
||||
bg = backgrounds[id]
|
||||
|
||||
if bg:typeOf("Video") and not bg:isPlaying() then
|
||||
bg:rewind()
|
||||
bg:play()
|
||||
end
|
||||
|
||||
stopOtherBgs(bg)
|
||||
|
||||
return bg
|
||||
end
|
||||
|
||||
-- create section backgrounds
|
||||
local section = 0
|
||||
while (createBackgroundIfExists(section, section*100)) do
|
||||
section = section + 1
|
||||
end
|
||||
|
||||
-- create named backgrounds
|
||||
local nbgIndex = 1
|
||||
while nbgIndex <= #named_backgrounds do
|
||||
createBackgroundIfExists(
|
||||
named_backgrounds[nbgIndex],
|
||||
string.gsub(named_backgrounds[nbgIndex], "_", "-")
|
||||
)
|
||||
nbgIndex = nbgIndex + 1
|
||||
end
|
||||
|
||||
-- in order, the colors are:
|
||||
|
@ -109,4 +197,17 @@ misc_graphics = {
|
|||
strike = love.graphics.newImage("res/img/strike.png"),
|
||||
santa = love.graphics.newImage("res/img/santa.png"),
|
||||
icon = love.graphics.newImage("res/img/cambridge_transparent.png")
|
||||
}
|
||||
}
|
||||
|
||||
-- utility function to allow any size background to be used
|
||||
-- this will stretch the background to 4:3 aspect ratio
|
||||
function drawBackground(id)
|
||||
local bg_object = fetchBackgroundAndLoop(id)
|
||||
local width = bg_object:getWidth()
|
||||
local height = bg_object:getHeight()
|
||||
love.graphics.draw(
|
||||
bg_object,
|
||||
0, 0, 0,
|
||||
640 / width, 480 / height
|
||||
)
|
||||
end
|
|
@ -1 +1 @@
|
|||
version = "v0.3.3.2"
|
||||
version = "v0.3.4"
|
12
main.lua
12
main.lua
|
@ -113,8 +113,8 @@ function love.keypressed(key, scancode)
|
|||
saveConfig()
|
||||
scene.restart_message = true
|
||||
if config.secret then playSE("mode_decide")
|
||||
else playSE("erase") end
|
||||
-- f12 is reserved for saving screenshots
|
||||
else playSE("erase", "single") end
|
||||
-- f12 is reserved for saving screenshots
|
||||
elseif scancode == "f12" then
|
||||
local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
|
||||
local info = love.filesystem.getInfo("ss", "directory")
|
||||
|
@ -280,14 +280,6 @@ function love.wheelmoved(x, y)
|
|||
scene:onInputPress({input=nil, type="wheel", x=x, y=y})
|
||||
end
|
||||
|
||||
function love.focus(f)
|
||||
if f then
|
||||
resumeBGM(true)
|
||||
else
|
||||
pauseBGM(true)
|
||||
end
|
||||
end
|
||||
|
||||
function love.resize(w, h)
|
||||
GLOBAL_CANVAS:release()
|
||||
GLOBAL_CANVAS = love.graphics.newCanvas(w, h)
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
-- ex: extend_section_bg[100] = 0
|
||||
-- extend_section_bg[200] = 0
|
||||
-- the video background associated with section 0 will continue playing into 100 and 200 without restarting.
|
||||
-- will also cause any existing level 100, 200 backgrounds specified to NOT render.
|
||||
|
||||
-- please also note that you cannot currently extend any "named" backgrounds, such as "title" and "options-input"
|
||||
|
||||
extend_section_bg = {}
|
||||
|
||||
-- extend_section_bg[100] = 0
|
||||
-- extend_section_bg[200] = 0
|
||||
-- remove the dashes
|
||||
|
||||
return extend_section_bg
|
|
@ -16,9 +16,7 @@ function CreditsScene:new()
|
|||
end
|
||||
|
||||
function CreditsScene:update()
|
||||
if love.window.hasFocus() then
|
||||
self.frames = self.frames + 1
|
||||
end
|
||||
self.frames = self.frames + 1
|
||||
if self.frames >= 2100 * self.scroll_speed then
|
||||
playSE("mode_decide")
|
||||
scene = TitleScene()
|
||||
|
@ -32,11 +30,7 @@ function CreditsScene:render()
|
|||
local offset = self.frames / self.scroll_speed
|
||||
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds[19],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground(19)
|
||||
|
||||
love.graphics.setFont(font_3x5_4)
|
||||
love.graphics.print("Cambridge Credits", 320, 500 - offset)
|
||||
|
|
|
@ -81,6 +81,7 @@ function GameScene:onInputPress(e)
|
|||
scene = e.input == "retry" and GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) or ModeSelectScene()
|
||||
elseif e.input == "retry" then
|
||||
switchBGM(nil)
|
||||
pitchBGM(1)
|
||||
self.game:onExit()
|
||||
scene = GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs)
|
||||
elseif e.input == "pause" and not (self.game.game_over or self.game.completed) then
|
||||
|
|
|
@ -45,11 +45,7 @@ end
|
|||
|
||||
function ConfigScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["game_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_game")
|
||||
|
||||
love.graphics.setFont(font_3x5_4)
|
||||
love.graphics.print("GAME SETTINGS", 80, 40)
|
||||
|
|
|
@ -20,11 +20,7 @@ function ConfigScene:update() end
|
|||
|
||||
function ConfigScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["input_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_input")
|
||||
|
||||
love.graphics.setFont(font_3x5_4)
|
||||
love.graphics.print("INPUT CONFIG", 80, 40)
|
||||
|
|
|
@ -45,11 +45,7 @@ end
|
|||
|
||||
function KeyConfigScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["input_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_input")
|
||||
|
||||
love.graphics.setFont(font_3x5_2)
|
||||
for i, input in ipairs(configurable_inputs) do
|
||||
|
|
|
@ -58,11 +58,7 @@ function ModeSelectScene:update()
|
|||
end
|
||||
|
||||
function ModeSelectScene:render()
|
||||
love.graphics.draw(
|
||||
backgrounds[0],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground(0)
|
||||
|
||||
love.graphics.draw(misc_graphics["select_mode"], 20, 40)
|
||||
|
||||
|
|
|
@ -36,6 +36,9 @@ function ReplayScene:new(replay, game_mode, ruleset)
|
|||
self.game.pause_time = replay["pause_time"]
|
||||
self.replay = deepcopy(replay)
|
||||
self.replay_index = 1
|
||||
self.replay_speed = 1
|
||||
self.show_invisible = false
|
||||
self.frame_steps = 0
|
||||
DiscordRPC:update({
|
||||
details = "Viewing a replay",
|
||||
state = self.game.name,
|
||||
|
@ -44,18 +47,25 @@ function ReplayScene:new(replay, game_mode, ruleset)
|
|||
end
|
||||
|
||||
function ReplayScene:update()
|
||||
if not self.paused then
|
||||
self.inputs = self.replay["inputs"][self.replay_index]["inputs"]
|
||||
self.replay["inputs"][self.replay_index]["frames"] = self.replay["inputs"][self.replay_index]["frames"] - 1
|
||||
if self.replay["inputs"][self.replay_index]["frames"] == 0 and self.replay_index < table.getn(self.replay["inputs"]) then
|
||||
self.replay_index = self.replay_index + 1
|
||||
local frames_left = self.replay_speed
|
||||
if not self.paused or self.frame_steps > 0 then
|
||||
if self.frame_steps > 0 then
|
||||
self.frame_steps = self.frame_steps - 1
|
||||
end
|
||||
local input_copy = {}
|
||||
for input, value in pairs(self.inputs) do
|
||||
input_copy[input] = value
|
||||
while frames_left > 0 do
|
||||
frames_left = frames_left - 1
|
||||
self.inputs = self.replay["inputs"][self.replay_index]["inputs"]
|
||||
self.replay["inputs"][self.replay_index]["frames"] = self.replay["inputs"][self.replay_index]["frames"] - 1
|
||||
if self.replay["inputs"][self.replay_index]["frames"] == 0 and self.replay_index < table.getn(self.replay["inputs"]) then
|
||||
self.replay_index = self.replay_index + 1
|
||||
end
|
||||
local input_copy = {}
|
||||
for input, value in pairs(self.inputs) do
|
||||
input_copy[input] = value
|
||||
end
|
||||
self.game:update(input_copy, self.ruleset)
|
||||
self.game.grid:update()
|
||||
end
|
||||
self.game:update(input_copy, self.ruleset)
|
||||
self.game.grid:update()
|
||||
DiscordRPC:update({
|
||||
details = "Viewing a replay",
|
||||
state = self.game.name,
|
||||
|
@ -69,6 +79,11 @@ function ReplayScene:render()
|
|||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.setFont(font_3x5_3)
|
||||
love.graphics.printf("REPLAY", 0, 0, 635, "right")
|
||||
local pauses_y_coordinate = 23
|
||||
if self.replay_speed > 1 then
|
||||
pauses_y_coordinate = pauses_y_coordinate + 20
|
||||
love.graphics.printf(self.replay_speed.."X", 0, 20, 635, "right")
|
||||
end
|
||||
love.graphics.setFont(font_3x5_2)
|
||||
if self.game.pause_time and self.game.pause_count then
|
||||
if self.game.pause_time > 0 or self.game.pause_count > 0 then
|
||||
|
@ -77,10 +92,16 @@ function ReplayScene:render()
|
|||
self.game.pause_count,
|
||||
self.game.pause_count == 1 and "" or "S",
|
||||
formatTime(self.game.pause_time)
|
||||
), 0, 23, 635, "right")
|
||||
), 0, pauses_y_coordinate, 635, "right")
|
||||
end
|
||||
else
|
||||
love.graphics.printf("?? PAUSES (--:--.--)", 0, 23, 635, "right")
|
||||
love.graphics.printf("?? PAUSES (--:--.--)", 0, pauses_y_coordinate, 635, "right")
|
||||
end
|
||||
if self.show_invisible then
|
||||
self.game.grid:draw()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.setFont(font_3x5_3)
|
||||
love.graphics.printf("SHOW INVIS", 64, 60, 160, "center")
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -90,6 +111,8 @@ function ReplayScene:onInputPress(e)
|
|||
e.input == "menu_decide" or
|
||||
e.input == "retry"
|
||||
) then
|
||||
switchBGM(nil)
|
||||
pitchBGM(1)
|
||||
self.game:onExit()
|
||||
loadSave()
|
||||
love.math.setRandomSeed(os.time())
|
||||
|
@ -104,6 +127,23 @@ function ReplayScene:onInputPress(e)
|
|||
self.paused = not self.paused
|
||||
if self.paused then pauseBGM()
|
||||
else resumeBGM() end
|
||||
--frame step
|
||||
elseif e.input == "rotate_left" then
|
||||
self.frame_steps = self.frame_steps + 1
|
||||
elseif e.input == "left" then
|
||||
self.replay_speed = self.replay_speed - 1
|
||||
if self.replay_speed < 1 then
|
||||
self.replay_speed = 1
|
||||
end
|
||||
pitchBGM(self.replay_speed)
|
||||
elseif e.input == "right" then
|
||||
self.replay_speed = self.replay_speed + 1
|
||||
if self.replay_speed > 99 then
|
||||
self.replay_speed = 99
|
||||
end
|
||||
pitchBGM(self.replay_speed)
|
||||
elseif e.input == "hold" then
|
||||
self.show_invisible = not self.show_invisible
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -14,8 +14,12 @@ function ReplaySelectScene:new()
|
|||
replay_file_list = love.filesystem.getDirectoryItems("replays")
|
||||
for i=1,#replay_file_list do
|
||||
local data = love.filesystem.read("replays/"..replay_file_list[i])
|
||||
local new_replay = binser.deserialize(data)[1]
|
||||
replays[#replays + 1] = new_replay
|
||||
local success, new_replay = pcall(
|
||||
function() return binser.deserialize(data)[1] end
|
||||
)
|
||||
if success then
|
||||
replays[#replays + 1] = new_replay
|
||||
end
|
||||
end
|
||||
table.sort(replays, function(a, b)
|
||||
return a["timestamp"] > b["timestamp"]
|
||||
|
@ -43,8 +47,6 @@ function ReplaySelectScene:new()
|
|||
end
|
||||
|
||||
function ReplaySelectScene:update()
|
||||
switchBGM(nil) -- experimental
|
||||
|
||||
if self.das_up or self.das_down or self.das_left or self.das_right then
|
||||
self.das = self.das + 1
|
||||
else
|
||||
|
@ -74,11 +76,7 @@ function ReplaySelectScene:update()
|
|||
end
|
||||
|
||||
function ReplaySelectScene:render()
|
||||
love.graphics.draw(
|
||||
backgrounds[0],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground(0)
|
||||
|
||||
-- Same graphic as mode select
|
||||
--love.graphics.draw(misc_graphics["select_mode"], 20, 40)
|
||||
|
|
|
@ -29,11 +29,7 @@ function SettingsScene:update() end
|
|||
|
||||
function SettingsScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["game_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_game")
|
||||
|
||||
love.graphics.setFont(font_3x5_4)
|
||||
love.graphics.print("SETTINGS", 80, 40)
|
||||
|
|
|
@ -46,11 +46,7 @@ end
|
|||
|
||||
function StickConfigScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["input_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_input")
|
||||
|
||||
love.graphics.setFont(font_3x5_2)
|
||||
for i, input in ipairs(configurable_inputs) do
|
||||
|
|
|
@ -73,11 +73,7 @@ local block_offsets = {
|
|||
function TitleScene:render()
|
||||
love.graphics.setFont(font_3x5_4)
|
||||
love.graphics.setColor(1, 1, 1, 1 - self.snow_bg_opacity)
|
||||
love.graphics.draw(
|
||||
backgrounds["title_no_icon"], -- title, title_night
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("title_no_icon") -- title, title_night
|
||||
|
||||
-- 490, 192
|
||||
for _, b in ipairs(block_offsets) do
|
||||
|
@ -99,11 +95,7 @@ function TitleScene:render()
|
|||
|
||||
love.graphics.setFont(font_3x5_2)
|
||||
love.graphics.setColor(1, 1, 1, self.snow_bg_opacity)
|
||||
love.graphics.draw(
|
||||
backgrounds["snow"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("snow")
|
||||
|
||||
love.graphics.draw(
|
||||
misc_graphics["santa"],
|
||||
|
|
|
@ -34,11 +34,7 @@ end
|
|||
|
||||
function TuningScene:render()
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds["game_config"],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground("options_game")
|
||||
|
||||
love.graphics.setColor(1, 1, 1, 0.5)
|
||||
love.graphics.rectangle("fill", 75, 98 + self.highlight * 75, 400, 33)
|
||||
|
|
|
@ -10,41 +10,10 @@ BigA2Game.tagline = "Big blocks in the most celebrated TGM mode!"
|
|||
function BigA2Game:new()
|
||||
BigA2Game.super:new()
|
||||
self.big_mode = true
|
||||
end
|
||||
|
||||
function BigA2Game:updateScore(level, drop_bonus, cleared_lines)
|
||||
cleared_lines = cleared_lines / 2
|
||||
if not self.clear then
|
||||
self:updateGrade(cleared_lines)
|
||||
if cleared_lines >= 4 then
|
||||
self.tetris_count = self.tetris_count + 1
|
||||
end
|
||||
if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
|
||||
if cleared_lines > 0 then
|
||||
self.combo = self.combo + (cleared_lines - 1) * 2
|
||||
self.score = self.score + (
|
||||
(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
|
||||
cleared_lines * self.combo * self.bravo
|
||||
)
|
||||
else
|
||||
self.combo = 1
|
||||
end
|
||||
self.drop_bonus = 0
|
||||
else self.lines = self.lines + cleared_lines end
|
||||
end
|
||||
|
||||
function BigA2Game:onLineClear(cleared_row_count)
|
||||
cleared_row_count = cleared_row_count / 2
|
||||
self:updateSectionTimes(self.level, self.level + cleared_row_count)
|
||||
self.level = math.min(self.level + cleared_row_count, 999)
|
||||
if self.level == 999 and not self.clear then
|
||||
self.clear = true
|
||||
self.grid:clear()
|
||||
if self:qualifiesForMRoll() then self.grade = 32 end
|
||||
self.roll_frames = -150
|
||||
local getClearedRowCount = self.grid.getClearedRowCount
|
||||
self.grid.getClearedRowCount = function(self)
|
||||
return getClearedRowCount(self) / 2
|
||||
end
|
||||
self.lock_drop = self.level >= 900
|
||||
self.lock_hard_drop = self.level >= 900
|
||||
end
|
||||
|
||||
return BigA2Game
|
|
@ -179,6 +179,9 @@ function GameMode:update(inputs, ruleset)
|
|||
if self.game_over or self.completed then
|
||||
if self.save_replay and self.game_over_frames == 0 then
|
||||
self:saveReplay()
|
||||
|
||||
-- ensure replays are only saved once per game, incase self.game_over_frames == 0 for longer than one frame
|
||||
self.save_replay = false
|
||||
end
|
||||
self.game_over_frames = self.game_over_frames + 1
|
||||
return
|
||||
|
@ -400,6 +403,7 @@ end
|
|||
|
||||
function GameMode:onGameOver()
|
||||
switchBGM(nil)
|
||||
pitchBGM(1)
|
||||
local alpha = 0
|
||||
local animation_length = 120
|
||||
if self.game_over_frames < animation_length then
|
||||
|
@ -982,11 +986,7 @@ function GameMode:drawBackground()
|
|||
local id = self:getBackground()
|
||||
if type(id) == "number" then id = clamp(id, 0, #backgrounds) end
|
||||
love.graphics.setColor(1, 1, 1, 1)
|
||||
love.graphics.draw(
|
||||
backgrounds[id],
|
||||
0, 0, 0,
|
||||
0.5, 0.5
|
||||
)
|
||||
drawBackground(id)
|
||||
end
|
||||
|
||||
function GameMode:drawFrame()
|
||||
|
|
|
@ -283,7 +283,7 @@ function Marathon2020Game:sectionPassed(old_level, new_level)
|
|||
)
|
||||
else
|
||||
return (
|
||||
(new_level < 2001 and math.floor(old_level / 100) < math.floor(new_level / 100)) or
|
||||
(new_level < 2000 and math.floor(old_level / 100) < math.floor(new_level / 100)) or
|
||||
(new_level >= 2020)
|
||||
)
|
||||
end
|
||||
|
|
|
@ -143,7 +143,7 @@ end
|
|||
function Survival2020Game:onPieceEnter()
|
||||
if not self.clear and (
|
||||
(self.level < 1900 and self.level % 100 ~= 99) or
|
||||
self.level == 2019
|
||||
(1900 <= self.level and self.level < 2019)
|
||||
) then
|
||||
self.level = self.level + 1
|
||||
end
|
||||
|
@ -201,7 +201,7 @@ end
|
|||
|
||||
Survival2020Game.opacityFunction = function(age)
|
||||
if age > 300 then return 0
|
||||
else return 1 - Math.max(age - 240, 0) / 60 end
|
||||
else return 1 - math.max(age - 240, 0) / 60 end
|
||||
end
|
||||
|
||||
function Survival2020Game:drawGrid()
|
||||
|
@ -249,7 +249,7 @@ function Survival2020Game:drawScoringInfo()
|
|||
end
|
||||
|
||||
function Survival2020Game:getBackground()
|
||||
return math.floor(self.level / 100)
|
||||
return math.min(19, math.floor(self.level / 100))
|
||||
end
|
||||
|
||||
function Survival2020Game:getHighscoreData()
|
||||
|
|
|
@ -93,6 +93,8 @@ function SRS:onPieceMove(piece, grid)
|
|||
if piece.manipulations >= SRS.MANIPULATIONS_MAX then
|
||||
piece.locked = true
|
||||
end
|
||||
else
|
||||
piece.locked = false
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue