Merge branch 'release/0.14.0.1489'

Author: rm-code

.editorconfig

@@ -7,3 +7,6 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.sh]
+indent_size = 2

CHANGELOG.md

@@ -1,3 +1,27 @@
+# Version 0.14.0.1489 - 2018-01-26
+
+## Additions
+- Added a new user interface overlay which contains detailed information about the currently selected creature and the tile the mouse cursor is hovering over.
+- Added message log which displays information about what is going on in the game. It only shows events which can be seen by the player's faction. The direction of the message log can be inverted in the options screen.
+- Added creature classes (Stalker, Bandit, ...) as a basis for more detailed creatures in the future.
+- Added creature groups to determine which creatures to spawn for each team. For example dogs can now spawn on the enemy team.
+- Added new health system which re-introduces health points and has a simplified body model. There is a chance for status effects like blindness to occur on critical hits.
+- Added new image font.
+- Added sprites that are based on a creature's class rather than its body type. This allows us to bring back the "bad knight" sprite for bandits.
+
+## Removals
+- Removed health screen. It has been replaced by the new player info screen.
+
+## Fixes
+- Fixed tiles being hit twice by a projectile on some occasions.
+- Fixed savegames not being sorted correctly. Savegames are now sorted by the time of their creation.
+
+## Other Changes
+- Changed item stats in inventory to include damage values for weapons.
+
+
+
+
 # Version 0.13.1.1413 - 2017-12-28
 
 ## Fixes

LICENSE.md

@@ -1,4 +1,4 @@
-All rights reserved (c) 2016 - 2017 Robert Machmer
+All rights reserved (c) 2016 - 2018 Robert Machmer
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

README.md

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

main.lua

