Merge branch 'release/0.17.0.1766'

Author: rm-code

CHANGELOG.md

@@ -1,3 +1,45 @@
+# Version 0.17.0.1766 - 2019-04-20
+
+## Additions
+- Added simple base screen.
+    - Allows the player to start a new mission.
+    - Allows the player to quit to the main menu.
+    - Allows the player to recruit new stalkers.
+    - Allows the player to edit each stalkers inventory and to store items in the base.
+    - Allows the player to sell and buy items inside of a shop menu.
+    - Starting a new game will direct the player directly to the base screen.
+    - Shows overview over the player's faction.
+    - Missions can be aborted and the game will return back to the base screen.
+- Added button to the option menu which allows opening the save / modding directory.
+- Added keybinding that centers the camera on the currently selected character.
+- Added better save game validation.
+- Added sorting mechanics for paginated lists.
+- Added keybindings for the "split item stack" and "drag full item stack" actions so they can be changed.
+
+## Fixes
+- Fixed inventory volume being set incorrectly after loading a savegame.
+- Fixed health points being set incorrectly after loading a savegame.
+- Fixed items of paginated list not being moved correctly when the paginated list was moved.
+- Fixed positioning of UI child elements.
+- Fixed splitting of item stacks.
+
+## Other Changes
+- Changed view range based on character classes.
+- Changed values for shooting and throwing skills based on character classes.
+- Changed prefab editor to be more performant.
+- Changed translator to load translations from a single .lua file.
+- Changed translator to load external translations.
+- Changed savegame screen
+    - Saves are now displayed as a paginated list for easy navigation
+    - Saves can now be deleted by clicking on the "X" button
+    - Improved information about saves
+- Changed all items to be stackable.
+    - Item stacks are now merged automatically.
+- Changed detection for mouse dragging events which makes it easier to distinguish dragging events from normal mouse clicking.
+
+
+
+
 # Version 0.16.1.1627 - 2018-09-02 (LÖVE 11.1)
 
 ## Additions

LICENSE.md

@@ -1,4 +1,16 @@
-All rights reserved (c) 2016 - 2018 Robert Machmer
+The MIT License (MIT)
+
+Copyright (c) 2016 - 2019 Robert Machmer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

README.md

