From 19681f1a75ccc634dac2419e8b0d474af25b6ac8 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sat, 8 Feb 2025 20:25:27 -0400 Subject: [PATCH] nogame: resizing doesn't change existing cloud shapes --- src/scripts/nogame.lua | 11 ++++++----- src/scripts/nogame.lua.h | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/scripts/nogame.lua b/src/scripts/nogame.lua index 610cf83ce..e66fcaaf3 100644 --- a/src/scripts/nogame.lua +++ b/src/scripts/nogame.lua @@ -2932,7 +2932,7 @@ function love.nogame() self.closed_t = math.max(0, self.closed_t - dt) if self.next_blink_t == 0 then - self.next_blink_t = 5 + math.random(0, 3) + self.next_blink_t = 5 + love.math.random(0, 3) self.closed_t = 0.1 end end @@ -2962,7 +2962,7 @@ function love.nogame() self.state:save(self.body, g_step) if math.floor(g_step % 5) == 0 then - self.body:applyForce(math.random(30, 50), 0) + self.body:applyForce(love.math.random(30, 50), 0) end end @@ -3113,7 +3113,7 @@ function love.nogame() self.w = self.h_spacing + self.img:getWidth() self.speed = speed -- px/s self.count = love.graphics.getWidth() / self.w + 2 - self.initial_img = math.random(1, 4) + self.initial_img = love.math.random(1, 4) end function CloudTrack:update(dt) @@ -3151,6 +3151,8 @@ function love.nogame() -- Called on resize. function create_world() + love.math.setRandomSeed(12345) + local wx, wy = love.graphics.getDimensions() world = love.physics.newWorld(0, 9.81*64) duckloon = Duckloon(world, wx / 2, wy / 2 - 100) @@ -3267,8 +3269,7 @@ function love.nogame() function love.resize() create_world() - g_t = 0 - g_step = 0 + g_step = g_t end function love.conf(t) diff --git a/src/scripts/nogame.lua.h b/src/scripts/nogame.lua.h index 7e1ed73e6..227d43f28 100644 --- a/src/scripts/nogame.lua.h +++ b/src/scripts/nogame.lua.h @@ -11411,8 +11411,8 @@ const unsigned char nogame_lua[] = 0x09, 0x09, 0x69, 0x66, 0x20, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x30, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, - 0x5f, 0x74, 0x20, 0x3d, 0x20, 0x35, 0x20, 0x2b, 0x20, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, 0x6e, 0x64, - 0x6f, 0x6d, 0x28, 0x30, 0x2c, 0x20, 0x33, 0x29, 0x0a, + 0x5f, 0x74, 0x20, 0x3d, 0x20, 0x35, 0x20, 0x2b, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, + 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x28, 0x30, 0x2c, 0x20, 0x33, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x5f, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x31, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, @@ -11472,8 +11472,8 @@ const unsigned char nogame_lua[] = 0x73, 0x74, 0x65, 0x70, 0x20, 0x25, 0x20, 0x35, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x30, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x62, 0x6f, 0x64, 0x79, 0x3a, 0x61, 0x70, 0x70, 0x6c, 0x79, - 0x46, 0x6f, 0x72, 0x63, 0x65, 0x28, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x28, - 0x33, 0x30, 0x2c, 0x20, 0x35, 0x30, 0x29, 0x2c, 0x20, 0x30, 0x29, 0x0a, + 0x46, 0x6f, 0x72, 0x63, 0x65, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, + 0x6e, 0x64, 0x6f, 0x6d, 0x28, 0x33, 0x30, 0x2c, 0x20, 0x35, 0x30, 0x29, 0x2c, 0x20, 0x30, 0x29, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x0a, @@ -11770,8 +11770,8 @@ const unsigned char nogame_lua[] = 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64, 0x74, 0x68, 0x28, 0x29, 0x20, 0x2f, 0x20, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x77, 0x20, 0x2b, 0x20, 0x32, 0x0a, 0x09, 0x09, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x69, 0x6d, 0x67, - 0x20, 0x3d, 0x20, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x28, 0x31, 0x2c, 0x20, - 0x34, 0x29, 0x0a, + 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f, + 0x6d, 0x28, 0x31, 0x2c, 0x20, 0x34, 0x29, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x54, 0x72, 0x61, @@ -11846,6 +11846,9 @@ const unsigned char nogame_lua[] = 0x7a, 0x65, 0x2e, 0x0a, 0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x28, 0x29, 0x0a, + 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x73, 0x65, 0x74, 0x52, 0x61, 0x6e, + 0x64, 0x6f, 0x6d, 0x53, 0x65, 0x65, 0x64, 0x28, 0x31, 0x32, 0x33, 0x34, 0x35, 0x29, 0x0a, + 0x0a, 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x77, 0x78, 0x2c, 0x20, 0x77, 0x79, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x67, 0x65, 0x74, 0x44, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x28, 0x29, 0x0a, @@ -12098,8 +12101,7 @@ const unsigned char nogame_lua[] = 0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x28, 0x29, 0x0a, 0x09, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x28, 0x29, 0x0a, - 0x09, 0x09, 0x67, 0x5f, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x0a, - 0x09, 0x09, 0x67, 0x5f, 0x73, 0x74, 0x65, 0x70, 0x20, 0x3d, 0x20, 0x30, 0x0a, + 0x09, 0x09, 0x67, 0x5f, 0x73, 0x74, 0x65, 0x70, 0x20, 0x3d, 0x20, 0x67, 0x5f, 0x74, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e,