Merge branch 'release/0.2.2.455'

Author: rm-code

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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))

README.md

@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.2.1.450-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.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)
 
 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.
 

src/items/weapons/Projectile.lua

@@ -29,7 +29,7 @@ function Projectile.new( character, tiles )
     local energy = 100;
     local timer = 0;
     local index = 1;
-    local tile;
+    local tile = character:getTile();
     local previousTile;
 
     -- ------------------------------------------------

src/items/weapons/ProjectileManager.lua

@@ -81,12 +81,17 @@ function ProjectileManager.update( dt )
                 -- Stop the bullet if the object is indestructible.
                 if not tile:getWorldObject():isDestructible() then
                     print( "Hit indestructible object" );
-                    hitTile( i, projectile:getPreviousTile(), projectile );
+                    -- HACK: Need proper handling for explosive type weapons.
+                    if projectile:getWeapon():getWeaponType() == 'Grenade' or projectile:getWeapon():getMagazine():getAmmoType() == 'Rocket' then                        
+                        hitTile( i, projectile:getPreviousTile(), projectile );
+                        return;
+                    end
+                    hitTile( i, tile, projectile );
                     return;
                 end
 
-                -- Explosive weapons never pass through objects.
-                if projectile:getWeapon():getMagazine():getAmmoType() == 'Rocket' then
+                -- HACK: Need proper handling for explosive type weapons.
+                if projectile:getWeapon():getWeaponType() == 'Grenade' or projectile:getWeapon():getMagazine():getAmmoType() == 'Rocket' then
                     print( "Hit object with explosive ammunition" );
                     hitTile( i, tile, projectile );
                     return;

src/ui/OverlayPainter.lua

@@ -111,7 +111,7 @@ function OverlayPainter.new( game, particleLayer )
     -- @param character (Character) The character to draw the path for.
     --
     local function drawPath( character )
-        if #character:getActions() ~= 0 then
+        if character:getActionPoints() > 0 and #character:getActions() ~= 0 then
             local total = character:getActionPoints();
             local ap = total;
 

version.lua

@@ -1,8 +1,8 @@
 local version = {
     major = 0,
     minor = 2,
-    patch = 1,
-    build = 450,
+    patch = 2,
+    build = 455,
 }
 
 return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );