From 8009bb54d350bfaba2f743fae4ab4ce643e06d99 Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Mon, 20 Mar 2017 21:54:37 +0100 Subject: [PATCH 1/3] Add missing text for dog legs Fixes #133. --- res/text/de_DE/body_parts.lua | 2 ++ res/text/en_EN/body_parts.lua | 2 ++ 2 files changed, 4 insertions(+) diff --git a/res/text/de_DE/body_parts.lua b/res/text/de_DE/body_parts.lua index 1e71119f..8bb7a404 100644 --- 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 index d604e717..a67a537d 100644 --- 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", From a20d4afca9b6235cb335c0bc1e986d8a17ad70ac Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Mon, 20 Mar 2017 21:58:54 +0100 Subject: [PATCH 2/3] Fix health screen not opening for adjacent chars Fixes #132. --- src/turnbased/helpers/InteractionInput.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/turnbased/helpers/InteractionInput.lua b/src/turnbased/helpers/InteractionInput.lua index a627715c..3dad9b5d 100644 --- 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 From 93afa4d4b54ab6b61fe0d6704498cfa948e4e122 Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Mon, 20 Mar 2017 22:04:59 +0100 Subject: [PATCH 3/3] Prepare version 0.7.1.883 --- CHANGELOG.md | 9 +++++++++ README.md | 2 +- version.lua | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 590c59f6..2d6f1a99 100644 --- 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 index bce3e7bf..44e461ed 100644 --- 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/version.lua b/version.lua index 82dde7bd..264b1f9e 100644 --- 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 );