From 7a67ae2f650333f8bd2e9ff907bfa46aa28a3c9b Mon Sep 17 00:00:00 2001
From: lustlion <undeadmaelys@protonmail.ch>
Date: Thu, 3 Feb 2022 11:32:39 +0100
Subject: [PATCH] cleaned stuff

---
 data/dialog_sequences.lua  |  6 +++---
 data/locale/ENG.lua        | 12 +++++-------
 data/locale/HEON.lua       | 11 ++++-------
 data/scripts/menu.lua      |  2 +-
 data/scripts/ui/dialog.lua |  4 ++--
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/data/dialog_sequences.lua b/data/dialog_sequences.lua
index 7106015..bfce314 100644
--- a/data/dialog_sequences.lua
+++ b/data/dialog_sequences.lua
@@ -1,7 +1,7 @@
 DialogSequence = {
   Example = {
-    {Locale.character.fairy.name,Locale.dialogue.example[1]},
-    {Locale.character.chaos.name,Locale.dialogue.example[2]},
-    {Locale.character.life.name,Locale.dialogue.example[3]}
+    {Locale.dialogue.example[1],Locale.name.fairy},
+    {Locale.dialogue.example[2],Locale.name.chaos},
+    {Locale.dialogue.example[3],Locale.name.life}
   }
 }
diff --git a/data/locale/ENG.lua b/data/locale/ENG.lua
index 76f78ba..18651f2 100644
--- a/data/locale/ENG.lua
+++ b/data/locale/ENG.lua
@@ -1,4 +1,5 @@
 LocaleFont = love.graphics.getFont()
+
 Locale = {}
 
 Locale.ui = {}
@@ -6,13 +7,10 @@ Locale.ui.pause_screen_resume = "Resume"
 Locale.ui.pause_screen_options = "Options"
 Locale.ui.pause_screen_exit = "Exit"
 
-Locale.character = {}
-Locale.character.fairy = {}
-Locale.character.fairy.name = "Ozy"
-Locale.character.chaos = {}
-Locale.character.chaos.name = "Aelato"
-Locale.character.life = {}
-Locale.character.life.name = "Olidia"
+Locale.name = {}
+Locale.name.fairy = "Ozy"
+Locale.name.chaos = "Aelato"
+Locale.name.life = "Olidia"
 
 Locale.dialogue = {}
 Locale.dialogue.example = {"Hello!","Duh.","Lol"}
diff --git a/data/locale/HEON.lua b/data/locale/HEON.lua
index 91c8a43..1a757e3 100644
--- a/data/locale/HEON.lua
+++ b/data/locale/HEON.lua
@@ -7,13 +7,10 @@ Locale.ui.pause_screen_resume = ""
 Locale.ui.pause_screen_options = ""
 Locale.ui.pause_screen_exit = ""
 
-Locale.character = {}
-Locale.character.fairy = {}
-Locale.character.fairy.name = ""
-Locale.character.chaos = {}
-Locale.character.chaos.name = ""
-Locale.character.life = {}
-Locale.character.life.name = ""
+Locale.name = {}
+Locale.name.fairy = ""
+Locale.name.chaos = ""
+Locale.name.life = ""
 
 
 Locale.dialogue = {}
diff --git a/data/scripts/menu.lua b/data/scripts/menu.lua
index f407208..25b0c79 100644
--- a/data/scripts/menu.lua
+++ b/data/scripts/menu.lua
@@ -3,6 +3,7 @@ function MenuDraw(menu)
   love.graphics.setFont(LocaleFont)
   -- Set scale to 1
   love.graphics.scale(0.5,0.5)
+
   if menu == "pause" then
     MenuDrawPauseScreen()
   elseif menu == "dialog" then
@@ -89,7 +90,6 @@ function MenuInit(menu,parameter)
     MenuInitPauseScreen()
   elseif menu == "dialog" then
     if parameter == nil then
-      print("WARNING -- what dialog?")
       parameter = DialogSequence.Example
     end
     MenuInitDialog(parameter)
diff --git a/data/scripts/ui/dialog.lua b/data/scripts/ui/dialog.lua
index ffdb252..5bbb1d5 100644
--- a/data/scripts/ui/dialog.lua
+++ b/data/scripts/ui/dialog.lua
@@ -86,8 +86,8 @@ function interfaceDialog:Draw()
     self.size.h*self.style.scale_y*self.style.scale_proportion)
 
   if self.contents ~= nil then
-    love.graphics.printf(self.contents[1],self.pos.x+10,self.pos.y+(self.size.h/2),100,"left")
-    love.graphics.printf(self.contents[2],self.pos.x+(self.size.w/2),self.pos.y+(self.size.h/2),100,"center")
+    love.graphics.printf(self.contents[2],self.pos.x+10,self.pos.y+(self.size.h/2),100,"left")
+    love.graphics.printf(self.contents[1],self.pos.x+(self.size.w/2),self.pos.y+(self.size.h/2),100,"center")
     love.graphics.printf(self.contents[3],self.pos.x+(self.size.w)-10,self.pos.y+(self.size.h/2),100,"right")
   else
     love.graphics.printf("ERROR",self.pos.x+(self.size.w/2),self.pos.y+(self.size.h/2),100,"center")