gemwarrior 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd2a134a899cfbfd6ac8cf1a0a21e39f22abe86
-  data.tar.gz: f8db94e677447ffa3568ebfe94181f4be0a504de
+  metadata.gz: 8cd1829a08b6e83220b459bbf729652871e0e81d
+  data.tar.gz: 43625f3347022e2f25edafa561de8adc0201eaa2
 SHA512:
-  metadata.gz: baf985a9731cff030b8cbf27693680eb063dee3a748d3bb541f4bd93eca8db3b7772b496d73d3ce3675ec6244269ba961a197fd398f22be153d29dac10f86d08
-  data.tar.gz: b4cadec0839733de6a0d064e0063b8aca37cf47980b0db968494f014d43be0b124aeff8df3cc454f1da07b1bca924e550f53fcbeb16e5749729118c53356f666
+  metadata.gz: 6cafe13f7ec0d4d08e50859ba1a2774afa6b715fb264745957d11ff14f2c97f853ab6c872d64d712acb3756aa6aa2c48324c43ddc426ff1a331efdc53ddefd8a
+  data.tar.gz: 61332501f1680a1289723a2c7379d84ced6eb8195723640b41de1be6fdefa95c7469b0541da12cc311b0bbd30c62212e28724831feb44c4bda63c0a73838bb7d

data/bin/gemwarrior

@@ -8,13 +8,17 @@ require_relative '../lib/gemwarrior/game'
 GAME_NAME = "Gem Warrior"
 
 def parse_options
-  options = {:god_mode => false, :beast_mode => false}
+  options = {:debug_mode => false, :god_mode => false, :beast_mode => false}
 
   optparse = OptionParser.new do |opts|
     opts.on('-v', '--version', 'Display version number and exit') do
       puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
       exit
     end
+
+    opts.on('-d', '--debug', 'Turn debug on') do
+      options[:debug_mode] = true
+    end
     
     opts.on('-g', '--god', 'Set godmode to true on load') do
       options[:god_mode] = true

data/lib/gemwarrior/entities/monster.rb

@@ -14,12 +14,12 @@ module Gemwarrior
       status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} "
       status_text << "DEF: #{defense.to_s.rjust(2)} "
       status_text << "DEX: #{dexterity.to_s.rjust(2)} "
-      status_text << "INV: #{inventory.list_contents} "
       status_text << "ROX: #{rox.to_s.rjust(3)} "
       status_text << "XP: #{xp.to_s.rjust(3)} "
-      status_text << "FACE: #{face.ljust(10)} "
-      status_text << "HANDS: #{hands.ljust(11)} "
-      status_text << "MOOD: #{mood.ljust(10)}\n"
+      status_text << "FACE: #{face.ljust(12)} "
+      status_text << "HANDS: #{hands.ljust(12)} "
+      status_text << "MOOD: #{mood.ljust(12)}"
+      status_text << "INV: #{inventory.list_contents}\n"
     end
   end
 end

data/lib/gemwarrior/entities/monsters/alexandrat.rb

@@ -10,7 +10,7 @@ module Gemwarrior
       self.description  = 'Tiny, but fierce, color-changing rodent.'
       self.face         = 'ugly'
       self.hands        = 'gnarled'
-      self.mood         = 'unsurprisingly unchipper'
+      self.mood         = 'unchipper'
       
       self.level        = rand(1..2)
       self.hp_cur       = rand((level * 2)..(level * 3))

data/lib/gemwarrior/entities/player.rb

@@ -51,7 +51,7 @@ module Gemwarrior
       self.beast_mode   = options.fetch(:beast_mode)
     end
 
-    def check_self(show_pic = true)
+    def check_self(debug_mode = false, show_pic = true)
       unless show_pic == false
         print_char_pic
       end
@@ -74,10 +74,12 @@ module Gemwarrior
       self_text << "ATTACK    : #{self.atk_lo}-#{self.atk_hi}\n"
       self_text << "DEXTERITY : #{self.dexterity}\n"
       self_text << "DEFENSE   : #{self.defense}\n"
-      self_text << "GOD_MODE  : #{self.god_mode}\n"
-      self_text << "BEAST_MODE: #{self.beast_mode}\n\n"
+      if debug_mode
+        self_text << "GOD_MODE  : #{self.god_mode}\n"
+        self_text << "BEAST_MODE: #{self.beast_mode}\n"
+      end
       
-      self_text << "#{self.description}\n\n"
+      self_text << "\n#{self.description}\n\n"
       
       self_text << "Current status - breathing, wearing clothing, and with a few other specific characteristics: face is #{self.face}, hands are #{self.hands}, and general mood is #{self.mood}.\n"
     end

data/lib/gemwarrior/evaluator.rb

