Merge pull request #1 from martez81/dev

Minor improvements

README.md

@@ -13,7 +13,7 @@ Elements in the game are:
 - "|" - vertical wall
 - "-" - horizontal wall
 
-![Alt text](https://github.com/martez81/scala-dash/blob/master/resource/img/screenshot1.png)
+![Alt text](resource/img/game.gif)
 
 ## Requirements
 - OSX or Linux, not sure about Windows

src/scaladash/ScalaDash.scala

@@ -94,8 +94,10 @@ object ScalaDash extends App {
     maybeActionSeqenceFile match {
         case Some(fileName) => {
             for ( line <- Source.fromFile(fileName).getLines() ) {
-                renderScene(line(0).toInt) // line here should be single character
-                Thread.sleep(250)
+                if (line.length > 0) {
+                    renderScene(line(0).toInt) // line here should be single character
+                    Thread.sleep(250)
+                }
             }
         }
         case None => userMoveInput

src/scaladash/Thing.scala

@@ -35,8 +35,8 @@ class Player extends Thing with CanMove {
     def consume(thing: Thing): Thing = {
         return thing match {
             case obj: Diamond => score += obj.points; new Space()
-            case obj: Turf => score -= 1; new Space()
-            case obj: Space => thing
+            case obj: Turf => score += obj.points; new Space()
+            case obj: Space => score += obj.points; thing
             case _ => throw new IllegalMove
         }
     }
@@ -59,7 +59,7 @@ class PsychoKiller extends Thing with CanMove {
 }
 
 class Diamond extends Thing with HasValue with CanMove {
-    val points = 15
+    val points = 30
 
     def nextMove(): String = {
         // Can only move down to simulate gravity
@@ -107,10 +107,12 @@ class Boulder extends Thing with CanMove {
 }
 
 class Turf extends Thing {
+    val points = -2
     override def toString() = "#"
 }
 
 class Space extends Thing {
+    val points = -1
     override def toString() = " "
 }