Merge branch 'release/0.10.0.1089'

.gitignore

@@ -1,3 +1,6 @@
+# macOS
+*.DS_Store
+
 # IntelliJ Project Files
 .idea/*
 *.iml

CHANGELOG.md

@@ -1,3 +1,33 @@
+# Version 0.10.0.1089 - 2017-10-28
+
+## Additions
+- Added ammo indicator which displays the total amount of ammunition a character has in his inventory
+- Added basics for parcel based procedural map generation
+    - Map layouts determine the general look of the map such as road placement and where parcels are placed
+    - Building-prefabs can be spawned in parcels matching their size
+    - Prefabs can be rotated randomly
+    - Spawn randomly generated foliage parcels
+- Added completely revamped inventory user interface
+    - General groundwork for future user interface additions
+
+## Removals
+- Removed unused resource file
+- Removed heal all selector on base screen
+
+## Fixes
+- Fixed crash on base screen when health screen was opened before a character was selected
+
+## Other Changes
+- Character names are aligned to the left now
+- Improved interaction between mouse and keyboard controls in menu screens
+- Nationalities are now picked from a weighted list to control the rarity of certain nations
+- The aim overlay will always mark unseen tiles as potentially blocking
+- Changed minimum resolution from 800x600 to 1024x768
+- Improved the ingame help screen and updated it to follow the general UI style
+
+
+
+
 # Version 0.9.2.1079 - 2017-10-28
 
 ## Fixes
@@ -188,7 +218,7 @@
 # Version 0.5.0.725 - 2017-02-09
 
 ## Additions
-- Added a new smaller map with more tactical possibilites
+- Added a new smaller map with more tactical possibilities
     - Added new tiles "Gravel" and "Wooden Floor"
     - Added new world object "Tree"
 - Added preliminary item descriptions
@@ -403,8 +433,8 @@
 - FOV isn't drawn for AI controlled factions
 - Tweaked shot calculations
     - Uses the maximum angle for a shot's derivation correctly now
-    - Randomly varies the projectile's travelling distance
-- Improved line of sight drawning
+    - Randomly varies the projectile's traveling distance
+- Improved line of sight drawing
     - Line of sight is now generated in real time between the active character and the mouse cursor
 - Center the camera on characters which have been selected via right-clicks
 - Use different sounds based on the selected weapon type

README.md

@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.9.2.1079-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.10.0.1089-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
 [![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
 [![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)
 

conf.lua

@@ -1,64 +1,64 @@
-local PROJECT_TITLE = "On The Roadside";
+local PROJECT_TITLE = "On The Roadside"
 
-local PROJECT_IDENTITY = "rmcode_otr";
+local PROJECT_IDENTITY = "rmcode_otr"
 
-local PROJECT_VERSION = require( 'version' );
+local PROJECT_VERSION = require( 'version' )
 
-local LOVE_VERSION = "0.10.2";
+local LOVE_VERSION = "0.10.2"
 
 ---
 -- Initialise löve's config file.
 -- @param t
 --
 function love.conf(t)
-    t.identity = PROJECT_IDENTITY;
-    t.version = LOVE_VERSION;
-    t.console = true;
+    t.identity = PROJECT_IDENTITY
+    t.version = LOVE_VERSION
+    t.console = true
 
-    t.accelerometerjoystick = true;
-    t.gammacorrect = false;
+    t.accelerometerjoystick = true
+    t.gammacorrect = false
 
-    t.window.title = PROJECT_TITLE;
-    t.window.icon = nil;
-    t.window.width = 800;
-    t.window.height = 600;
-    t.window.borderless = false;
-    t.window.resizable = true;
-    t.window.minwidth = 800;
-    t.window.minheight = 600;
-    t.window.fullscreen = true;
-    t.window.fullscreentype = "desktop";
-    t.window.vsync = true;
-    t.window.msaa = 0;
-    t.window.display = 1;
-    t.window.highdpi = false;
-    t.window.x = nil;
-    t.window.y = nil;
+    t.window.title = PROJECT_TITLE
+    t.window.icon = nil
+    t.window.width = 0
+    t.window.height = 0
+    t.window.borderless = false
+    t.window.resizable = true
+    t.window.minwidth = 1024
+    t.window.minheight = 768
+    t.window.fullscreen = true
+    t.window.fullscreentype = "desktop"
+    t.window.vsync = true
+    t.window.msaa = 0
+    t.window.display = 1
+    t.window.highdpi = false
+    t.window.x = nil
+    t.window.y = nil
 
-    t.modules.audio = true;
-    t.modules.event = true;
-    t.modules.graphics = true;
-    t.modules.image = true;
-    t.modules.joystick = true;
-    t.modules.keyboard = true;
-    t.modules.math = true;
-    t.modules.mouse = true;
-    t.modules.physics = true;
-    t.modules.sound = true;
-    t.modules.system = true;
-    t.modules.timer = true;
-    t.modules.touch = true;
-    t.modules.video = true;
-    t.modules.window = true;
-    t.modules.thread = true;
+    t.modules.audio = true
+    t.modules.event = true
+    t.modules.graphics = true
+    t.modules.image = true
+    t.modules.joystick = true
+    t.modules.keyboard = true
+    t.modules.math = true
+    t.modules.mouse = true
+    t.modules.physics = true
+    t.modules.sound = true
+    t.modules.system = true
+    t.modules.timer = true
+    t.modules.touch = true
+    t.modules.video = true
+    t.modules.window = true
+    t.modules.thread = true
 end
 
 ---
 -- Returns the project's version.
 --
 function getVersion()
     if PROJECT_VERSION then
-        return PROJECT_VERSION;
+        return PROJECT_VERSION
     end
 end
 
@@ -67,6 +67,6 @@ end
 --
 function getTitle()
     if PROJECT_TITLE then
-        return PROJECT_TITLE;
+        return PROJECT_TITLE
     end
 end

lib/TGFParser.lua

@@ -55,12 +55,24 @@ local function loadFile( path )
     -- Change the target table once the '#' separator is reached.
     -- TODO love.filesystem.lines is currently bugged on Mac OS 10.13
     -- therefore we have to use a quick workaround
-    local str = love.filesystem.read(path)
-    for line in str:gmatch("[^\r\n]+") do
-        if line == '#' then
-            target = edges;
-        else
-            target[#target + 1] = line;
+
+    if love then
+        local str = love.filesystem.read(path)
+        for line in str:gmatch("[^\r\n]+") do
+            if line == '#' then
+                target = edges;
+            else
+                target[#target + 1] = line;
+            end
+        end
+    else
+        -- Change the target table once the '#' separator is reached.
+        for line in io.lines( path ) do
+            if line == '#' then
+                target = edges;
+            else
+                target[#target + 1] = line;
+            end
         end
     end
 

main.lua

@@ -1,6 +1,7 @@
 local ScreenManager = require('lib.screenmanager.ScreenManager');
 local ProFi = require( 'lib.ProFi' );
 local Log = require( 'src.util.Log' );
+local DebugGrid = require( 'src.ui.overlays.DebugGrid' )
 
 -- ------------------------------------------------
 -- Local Variables
@@ -10,13 +11,36 @@ local Log = require( 'src.util.Log' );
 local profile = 0;
 local info;
 
+local debugGrid
+
+-- ------------------------------------------------
+-- Constants
+-- ------------------------------------------------
+
+local DEBUG_OUTPUT_FLAG     = '-d'
+local DEBUG_GRID_FLAG       = '-g'
+local DEBUG_FULLSCREEN_FLAG = '-f'
+local DEBUG_WINDOWED_FLAG   = '-w'
+
 -- ------------------------------------------------
 -- Callbacks
 -- ------------------------------------------------
 
-function love.load()
+function love.load( args )
     Log.init();
 
+    for _, arg in pairs( args ) do
+        if arg == DEBUG_OUTPUT_FLAG then
+            Log.setDebugActive( true )
+        elseif arg == DEBUG_GRID_FLAG then
+            debugGrid = true
+        elseif arg == DEBUG_FULLSCREEN_FLAG then
+            love.window.setFullscreen( true )
+        elseif arg == DEBUG_WINDOWED_FLAG then
+            love.window.setFullscreen( false )
+        end
+    end
+
     info = {};
     info[#info + 1] = "===================";
     info[#info + 1] = string.format( "Title: '%s'", getTitle() );
@@ -66,6 +90,10 @@ function love.draw()
         ProFi:writeReport( string.format( '../profiling/draw_%d.txt', os.time( os.date( '*t' ))));
         profile = 0;
     end
+
+    if debugGrid then
+        DebugGrid.draw()
+    end
 end
 
 function love.update(dt)
@@ -116,6 +144,10 @@ function love.mousemoved( x, y, dx, dy, isTouch )
     ScreenManager.mousemoved( x, y, dx, dy, isTouch );
 end
 
+function love.wheelmoved( dx, dy )
+    ScreenManager.wheelmoved( dx, dy )
+end
+
 function love.errhand( msg )
     msg = tostring( msg );
 
@@ -168,15 +200,14 @@ function love.errhand( msg )
         end
     end
 
+    table.insert(err, '\n\nYou can find the error in the latest.log file in your save directory.' )
+    table.insert(err, 'Press <return> to open the directoy. Press <escape> to close the game.' )
+
     local p = table.concat(err, "\n")
 
     p = string.gsub(p, "\t", "")
     p = string.gsub(p, "%[string \"(.-)\"%]", "%1")
 
-    -- Open save directory where the error log is saved.
-    Log.error( 'You can find the error in the latest.log file in your save directory. Opening save directory now ...' );
-    love.system.openURL( 'file://' .. love.filesystem.getSaveDirectory() )
-
     local function draw()
         local pos = love.window.toPixels(70)
         love.graphics.clear(love.graphics.getBackgroundColor())
@@ -189,8 +220,13 @@ function love.errhand( msg )
         for e, a, _, _ in love.event.poll() do
             if e == "quit" then
                 return
-            elseif e == "keypressed" and a == "escape" then
-                return
+            elseif e == "keypressed" then
+                if a == "return" then
+                    love.system.openURL( 'file://' .. love.filesystem.getSaveDirectory() )
+                    return
+                elseif a == "escape" then
+                    return
+                end
             elseif e == "touchpressed" then
                 local name = love.window.getTitle()
                 if #name == 0 or name == "Untitled" then name = "Game" end

publish-release.sh

@@ -77,8 +77,15 @@ mv -i -v OTR_$formatted.app ../OTR_$formatted-OSX.app
 cd ..
 rm -r LOVE_OSX
 
+## ZIP THE LOVE FILE
+# Fix for https://github.com/itchio/butler/issues/58#issuecomment-299619964
+zip OTR_$formatted-LOVE.zip OTR_$formatted.love
+
+# Remove original love file.
+rm OTR_$formatted.love
+
 # Publish to itch.io
 echo "Publishing to itch.io"
 butler push OTR_$formatted-WIN.zip rmcode/on-the-roadside:win --userversion $major.$minor.$patch.$build
 butler push OTR_$formatted-OSX.app rmcode/on-the-roadside:osx --userversion $major.$minor.$patch.$build
-butler push OTR_$formatted.love rmcode/on-the-roadside:win-osx-linux --userversion $major.$minor.$patch.$build
+butler push OTR_$formatted-LOVE.zip rmcode/on-the-roadside:win-osx-linux --userversion $major.$minor.$patch.$build