Merge branch 'hotfix/0.7.1'

rm-code · Mar 20, 2017 · 088903a · 088903a
2 parents 094396d + 93afa4d
commit 088903a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Version 0.7.1.883 - 2017-03-20
+
+## Fixes
+- Fixed health screen not opening for adjacent chars
+- Fixed missing text for dog legs
+
+
+
+
 # Version 0.7.0.880 - 2017-03-19
 
 ## Additions

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

diff --git a/res/text/de_DE/body_parts.lua b/res/text/de_DE/body_parts.lua
@@ -20,6 +20,8 @@ locale.strings = {
     ['leg_right'] = "Bein (R)",
     ['foot_right'] = "Fuß (R)",
 
+    ['legs'] = "Legs",
+
     ['torso'] = "Oberkörper",
     ['heart'] = "Herz",
     ['kidneys'] = "Nieren",

diff --git a/res/text/en_EN/body_parts.lua b/res/text/en_EN/body_parts.lua
@@ -20,6 +20,8 @@ locale.strings = {
     ['leg_right'] = "Leg (R)",
     ['foot_right'] = "Foot (R)",
 
+    ['legs'] = "Legs",
+
     ['torso'] = "Torso",
     ['heart'] = "Heart",
     ['kidneys'] = "Kidneys",

diff --git a/src/turnbased/helpers/InteractionInput.lua b/src/turnbased/helpers/InteractionInput.lua
@@ -46,12 +46,14 @@ function InteractionInput.new()
     -- @return          (boolean)   True if an action was created, false otherwise.
     --
     function self:request( target, character )
+        -- Check health of enemy characters.
+        if target:isOccupied() and target:getCharacter():getFaction():getType() ~= character:getFaction():getType() then
+            ScreenManager.push( 'health', target:getCharacter() );
+            return true;
+        end
+
         -- Characters can only interact with adjacent tiles.
         if not target:isAdjacent( character:getTile() ) then
-            if target:isOccupied() and target:getCharacter():getFaction():getType() ~= character:getFaction():getType() then
-                ScreenManager.push( 'health', target:getCharacter() );
-                return true;
-            end
             return false;
         end
 

diff --git a/version.lua b/version.lua
@@ -1,8 +1,8 @@
 local version = {
     major = 0,
     minor = 7,
-    patch = 0,
-    build = 880,
+    patch = 1,
+    build = 883,
 }
 
 return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );