gemwarrior 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda7511ef167bd6776d0da74d168cb2d99b17635
-  data.tar.gz: ceb694fe92e5528d0ec89a1e312a1878b0058e5f
+  metadata.gz: f8f4d5a687c7e67e55c6e675d53eed0ee81802b1
+  data.tar.gz: 64d4c7673e0956ab01a70933188160c40ef55c9f
 SHA512:
-  metadata.gz: ce465c7fd3627748fdd14891dd203fe96606a39dedf287889ab49e947a3b11492d8a902adabc78273e554cda6fda32a9e9f899468f469d3c028118a095a9f636
-  data.tar.gz: 50f552b9b60c672ed408e9928aa2019aa6850090ac012f9cc9d82f6d4e96c306f17e763d266b402ef8c0ef5e1ecacb8b5cb57718344b1825e522f3a461cc6945
+  metadata.gz: 4004e73feef6f2fb37694c904ab8e3953073af5a8d67e9f868e4643ba3f20b05588bea1428caaa581efdd59079fe5bed86b41a136aef2dafde5d5159441529f4
+  data.tar.gz: 8f9a8949bf9ae1f6c3de960ecd1417dec8597b0b712059b6b681ef288bcfab407cafd7849b594d01e0b1f1388fe266d38c1e4d69738008074d3ca2c9ba44ea95

data/README.md

@@ -30,24 +30,26 @@ This is in super-hyper-turbo-edition pre-pre-pre-alpha right now, but a working
 
 `> c` - character check for visual identity  
 `> i [object]` - check your inventory (or an individual item within)  
-`> r` - take a load off (future: replenish stamina)  
+`> ls [entity_type]` - list entities in the game (monsters, items, locations)  
+`> r` - take a load off and replenish hp  
 `> l [object]` - look at current location and its items and monsters  
-`> ls [entity_type]` - list entities in the game (monsters, items, locations)
 `> t [object]` - take an item from a location  
-`> e [object]` - equip an item in your inventory as a weapon
-`> a [monster]` - attack a monster
+`> d [object]` - drop an item from your inventory  
+`> e [object]` - equip an item in your inventory as a weapon  
+`> ue [object]` - unequip an item in your inventory  
 `> g [direction]` - go in a direction, if possible  
-`> w` - list all the locations available in the world  
-`> m` - list all the monsters available in the world  
+`> a [monster]` - attack a monster  
 `> ch [attribute]` - change some things about yourself  
-`> q` - quit this nonsense  
+`> h` - display available commands  
+`> q` - quit this nonsense w/ prompt  
+`> qq` - quit this nonsense w/o prompt  
 
 To come:
 
 * ~~Ability to move between locations!~~
 * ~~Monsters!~~
 * ~~Ability to fight those monsters!~~
-* Monsters to fight back!
+* ~~Monsters to fight back!~~
 * ~~Items you can pick up!~~
 * Saving!
 * Loading of said saved state!

data/bin/gemwarrior

@@ -5,11 +5,21 @@ require 'optparse'
 require_relative '../lib/gemwarrior/misc/version'
 require_relative '../lib/gemwarrior/game'
 
+GAME_NAME = "Gem Warrior"
+
 def parse_options
-  opts.on('-v', '--version', 'Display version number and exit') do
-    puts "#{$PROGRAM_NAME} #{Gemwarrior::VERSION}"
-    exit
+  options = {}
+
+  optparse = OptionParser.new do |opts|
+    opts.on('-v', '--version', 'Display version number and exit') do
+      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
+      exit
+    end
   end
+  
+  optparse.parse!()
+
+  return options
 end
 
 def print_error(error)
@@ -23,6 +33,8 @@ def print_error(error)
 end
 
 begin
+  options = parse_options
+
   Gemwarrior::Game.new
 rescue => error
   print_error(error)

data/lib/gemwarrior/battle.rb