@@ -43,6 +43,7 @@ function love.load( args )
     info[#info + 1] = string.format( "Title: '%s'", getTitle() )
     info[#info + 1] = string.format( "Version: %s", getVersion() )
     info[#info + 1] = string.format( "LOVE Version: %d.%d.%d (%s)", love.getVersion() )
+    info[#info + 1] = string.format( "OS: %s", love.system.getOS() )
     info[#info + 1] = string.format( "Resolution: %dx%d\n", love.graphics.getDimensions() )
 
     info[#info + 1] = "---- RENDERER  ---- "
@@ -65,7 +66,6 @@ function love.load( args )
         combat      = require( 'src.ui.screens.CombatScreen'      ),
         inventory   = require( 'src.ui.screens.InventoryScreen'   ),
         help        = require( 'src.ui.screens.HelpScreen'        ),
-        health      = require( 'src.ui.screens.HealthScreen'      ),
         gamescreen  = require( 'src.ui.screens.GameScreen'        ),
         gameover    = require( 'src.ui.screens.GameOverScreen'    ),
         loadgame    = require( 'src.ui.screens.SavegameScreen'    ),
@@ -80,6 +80,7 @@ function love.load( args )
         editorloading    = require( 'src.ui.mapeditor.EditorLoadingScreen'  ),
         keybindingeditor = require( 'src.ui.screens.KeybindingScreen' ),
         keybindingmodal = require( 'src.ui.screens.KeybindingModal' ),
+        playerInfo = require( 'src.ui.screens.PlayerInfo' ),
     }
 
     ScreenManager.init( screens, 'bootloading' )

publish-release.sh

@@ -27,8 +27,6 @@ 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
@@ -52,6 +50,7 @@ zip -r -q OTR_$formatted-WIN.zip LOVE_WIN/ -x *.git* -x *.DS_Store*
 # Remove the folder.
 rm -r LOVE_WIN
 
+
 ## CREATE MAC OS APPLICATION
 echo "Creating Mac OS Application"
 unzip -q ../LOVE_bin_OSX.zip -d LOVE_OSX
@@ -75,9 +74,13 @@ 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.
+# Zip the .app file.
 cd ..
-rm -r LOVE_OSX
+zip -r OTR_$formatted-OSX.zip OTR_$formatted-OSX.app
+
+# Remove the temporary folder and the .app file.
+rm -r LOVE_OSX OTR_$formatted-OSX.app
+
 
 ## ZIP THE LOVE FILE
 # Fix for https://github.com/itchio/butler/issues/58#issuecomment-299619964
@@ -89,5 +92,5 @@ rm OTR_$formatted.love
 # 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-OSX.zip rmcode/on-the-roadside:osx --userversion $major.$minor.$patch.$build
 butler push OTR_$formatted-LOVE.zip rmcode/on-the-roadside:win-osx-linux --userversion $major.$minor.$patch.$build

res/data/creatures/bodies/body_dog.lua

@@ -0,0 +1,61 @@
+return {
+    id = 'body_dog',
+    defaultCarryWeight = 20,
+    defaultCarryVolume = 5,
+    size = {
+        stand  = 50,
+        crouch = 30,
+        prone  = 20
+    },
+    tags = {
+        whitelist = {
+            'creature'
+        },
+        blacklist = {
+            'humanoid'
+        }
+    },
+    bodyparts = {
+        {
+            name = 'bodypart_head',
+            damageModifier = 2.0,
+            equipment = 'equip_torso',
+            effects = {
+                'blind'
+            }
+        },
+        {
+            name = 'bodypart_torso',
+            damageModifier = 1.0,
+            equipment = 'equip_torso'
+        },
+        {
+            name = 'bodypart_legs',
+            damageModifier = 1.0,
+            equipment = 'equip_legs'
+        }
+    },
+    equipment = {
+        {
+            id = 'equip_mouth',
+            type = 'equipment',
+            itemType = 'Weapon',
+            subType = 'Melee',
+            sort = 1
+        },
+        {
+            id = 'equip_torso',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Fur',
+            sort = 2
+        },
+        {
+            id = 'equip_legs',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Fur',
+            sort = 3
+        }
+    }
+}

res/data/creatures/bodies/body_human.lua

@@ -0,0 +1,90 @@
+return {
+    id = 'body_human',
+    defaultCarryWeight = 100,
+    defaultCarryVolume = 10,
+    size = {
+        stand  = 80,
+        crouch = 50,
+        prone  = 30
+    },
+    tags = {
+        whitelist = {
+            'humanoid'
+        },
+        blacklist = {
+            'creature'
+        }
+    },
+    bodyparts = {
+        {
+            name = 'bodypart_head',
+            damageModifier = 2.0,
+            equipment = 'equip_head',
+            effects = {
+                'blind'
+            }
+        },
+        {
+            name = 'bodypart_torso',
+            damageModifier = 1.0,
+            equipment = 'equip_torso'
+        },
+        {
+            name = 'bodypart_hands',
+            damageModifier = 1.0,
+            equipment = 'equip_hands'
+        },
+        {
+            name = 'bodypart_legs',
+            damageModifier = 1.0,
+            equipment = 'equip_legs'
+        },
+        {
+            name = 'bodypart_feet',
+            damageModifier = 1.0,
+            equipment = 'equip_feet'
+        }
+    },
+    equipment = {
+        {
+            id = 'equip_head',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Headgear',
+            sort = 1
+        },
+        {
+            id = 'equip_backpack',
+            type = 'equipment',
+            itemType = 'Container',
+            sort = 2
+        },
+        {
+            id = 'equip_torso',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Jacket',
+            sort = 3
+        },
+        {
+            id = 'equip_hands',
+            type = 'equipment',
+            itemType = 'Weapon',
+            sort = 4
+        },
+        {
+            id = 'equip_legs',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Trousers',
+            sort = 5
+        },
+        {
+            id = 'equip_feet',
+            type = 'equipment',
+            itemType = 'Armor',
+            subType = 'Footwear',
+            sort = 6
+        }
+    }
+}

res/data/creatures/classes.lua

@@ -0,0 +1,29 @@
+return {
+    {
+        id = 'class_stalker',
+        body = {
+            'body_human'
+        },
+        stats = {
+            hp = 8
+        }
+    },
+    {
+        id = 'class_bandit',
+        body = {
+            'body_human'
+        },
+        stats = {
+            hp = 5
+        }
+    },
+    {
+        id = 'class_dog',
+        body = {
+            'body_dog'
+        },
+        stats = {
+            hp = 4
+        }
+    }
+}