Compare commits

..

No commits in common. "a7ee1d786180c209b785368ffb2ebb7e8c38aac5" and "50f6010ed13dacf46b0360114a89be728838b86a" have entirely different histories.

27 changed files with 10 additions and 22 deletions

View File

@ -22,9 +22,8 @@ sounds = {
go = love.audio.newSource("res/se/go.wav", "static"), go = love.audio.newSource("res/se/go.wav", "static"),
irs = love.audio.newSource("res/se/irs.wav", "static"), irs = love.audio.newSource("res/se/irs.wav", "static"),
ihs = love.audio.newSource("res/se/ihs.wav", "static"), ihs = love.audio.newSource("res/se/ihs.wav", "static"),
-- secret sounds! -- a secret sound!
welcome = love.audio.newSource("res/se/welcomeToCambridge.wav", "static"), welcome = love.audio.newSource("res/se/welcomeToCambridge.wav", "static"),
mystery = love.audio.newSource("res/se/mystery.wav", "static"),
} }
function playSE(sound, subsound) function playSE(sound, subsound)
@ -61,4 +60,4 @@ function playSEOnce(sound, subsound)
sounds[sound]:play() sounds[sound]:play()
end end
end end
end end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 827 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 943 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

View File

@ -10,8 +10,7 @@ function CreditsScene:new()
DiscordRPC:update({ DiscordRPC:update({
details = "Watching the credits", details = "Watching the credits",
state = "Thanks for playing the game!", state = "Thanks for playing the game!"
largeImageKey = "ingame-1900",
}) })
end end
@ -30,7 +29,7 @@ end
function CreditsScene:render() function CreditsScene:render()
local offset = self.frames / self.scroll_speed local offset = self.frames / self.scroll_speed
love.graphics.setColor(1, 1, 1, 1) love.graphics.setColor(1, 1, 1, 1)
love.graphics.draw( love.graphics.draw(
backgrounds[19], backgrounds[19],
@ -51,9 +50,9 @@ function CreditsScene:render()
love.graphics.setFont(font_3x5_2) love.graphics.setFont(font_3x5_2)
love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - offset) love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - offset)
love.graphics.print("Mizu\nMarkGamed\nHailey", 320, 680 - offset) love.graphics.print("Mizu\nMarkGamed\nhaileylgbt", 320, 680 - offset)
love.graphics.print( love.graphics.print(
"Alexey Pajitnov - Tetris\n2Tie - TGMsim\nAxel Fox - Multimino\nDr Ocelot - Tetra Legends\n" .. "2Tie - TGMsim\nAxel Fox - Multimino\nDr Ocelot - Tetra Legends\n" ..
"Electra - ZTrix\nFelicity/nightmareci/kdex - Shiromino\n" .. "Electra - ZTrix\nFelicity/nightmareci/kdex - Shiromino\n" ..
"Mine - Tetra Online\nMrZ - Techmino\nosk - TETR.IO\n" .. "Mine - Tetra Online\nMrZ - Techmino\nosk - TETR.IO\n" ..
"Phoenix Flare - Master of Blocks\nRayRay26 - Spirit Drop\n" .. "Phoenix Flare - Master of Blocks\nRayRay26 - Spirit Drop\n" ..
@ -87,4 +86,4 @@ function CreditsScene:onInputPress(e)
end end
end end
return CreditsScene return CreditsScene

View File

@ -27,7 +27,9 @@ function GameScene:new(game_mode, ruleset, inputs)
DiscordRPC:update({ DiscordRPC:update({
details = self.game.rpc_details, details = self.game.rpc_details,
state = self.game.name, state = self.game.name,
largeImageKey = "ingame-"..self.game:getBackground().."00" --largeImageText = "Level "..self.game.level????
largeImageKey = "ingame-0"
--largeImageKey = ingame-<section>
}) })
end end
@ -39,9 +41,6 @@ function GameScene:update()
end end
self.game:update(inputs, self.ruleset) self.game:update(inputs, self.ruleset)
self.game.grid:update() self.game.grid:update()
DiscordRPC:update({
largeImageKey = "ingame-"..self.game:getBackground().."00"
})
end end
end end

View File

@ -12,7 +12,6 @@ function ConfigScene:new()
DiscordRPC:update({ DiscordRPC:update({
details = "In settings", details = "In settings",
state = "Changing input config", state = "Changing input config",
largeImageKey = "settings-input"
}) })
end end

View File

@ -103,14 +103,6 @@ function TitleScene:onInputPress(e)
elseif e.input == "up" or e.scancode == "up" then elseif e.input == "up" or e.scancode == "up" then
self:changeOption(-1) self:changeOption(-1)
playSE("cursor") playSE("cursor")
elseif e.scancode == "kp5" then
DiscordRPC:update({
details = "Pressed the cool button",
state = "You found the cool easter egg!",
largeImageKey = "transbridge",
})
playSE("mystery")
--now you've just spoiled the fun for yourself.
elseif e.input == "down" or e.scancode == "down" then elseif e.input == "down" or e.scancode == "down" then
self:changeOption(1) self:changeOption(1)
playSE("cursor") playSE("cursor")