@@ -0,0 +1,184 @@
+# lib/gemwarrior/battle.rb
+# Monster battle
+
+module Gemwarrior
+  class Battle
+    # CONSTANTS
+    ## ERRORS
+    ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
+    
+    attr_accessor :world, :player, :monster
+    
+    def initialize(options)
+      self.world    = options.fetch(:world)
+      self.player   = options.fetch(:player)
+      self.monster  = options.fetch(:monster)
+    end
+    
+    def start
+      print_battle_line
+      puts "You decide to attack the #{monster.name}!"
+      puts "#{monster.name} cries out: #{monster.battlecry}"
+
+      # first strike!
+      if monster_strikes_first?
+        puts "#{monster.name} strikes first!"
+        monster_attacks_player
+      end
+      
+      # main battle loop
+      loop do
+        if (monster.hp_cur <= 0)
+          monster_death
+          return
+        elsif (player.hp_cur <= 0 && !player.god_mode)
+          player_death
+        end
+
+        puts
+        puts "[Fight/Attack][Look][Run]"
+        puts "P :: #{player.hp_cur} HP\n"
+        puts "M :: #{monster.hp_cur} HP\n"
+        
+        if ((player.hp_cur.to_f / player.hp_max.to_f) < 0.10)
+          puts "You are almost dead!\n"
+        end
+        if ((monster.hp_cur.to_f / monster.hp_max.to_f) < 0.10)
+          puts "#{monster.name} is almost dead!\n"
+        end
+        
+        puts 'What do you do?'
+        cmd = gets.chomp.downcase
+        
+        # player action
+        case cmd
+        when 'fight', 'f', 'attack', 'a'
+          puts "You attack #{monster.name}#{player.cur_weapon_name}!"
+          dmg = calculate_damage_to(monster)
+          if dmg > 0
+            puts "You wound it for #{dmg} point(s)!"
+            take_damage(monster, dmg)
+            if (monster.hp_cur <= 0)
+              monster_death
+              return
+            end
+          else
+            puts "You miss entirely!"
+          end
+        when 'look', 'l'
+          puts "#{monster.name}: #{monster.description}"
+          puts "Its got some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
+        when 'run', 'r'
+          if player_escape?
+            monster.hp_cur = monster.hp_max
+            puts "You successfully elude #{monster.name}!"
+            return
+          else
+            puts "You were not able to run away! :-("
+          end
+        else
+          puts ERROR_ATTACK_OPTION_INVALID
+          next
+        end
+        
+        # monster action
+        monster_attacks_player
+      end
+    end
+    
+    private
+    
+    def monster_strikes_first?
+      if (monster.dexterity > player.dexterity)
+        return true
+      else
+        dex_diff = player.dexterity - monster.dexterity
+        rand_dex = rand(0..dex_diff)
+        if rand_dex % 2 > 0
+          return true
+        else
+          return false
+        end
+      end
+    end
+    
+    def calculate_damage_to(entity)
+      miss = rand(0..100)
+      if (miss < 15)
+        0
+      else
+        if entity.eql?(monster)
+          rand(player.atk_lo..player.atk_hi)
+        else
+          rand(monster.atk_lo..monster.atk_hi)
+        end
+      end
+    end
+    
+    def take_damage(entity, dmg)
+      entity.hp_cur = entity.hp_cur.to_i - dmg.to_i
+    end
+    
+    def monster_attacks_player
+      puts "#{monster.name} attacks you!"
+      dmg = calculate_damage_to(player)
+      if dmg > 0
+        puts "You are wounded for #{dmg} point(s)!"
+        take_damage(player, dmg)
+        if player.hp_cur <= 0
+          player_death
+        end
+      else
+        puts "#{monster.name} misses entirely!"
+      end
+    end
+    
+    def calculate_monster_damage
+      miss = rand(0..100)
+      if (miss < 15)
+        0
+      else
+        rand(player.atk_lo..player.atk_hi)
+      end
+    end
+    
+    def monster_death
+      puts "You have defeated #{monster.name}!"
+      puts "You have received #{monster.xp} XP!"
+      puts "You have found #{monster.rox} barterable rox on your slain opponent!"
+      print_battle_line
+      update_player_stats
+      world.location_by_coords(player.cur_coords).remove_monster(monster.name)
+    end
+    
+    def player_death
+      puts "You are dead, slain by the #{monster.name}!"
+      puts 'Your adventure ends here. Try again next time!'
+      print_battle_line
+      exit(0)
+    end
+    
+    def update_player_stats
+      player.xp = player.xp + monster.xp
+      player.rox = player.rox + monster.rox
+    end
+    
+    def player_escape?
+      if (player.dexterity > monster.dexterity)
+        return true
+      else
+        dex_diff = monster.dexterity - player.dexterity
+        rand_dex = rand(0..dex_diff)
+        if rand_dex % 2 > 0
+          return true
+        else
+          return false
+        end
+      end
+    end
+    
+    def print_battle_line
+      puts '**************************************'
+    end
+  end
+end

data/lib/gemwarrior/entities/items/stonemite.rb

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/stonemite.rb
+# Item::Stonemite
+
+require_relative '../item'
+
+module Gemwarrior
+  class Stonemite < Item
+    def initialize
+      self.name         = 'stonemite'
+      self.description  = 'Stubby cave debris that is kind of neat to look at, as it is off-grey and sparkly, but the size makes it unusable as anything but skipping on a lake or tossing to the ground.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -29,7 +29,13 @@ module Gemwarrior
       self.monsters_abounding   = []
       self.checked_for_monsters = false
     end
