From 533f1c553476ae1631f5470869cd63f583450796 Mon Sep 17 00:00:00 2001 From: wan-may Date: Mon, 17 Mar 2025 23:35:28 -0300 Subject: [PATCH] ending screen again --- src/i18n/en.lua | 4 ++-- src/models/bell.lua | 2 +- src/models/sky.lua | 8 ++++---- src/scenes/slideshow.lua | 11 ++++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/i18n/en.lua b/src/i18n/en.lua index 026262a..9a52957 100644 --- a/src/i18n/en.lua +++ b/src/i18n/en.lua @@ -23,8 +23,8 @@ ENTER TO KEEP]], mouseSensitivity = "TURN SPEED", language = "LANGUAGE", FOV = "FOV", - win = [[ -YOU'RE WINNER! + win = [[ZIMINIAR HAS ARRIVED. THE WORLD WILL NEVER BE THE SAME. +RICHES TO THE CONJUROR! ]] } \ No newline at end of file diff --git a/src/models/bell.lua b/src/models/bell.lua index 2a35685..00ea170 100644 --- a/src/models/bell.lua +++ b/src/models/bell.lua @@ -15,7 +15,7 @@ local function radius( y ) return math.pow( math.max( 0, 0.6 * math.pow( (1-y), 1/3 ) + 0.1 * math.exp( -5*y )), - 1.1) + 0.8) end local loops = {} diff --git a/src/models/sky.lua b/src/models/sky.lua index 86c0581..eb9e2bc 100644 --- a/src/models/sky.lua +++ b/src/models/sky.lua @@ -29,12 +29,12 @@ mesh:setVertexMap{ } local cubemap = lg.newCubeImage( { - "tex/cubemap_0.png", - "tex/cubemap_1.png", + "tex/cubemap_5.png", + "tex/cubemap_4.png", "tex/cubemap_2.png", "tex/cubemap_3.png", - "tex/cubemap_4.png", - "tex/cubemap_5.png", + "tex/cubemap_0.png", + "tex/cubemap_1.png", }, {mipmaps = true} ) diff --git a/src/scenes/slideshow.lua b/src/scenes/slideshow.lua index c525f7b..420345a 100644 --- a/src/scenes/slideshow.lua +++ b/src/scenes/slideshow.lua @@ -20,6 +20,9 @@ t.wheelmoved = noop function t.keypressed( key, code, isRepeat ) + if code == "escape" then + love.mouse.setRelativeMode( false ) + end if code == "return" then if printString ~= fullString then printString = fullString @@ -36,7 +39,13 @@ function t.draw() love.graphics.setColor( 1, 0.2, 0.2 ) love.graphics.printf( printString, 10, 10, math.min( 400, love.graphics.getWidth() / 2 ), "left" ) love.graphics.print( strings.toContinue, 10, love.graphics.getHeight() - love.graphics.getFont():getHeight() ) - if quad then love.graphics.draw( quad, 450, 0, 0, 0.3, 0.3) end + love.graphics.setColor( 1, 1, 1 ) + if quad then + local h = love.graphics.getHeight() + local s = (love.graphics.getWidth() - 450) / quad:getWidth() + local y = h - quad:getHeight() * s + love.graphics.draw( quad, 450, y, 0, s, s) + end end function t.update( dt )