@@ -14,8 +14,7 @@ module Gemwarrior
     
     GO_PARAMS         = 'Options: north, east, south, west'
     CHANGE_PARAMS     = 'Options: name'
-    LIST_PARAMS       = 'Options: monsters, items, locations'
-    DEBUG_PARAMS      = 'Options: vars, map, stat'
+    DEBUG_LIST_PARAMS = 'Options: monsters, items, locations'
     DEBUG_STAT_PARAMS = 'Options: atk_lo, atk_hi, strength, dexterity'
     
     ## ERRORS
@@ -33,24 +32,33 @@ module Gemwarrior
     ERROR_CHANGE_PARAM_INVALID      = 'You cannot change that...yet.'
     ERROR_LIST_PARAM_MISSING        = 'You cannot just "list". You gotta choose something to list.'
     ERROR_LIST_PARAM_INVALID        = 'You cannot list that...yet.'
-    ERROR_DEBUG_PARAM_MISSING       = 'You cannot just "debug". You gotta choose a debug command.'
-    ERROR_DEBUG_PARAM_INVALID       = 'You cannot debug that...yet.'
     ERROR_DEBUG_STAT_PARAM_MISSING  = 'You cannot just "change stats". You gotta choose a stat to change.'
     ERROR_DEBUG_STAT_PARAM_INVALID  = 'You cannot change that stat...yet.'
     
-    attr_accessor :world, :commands, :aliases, :descriptions, :devcmds, :devaliases, :extras
+    attr_accessor :world, 
+                  :commands, :aliases, :extras, :cmd_descriptions, 
+                  :devcommands, :devaliases, :devcmd_descriptions
     
     def initialize(world)
       self.world = world
-      self.devcmds = %w(debug)
-      self.devaliases = %w(db)
-      self.commands = %w(character inventory list rest look take drop equip unequip go attack change help quit quit!)
-      self.aliases = %w(c i ls r l t d e ue g a ch h q qq)
+      
+      self.devcommands = %w(god beast list vars map stat)
+      self.devaliases = %w(gd bs ls v m s)
+      self.devcmd_descriptions = [
+        'Toggle god mode (i.e. invincible)',
+        'Toggle beast mode (i.e. super strength)',
+        'List all instances of a specific entity type',
+        'List all the variables in the world',
+        'Show a map of the world',
+        'Change player stat'
+      ]
+      
+      self.commands = %w(character inventory rest look take drop equip unequip go attack change help quit quit!)
+      self.aliases = %w(c i r l t d e ue g a ch h q qq)
       self.extras = %w(exit exit! x x)
