Merge branch 'release/0.3.0.564'

Author: rm-code

.luacheckrc

@@ -0,0 +1,16 @@
+files['.luacheckrc'].global = false
+std = 'max+busted'
+
+globals = {
+    'love',
+    'getVersion',
+    'getTitle'
+}
+
+exclude_files = {
+    './lua_install/*'
+}
+
+ignore = {
+    '/self'
+}

.travis.yml

@@ -0,0 +1,32 @@
+language: python
+sudo: false
+
+env:
+  - LUA="lua 5.1"
+  - LUA="lua 5.2"
+  - LUA="lua 5.3"
+  - LUA="luajit 2.0"
+  - LUA="luajit 2.1"
+
+before_install:
+  - pip install hererocks
+  - hererocks lua_install -r^ --$LUA
+  - export PATH=$PATH:$PWD/lua_install/bin
+
+install:
+  - luarocks install luacheck
+  - luarocks install busted
+
+script:
+  - luacheck .
+  - busted spc
+
+branches:
+  only:
+  - master
+  - develop
+
+notifications:
+  email:
+    on_success: change
+    on_failure: always

CHANGELOG.md

@@ -1,15 +1,72 @@
+# Version 0.3.0.564 - 2016-11-10
+
+## Additions
+- Added keybinding which toggles fullscreen ([#37](https://github.com/rm-code/On-The-Roadside/issues/37))
+- Added keybinding for quitting the game
+- Added a translation system ([#51](https://github.com/rm-code/On-The-Roadside/issues/51))
+- Added crate world objects which act as item containers ([#42](https://github.com/rm-code/On-The-Roadside/issues/42))
+    - Ammo is spawned randomly in these crates when the game starts
+    - Characters can open and interact with the container's inventory by using the "interact" mode
+- Added inventory screen for swapping items between friendly characters ([#59](https://github.com/rm-code/On-The-Roadside/issues/59))
+- Added weight attributes for items ([#44](https://github.com/rm-code/On-The-Roadside/issues/44))
+- Added volume attributes for items ([#65](https://github.com/rm-code/On-The-Roadside/issues/65))
+- Added weight and volume limitation for inventory containers (bags, tiles, etc.) ([#48](https://github.com/rm-code/On-The-Roadside/issues/48))
+    - Inventory lists show the current weight and the weight limit ([#62](https://github.com/rm-code/On-The-Roadside/issues/62))
+- Added stackable items ([#45](https://github.com/rm-code/On-The-Roadside/issues/45))
+    - Items in stacks can be moved one-by-one or as as the whole stack ([#57](https://github.com/rm-code/On-The-Roadside/issues/57))
+    - Stacks can be split in half ([#58](https://github.com/rm-code/On-The-Roadside/issues/58))
+    - Stacks can be merged ([#61](https://github.com/rm-code/On-The-Roadside/issues/61))
+- Added functionality to allow arbitrary item sorting in the inventory ([#60](https://github.com/rm-code/On-The-Roadside/issues/60))
+- Added a maximum range for weapons ([#63](https://github.com/rm-code/On-The-Roadside/issues/63))
+- Added line-of-sight overlay for grenades ([#64](https://github.com/rm-code/On-The-Roadside/issues/64))
+- Added a cone overlay representing the maximum angle at which a projectile can divert from its intended target ([#71](https://github.com/rm-code/On-The-Roadside/issues/71))
+- Added a small version info overlay
+- Added a quick-help screen
+
+## Removals
+- Removed a bunch items until the item and inventory system is a bit more stable
+
+## Fixes
+- Fixed serialization and loading of openable world objects ([#49](https://github.com/rm-code/On-The-Roadside/issues/49))
+- Fixed unequippable items vanishing when trying to equip them ([#54](https://github.com/rm-code/On-The-Roadside/issues/54))
+- Fixed crash when trying to switch firing modes without a weapon equipped
+([#55](https://github.com/rm-code/On-The-Roadside/issues/55))
+- Fixed grenades being removed upon explosion instead of being thrown
+- Fixed crash when a character tries to attack its own tile
+([#68](https://github.com/rm-code/On-The-Roadside/issues/68))
+- Fixed crash with dropping a character's inventory on death
+([#70](https://github.com/rm-code/On-The-Roadside/issues/70))
+
+## Other Changes
+- The game starts in fullscreen now by default
+- The mouse scrolling stops if the mouse cursor leaves the game's window ([#38](https://github.com/rm-code/On-The-Roadside/issues/38))
+- Increased the size of the mouse scrolling area
+- Renamed _Police Baton_ to _Tonfa_
+- Ammunition is now handled on a single-round level instead of using magazines ([#52](https://github.com/rm-code/On-The-Roadside/issues/52))
+- Pathfinding now uses the more appropriate Chebyshev distance as an heuristic ([#66](https://github.com/rm-code/On-The-Roadside/issues/66))
+- Updated spawnpoints for player's characters
+
+
+
+
 # Version 0.2.2.455 - 2016-09-13
 ## Fixes
 - Fixed drawing of overlays for actions that can't be executed ([#35](https://github.com/rm-code/On-The-Roadside/issues/35))
 - Fixed crash when shooting an adjacent world object ([#39](https://github.com/rm-code/On-The-Roadside/issues/39))
 - Fixed crash when a grenade hit a world object ([#40](https://github.com/rm-code/On-The-Roadside/issues/40))
 
+
+
+
 # Version 0.2.1.450 - 2016-09-12
 ## Fixes
 - Fixed crash when trying to load a savegame containing grenades ([#32](https://github.com/rm-code/On-The-Roadside/issues/32))
 - Fixed issue with rockets failing to explode when hitting an indestructible object ([#33](https://github.com/rm-code/On-The-Roadside/issues/33))
 - Fixed crash when trying to reload with no (ranged) weapon equipped ([#34](https://github.com/rm-code/On-The-Roadside/issues/34))
 
+
+
+
 # Version 0.2.0.445 - 2016-09-11
 ## Additions
 - Added system to handle calculation, updating and drawing of explosions ([#6](https://github.com/rm-code/On-The-Roadside/issues/6))
@@ -54,6 +111,9 @@
 - Reduce turn delay for AI controlled characters
 - Updated the map
 
+
+
+
 # Version 0.1.0.337 - 2016-07-31
 - Initial Release
 - Add basic implementation of turn based combat mechanics

README.md

@@ -1,6 +1,7 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.2.2.455-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest) [![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.1-EA316E.svg)](http://love2d.org/) [![License](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE.md)
+[![Version](https://img.shields.io/badge/Version-0.3.0.564-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/) [![License](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE.md)
+[![Build Status](https://travis-ci.org/rm-code/On-The-Roadside.svg?branch=develop)](https://travis-ci.org/rm-code/On-The-Roadside)
 
 On the Roadside is a turnbased strategy game. It is developed by [@rm-code](https://twitter.com/rm_code) using [Lua](http://www.lua.org/) and the [LÖVE](https://love2d.org/) framework.
 

conf.lua

@@ -4,7 +4,7 @@ local PROJECT_IDENTITY = "rmcode_otr";
 
 local PROJECT_VERSION = require( 'version' );
 
-local LOVE_VERSION = "0.10.1";
+local LOVE_VERSION = "0.10.2";
 
 ---
 -- Initialise löve's config file.
@@ -26,7 +26,7 @@ function love.conf(t)
     t.window.resizable = false;
     t.window.minwidth = 1;
     t.window.minheight = 1;
-    t.window.fullscreen = false;
+    t.window.fullscreen = true;
     t.window.fullscreentype = "desktop";
     t.window.vsync = true;
     t.window.msaa = 0;

lib/Bresenham.lua

@@ -20,7 +20,11 @@
 -- THE SOFTWARE.                                                                   =
 --==================================================================================
 
-local Bresenham = {};
+local Bresenham = {
+    _VERSION     = "1.1.0",
+    _DESCRIPTION = "Bresenham's line algorithm written in Lua." ,
+    _URL         = 'https://github.com/rm-code/bresenham/',
+};
 
 ---
 -- Maps a line from point (ox, oy) to point (ex, ey) onto a two dimensional
@@ -35,8 +39,10 @@ local Bresenham = {};
 -- @ex       (number)   The x-coordinates of the target.
 -- @ey       (number)   The y-coordinates of the target.
 -- @callback (function) A callback function being called for every tile the line passes.
+-- @...      (varargs)  Additional parameters which will be forwarded to the callback.
+-- @return   (boolean)  True if the target was reached, otherwise false.
 --
-function Bresenham.calculateLine( ox, oy, ex, ey, callback )
+function Bresenham.calculateLine( ox, oy, ex, ey, callback, ... )
     local dx = math.abs( ex - ox );
     local dy = math.abs( ey - oy ) * -1;
 
@@ -46,9 +52,9 @@ function Bresenham.calculateLine( ox, oy, ex, ey, callback )
 
     local counter = 0;
     while true do
-        local continue = callback( ox, oy, counter );
+        local continue = callback( ox, oy, counter, ... );
         if not continue then
-            return;
+            return false;
         end
 
         counter = counter + 1;

lib/Camera.lua

@@ -24,7 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ]]--
 
-local _PATH = (...):match('^(.*[%./])[^%.%/]+$') or ''
 local cos, sin = math.cos, math.sin
 
 local camera = {}

main.lua

@@ -7,6 +7,7 @@ local ProFi = require( 'lib.ProFi' );
 
 -- TODO Remove profiling code.
 local profile = 0;
+local versionString = "WIP - Version: " .. getVersion();
 
 -- ------------------------------------------------
 -- Callbacks
@@ -30,6 +31,7 @@ function love.load()
     local screens = {
         main = require('src.screens.MainScreen');
         inventory = require('src.screens.InventoryScreen');
+        help = require('src.screens.HelpScreen');
     };
 
     ScreenManager.init(screens, 'main');
@@ -47,6 +49,11 @@ function love.draw()
         ProFi:writeReport( string.format( '../profiling/draw_%d.txt', os.time( os.date( '*t' ))));
         profile = 0;
     end
+
+    love.graphics.setColor( 255, 255, 255, 100 );
+    love.graphics.print( versionString, love.graphics.getWidth() - 155, 5 );
+    love.graphics.print( 'Press "h" for help!', love.graphics.getWidth() - 155, 25 );
+    love.graphics.setColor( 255, 255, 255, 255 );
 end
 
 function love.update(dt)
@@ -78,3 +85,7 @@ end
 function love.mousepressed( mx, my, button, isTouch )
     ScreenManager.mousepressed( mx, my, button, isTouch );
 end
+
+function love.mousefocus( f )
+    ScreenManager.mousefocus( f );
+end

pack.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Get the version numbers from the lua file and store them in an array.
+i=0
+while read line ; do
+    no=${line//[!0-9]/}
+    if [ ! -z "$no" ]; then
+        version[$i]=${line//[!0-9]/}
+        i=$((i+1))
+    fi
+done < version.lua
+
+# Assign to variables.
+major=${version[0]}
+minor=${version[1]}
+patch=${version[2]}
+build=${version[3]}
+
+formatted="$major$minor$patch-$build"
+
+# Zip files. Exclude git folder and DS_Store files.
+echo "Packing .love file for $major.$minor.$patch.$build"
+zip -r -q OTR_$formatted.love ./ -x *.git* -x *.DS_Store* -x *.sh*
+
+# Move to releases folder and cd to releases.
+mkdir ../releases/OTR_$formatted
+mv -i -v OTR_$formatted.love ../releases/OTR_$formatted
+cd ../releases/OTR_$formatted || exit
+
+## CREATE WINDOWS EXECUTABLE
+# Unzip the LÖVE binaries.
+unzip -q ../LOVE_bin.zip -d LOVE_WIN
+
+# Create the executable.
+echo "Creating .exe"
+cp ./OTR_$formatted.love ./LOVE_WIN
+cd LOVE_WIN || exit
+cat love.exe OTR_$formatted.love > OTR_$formatted.exe
+rm love.exe
+rm OTR_$formatted.love
+
+# Zip all files.
+echo "Zipping .exe and binary files"
+zip -r -q OTR_$formatted-WIN.zip ./ -x *.git* -x *.DS_Store*
+mv -i -v OTR_$formatted-WIN.zip ../
+
+# Remove the folder.
+cd ..
+rm -r LOVE_WIN
+
+## CREATE MAC OS APPLICATION
+echo "Creating Mac OS Application"
+unzip -q ../LOVE_bin_OSX.zip -d LOVE_OSX
+
+# Rename Application
+cd LOVE_OSX || exit
+mv love.app OTR_$formatted.app
+
+# Move .love file into the .app
+cp ../OTR_$formatted.love OTR_$formatted.app/Contents/Resources
+
+# Copy modifed plist
+cp ../../Info.plist OTR_$formatted.app/Contents/
+
+# There probably is a wayyy better way to do this ...
+echo "<key>CFBundleShortVersionString</key>" >> OTR_$formatted.app/Contents/Info.plist
+echo "<string>$major.$minor.$patch.$build</string>" >> OTR_$formatted.app/Contents/Info.plist
+echo "</dict>" >> OTR_$formatted.app/Contents/Info.plist
+echo "</plist>" >> OTR_$formatted.app/Contents/Info.plist
+
+# Move to the parent folder
+mv -i -v OTR_$formatted.app ../OTR_$formatted-OSX.app
+
+# Remove the temporary folder.
+cd ..
+rm -r LOVE_OSX
+
+# 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

publish-release.sh

@@ -1,6 +1,11 @@
 return {
-    name     = "12 gauge",
+    id = "12 gauge",
     itemType = "Ammunition",
-    ammoType = "ShotgunShell",
-    pellets = 12
+    weight = 0,
+    volume = 0,
+    stackable = true,
+    equippable = false,
+    effects = {
+        spreadsOnShot = { pellets = 12 }
+    }
 }

res/data/items/ammunition/12_gauge.lua

@@ -1,4 +1,11 @@
 return {
-    name     = "5.45x39mm",
-    itemType = "Ammunition"
+    id = "5.45x39mm",
+    itemType = "Ammunition",
+    weight = 0,
+    volume = 0,
+    stackable = true,
+    equippable = false,
+    effects = {
+        customSpeed = { speed = 35 }
+    }
 }