Merge branch 'release/0.2.0.445'

Author: rm-code

CHANGELOG.md

@@ -1,5 +1,48 @@
-# Version 0.1.0.337 - 2016-07-31
+# Version 0.2.0.445 - 2016-09-11
+## Additions
+- Added system to handle calculation, updating and drawing of explosions ([#6](https://github.com/rm-code/On-The-Roadside/issues/6))
+- Added a specific mouse cursor graphic for each of the input states ([#11](https://github.com/rm-code/On-The-Roadside/issues/11))
+- Added system to create spawn areas for the different factions ([#13](https://github.com/rm-code/On-The-Roadside/issues/13))
+- Added simple savegame functionality ([#16](https://github.com/rm-code/On-The-Roadside/issues/16))
+- Added shotguns ([#19](https://github.com/rm-code/On-The-Roadside/issues/19))
+- Added rocket launchers ([#20](https://github.com/rm-code/On-The-Roadside/issues/20))
+- Added melee weapons ([#25](https://github.com/rm-code/On-The-Roadside/issues/25))
+- Added grenades ([#10](https://github.com/rm-code/On-The-Roadside/issues/10))
+- Added a behavior tree system for the AI controlled factions ([#29](https://github.com/rm-code/On-The-Roadside/issues/29))
+
+## Fixes
+- Fixed crash when walking through open doors ([#4](https://github.com/rm-code/On-The-Roadside/issues/4))
+- Fixed backpacks being placed inside of themselves ([#7](https://github.com/rm-code/On-The-Roadside/issues/7))
+- Fixed crash on inventory screen with no backpack equipped ([#8](https://github.com/rm-code/On-The-Roadside/issues/8))
+- Fixed interaction with unequipped backpacks ([#9](https://github.com/rm-code/On-The-Roadside/issues/9))
+- Fixed interaction with dead characters ([#17](https://github.com/rm-code/On-The-Roadside/issues/17))
+- Fixed camera not being centered on selected character when game starts ([#18](https://github.com/rm-code/On-The-Roadside/issues/18))
+- Fixed AP cost for attempting attack with empty weapon ([#21](https://github.com/rm-code/On-The-Roadside/issues/21))
+- Fixed hidden mouse cursor in inventory screen ([#22](https://github.com/rm-code/On-The-Roadside/issues/22))
+- Fixed projectiles not being removed correctly ([#28](https://github.com/rm-code/On-The-Roadside/issues/28))
+- Fixed rockets not exploding on impact ([#30](https://github.com/rm-code/On-The-Roadside/issues/30))
+- Fixed flickering mouse cursor during AI turns ([#31](https://github.com/rm-code/On-The-Roadside/issues/31))
 
+## Other Changes
+- Improved camera handling during execution of a turn ([#27](https://github.com/rm-code/On-The-Roadside/issues/27))
+    - It will follow moving characters now
+    - It will track the target of an attack
+    - It is locked during the execution of the turn
+    - It will return to its original position after the turn is done
+    - It is restricted to the map's area
+    - Disable camera tracking for AI controlled characters ([#26](https://github.com/rm-code/On-The-Roadside/issues/26))
+- FOV isn't drawn for AI controlled factions ([#26](https://github.com/rm-code/On-The-Roadside/issues/26))
+- Tweaked shot calculations ([#24](https://github.com/rm-code/On-The-Roadside/issues/24))
+    - Uses the maximum angle for a shot's derivation correctly now
+    - Randomly varies the projectile's travelling distance
+- Improved line of sight drawning
+    - Line of sight is now generated in real time between the active character and the mouse cursor
+- Center the camera on characters which have been selected via right-clicks
+- Use different sounds based on the selected weapon type
+- Reduce turn delay for AI controlled characters
+- Updated the map
+
+# Version 0.1.0.337 - 2016-07-31
 - Initial Release
 - Add basic implementation of turn based combat mechanics
     - Three different factions

README.md

@@ -1,9 +1,11 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.1.0.337-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.0.445-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.
 
+![img](res/misc/screenshot.png)
+
 ## Controls
 
 | Key       | Action                     |

pack.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Get the version numbers from the lua file and store them in an array.
+i=0
+while read line ; do
+    no=${line//[!0-9]/}
+    if [ ! -z "$no" ]; then
+        version[$i]=${line//[!0-9]/}
+        i=$((i+1))
+    fi
+done < version.lua
+
+# Assign to variables.
+major=${version[0]}
+minor=${version[1]}
+patch=${version[2]}
+build=${version[3]}
+
+formatted="$major$minor$patch-$build"
+
+# Zip files. Exclude git folder and DS_Store files.
+zip -r OTR_$formatted.love ./ -x *.git* -x *.DS_Store*
+
+# Move to releases folder.
+mv -i -v OTR_$formatted.love ../releases

res/data/items/ammunition/12_gauge.lua

@@ -0,0 +1,6 @@
+return {
+    name     = "12 gauge",
+    itemType = "Ammunition",
+    ammoType = "ShotgunShell",
+    pellets = 12
+}

res/data/items/ammunition/og_7v.lua

@@ -0,0 +1,6 @@
+return {
+    name     = "OG-7V",
+    itemType = "Ammunition",
+    ammoType = "Rocket",
+    blastRadius = 5
+}

res/data/items/clothing/footwear/combat_boots.lua

@@ -1,9 +1,8 @@
 return {
     name = "Combat Boots",
-    itemType = "Clothing",
-    clothingType = "Footwear",
+    itemType = "Footwear",
     armor = {
-        protection = 2,
+        protection = 12,
         coverage = 100
     }
 }

res/data/items/clothing/footwear/sneakers.lua

@@ -1,5 +1,8 @@
 return {
     name = "Sneakers",
-    itemType = "Clothing",
-    clothingType = "Footwear",
+    itemType = "Footwear",
+    armor = {
+        protection = 0,
+        coverage = 100
+    }
 }

res/data/items/clothing/gloves/leather_gloves.lua

@@ -1,5 +1,8 @@
 return {
     name = "Leather Gloves",
-    itemType = "Clothing",
-    clothingType = "Gloves",
+    itemType = "Gloves",
+    armor = {
+        protection = 1,
+        coverage = 100
+    }
 }

res/data/items/clothing/headgear/bandana.lua

@@ -1,5 +1,8 @@
 return {
     name = "Bandana",
-    itemType = "Clothing",
-    clothingType = "Headgear",
+    itemType = "Headgear",
+    armor = {
+        protection = 0,
+        coverage = 10
+    }
 }

res/data/items/clothing/headgear/baseball_cap.lua

@@ -1,5 +1,8 @@
 return {
     name = "Baseball Cap",
-    itemType = "Clothing",
-    clothingType = "Headgear",
+    itemType = "Headgear",
+    armor = {
+        protection = 0,
+        coverage = 30
+    }
 }

res/data/items/clothing/headgear/pasgt_helmet.lua

@@ -1,9 +1,8 @@
 return {
     name = "PASGT Helmet",
-    itemType = "Clothing",
-    clothingType = "Headgear",
+    itemType = "Headgear",
     armor = {
         protection = 30,
-        coverage = 45,
+        coverage = 45
     }
 }

res/data/items/clothing/jackets/leather_jacket.lua

@@ -1,7 +1,6 @@
 return {
     name = "Leather Jacket",
-    itemType = "Clothing",
-    clothingType = "Jacket",
+    itemType = "Jacket",
     armor = {
         protection = 4,
         coverage = 95

res/data/items/clothing/jackets/pasgt_vest.lua

@@ -1,9 +1,8 @@
 return {
     name = "PASGT Ballistic Vest",
-    itemType = "Clothing",
-    clothingType = "Jacket",
+    itemType = "Jacket",
     armor = {
         protection = 12,
-        coverage = 80,
+        coverage = 80
     }
 }

res/data/items/clothing/jackets/rain_coat.lua

@@ -1,5 +1,8 @@
 return {
     name = "Rain Coat",
-    itemType = "Clothing",
-    clothingType = "Jacket",
+    itemType = "Jacket",
+    armor = {
+        protection = 1,
+        coverage = 100,
+    }
 }

res/data/items/clothing/shirts/shirt.lua

@@ -1,5 +1,8 @@
 return {
     name = "Shirt",
-    itemType = "Clothing",
-    clothingType = "Shirt"
+    itemType = "Shirt",
+    armor = {
+        protection = 0,
+        coverage = 80
+    }
 }

res/data/items/clothing/trousers/jeans.lua

@@ -1,5 +1,8 @@
 return {
     name = "Jeans",
-    itemType = "Clothing",
-    clothingType = "Trousers",
+    itemType = "Trousers",
+    armor = {
+        protection = 4,
+        coverage = 100
+    }
 }

res/data/items/clothing/trousers/short_shorts.lua

@@ -1,5 +1,8 @@
 return {
     name = "Short Shorts",
-    itemType = "Clothing",
-    clothingType = "Trousers",
+    itemType = "Trousers",
+    armor = {
+        protection = 8,
+        coverage = 20
+    }
 }

res/data/items/weapons/ar_aks74.lua

@@ -1,23 +1,23 @@
 return {
     name     = "AKS-74",
     itemType = "Weapon",
+    weaponType = "Assault Rifle",
     damage   = 40,
-    range    = 12,
     rpm      = 650,
-    ammoType = "5.45x39mm",
+    caliber  = "5.45x39mm",
     magSize  = 30,
     mode = {
         {
             name = "Single",
             cost = 3,
             accuracy = 80,
-            shots = 1,
+            attacks = 1,
         },
         {
             name = "Full-Auto",
             cost = 10,
             accuracy = 50,
-            shots = 11,
+            attacks = 11,
         }
     }
 }

res/data/items/weapons/ar_l85a1.lua

@@ -1,23 +1,23 @@
 return {
     name     = "Enfield L85A1",
     itemType = "Weapon",
+    weaponType = "Assault Rifle",
     damage   = 45,
-    range    = 12,
     rpm      = 610,
-    ammoType = "5.56x45mm",
+    caliber  = "5.56x45mm",
     magSize  = 30,
     mode = {
         {
             name = "Single",
             cost = 3,
             accuracy = 75,
-            shots = 1,
+            attacks = 1,
         },
         {
             name = "Full-Auto",
             cost = 10,
             accuracy = 60,
-            shots = 10,
+            attacks = 10,
         }
     }
 }

res/data/items/weapons/m67_grenade.lua

@@ -0,0 +1,14 @@
+return {
+    name     = "M67 Grenade",
+    itemType = "Weapon",
+    weaponType = "Grenade",
+    damage   = 120,
+    mode = {
+        {
+            name = "Throw",
+            cost = 3,
+            accuracy = 75,
+            attacks = 1,
+        }
+    }
+}

res/data/items/weapons/me_policebaton.lua

@@ -0,0 +1,14 @@
+return {
+    name       = "Police Baton",
+    itemType   = "Weapon",
+    weaponType = "Melee",
+    damage     = 30,
+    mode = {
+        {
+            name = "Single",
+            cost = 3,
+            accuracy = 85,
+            attacks = 1,
+        }
+    }
+}

res/data/items/weapons/rl_rpg7.lua

@@ -0,0 +1,16 @@
+return {
+    name     = "RPG-7",
+    itemType = "Weapon",
+    weaponType = "Rocket Launcher",
+    damage   = 0,
+    caliber  = "OG-7V",
+    magSize  = 1,
+    mode = {
+        {
+            name = "Single",
+            cost = 10,
+            accuracy = 65,
+            attacks = 1,
+        }
+    }
+}

res/data/items/weapons/sg_m1014.lua

@@ -0,0 +1,16 @@
+return {
+    name       = "Benelli M4 Super 90",
+    itemType   = "Weapon",
+    weaponType = "Shotgun",
+    damage     = 20,
+    caliber    = "12 gauge",
+    magSize    = 8,
+    mode = {
+        {
+            name = "Single",
+            cost = 3,
+            accuracy = 25,
+            attacks = 1,
+        }
+    }
+}

res/data/items/weapons/smg_fnp90.lua

@@ -1,23 +1,23 @@
 return {
     name     = "FN P90",
     itemType = "Weapon",
+    weaponType = "Submachine Gun",
     damage   = 38,
-    range    = 12,
     rpm      = 900,
-    ammoType = "5.7x28mm",
+    caliber  = "5.7x28mm",
     magSize  = 50,
     mode = {
         {
             name = "Single",
             cost = 3,
             accuracy = 65,
-            shots = 1,
+            attacks = 1,
         },
         {
             name = "Full-Auto",
             cost = 8,
             accuracy = 40,
-            shots = 13,
+            attacks = 13,
         }
     }
 }