Merge branch 'release/0.11.0.1125'

Author: rm-code

.gitignore

@@ -13,3 +13,6 @@
 
 # Log files
 .consolelog
+
+# Automatically created files
+templates.out

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 
 env:
   - LUA="luajit 2.0"
-  - LUA="luajit 2.1"
 
 before_install:
   - pip install hererocks
@@ -16,7 +15,8 @@ install:
 
 script:
   - luacheck .
-  - busted spc
+  - busted tests/spc
+  - tests/templates/validate_templates.sh
 
 branches:
   only:

CHANGELOG.md

@@ -1,3 +1,29 @@
+# Version 0.11.0.1125 - 2017-11-08
+
+## Additions
+- Added letterboxing to hide parts of the screen which don't fit on the tile grid
+- Added Changelog screen to the main menu
+
+## Removals
+- Removed old base screen
+- Removed german translation
+- Removed generators and templates for static maps
+
+## Fixes
+- Fixed issue with registering attacks hitting indestructible objects
+- Fixed alignment of ui items when the window is resized
+- Fixed camera grid alignment
+- Fixed inventory items not being dropped when a character bled to death
+
+## Other Changes
+- Calculated deviation for ranged shots is floored instead of rounded
+- Updated the savegame screen
+- Limited mouse cursor for the UI to the actual screen grid
+- Player-controlled characters now always spawn with a ranged weapon (additionally they either get a melee or some throwing weapons)
+
+
+
+
 # Version 0.10.0.1089 - 2017-10-28
 
 ## Additions
@@ -371,7 +397,7 @@
 - The game starts in fullscreen now by default
 - The mouse scrolling stops if the mouse cursor leaves the game's window
 - Increased the size of the mouse scrolling area
-- Renamed _Police Baton_ to _Tonfa_
+- Renamed Police Baton to Tonfa
 - Ammunition is now handled on a single-round level instead of using magazines
 - Pathfinding now uses the more appropriate Chebyshev distance as an heuristic
 - Updated spawnpoints for player's characters
@@ -445,6 +471,8 @@
 
 
 # Version 0.1.0.337 - 2016-07-31
+
+## Additions
 - Initial Release
 - Add basic implementation of turn based combat mechanics
     - Three different factions

README.md

@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.10.0.1089-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.11.0.1125-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)
 

lib/Camera.lua

@@ -72,6 +72,8 @@ end
 
 function camera:attach()
     local cx,cy = love.graphics.getWidth()/(2*self.scale), love.graphics.getHeight()/(2*self.scale)
+    cx, cy = math.floor( cx / 16 ) * 16, math.floor( cy / 16 ) * 16
+
     love.graphics.push()
     love.graphics.scale(self.scale)
     love.graphics.translate(cx, cy)

main.lua

@@ -2,6 +2,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 Letterbox = require( 'src.ui.overlays.Letterbox' )
 
 -- ------------------------------------------------
 -- Local Variables
@@ -13,6 +14,8 @@ local info;
 
 local debugGrid
 
+local letterbox
+
 -- ------------------------------------------------
 -- Constants
 -- ------------------------------------------------
@@ -62,10 +65,9 @@ function love.load( args )
     local screens = {
         bootloading = require( 'src.ui.screens.BootLoadingScreen' ),
         mainmenu    = require( 'src.ui.screens.MainMenu'          ),
-        basemenu    = require( 'src.ui.screens.IngameBaseMenu'    ),
         ingamemenu  = require( 'src.ui.screens.IngameCombatMenu'  ),
         options     = require( 'src.ui.screens.OptionsScreen'     ),
-        base        = require( 'src.ui.screens.BaseScreen'        ),
+        changelog   = require( 'src.ui.screens.ChangelogScreen'   ),
         combat      = require( 'src.ui.screens.CombatScreen'      ),
         inventory   = require( 'src.ui.screens.InventoryScreen'   ),
         help        = require( 'src.ui.screens.HelpScreen'        ),
@@ -76,6 +78,8 @@ function love.load( args )
     };
 
     ScreenManager.init( screens, 'bootloading' );
+
+    letterbox = Letterbox.new()
 end
 
 function love.draw()
@@ -94,6 +98,8 @@ function love.draw()
     if debugGrid then
         DebugGrid.draw()
     end
+
+    letterbox.draw()
 end
 
 function love.update(dt)

publish-release.sh

@@ -18,15 +18,17 @@ build=${version[3]}
 
 formatted="$major$minor$patch-$build"
 
-# Zip files. Exclude git folder and DS_Store files.
+# Zip files.
 echo "Packing .love file for $major.$minor.$patch.$build"
-zip -r -q OTR_$formatted.love ./ -x *.git* -x *.DS_Store* -x *.sh* -x *.idea* -x .travis.yml -x .luacheckrc -x README.md
+zip -r -q OTR_$formatted.love ./ -x .\* -x \*.sh -x tests/\* -x README.md -x config.ld
 
 # 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
 
+exit
+
 ## CREATE WINDOWS EXECUTABLE
 # Unzip the LÖVE binaries.
 unzip -q ../LOVE_bin.zip -d LOVE_WIN

res/data/items/Ammunition.lua

@@ -17,8 +17,8 @@ return {
         }
     },
     {
-        id         = "12 gauge",
-        idDesc     = "12 gauge_desc",
+        id         = "12_gauge",
+        idDesc     = "12_gauge_desc",
         itemType   = "Ammunition",
         weight     = 0,
         volume     = 0,

res/data/items/weapons/Ranged.lua

@@ -72,7 +72,7 @@ return {
         stackable  = false,
         permanent  = false,
         subType    = "Ranged",
-        caliber    = "12 gauge",
+        caliber    = "12_gauge",
         sound      = 'SHOTGUN',
         damage     = 15,
         magSize    = 8,