From 03b502299df24384304a9e5ae81dd2c3e4a25264 Mon Sep 17 00:00:00 2001
From: Retrisma <64330958+Retrisma@users.noreply.github.com>
Date: Thu, 12 Oct 2023 15:02:18 -0400
Subject: [PATCH] added rich textboxes

---
 Graphics/Sprites/dialoguebox.png | Bin 0 -> 556 bytes
 assets.lua                       |   2 +-
 camera.lua                       |   6 +--
 main.lua                         |  21 +++++-----
 ui.lua                           |  64 +++++++++++++++++++++++++++++--
 5 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 Graphics/Sprites/dialoguebox.png

diff --git a/Graphics/Sprites/dialoguebox.png b/Graphics/Sprites/dialoguebox.png
new file mode 100644
index 0000000000000000000000000000000000000000..fafa34af3758bbd8a8349e113a0e757710ed822b
GIT binary patch
literal 556
zcmeAS@N?(olHy`uVBq!ia0y~yU~&Mm8#tJO<P~GJnLvuMILO_JVcj{Imq1QJfKP}k
zkXBMKan-O%vo!1vv%X)bc5^}6yTh}7e=?i-G$3oAf%%j??@aw5ZxtgOOMCkggM_B&
zyobrN|Hq$wa{Bh4|NsBbUc0@eu01m=D>5vo%&BXQk<rcY<m=VD`low!<s1A?-g6#k
zheAn^UoZnuH9jzD*4i?l8~r?8978JRyuD<|%V5BBV8bPe`bDf0lUJoEpO{!FaOOQj
zp0Pk@qX&;ml7bNPM2U_g4k~O)hND7QLn4Lo=_|#hS0iSs0Aqo{)78&qol`;+0JFNn
ALI3~&

literal 0
HcmV?d00001

diff --git a/assets.lua b/assets.lua
index 3cd5bfa..680118d 100644
--- a/assets.lua
+++ b/assets.lua
@@ -35,7 +35,7 @@ function loadfolder(path, type)
                     out[shortname].image:getWidth(), out[shortname].image:getHeight())
             end
         elseif type == "font" then
-            out[shortname] = love.graphics.newFont(lpath, 20)
+            out[shortname] = love.graphics.newFont(lpath, 32)
         end
     end
 
diff --git a/camera.lua b/camera.lua
index 2cf3270..c2f1aad 100644
--- a/camera.lua
+++ b/camera.lua
@@ -5,7 +5,7 @@ camera = {
     xoff = 0, yoff = 0, -- offset
     xlock = false, ylock = false, -- camera lock coordinates
     init = false,
-    damping = 10
+    damping = 2
 }
 
 function caminit(map)
@@ -51,8 +51,8 @@ function updatecamera(dt)
     if camera.xlock then camera.x = camera.xlock end
     if camera.ylock then camera.y = camera.ylock end
 
-    camera.rx = qerp(camera.rx, camera.x + (camera.xoff * (window.width * (1 / window.scale))), dt)
-    camera.ry = qerp(camera.ry, camera.y, dt)
+    camera.rx = qerp(camera.rx, camera.x + (camera.xoff * (window.width * (1 / window.scale))), dt * camera.damping)
+    camera.ry = qerp(camera.ry, camera.y, dt * camera.damping)
 
     camera.fx = math.floor(camera.rx)
     camera.fy = math.floor(camera.ry)
diff --git a/main.lua b/main.lua
index 1bb00e7..57dc04c 100644
--- a/main.lua
+++ b/main.lua
@@ -15,7 +15,7 @@ require "drawing"
 sti = require "lib/sti"
 moonshine = require "lib/moonshine"
 
-window = { width = 800, height = 460, scale = 1.5 }
+window = { width = 800, height = 460, scale = 1.3 }
 
 speed = { target = 1 / 60, multiplier = 1 }
 
@@ -43,24 +43,23 @@ function love.load()
     end
 
     Button:add(50, 100, "button", function() showdebug = not showdebug end)
