Browse Source

fix game pause menu not unpausing on escape

master
Nicholas Hayashi 3 years ago
parent
commit
7db2d292c8
  1. 7
      lib/gui.lua
  2. 57
      lib/random.lua
  3. 2
      lib/texture.lua
  4. 29
      main.lua
  5. BIN
      res/img/seed_colon_text.png
  6. 13
      src/game.lua
  7. 4
      src/hexyz.lua
  8. 2
      src/map-editor.lua

7
lib/gui.lua

@ -216,6 +216,7 @@ function gui_make_textfield(
if self"text".text:len() ~= 0 then if self"text".text:len() ~= 0 then
self"text".text = self"text".text:sub(1, self"text".text:len() - 1) self"text".text = self"text".text:sub(1, self"text".text:len() - 1)
self"cursor".position2d = self"cursor".position2d - vec2(9 * 2, 0) self"cursor".position2d = self"cursor".position2d - vec2(9 * 2, 0)
self"cursor".hidden = false
end end
elseif k == "tab" then elseif k == "tab" then
-- @TODO -- @TODO
@ -230,9 +231,13 @@ function gui_make_textfield(
for _,c in pairs(chars) do for _,c in pairs(chars) do
if validate(self"text".text .. c) then if validate(self"text".text .. c) then
if self"text".text:len() <= max then
local len = self"text".text:len()
if len <= max then
self"text".text = self"text".text .. c self"text".text = self"text".text .. c
self"cursor".position2d = self"cursor".position2d + vec2(9 * 2, 0) self"cursor".position2d = self"cursor".position2d + vec2(9 * 2, 0)
if len == max then
self"cursor".hidden = true
end
end end
end end
end end

57
lib/random.lua

@ -1,4 +1,6 @@
RANDOM_CALLS_COUNT = 0
-- https://stackoverflow.com/a/32387452/12464892 -- https://stackoverflow.com/a/32387452/12464892
local function bitwise_and(a, b) local function bitwise_and(a, b)
local result = 0 local result = 0
@ -26,39 +28,46 @@ local function rand()
X2 = V - X1*D20 X2 = V - X1*D20
return V/D40 return V/D40
end end
local SEED_BOUNDS = 2^20 - 1
math.randomseed = function(seed)
RANDOM_CALLS_COUNT = 0
local SEED_BOUNDS = 2^20 - 1
local function randomseed2(seed)
-- 0 <= X1 <= 2^20-1, 1 <= X2 <= 2^20-1 (must be odd!) -- 0 <= X1 <= 2^20-1, 1 <= X2 <= 2^20-1 (must be odd!)
-- ensure the number is odd, and within the bounds of
-- ensure the number is odd, and within bounds of the generator
local seed = bitwise_and(seed, 1) local seed = bitwise_and(seed, 1)
local v = math.clamp(math.abs(seed), 0, SEED_BOUNDS) local v = math.clamp(math.abs(seed), 0, SEED_BOUNDS)
X1 = v X1 = v
X2 = v + 1 X2 = v + 1
end end
RANDOM_CALLS_COUNT = 0
local RS = math.randomseed
math.randomseed = function(seed)
RANDOM_CALLS_COUNT = 0
RS(seed)
end
local R = math.random local R = math.random
local function random(n, m) local function random(n, m)
RANDOM_CALLS_COUNT = RANDOM_CALLS_COUNT + 1 RANDOM_CALLS_COUNT = RANDOM_CALLS_COUNT + 1
local r
if n then if n then
if m then if m then
return (rand() + n) * m
r = R(n, m)
else else
return rand() * n
r = R(n)
end end
else else
return rand()
r = R()
end end
return r
end end
-- whenever we refer to math.random, actually use the function 'random' above -- whenever we refer to math.random, actually use the function 'random' above
math.random = random math.random = random
function g_octave_noise(x, y, num_octaves, seed) function g_octave_noise(x, y, num_octaves, seed)
local seed = seed or os.clock()
local seed = seed or os.time()
local noise = 0 local noise = 0
for oct = 1, num_octaves do for oct = 1, num_octaves do
@ -71,21 +80,21 @@ function g_octave_noise(x, y, num_octaves, seed)
return noise return noise
end end
---- @TODO test, fix
--function poisson_knuth(lambda)
-- local e = 2.71828
--
-- local L = e^-lambda
-- local k = 0
-- local p = 1
--
-- while p > L do
-- k = k + 1
-- p = p * math.random()
-- end
--
-- return k - 1
--end
-- @TODO test, fix
function poisson_knuth(lambda)
local e = 2.71828
local L = e^-lambda
local k = 0
local p = 1
while p > L do
k = k + 1
p = p * math.random()
end
return k - 1
end
-- seed the random number generator with the current time -- seed the random number generator with the current time
-- os.clock() is better if the program has been running for a little bit. -- os.clock() is better if the program has been running for a little bit.

2
lib/texture.lua

@ -30,6 +30,8 @@ TEXTURES = {
UNPAUSE_HEX = load_texture("unpausehex.png"), UNPAUSE_HEX = load_texture("unpausehex.png"),
MAIN_MENU_HEX = load_texture("mainmenuhex.png"), MAIN_MENU_HEX = load_texture("mainmenuhex.png"),
SEED_COLON_TEXT = load_texture("seed_colon_text.png"),
CURTAIN = load_texture("curtain1.png"), CURTAIN = load_texture("curtain1.png"),
SOUND_ON1 = load_texture("sound-on.png"), SOUND_ON1 = load_texture("sound-on.png"),

29
main.lua

@ -151,9 +151,9 @@ function main_scene(do_backdrop, do_logo)
end end
local seed_textfield, get_seed_textfield_value = gui_make_textfield{ local seed_textfield, get_seed_textfield_value = gui_make_textfield{
position = vec2(win.left + 150, 50),
dimensions = vec2(200, 40),
max = 9,
position = vec2(win.left + 500, 50),
dimensions = vec2(90, 40),
max = math.ceil(math.log(HEX_GRID_WIDTH * HEX_GRID_HEIGHT, 10)),
validate = function(string) validate = function(string)
return not string.match(string, "%D") return not string.match(string, "%D")
end, end,
@ -161,6 +161,9 @@ function main_scene(do_backdrop, do_logo)
group:append( group:append(
seed_textfield seed_textfield
) )
group:append(
am.translate(win.left + 220, 50) ^ pack_texture_into_sprite(TEXTURES.SEED_COLON_TEXT)
)
local main_scene_options = { local main_scene_options = {
false, false,
@ -213,7 +216,7 @@ function main_scene(do_backdrop, do_logo)
return group return group
end end
function make_scene_menu(scene_options, tag)
function make_scene_menu(scene_options, tag, do_curtain)
-- calculate the dimensions of the whole grid -- calculate the dimensions of the whole grid
local spacing = 150 local spacing = 150
local grid_width = 6 local grid_width = 6
@ -227,6 +230,11 @@ function make_scene_menu(scene_options, tag)
-- generate a map of hexagons (the menu is made up of two rows of hexes) and populate their locations with buttons from the provided options -- generate a map of hexagons (the menu is made up of two rows of hexes) and populate their locations with buttons from the provided options
local map = hex_rectangular_map(grid_width, grid_height, HEX_ORIENTATION.POINTY) local map = hex_rectangular_map(grid_width, grid_height, HEX_ORIENTATION.POINTY)
local group = am.group():tag(tag or "menu") local group = am.group():tag(tag or "menu")
if do_curtain then
group:append(pack_texture_into_sprite(TEXTURES.CURTAIN, win.width, win.height))
end
local menu = am.group()
local option_index = 1 local option_index = 1
for i,_ in pairs(map) do for i,_ in pairs(map) do
for j,_ in pairs(map[i]) do for j,_ in pairs(map[i]) do
@ -250,6 +258,14 @@ function make_scene_menu(scene_options, tag)
local hex_ = pixel_to_hex(mouse - pixel_offset, vec2(spacing), HEX_ORIENTATION.POINTY) local hex_ = pixel_to_hex(mouse - pixel_offset, vec2(spacing), HEX_ORIENTATION.POINTY)
if tile.option then if tile.option then
if tile.option.keys and tile.option.action then
for _,key in pairs(win:keys_pressed()) do
if table.find(tile.option.keys, function(_key) return _key == key end) then
tile.option.action()
end
end
end
if hex == hex_ then if hex == hex_ then
if not selected then if not selected then
play_sfx(SOUNDS.SELECT1) play_sfx(SOUNDS.SELECT1)
@ -267,12 +283,13 @@ function make_scene_menu(scene_options, tag)
end end
end) end)
group:append(node)
menu:append(node)
option_index = option_index + 1 option_index = option_index + 1
end end
end end
group:append(am.translate(pixel_offset) ^ menu)
return am.translate(pixel_offset) ^ group
return group
end end
function switch_context(scene, action) function switch_context(scene, action)

BIN
res/img/seed_colon_text.png

After

Width: 376  |  Height: 40  |  Size: 3.8 KiB

13
src/game.lua

@ -42,7 +42,10 @@ local game_scene_menu_options = {
action = function() action = function()
win.scene("context").paused = false win.scene("context").paused = false
win.scene:remove("menu") win.scene:remove("menu")
end
end,
keys = {
"escape"
}
}, },
{ {
texture = TEXTURES.SETTINGS_HEX, texture = TEXTURES.SETTINGS_HEX,
@ -149,12 +152,11 @@ end
local function game_pause() local function game_pause()
win.scene("context").paused = true win.scene("context").paused = true
win.scene:append(make_scene_menu(game_scene_menu_options))
win.scene:append(make_scene_menu(game_scene_menu_options, nil, true))
end end
local function game_deserialize(json_string) local function game_deserialize(json_string)
local new_game_state = am.parse_json(json_string) local new_game_state = am.parse_json(json_string)
log(new_game_state.RANDOM_CALLS_COUNT)
if new_game_state.version ~= version then if new_game_state.version ~= version then
gui_alert("loading incompatible old save data.\nstarting a fresh game instead.", nil, 10) gui_alert("loading incompatible old save data.\nstarting a fresh game instead.", nil, 10)
@ -167,10 +169,11 @@ local function game_deserialize(json_string)
-- in order to restore the state of the random number generator on game deserialize, we first -- in order to restore the state of the random number generator on game deserialize, we first
-- seed it with the same seed used in the original state. then, we discard N calls, where N -- seed it with the same seed used in the original state. then, we discard N calls, where N
-- is the number of calls we counted since seeding the generator last time. -- is the number of calls we counted since seeding the generator last time.
for i = 0, new_game_state.RANDOM_CALLS_COUNT do
--
-- this means it's important that deserializing the rest of the game state doesn't cause any math.random() calls.
for i = 1, new_game_state.RANDOM_CALLS_COUNT do
math.random() math.random()
end end
log(RANDOM_CALLS_COUNT)
new_game_state.world = make_hex_grid_scene(new_game_state.map, true) new_game_state.world = make_hex_grid_scene(new_game_state.map, true)
new_game_state.seed = nil new_game_state.seed = nil

4
src/hexyz.lua

@ -384,7 +384,7 @@ end
-- Returns Unordered Hexagonal Map of |radius| with Simplex Noise -- Returns Unordered Hexagonal Map of |radius| with Simplex Noise
function hex_hexagonal_map(radius, seed) function hex_hexagonal_map(radius, seed)
local seed = seed or os.time()
local seed = seed or math.floor(math.random() * (2 * math.pi * radius^2))
local size = 0 local size = 0
local map = {} local map = {}
@ -435,7 +435,7 @@ end
-- Returns Unordered Rectangular Map of |width| and |height| with Simplex Noise -- Returns Unordered Rectangular Map of |width| and |height| with Simplex Noise
function hex_rectangular_map(width, height, orientation, seed, do_generate_noise) function hex_rectangular_map(width, height, orientation, seed, do_generate_noise)
local orientation = orientation or HEX_DEFAULT_ORIENTATION local orientation = orientation or HEX_DEFAULT_ORIENTATION
local seed = seed or os.time()
local seed = seed or math.floor(math.random() * (width * height))
local map = {} local map = {}
if orientation == HEX_ORIENTATION.FLAT then if orientation == HEX_ORIENTATION.FLAT then

2
src/map-editor.lua

@ -81,7 +81,7 @@ function map_editor_action()
if win:key_pressed"escape" then if win:key_pressed"escape" then
win.scene("map_editor").paused = true win.scene("map_editor").paused = true
win.scene:append(make_scene_menu(map_editor_scene_menu_options))
win.scene:append(make_scene_menu(map_editor_scene_menu_options, nil, true))
end end
if win:mouse_down"left" then if win:mouse_down"left" then

Loading…
Cancel
Save