-      self.descriptions = [
+      self.cmd_descriptions = [
         'Display character information',
         'Look in your inventory',
-        'List all the objects of a type that exist in the world',
         'Take a load off and regain HP',
         'Look around your current location',
         'Take item',
@@ -82,91 +90,85 @@ module Gemwarrior
       command = tokens.first.downcase
       param1 = tokens[1]
       param2 = tokens[2]
-      param3 = tokens[3]
 
-      case command
       # dev commands
-      when 'debug', 'db'
-        if param1.nil?
-          puts ERROR_DEBUG_PARAM_MISSING
-          DEBUG_PARAMS
-        else
-          case param1
-          when 'vars', 'v'
-            world.print_all_vars
-          when 'godmode', 'iddqd', 'god', 'g'
-            world.player.god_mode = !world.player.god_mode
-          when 'beastmode', 'beast', 'b'
-            world.player.beast_mode = !world.player.beast_mode
-          when 'map', 'm'
-            world.print_map
-          when 'stat'
-            if param2.nil?
-              puts ERROR_DEBUG_STAT_PARAM_MISSING
-              DEBUG_STAT_PARAMS
-            else
-              case param2
-              when 'atk_lo'
-                unless param3.nil?
-                  param3 = param3.to_i
-                  if param3.is_a? Numeric
-                    if param3 >= 0
-                      world.player.atk_lo = param3
-                    end
+      if world.debug_mode
+        case command
+        when 'god', 'gd'
+          return world.player.god_mode = !world.player.god_mode
+        when 'beast', 'bs'
+          return world.player.beast_mode = !world.player.beast_mode
+        when 'vars', 'v'
+          world.print_all_vars
+        when 'list', 'ls'
+          if param1.nil?
+            puts ERROR_LIST_PARAM_MISSING
+            return DEBUG_LIST_PARAMS
+          else
+            return world.list(param1)
+          end
+        when 'map', 'm'
+          world.print_map
+        when 'stat', 'st'
+          if param1.nil?
+            puts ERROR_DEBUG_STAT_PARAM_MISSING
+            return DEBUG_STAT_PARAMS
+          else
+            case param1
+            when 'atk_lo'
+              unless param2.nil?
+                param2.to_i!
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.atk_lo = param2
                   end
                 end
-              when 'atk_hi'
-                unless param3.nil?
-                  param3 = param3.to_i
-                  if param3.is_a? Numeric
-                    if param3 >= 0
-                      world.player.atk_hi = param3
-                    end
+              end
+            when 'atk_hi'
+              unless param2.nil?
+                param2.to_i!
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.atk_hi = param2
                   end
                 end
-              when 'strength', 'str', 'st'
-                unless param3.nil?
-                  param3 = param3.to_i
-                  if param3.is_a? Numeric
-                    if param3 >= 0
-                      world.player.atk_lo = param3
-                      world.player.atk_hi = param3
-                    end
+              end
+            when 'strength', 'str', 'st'
+              unless param2.nil?
+                param2.to_i!
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.atk_lo = param2
+                    world.player.atk_hi = param2
                   end
                 end
-              when 'dexterity', 'dex', 'd'
-                unless param3.nil?
-                  param3 = param3.to_i
-                  if param3.is_a? Numeric
-                    if param3 >= 0
-                      world.player.dexterity = param3
-                    end
+              end
+            when 'dexterity', 'dex', 'd'
+              unless param2.nil?
+                param2.to_i!
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.dexterity = param2
                   end
                 end
-              else
-                ERROR_DEBUG_STAT_PARAM_INVALID
               end
+            else
+              return ERROR_DEBUG_STAT_PARAM_INVALID
             end
-          else
-            ERROR_DEBUG_PARAM_INVALID
           end
         end
+      end
+      
       # normal commands
+      case command
       when 'character', 'c'
-        world.player.check_self
+        world.player.check_self(world.debug_mode)
       when 'inventory', 'i'
         if param1
           world.player.inventory.describe_item(param1)
         else
           world.player.list_inventory
         end
-      when 'list', 'ls'
-        if param1.nil?
-          puts ERROR_LIST_PARAM_MISSING
-          LIST_PARAMS
-        else
-          world.list(param1)
-        end
       when 'rest', 'r'
         world.player.rest
       when 'look', 'l'
@@ -266,16 +268,30 @@ module Gemwarrior
       i = 0
       print_separator
       commands.each do |cmd|
-        puts " #{cmd.ljust(9)}, #{aliases[i].ljust(2)} -- #{descriptions[i]}"
+        puts " #{cmd.ljust(9)}, #{aliases[i].ljust(2)} -- #{cmd_descriptions[i]}"
         i = i + 1
       end
       print_separator
+      puts " DEBUG COMMANDS"
+      print_separator
+      if world.debug_mode
+        i = 0
+        devcommands.each do |cmd|
+          puts " #{cmd.ljust(9)}, #{devaliases[i].ljust(2)} -- #{devcmd_descriptions[i]}"
+          i = i + 1
+        end
+        print_separator
+      end
     end
     
     def input_valid?(input)
       tokens = input.split
       command = tokens[0]
-      commands_and_aliases = commands | aliases | devcmds | devaliases | extras
+      commands_and_aliases = commands | aliases | extras
+      
+      if world.debug_mode
+        commands_and_aliases = commands_and_aliases | devcommands | devaliases
+      end
 
       if commands_and_aliases.include?(command.downcase)
         if tokens.size.between?(1,4)

data/lib/gemwarrior/game.rb

@@ -25,10 +25,11 @@ module Gemwarrior
     
     def initialize(options)
       # create new world and player
-      self.world = World.new
-
+      self.world            = World.new
+      
       start_stats = PlayerLevels::get_level_stats(1)
       
+      world.debug_mode      = options.fetch(:debug_mode)
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,
         :level              => start_stats[:level],
@@ -44,6 +45,7 @@ module Gemwarrior
         :inventory          => PLAYER_INVENTORY_DEFAULT,
         :rox                => PLAYER_ROX_DEFAULT,
         :cur_coords         => world.location_coords_by_name('Home'),
+        
         :god_mode           => options.fetch(:god_mode),
         :beast_mode         => options.fetch(:beast_mode)
       })

data/lib/gemwarrior/misc/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/gemwarrior/world.rb

@@ -15,12 +15,12 @@ module Gemwarrior
     ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
     ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
   
-    attr_accessor :monsters, :locations, :player
+    attr_accessor :monsters, :locations, :player, :debug_mode
   
     def initialize
-      self.monsters = init_monsters
-      self.locations = init_locations
-      self.player = nil
+      self.monsters   = init_monsters
+      self.locations  = init_locations
+      self.player     = nil
     end
 
     def print_all_vars

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Michael Chadwick