From 717260f3f21ead8aa1ac50076d2ef987518570af Mon Sep 17 00:00:00 2001
From: Nicholas Hayashi <hayashi.nicholas@gmail.com>
Date: Fri, 7 Jan 2022 18:46:59 -0500
Subject: [PATCH] fix some seed stuff

---
 lib/gui.lua                 |  19 +++++++++++++------
 main.lua                    |   6 +++---
 res/img/seed_colon_text.png | Bin 3903 -> 762 bytes
 src/game.lua                |   5 ++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/gui.lua b/lib/gui.lua
index b2cfe98..1806bc2 100644
--- a/lib/gui.lua
+++ b/lib/gui.lua
@@ -99,7 +99,10 @@ end
 --  max number
 --  padding number
 --  validate function(string) -> bool
---  onchange function(new_value) -> void
+--
+--  font {
+--    color vec4
+--  }
 -- }
 function gui_make_textfield(
     args
@@ -107,10 +110,14 @@ function gui_make_textfield(
     local args = args or {}
     local position = args.position or vec2(0)
     local dimensions = args.dimensions or vec2(100, 40)
+    local max = args.max or math.floor(dimensions.x / 18)
+    local padding = args.padding or 6
     local validate = args.validate or function(string) return true end
+    local font = args.font or {
+        color = vec4(1)
+    }
+
     local width, height = dimensions.x, dimensions.y
-    local max = args.max or 10
-    local padding = args.padding or 6
     local half_width = width/2
     local half_height = height/2
 
@@ -127,7 +134,7 @@ function gui_make_textfield(
             am.wait(am.delay(0.4))
             cursor.color = vec4(0)
             am.wait(am.delay(0.4))
-            cursor.color = vec4(0, 0, 0, 1)
+            cursor.color = font.color
         end
     end
 
@@ -135,8 +142,8 @@ function gui_make_textfield(
         back_rect,
         front_rect,
         am.translate(position + vec2(-width/2 + padding, 0)) ^ am.group(
-            am.scale(2) ^ am.text("", vec4(0, 0, 0, 1), "left"),
-            (am.translate(0, -8) ^ am.line(vec2(0, 0), vec2(16, 0), 2, vec4(0, 0, 0, 1)):action(coroutine.create(blink_cursor))):tag"cursor"
+            am.scale(2) ^ am.text("", font.color, "left"),
+            (am.translate(0, -12) ^ am.line(vec2(0, 0), vec2(16, 0), 2, font.color):action(coroutine.create(blink_cursor))):tag"cursor"
         )
     }
 
diff --git a/main.lua b/main.lua
index 9ae35f6..2caeec5 100644
--- a/main.lua
+++ b/main.lua
@@ -130,7 +130,7 @@ function main_scene(do_backdrop, do_logo)
         local position = vec2(0, win.top - 20 - TEXTURES.LOGO.height/2)
         local logo =
             am.translate(position)
-            ^ pack_texture_into_sprite(TEXTURES.LOGO, TEXTURES.LOGO.width, TEXTURES.LOGO.height)
+            ^ pack_texture_into_sprite(TEXTURES.LOGO)
 
         local selected = false
         logo:action(function(self)
@@ -151,7 +151,7 @@ function main_scene(do_backdrop, do_logo)
     end
 
     local seed_textfield, get_seed_textfield_value = gui_make_textfield{
-        position = vec2(win.left + 500, 50),
+        position = vec2(win.left + 190, 50),
         dimensions = vec2(90, 40),
         max = math.ceil(math.log(HEX_GRID_WIDTH * HEX_GRID_HEIGHT, 10)),
         validate = function(string)
@@ -162,7 +162,7 @@ function main_scene(do_backdrop, do_logo)
         seed_textfield
     )
     group:append(
-        am.translate(win.left + 220, 50) ^ pack_texture_into_sprite(TEXTURES.SEED_COLON_TEXT)
+        am.translate(win.left + 80, 50) ^ pack_texture_into_sprite(TEXTURES.SEED_COLON_TEXT)
     )
 
     local main_scene_options = {
diff --git a/res/img/seed_colon_text.png b/res/img/seed_colon_text.png
index 2c48dd5d7d2148b5aa0f3e8c73aeb7bda2b47b2d..ca77aed20c9d53a5b182df7c831b8003896c6e89 100644
GIT binary patch
delta 724
zcmV;_0xSK$9{L3#iBL{Q4GJ0x0000DNk~Le0001P0000o2nGNE0KFIPcab49e*%w5
zL_t(|0qxn3ZPP#$2Jlaa0kT1F1F}KG1e6JCCa9PoW&*+l2@?PlI7|Q=<d}dm0o;=v
z>3a3q@7!l8F5gdjO43}PE`I*=d<KY!h=_=Yh=_=YCaXgHP2vg@yZ|i{3%5`#+(NN%
z3&p}M)Jw&fRS4I;mhfGSSx?9<e~yYVt1f>jkMX%r*)FdXW2)ry&n}AGh4_ufEvz>7
zXn$NE`Frz(+@}yX$lDsseKpf|8M+-vzpqhfYc#P_&jxUYKfJGaAB}Q1m~XqxQn<D8
z<mx1UW0+fZfOyBaG0ZJdMY)}E?#YGAH76Bp-A3<Shz;zd*ReOS70-Qxe+!XoPSR7`
zeTaA6tHu@&f27O2KRbl@44qAvAIkitbKei-b3NlFw}+0L4emz9yiPv*zCoI<Qpk_~
z3OyNL(rtZ*u1h@I7K|;OyGOpE>eGbyr5x)NV~&b3>cW*OZeOX4ws3Ov)X<Z?T#9!D
z%_3L0^m-tLD>*%#d9>$je?KyA-^Cmp+V1RG$#s=G*l=jC0aI2+Xh5!TKE!+2aF}rS
zPs4^5ndPV}X?2HK-&_6n#+s8u7Y=1)$thlnawFsA=q_p5Q$zP?9*^&h7Ejw%dX)Kt
zGWW1KvU5D1nOxzj5ZBRX*|1jEJTj0g+y)QV=tN0pcs=l4-)Zf3f8>A0$a2{+lV9fj
zlv|ClopuNPa@txkCY|dy6kJAX*sg##QSOy-?sNrzXPo;K<=z<QHh(%$vKMK@3&@i9
z6Xs(*_n52(d0c>8;ViFdAJBHDu^RKOXL`(cJ(lhA77J*0T!=52_O!ae_;bBF#E%KN
zhfbC8+#7@3r%dhxDr}zOUnRL!r%ECsA|fIpA|fK9OYjdtwcou7<RD%E0000<MNUMn
GLSTY6s#+BQ

delta 3890
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
A)&Kwi

diff --git a/src/game.lua b/src/game.lua
index 5219b03..c5c025d 100644
--- a/src/game.lua
+++ b/src/game.lua
@@ -57,7 +57,10 @@ local game_scene_menu_options = {
         texture = TEXTURES.QUIT_HEX,
         action = function()
             win:close()
-        end
+        end,
+        keys = {
+            "f4"
+        }
     },
     false
 }