diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua index ac1d8e827063dbe92573f9442e184e220a05c082..7fb1129e8127e5210cc54f039c681a0aadded5c3 100644 --- a/game/modules/tome/class/Player.lua +++ b/game/modules/tome/class/Player.lua @@ -337,6 +337,12 @@ function _M:restCheck() local spotted = spotHostiles(self) if spotted then return false, ("hostile spotted (%s%s)"):format(spotted.actor.name, game.level.map:isOnScreen(spotted.x, spotted.y) and "" or " - offscreen") end + -- Resting improves regen + local perc = math.min(self.resting.cnt / 10, 4) + self:heal(self.life_regen * perc) + self:incStamina(self.stamina_regen * perc) + self:incMana(self.mana_regen * perc) + -- Check ressources, make sure they CAN go up, otherwise we will never stop if not self.resting.rest_turns then if self.air_regen < 0 then return false, "loosing breath!" end diff --git a/game/special/mainmenu/class/Game.lua b/game/special/mainmenu/class/Game.lua index 7961242575ad75fa527fc51b7a26bdb54a19c3ce..9219d94c89e2d03ef18c2641f2990da22fccfeff 100644 --- a/game/special/mainmenu/class/Game.lua +++ b/game/special/mainmenu/class/Game.lua @@ -34,7 +34,7 @@ function _M:init() self.profile_font = core.display.newFont("/data/font/VeraIt.ttf", 14) engine.Game.init(self, engine.KeyBind.new()) - self.background = core.display.loadImage("/data/gfx/mainmenu/background.jpg") + self.background = core.display.loadImage("/data/gfx/mainmenu/background.png") end function _M:run() diff --git a/ideas/crafting.ods b/ideas/crafting.ods index bc24a72522f012236788ae9c95557dc94a5d1c17..e67c3b641c0a07d7243a60f88a2b59c37f3a0cce 100644 Binary files a/ideas/crafting.ods and b/ideas/crafting.ods differ