-
+    
+    def status
+      status_text =  name.ljust(20).upcase
+      status_text << coords.values.to_a
+      status_text << " #{description}\n"
+    end
+    
     def remove_item(item_name)
       if items.map(&:name).include?(item_name)
         items.reject! { |item| item.name == item_name }

data/lib/gemwarrior/entities/monster.rb

@@ -21,10 +21,5 @@ module Gemwarrior
       status_text << "HANDS: #{hands.ljust(11)} "
       status_text << "MOOD: #{mood.ljust(10)}\n"
     end
-    
-    def take_damage(dmg)
-      self.hp_cur = hp_cur.to_i - dmg.to_i
-    end
-
   end
 end

data/lib/gemwarrior/entities/player.rb

@@ -2,6 +2,7 @@
 # Player creature
 
 require_relative 'creature'
+require_relative '../battle'
 
 module Gemwarrior
   class Player < Creature
@@ -14,9 +15,6 @@ module Gemwarrior
     FACE_DESC   = ['smooth', 'tired', 'ruddy', 'moist', 'shocked', 'handsome', '5 o\'clock-shadowed']
     HANDS_DESC  = ['worn', 'balled into fists', 'relaxed', 'cracked', 'tingly', 'mom\'s spaghetti']
     MOOD_DESC   = ['calm', 'excited', 'depressed', 'tense', 'lackadaisical', 'angry', 'positive']
-      
-    ## ERRORS
-    ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
     
     attr_accessor :stam_cur, :stam_max, :cur_coords, :god_mode
     
@@ -63,6 +61,7 @@ module Gemwarrior
       end
 
       self_text =  "NAME: #{name}\n"
+      self_text =  "XY  : #{cur_coords.values.to_a}\n"
       self_text << "WPN : #{cur_weapon_name}\n"
       self_text << "LVL : #{level}\n"
       self_text << "XP  : #{xp}\n"
@@ -129,106 +128,8 @@ module Gemwarrior
     end
 
     def attack(world, monster)
-      print_battle_line
-      puts "You decide to attack the #{monster.name}!"
-      
-      puts "#{monster.name} cries out: #{monster.battlecry}"
-
-      # first strike!
-      if calculate_first_strike(monster)
-        puts "#{monster.name} strikes first!"
-        player_attacked_by(monster)
-      end
-      
-      # main battle loop
-      loop do
-        if (monster.hp_cur <= 0)
-          monster_death(world, monster)
-          return
-        elsif (hp_cur <= 0 && !god_mode)
-          player_death(monster)
-        end
-
-        puts
-        puts "[Fight/Attack][Look][Run]"
-        puts "P :: #{hp_cur} HP\n"
-        puts "M :: #{monster.hp_cur} HP\n"
-        
-        if ((monster.hp_cur.to_f / monster.hp_max.to_f) < 0.10)
-          puts "#{monster.name} is almost dead!\n"
-        end
-        
-        puts 'What do you do?'
-        cmd = gets.chomp.downcase
-        
-        # player action
-        case cmd
-        when 'fight', 'f', 'attack', 'a'
-          puts "You attack #{monster.name}#{cur_weapon_name}!"
-          dmg = calculate_mob_damage
-          if dmg > 0
-            puts "You wound it for #{dmg} point(s)!"
-            monster.take_damage(dmg)
-            if (monster.hp_cur <= 0)
-              monster_death(world, monster)
-              return
-            end
-          else
-            puts "You miss entirely!"
-          end
-        when 'look', 'l'
-          puts "#{monster.name}: #{monster.description}"
-          puts "Its got some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
-        when 'run', 'r'
-          if player_escape?(monster)
-            monster.hp_cur = monster.hp_max
-            puts "You successfully elude #{monster.name}!"
-            return
-          else
-            puts "You were not able to run away! :-("
-          end
-        else
-          puts ERROR_ATTACK_OPTION_INVALID
-        end
-        
-        # monster action
-        player_attacked_by(monster)
-      end
-    end
-
-    private
-    
-    # COMBAT
-    def update_player_stats(monster)
-      self.xp = xp + monster.xp
-      self.rox = rox + monster.rox
-    end
-    
-    def monster_death(world, monster)
-      puts "You have defeated #{monster.name}!"
-      puts "You have received #{monster.xp} XP!"
-      puts "You have found #{monster.rox} barterable rox on your slain opponent!"
-      print_battle_line
-      update_player_stats(monster)
-      world.location_by_coords(cur_coords).remove_monster(monster.name)
-    end
-    
-    def player_death(monster)
-      puts "You are dead, slain by the #{monster.name}!"
-      puts 'Your adventure ends here. Try again next time!'
-      print_battle_line
-      exit(0)
-    end
-    
-    def player_attacked_by(monster)
-      puts "#{monster.name} attacks you!"
-      dmg = calculate_player_damage(monster)
-      if dmg > 0
-        puts "You are wounded for #{dmg} point(s)!"
-        take_damage(dmg)
-      else
-        puts "#{monster.name} misses entirely!"
-      end
+      battle = Battle.new({:world => world, :player => self, :monster => monster})
+      battle.start
     end
     
     def cur_weapon_name
