Bug fixes

Robert W. Oliver II · Robert W. Oliver II · commit 3a9e7c1fb8ae · 2018-04-07T22:16:22.000-05:00
* Changed colors and icons to work better with various platforms
* Killing an enemy now removes them from the map
* Added the "clear" or "cls" command
diff --git a/README.md b/README.md
@@ -13,6 +13,12 @@ Written by Robert W. Oliver II
 
 Copyright (C) 2018 Sourcerer, All Rights Reserved.
 
+# Running the Game
+
+```
+ruby bin/lots
+```
+
 # License
 
 ```
diff --git a/bin/lots b/bin/lots
diff --git a/lib/main.rb b/lib/main.rb
@@ -42,6 +42,8 @@
       ui.draw_frame({:text => map})
     when "version", "ver"
       ui.display_version
+    when "clear", "cls"
+      ui.clear
     when "name", "whoami"
       ui.display_name({:player => player})
     when "location", "loc", "where", "whereami"
@@ -52,61 +54,58 @@
       unless player.in_combat
         if !player.move({:direction => :up, :world => world, :ui => ui, :story => story})
           player.in_combat = 1
-	end
+	      end
       else
         ui.cannot_travel_combat
       end
     when "down", "south", "d", "s"
       unless player.in_combat
         if !player.move({:direction => :down, :world => world, :ui => ui, :story => story})
           player.in_combat = 1
-	end
+	      end
       else
         ui.cannot_travel_combat
       end
     when "left", "west", "l", "w"
       unless player.in_combat
         if !player.move({:direction => :left, :world => world, :ui => ui, :story => story})
           player.in_combat = 1
-	end
+	      end
       else
         ui.cannot_travel_combat
       end
     when "right", "east", "r", "e"
       unless player.in_combat
         if !player.move({:direction => :right, :world => world, :ui => ui, :story => story})
           player.in_combat = 1
-	end
+	      end
       else
         ui.cannot_travel_combat
       end
     when "attack", "a"
       if player.in_combat
         retval = player.attack({:enemy => player.current_enemy, :ui => ui})
-	if retval == LOTS::ENEMY_KILLED
-	  player.lines += player.current_enemy.lines
+	      if retval == LOTS::ENEMY_KILLED
+          player.lines += player.current_enemy.lines
+          # Remove enemy from map
+          world.the_map[player.y-1][player.x-1] = LOTS::MAP_KEY_GRASS
+          # Take player out of combat
           player.current_enemy = nil
-	  player.in_combat = false
-	end
-	if retval.is_a? Numeric
+	        player.in_combat = false
+	      end
+	      if retval.is_a? Numeric
           player.current_enemy.health -= retval
-	  retval = player.current_enemy.attack({:player => player})
-	  if retval.is_a? Numeric
+	        retval = player.current_enemy.attack({:player => player})
+	        if retval.is_a? Numeric
             player.health -= retval
           end
-	  if retval == LOTS::PLAYER_DEAD
-            player.dead = 1
-	  end
-	end
-      else
-        ui.not_in_combat
-      end
-    when "cast", "spell"
-      if player.in_combat
-        # TODO: Cast a spell
-      else
-        ui.not_in_combat
-      end
+	      if retval == LOTS::PLAYER_DEAD
+          player.dead = 1
+	      end
+	    end
+    else
+      ui.not_in_combat
+    end
     when "player", "me", "info", "status", "i"
       ui.player_info({:player => player})
     when "enemy"
@@ -121,7 +120,7 @@
       player.dead = 1
     when "help", "h", "?"
       ui.help
-    when "quit"
+    when "quit", "exit"
       ui.quit
       running = nil
     else
diff --git a/lib/ui.rb b/lib/ui.rb
@@ -57,7 +57,9 @@ def help
     new_line
     print UI_ARROW.light_yellow + " " + "lines, score, status, info".light_white + " - Display lines of code (score)"
     new_line
-    print UI_ARROW.light_yellow + " " + "quit".light_white + " - Quits the game"
+    print UI_ARROW.light_yellow + " " + "clear, cls".light_white + " - Clears the screen"
+    new_line
+    print UI_ARROW.light_yellow + " " + "quit, exit".light_white + " - Quits the game"
     new_line
   end
 
diff --git a/lib/world.rb b/lib/world.rb
@@ -10,12 +10,12 @@ module LOTS
 MAP_WIDTH = 64
 MAP_HEIGHT = 14
 
-MAP_KEY_TREE      = "\u2618"
-MAP_KEY_WATER     = "\u2668"
+MAP_KEY_TREE      = "\u2663"
+MAP_KEY_WATER     = "\u2248"
 MAP_KEY_GRASS     = "\u2588"
 MAP_KEY_MOUNTAIN  = "\u25B2"
 MAP_KEY_ENEMY     = "\u263A"
-MAP_KEY_SOURCERER = "\u2658"
+MAP_KEY_SOURCERER = "\u263B"
 MAP_KEY_PLAYER    = "\u1330"
 
 # Weighted
@@ -69,22 +69,22 @@ def get_map(args)
         placed = 0
         # Place sourcerer
         if x == MAP_SOURCERER_X and y == MAP_SOURCERER_Y
-          tmp_row << MAP_KEY_SOURCERER.colorize(:color => :blue, :background => :light_white)
+          tmp_row << MAP_KEY_SOURCERER.colorize(:color => :white, :background => :red)
           placed = 1
         end
         # If player is here, display them
         if x == player.x and y == player.y
-          tmp_row << MAP_KEY_PLAYER.colorize(:color => :light_white, :background => :red) 
+          tmp_row << MAP_KEY_PLAYER.colorize(:color => :red, :background => :white) 
           placed = 1
         end
         # If we haven't already placed the character, run through the rest of the options
         if placed == 0
 	  case col
 	    when MAP_KEY_TREE
 	      tmp_row << col.colorize(:color => :light_green, :background => :green)
-            when MAP_KEY_GRASS
+      when MAP_KEY_GRASS
 	      tmp_row << col.colorize(:color => :green, :background => :green)
-            when MAP_KEY_WATER
+      when MAP_KEY_WATER
 	      tmp_row << col.colorize(:color => :white, :background => :blue)
 	    when MAP_KEY_MOUNTAIN
 	      tmp_row << col.colorize(:color => :yellow, :background => :green)