-    --Button:add(250, 2200, "button", function() showdebug = not showdebug end)
-    Textbox:add(500, 290, "debug button", { scroll = false })
+    Textbox:add(200, 100, "Everyone knows Mario is cool as fuck. Everyone knows Mario is cool as fuck.", {
+        scroll = true,
+        shadow = { 1, 0, 0 },
+        image = images["dialoguebox"],
+        hpad = 15,
+        vpad = 10,
+        font = fonts["ElixiR"]
+    })
 end
 
 function love.update(dt)
     --calculate fixed timestep
     local rate = speed.target * dt * speed.multiplier * 30
 
-    updatecamera(dt)
+    updatecamera(rate)
     updatemouse()
 
-    debug.mx = mouse.x
-    debug.my = mouse.y
-    debug.px = player.x
-    debug.py = player.y
-    debug.cx = camera.fx
-    debug.cy = camera.fy
-
     --update all sprites
     for _,v in pairs(p) do
         v:update(rate)
diff --git a/ui.lua b/ui.lua
index bded714..26559c8 100644
--- a/ui.lua
+++ b/ui.lua
@@ -44,7 +44,12 @@ function Button:animate(dt)
 end
 
 --textbox class
-Textbox = { bank = "" }
+Textbox = {
+    bank = "",
+    speed = 0.01, --delay in seconds per letter
+    cooldown = 0,
+    pixels = 0
+}
 local textbox_mt = class(Textbox)
 
 function Textbox:init(x, y, text, opts)
@@ -52,11 +57,21 @@ function Textbox:init(x, y, text, opts)
     local o = {
         x = x, y = y,
         text = "",
-        scroll = opts.scroll or false
+        drawmode = "absolute"
     }
 
+    for k,v in pairs(opts) do
+        o[k] = v
+    end
+
     if o.scroll then o.bank = text else o.text = text end
 
+    local word = o.bank:match("(%w+)(.+)")
+    local wordsize = fonts["ElixiR"]:getWidth(" " .. (word or ""))
+    o.pixels = wordsize
+
+    o.width = o.width or (o.image and o.image:getWidth()) or 100
+
     return o
 end
 
@@ -70,11 +85,52 @@ end
 
 function Textbox:update(dt)
     if self.bank ~= "" then
-        self.text = self.text .. self.bank:sub(1, 1)
+        self.cooldown = self.cooldown + dt
+        if self.cooldown > self.speed then
+            self:nextletter()
+            
+            self.cooldown = self.cooldown - self.speed
+        end
+    end
+end
+
+function Textbox:nextletter()
+    local char = self.bank:sub(1, 1)
+
+    if char == " " then
+        local word = self.bank:match("(%w+)(.+)")
+        local wordsize = fonts["ElixiR"]:getWidth(" " .. (word or ""))
+
+        if self.pixels + wordsize > self.width - (self.hpad * 2) then
+            self.text = self.text .. "\n"
+            self.pixels = 0
+        else
+            self.text = self.text .. char
+        end
+        
+        self.bank = self.bank:sub(2)
+        self.pixels = self.pixels + wordsize
+    else
+        self.text = self.text .. char
         self.bank = self.bank:sub(2)
     end
 end
 
 function Textbox:draw()
-    love.graphics.print(self.text, self.x, self.y, 0)
+    local textpos = {
+        x = self.x + (self.hpad or 0),
+        y = self.y + (self.vpad or 0)
+    }
+
+    if self.font then love.graphics.setFont(self.font) end
+
+    if self.image then
+        love.graphics.draw(self.image, self.x, self.y)
+    end
+    if self.shadow then
+        love.graphics.setColor(self.shadow)
+        love.graphics.print(self.text, textpos.x + 1, textpos.y + 1, 0)
+        love.graphics.setColor(1, 1, 1, 1)
+    end
+    love.graphics.print(self.text, textpos.x, textpos.y, 0)
 end
\ No newline at end of file