@@ -236,56 +137,8 @@ module Gemwarrior
         return " with your #{inventory.weapon.name}"
       end
     end
-    
-    def calculate_mob_damage
-      miss = rand(0..100)
-      if (miss < 15)
-        0
-      else
-        rand(atk_lo..atk_hi)
-      end
-    end
-    
-    def calculate_player_damage(monster)
-      miss = rand(0..100)
-      if (miss < 15)
-        0
-      else
-        rand(monster.atk_lo..monster.atk_hi)
-      end
-    end
-    
-    def calculate_first_strike(monster)
-      if (monster.dexterity > dexterity)
-        return true
-      else
-        dex_diff = dexterity - monster.dexterity
-        rand_dex = rand(0..dex_diff)
-        if rand_dex % 2 > 0
-          return true
-        else
-          return false
-        end
-      end
-    end
-    
-    def player_escape?(monster)
-      if (dexterity > monster.dexterity)
-        return true
-      else
-        dex_diff = monster.dexterity - dexterity
-        rand_dex = rand(0..dex_diff)
-        if rand_dex % 2 > 0
-          return true
-        else
-          return false
-        end
-      end
-    end
-   
-    def take_damage(dmg)
-      self.hp_cur = hp_cur.to_i - dmg.to_i
-    end
+
+    private
     
     # TRAVEL    
     def print_traveling_text
@@ -300,13 +153,13 @@ module Gemwarrior
     # CHARACTER
     def print_char_pic
       char_pic = ""
-      char_pic << "**********\n"
-      char_pic << "*   ()   *\n"
-      char_pic << "* \\-||-/ *\n"
-      char_pic << "*   --   *\n"
-      char_pic << "*   ||   *\n"
-      char_pic << "*  _||_  *\n"
-      char_pic << "**********\n"
+      char_pic << "************\n"
+      char_pic << "*    ()    *\n"
+      char_pic << "*  \\-||-/  *\n"
+      char_pic << "*    --    *\n"
+      char_pic << "*    ||    *\n"
+      char_pic << "*   _||_   *\n"
+      char_pic << "************\n"
       puts char_pic
     end
 

data/lib/gemwarrior/evaluator.rb

@@ -28,13 +28,15 @@ module Gemwarrior
     ERROR_DROP_PARAM_MISSING    = 'You cannot just "drop". You gotta choose something to drop.'
     ERROR_EQUIP_PARAM_MISSING   = 'You cannot just "equip". You gotta choose something to equip.'
     ERROR_UNEQUIP_PARAM_MISSING = 'You cannot just "unequip". You gotta choose something to unequip.'
+    ERROR_DEBUG_PARAM_MISSING   = 'You cannot just "debug". You gotta choose a debug command.'
+    ERROR_DEBUG_PARAM_INVALID   = 'You cannot debug that...yet.'
     
     attr_accessor :world, :commands, :aliases, :descriptions, :devcmds, :devaliases
     
     def initialize(world)
       self.world = world
