diff --git a/README.md b/README.md index b80b7296..a005071e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ###### Copyright (C) 2017 MarvellousSoft & USPGameDev ###### Code under license **GPLv3.0**, original assets under license **CC BY-AS 4.0** -# Marvellous Inc. v1.1 +# Marvellous Inc. v1.1.1 **an open source zachlike indie game by [MarvellousSoft](https://marvelloussoft.github.io/) and [USPGameDev](https://uspgamedev.org/) ~ 2016/2017** diff --git a/marv/classes/interpreter/operations.lua b/marv/classes/interpreter/operations.lua index 29aac5e9..25236c85 100644 --- a/marv/classes/interpreter/operations.lua +++ b/marv/classes/interpreter/operations.lua @@ -330,6 +330,7 @@ function Read:execute() if not console or console.tp ~= "console" then return "Trying to read from non-console" end local nx = console:input() if not nx then return "No input on console" end + if type(nx) ~= 'number' then return nx end return Util.findId("memory"):set(self.reg:evaluate(), nx) end diff --git a/marv/conf.lua b/marv/conf.lua index 64ae10b5..5e32487b 100644 --- a/marv/conf.lua +++ b/marv/conf.lua @@ -57,7 +57,7 @@ function love.conf(t) title = "Marvellous_Inc", -- The project title (string) package = "marvellous", -- The project command and package name (string) loveVersion = t.version, -- The project LÖVE version - version = "1.0.1", -- The project version + version = "1.1.1", -- The project version author = "Marvellous Soft", -- Your name (string) email = "marvellous.amoeba@gmail.com", -- Your email (string) description = "Zachlike with an immersive storyline told through emails.", -- The project description (string) diff --git a/marv/gamestates/menu.lua b/marv/gamestates/menu.lua index c3601dc4..32060f04 100644 --- a/marv/gamestates/menu.lua +++ b/marv/gamestates/menu.lua @@ -92,6 +92,9 @@ function state:draw() local f = self.font love.graphics.setFont(f) love.graphics.print("Username:", (W - self.box.w) / 2, H - 300 - f:getHeight() - 5) + + love.graphics.print('v' .. VERSION, W - f:getWidth('v' .. VERSION) - 10, H - f:getHeight() - 10) + love.graphics.setLineWidth(.5) love.graphics.rectangle("line", (W - self.box.w) / 2, H - 300, self.box.w, self.box.h) self.box:draw() diff --git a/marv/puzzles/jen3.lua b/marv/puzzles/jen3.lua index 15d4f6ca..205948fd 100644 --- a/marv/puzzles/jen3.lua +++ b/marv/puzzles/jen3.lua @@ -100,7 +100,7 @@ end function first_completed() _G.PopManager.new("Well done", - "You have proven yourself to be an efficient and valuable employee so far.\n\nI'll tell Franz about your sucess. It's time to carry on.\n-Janine", + "You have proven yourself to be an efficient and valuable employee so far.\n\nI'll tell Franz about your sucess. It's time to carry on.\n\n-Janine", _G.CHR_CLR['jen'], { func = after_pop, text = " I am ready ", diff --git a/marv/puzzles/jen7.lua b/marv/puzzles/jen7.lua index d4f1b99a..cf9e790c 100644 --- a/marv/puzzles/jen7.lua +++ b/marv/puzzles/jen7.lua @@ -105,7 +105,7 @@ grid_floor = "wwwwwwwwwwwwwwwwwwwww".. function first_completed() _G.PopManager.new("Clean as a morgue", - "I couldn't make it better myself.\nIf we get out of this mess in one piece, I'll buy you a bottle of Wharmpess and we put all of this havoc behind us, how about it?\n-Janine", + "I couldn't make it better myself.\nIf we get out of this mess in one piece, I'll buy you a bottle of Wharmpess and we put all of this havoc behind us, how about it?\n\n-Janine", _G.CHR_CLR['jen'], { func = function() _G.ROOM:disconnect() diff --git a/marv/puzzles/paul3.lua b/marv/puzzles/paul3.lua index c93eeb54..ad8f99da 100644 --- a/marv/puzzles/paul3.lua +++ b/marv/puzzles/paul3.lua @@ -122,11 +122,5 @@ function first_completed() end, text = " *you ponder your life choices* ", clr = _G.Color.blue() - }, { - func = function() - _G.ROOM:disconnect() - end, - text = " that's a lot of dead people... ", - clr = _G.Color.red() }) end diff --git a/marv/setup.lua b/marv/setup.lua index a65a77a2..c4a0db2a 100644 --- a/marv/setup.lua +++ b/marv/setup.lua @@ -15,6 +15,8 @@ local setup = {} --SETUP FUNCTIONS -------------------- +VERSION = "1.1.1" + --GLOBAL VARIABLES-- W = love.graphics.getWidth() --Current width of the game window H = love.graphics.getHeight() --Current height of the game window