@@ -1,7 +1,8 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.16.1.1627-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.17.0.1766-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
 [![LOVE](https://img.shields.io/badge/L%C3%96VE-11.1-EA316E.svg)](http://love2d.org/)
+[![License](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE.md)
 [![Build Status](https://travis-ci.com/rm-code/On-The-Roadside.svg?token=q3rLXeyGTBN9VB2zsWMr&branch=develop)](https://travis-ci.com/rm-code/On-The-Roadside)
 
 _On the Roadside_ is a turn-based strategy game in which you take control of a squad of mercenaries fighting for survival in a world shaped by unknown forces. It currently is in the very _early stages_ of development.
@@ -25,4 +26,3 @@ This game is still in early stages of development by a one-man team ([@rm-code](
 
 ### Generating the Documentation
 
-OTR uses LuaDoc to generate a documentation. By default the documentation will be generated in a `../docs` folder.

src/util/ArrayRotation.lua renamed to lib/ArrayRotation.lua

@@ -1,14 +1,30 @@
----
--- Allows the rotation of two-dimensional arrays by 90, 180 and 270 degrees.
--- Works with square and non square arrays.
--- @module ArrayRotation
---
-
--- ------------------------------------------------
--- Module
--- ------------------------------------------------
+--==================================================================================
+-- Copyright (C) 2017 by Robert Machmer                                            =
+--                                                                                 =
+-- Permission is hereby granted, free of charge, to any person obtaining a copy    =
+-- of this software and associated documentation files (the "Software"), to deal   =
+-- in the Software without restriction, including without limitation the rights    =
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell       =
+-- copies of the Software, and to permit persons to whom the Software is           =
+-- furnished to do so, subject to the following conditions:                        =
+--                                                                                 =
+-- The above copyright notice and this permission notice shall be included in      =
+-- all copies or substantial portions of the Software.                             =
+--                                                                                 =
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR      =
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,        =
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE     =
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER          =
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,   =
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN       =
+-- THE SOFTWARE.                                                                   =
+--==================================================================================
 
-local ArrayRotation = {}
+local ArrayRotation= {
+    _VERSION     = "1.0.0",
+    _DESCRIPTION = "Rotation of arrays in 90° increments." ,
+    _URL         = 'https://gist.github.com/rm-code/4118d4a97d8cde16952199d94b84ead0',
+}
 
 -- ------------------------------------------------
 -- Private Functions

lib/TGFParser.lua

@@ -1,7 +1,7 @@
 -- ============================================================================== --
 -- MIT License                                                                    --
 --                                                                                --
--- Copyright (c) 2016 - 2017 Robert Machmer                                       --
+-- Copyright (c) 2016 - 2018 Robert Machmer                                       --
 --                                                                                --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy   --
 -- of this software and associated documentation files (the "Software"), to deal  --
@@ -23,43 +23,57 @@
 -- ============================================================================== --
 
 local TGFParser = {
-    _VERSION     = '1.0.3',
+    _VERSION     = '1.1.0',
     _DESCRIPTION = 'A parser for "Trivial Graph Format" (TGF) files written in Lua.',
     _URL         = 'https://github.com/rm-code/lua-tgf-parser/',
-};
+}
+
+-- ------------------------------------------------
+-- Constants
+-- ------------------------------------------------
+
+local NODE_REGEX = '(.+) (.+)'
+local EDGE_REGEX = '(.+) (.+) (.+)'
 
 -- ------------------------------------------------
 -- Line iterator
 -- ------------------------------------------------
 
-local lines = love and love.filesystem.lines or io.lines;
+local lines = love and love.filesystem.lines or io.lines
 
 -- ------------------------------------------------
 -- Local Functions
 -- ------------------------------------------------
 
 ---
--- Iterates over the file and separates the lines for nodes and edges into
+-- Iterates over the file and stores the lines for nodes and edges in
 -- different tables.
--- @param path (string)   The path of the file to load.
--- @return     (sequence) A sequence containing all node definitions.
--- @return     (sequence) A sequence containing all edge definitions.
+-- @tparam string path The path of the file to load.
+-- @treturn table A sequence containing all node definitions.
+-- @treturn table A sequence containing all edge definitions.
 --
 local function loadFile( path )
-    local nodes = {};
-    local edges = {};
-    local target = nodes;
+    local nodes = {}
+    local edges = {}
+    local target = nodes
 
     -- Change the target table once the '#' separator is reached.
     for line in lines( path ) do
         if line == '#' then
-            target = edges;
+            target = edges
         else
-            target[#target + 1] = line;
+            target[#target + 1] = line
         end
     end
 
-    return nodes, edges;
+    return nodes, edges
+end
+
+---
+-- Tries to convert a string to a number.
+--
+local function convertNumber( n )
+    return tonumber( n ) and tonumber( n ) or n
 end
 
 -- ------------------------------------------------
@@ -68,34 +82,32 @@ end
 
 ---
 -- Parses a .tgf file.
--- @param path (string) The path of the file to load.
--- @return     (table)  The table containing the nodes and edges of the graph.
+-- @tparam string path The path of the file to load.
+-- @treturn table A table containing tables the nodes and edges of the graph.
 --
 function TGFParser.parse( path )
-    local nodes, edges = loadFile( path );
+    local nodes, edges = loadFile( path )
 
     -- Set up the graph table.
-    local graph = {};
-    graph.nodes = {};
-    graph.edges = {};
+    local graph = {}
+    graph.nodes = {}
+    graph.edges = {}
 
     -- Splits each line of the node definitions and stores them inside of the
     -- node table as nodes[id] = name.
     for _, line in ipairs( nodes ) do
-        local id, name = string.match( line, '(%d+) (.+)' );
-        id = tonumber( id );
-        graph.nodes[id] = name;
+        local id, label = string.match( line, NODE_REGEX )
+        graph.nodes[#graph.nodes + 1] = { id = convertNumber( id ), label = label }
     end
 
     -- Splits each line of the edge definitions and stores them inside of the
     -- edge table as edges[i] = { from = nodeId1, to = nodeId2, name = edgeName }.
     for _, line in ipairs( edges ) do
-        local f, t, e = string.match( line, '(%d+) (%d+) (.+)' );
-        f, t = tonumber( f ), tonumber( t );
-        graph.edges[#graph.edges + 1] = { from = f, to = t, name = e };
+        local from, to, label = string.match( line, EDGE_REGEX )
+        graph.edges[#graph.edges + 1] = { from = convertNumber( from ), to = convertNumber( to ), label = label }
     end
 
-    return graph;
+    return graph
 end
 
-return TGFParser;
+return TGFParser

lib/screenmanager/ScreenManager.lua

@@ -358,6 +358,14 @@ function ScreenManager.mousereleased( x, y, button, istouch, presses )
     ScreenManager.peek():mousereleased( x, y, button, istouch, presses )
 end
 
+function ScreenManager.mousedragstarted()
+    ScreenManager.peek():mousedragstarted()
+end
+
+function ScreenManager.mousedragstopped()
+    ScreenManager.peek():mousedragstopped()
+end
+
 ---
 -- Reroutes the quit callback to the currently active screen.
 -- @return quit (boolean) Abort quitting. If true, do not close the game.

main.lua

@@ -2,6 +2,7 @@ local ScreenManager = require('lib.screenmanager.ScreenManager')
 local Log = require( 'src.util.Log' )
 local DebugGrid = require( 'src.ui.overlays.DebugGrid' )
 local Letterbox = require( 'src.ui.overlays.Letterbox' )
+local DataHandler = require( 'src.DataHandler' )
 
 -- ------------------------------------------------
 -- Local Variables
@@ -10,6 +11,9 @@ local Letterbox = require( 'src.ui.overlays.Letterbox' )
 local debugGrid
 local letterbox
 
+local mousepressed = false
+local mousedragged = false
+
 -- ------------------------------------------------
 -- Constants
 -- ------------------------------------------------
@@ -35,14 +39,18 @@ local SCREENS = {
     information      = require( 'src.ui.screens.InformationModal'      ),
     inputdialog      = require( 'src.ui.screens.InputDialog'           ),
     maptest          = require( 'src.ui.screens.MapTest'               ),
-    mapeditor        = require( 'src.ui.screens.MapEditor'             ),
-    mapeditormenu    = require( 'src.ui.screens.MapEditorMenu'         ),
-    prefabeditor     = require( 'src.ui.screens.PrefabEditor'          ),
-    prefabeditormenu = require( 'src.ui.screens.PrefabEditorMenu'      ),
-    editorloading    = require( 'src.ui.mapeditor.EditorLoadingScreen' ),
+    mapeditor        = require( 'src.map.editor.MapEditor'             ),
+    mapeditormenu    = require( 'src.map.editor.MapEditorMenu'         ),
+    prefabeditor     = require( 'src.map.editor.PrefabEditor'          ),
+    prefabeditormenu = require( 'src.map.editor.PrefabEditorMenu'      ),
+    editorloading    = require( 'src.map.editor.EditorLoadingScreen'   ),
     keybindingeditor = require( 'src.ui.screens.KeybindingScreen'      ),
     keybindingmodal  = require( 'src.ui.screens.KeybindingModal'       ),
     playerInfo       = require( 'src.ui.screens.PlayerInfo'            ),
+    base             = require( 'src.base.BaseScreen'                  ),
+    basemenu         = require( 'src.base.BaseScreenMenu'              ),
+    recruitment      = require( 'src.base.RecruitmentScreen'           ),
+    shop             = require( 'src.base.ShopScreen'                  ),
 }
 
 -- ------------------------------------------------
@@ -128,7 +136,12 @@ function love.update(dt)
 end
 
 function love.quit(q)
+    Log.info( 'Shutting down...', 'Main' )
+
     ScreenManager.quit(q)
+
+    DataHandler.removeTemporaryFiles()
+    Log.info( 'Thank you for playing "On The Roadside"!', 'Main' )
 end
 
 function love.keypressed( key, scancode, isrepeat )
@@ -148,10 +161,18 @@ function love.textinput( text )
 end
 
 function love.mousepressed( mx, my, button, isTouch, presses )
+    mousepressed = true
     ScreenManager.mousepressed( mx, my, button, isTouch, presses )
 end
 
 function love.mousereleased( mx, my, button, isTouch, presses )
+    mousepressed = false
+    if mousedragged then
+        mousedragged = false
+        ScreenManager.mousedragstopped()
+        return
+    end
+
     ScreenManager.mousereleased( mx, my, button, isTouch, presses )
 end
 
@@ -160,6 +181,12 @@ function love.mousefocus( f )
 end
 
 function love.mousemoved( x, y, dx, dy, isTouch )
+    if mousepressed then
+        mousedragged = true
+        mousepressed = false
+        ScreenManager.mousedragstarted()
+    end
+
     ScreenManager.mousemoved( x, y, dx, dy, isTouch )
 end
 

res/data/Tiles.lua

@@ -1,4 +1,8 @@
 return {
+    {
+        id = 'tile_empty',
+        passable = false
+    },
     {
         id = 'tile_asphalt',
         movementCost = {

res/data/creatures/classes.lua

@@ -6,7 +6,10 @@ return {
         },
         stats = {
             ap = 40,
-            hp = 8
+            hp = 8,
+            viewRange = 12,
+            shootingSkill = { min = 40, max = 70 },
+            throwingSkill = { min = 50, max = 80 }
         }
     },
     {
@@ -16,7 +19,10 @@ return {
         },
         stats = {
             ap = 30,
-            hp = 5
+            hp = 5,
+            viewRange = 10,
+            shootingSkill = { min = 30, max = 60 },
+            throwingSkill = { min = 40, max = 70 }
         }
     },
     {
@@ -26,7 +32,10 @@ return {
         },
         stats = {
             ap = 20,
-            hp = 4
+            hp = 4,
+            viewRange = 8,
+            shootingSkill = { min = 30, max = 40 },
+            throwingSkill = { min = 20, max = 30 }
         }
     }
 }