-      self.devcmds = %w(allvars godmode iddqd)
-      self.devaliases = %w(av god)
+      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.descriptions = [
@@ -72,10 +74,21 @@ module Gemwarrior
 
       case command
       # dev commands
-      when 'allvars', 'av'
-        world.all_vars()
-      when 'iddqd', 'godmode', 'god'
-        world.player.god_mode = !world.player.god_mode
+      when 'debug', 'db'
+        if param.nil?
+          ERROR_DEBUG_PARAM_MISSING
+        else
+          case param
+          when 'vars', 'v'
+            world.print_all_vars
+          when 'godmode', 'iddqd', 'god', 'g'
+            world.player.god_mode = !world.player.god_mode
+          when 'map', 'm'
+            world.print_map
+          else
+            ERROR_DEBUG_PARAM_INVALID
+          end
+        end
       # normal commands
       when 'character', 'c'
         world.player.check_self

data/lib/gemwarrior/misc/version.rb

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

data/lib/gemwarrior/world.rb

@@ -7,6 +7,10 @@ require_relative 'entities/location'
 module Gemwarrior
   class World
     # CONSTANTS
+    ## WORLD DIMENSIONS
+    WORLD_DIM_WIDTH   = 10
+    WORLD_DIM_HEIGHT  = 10
+    
     ## ERRORS
     ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
   
@@ -18,7 +22,7 @@ module Gemwarrior
       self.player = nil
     end
 
-    def all_vars
+    def print_all_vars
       puts "======================\n"
       puts "All Variables in World\n"
       puts "======================\n"
@@ -27,7 +31,32 @@ module Gemwarrior
       puts "#{list("items", true)}\n\n"
       puts "#{list("locations", true)}\n"
     end
-    
+
+    def print_map
+      0.upto(WORLD_DIM_HEIGHT-1) do |count_y|
+        print '  '
+        0.upto(WORLD_DIM_WIDTH-1) do
+          print '___'
+        end
+        print "\n"
+        print "#{(WORLD_DIM_HEIGHT-1) - count_y} "
+        0.upto(WORLD_DIM_WIDTH-1) do |count_x|
+          if location_by_coords({:x => count_x, :y => (WORLD_DIM_HEIGHT-1) - count_y})
+            print '|X|'
+          else
+            print '|_|'
+          end
+        end
+        print "\n"
+      end
+      puts
+      print '   '
+      0.upto(WORLD_DIM_WIDTH-1) do |count_x|
+        print "#{count_x}  "
+      end
+      return
+    end
+
     def list(param, details = false)
       case param
       when 'players'
@@ -163,6 +192,7 @@ module Gemwarrior
       require_relative 'entities/items/feather'
       require_relative 'entities/items/gun'
       require_relative 'entities/items/stalactite'
+      require_relative 'entities/items/stonemite'
       require_relative 'entities/items/stone'
       require_relative 'entities/items/tree'
       
@@ -189,12 +219,42 @@ module Gemwarrior
         })
       )
       locations.push(Location.new({
-          :name               => 'Cave (Room1)', 
-          :description        => 'Now inside the first cavernous room, you confirm that there are stacktites, stonemites, rocksites, and even one or two pebblejites.',
+          :name               => 'Cave (Foyer)', 
+          :description        => 'Now inside the entrance to the cavern, you confirm that there are stacktites, stonemites, rocksites, and even one or two pebblejites.',
           :coords             => {:x => 7, :y => 0},
-          :locs_connected     => {:north => false, :east => false, :south => false, :west => true},
+          :locs_connected     => {:north => true, :east => true, :south => false, :west => true},
           :danger_level       => :moderate,
-          :items              => [Stalactite.new],
+          :items              => [Stalactite.new, Stonemite.new],
+          :monsters_available => monsters
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Cave (Nook)', 
+          :description        => 'A depression in the cave wall casts a shadow over a small rock shelf.',
+          :coords             => {:x => 7, :y => 1},
+          :locs_connected     => {:north => false, :east => true, :south => true, :west => false},
+          :danger_level       => :moderate,
+          :items              => [],
+          :monsters_available => monsters
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Cave (Dropoff)', 
+          :description        => 'Caves do not usually feature sudden chasms spilling down into an unknowable void, but this one does.',
+          :coords             => {:x => 8, :y => 1},
+          :locs_connected     => {:north => false, :east => false, :south => true, :west => true},
+          :danger_level       => :moderate,
+          :items              => [],
+          :monsters_available => monsters
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Cave (Causeway)', 
+          :description        => 'Paths lead north and west, but nothing of interest is in this causeway.',
+          :coords             => {:x => 8, :y => 0},
+          :locs_connected     => {:north => true, :east => false, :south => false, :west => true},
+          :danger_level       => :moderate,
+          :items              => [],
           :monsters_available => monsters
         })
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -158,6 +158,7 @@ files:
 - Rakefile
 - bin/gemwarrior
 - gemwarrior.gemspec
+- lib/gemwarrior/battle.rb
 - lib/gemwarrior/entities/creature.rb
 - lib/gemwarrior/entities/entity.rb
 - lib/gemwarrior/entities/item.rb
@@ -166,6 +167,7 @@ files:
 - lib/gemwarrior/entities/items/gun.rb
 - lib/gemwarrior/entities/items/stalactite.rb
 - lib/gemwarrior/entities/items/stone.rb
+- lib/gemwarrior/entities/items/stonemite.rb
 - lib/gemwarrior/entities/items/tree.rb
 - lib/gemwarrior/entities/location.rb
 - lib/gemwarrior/entities/monster.rb