gemwarrior 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f01219fe323d1a74d0205758b61084bbea01e4e
-  data.tar.gz: 1dc551158da4ddcb6737c7daa15c33e151eaf5a3
+  metadata.gz: 638aef0b767f40757bdadab429977bdcd2f23c22
+  data.tar.gz: 9e7a30b926f56dee75605ac92a41a966c6886e7c
 SHA512:
-  metadata.gz: 0099d78162db97ca70e0fc6760f103ee720667262a763c5a294d1c1fb505b2ac26827601673304c7eadb72674a1e2b28a0e5f0f0a1b4fdf77ca87aa22e962922
-  data.tar.gz: a9a84abd388aca04244c7afd9d558ac27ba460b4d2ba62505e12f1df3936791108e15d7f67aef06aaf9ebd1f6ec3dfa33a4a11bb870b4f4e5a1499e3ad74632c
+  metadata.gz: a231f1497002ec5a325e913b156595b067a5ccfabd77f966c6e4861d73a07a6197e1dc8ddc096d912c309df82b2bbf34189a80ebe51c99799e567b437580b93e
+  data.tar.gz: ddd8a4352f8e0691a67c6e382221b4a8cbb05c9c3de312f7ab7545e8e82a126e5812fba2fcf81bb4abfe6108a29343d2a0e9df06ee3a50501db8d516af4bfd64

data/README.md

@@ -17,10 +17,12 @@ As you travel you will discover sights and sounds of the land, all of which are
 
 ## How to Get to Jool
 
-1. `gem install gemwarrior`  
-2. `gemwarrior`
+1. `ruby -v` should return `ruby 2.`something; else install [Ruby](https://www.ruby-lang.org)
+2. `gem -v` should return `2.`something; else install [RubyGems](https://rubygems.org)
+2. `gem install gemwarrior`  
+3. `gemwarrior`
 
-Run the two commands above and you'll be whisked away to Jool, ready to start or continue your quest to defeat Emerald and take back the coveted Shiny Thing(tm) that you will bring back to Queen Ruby (or will you...?).
+Run the commands above and you'll be whisked away to Jool, ready to start or continue your quest to defeat Emerald and take back the coveted Shiny Thing(tm) that you will bring back to Queen Ruby (or will you...?).
 
 ## In Progress, Yanno
 
@@ -30,6 +32,7 @@ This is in super-hyper-turbo-edition pre-pre-pre-alpha right now, but a working
 `> i [object]` - check your inventory (or an individual item within)  
 `> r` - take a load off (future: replenish stamina)  
 `> 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
@@ -42,13 +45,15 @@ This is in super-hyper-turbo-edition pre-pre-pre-alpha right now, but a working
 To come:
 
 * ~~Ability to move between locations!~~
-* More locations to move between!
 * ~~Monsters!~~
 * ~~Ability to fight those monsters!~~
 * Monsters to fight back!
 * ~~Items you can pick up!~~
-* Quests!
-* Towns!
+* Saving!
+* Loading of said saved state!
+* More locations to move between!
+* Quests (maybe)!
+* Towns (maybe)!
 * Merchants!
 * Sound FX!
 * Music!

data/bin/gemwarrior

@@ -2,7 +2,7 @@
 
 require 'optparse'
 
-require_relative '../lib/gemwarrior/version'
+require_relative '../lib/gemwarrior/misc/version'
 require_relative '../lib/gemwarrior/game'
 
 def parse_options

data/gemwarrior.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gemwarrior/version'
+require 'gemwarrior/misc/version'
 
 Gem::Specification.new do |spec|
   spec.name            = 'gemwarrior'

data/lib/gemwarrior/entities/creature.rb

@@ -0,0 +1,27 @@
+# lib/gemwarrior/entities/creature.rb
+# Creature base class
+
+require_relative 'entity'
+require_relative '../inventory'
+
+module Gemwarrior
+  class Creature < Entity
+    attr_accessor :id, :name, :description, :face, :hands, :mood, 
+                  :level, :hp_cur, :hp_max, :inventory
+    
+    def initialize(options)
+      self.id           = options[:id]
+      self.name         = options[:name]
+      self.description  = options[:description]
+      self.face         = options[:face]
+      self.hands        = options[:hands]
+      self.mood         = options[:mood]
+
+      self.level        = options[:level]
+      self.hp_cur       = options[:hp_cur]
+      self.hp_max       = options[:hp_max]
+
+      self.inventory    = options[:inventory]
+    end
+  end
+end

data/lib/gemwarrior/entities/entity.rb

@@ -0,0 +1,20 @@
+# lib/gemwarrior/entities/entity.rb
+# Base class for an interactable object
+
+module Gemwarrior
+  class Entity
+    attr_reader :id, :name, :description
+    
+    def initialize(options)
+      self.id           = options[:id]
+      self.name         = options[:name]
+      self.description  = options[:description]
+    end
+    
+    def status
+      status_text =  name.ljust(20).upcase
+      status_text << "#{description}\n"
+      status_text.to_s
+    end
+  end
+end

data/lib/gemwarrior/entities/item.rb

@@ -0,0 +1,22 @@
+# lib/gemwarrior/entities/item.rb
+# Item base class
+
+require_relative 'entity'
+
+module Gemwarrior
+  class Item < Entity
+    attr_accessor :id, :name, :description, 
+                  :atk_lo, :atk_hi, :takeable, :equippable, :equipped
+    
+    def initialize(options)
+      self.id           = options[:id]
+      self.name         = options[:name]
+      self.description  = options[:description]
+      self.atk_lo       = options[:atk_lo]
+      self.atk_hi       = options[:atk_hi]
+      self.takeable     = options[:takeable]
+      self.equippable   = options[:equippable]
+      self.equipped     = options[:equipped]
+    end
+  end
+end

data/lib/gemwarrior/{location.rb → entities/location.rb}

@@ -1,10 +1,12 @@
-# lib/gemwarrior/location.rb
+# lib/gemwarrior/entities/location.rb
 # Place in the game
 
 require 'matrext'
 
+require_relative 'entity'
+
 module Gemwarrior
-  class Location
+  class Location < Entity
     # CONSTANTS
     ## HASHES
     DANGER_LEVEL = {:none => 0, :low => 15, :moderate => 30, :high => 55, :assured => 100}
@@ -16,15 +18,15 @@ module Gemwarrior
     attr_accessor :id, :name, :description, :locs_connected, :danger_level, 
                   :items, :monsters_available, :monsters_abounding, :checked_for_monsters
   
-    def initialize(id, name, description, locs_connected, danger_level, items, monsters_available)
-      self.id = id
-      self.name = name
-      self.description = description
-      self.locs_connected = locs_connected
-      self.danger_level = danger_level
-      self.items = items
-      self.monsters_available = monsters_available
-      self.monsters_abounding = []
+    def initialize(options)
+      self.id                   = options[:id]
+      self.name                 = options[:name]
+      self.description          = options[:description]
+      self.locs_connected       = options[:locs_connected]
+      self.danger_level         = options[:danger_level]
+      self.items                = options[:items]
+      self.monsters_available   = options[:monsters_available]
+      self.monsters_abounding   = []
       self.checked_for_monsters = false
     end
     
@@ -91,7 +93,7 @@ module Gemwarrior
     def monster_by_name(name)
       monsters_abounding.each do |m|
         if m.name.eql?(name)
-          return m
+          return m.clone
         end
       end
     end

data/lib/gemwarrior/entities/monster.rb

@@ -0,0 +1,53 @@
+# lib/gemwarrior/entities/monster.rb
+# Monster creature
+
+require_relative 'creature'
+
+module Gemwarrior
+  class Monster < Creature
+    attr_accessor :xp, :atk_hi, :atk_lo, :dexterity, 
+                  :rox_to_give, :xp_to_give, :battlecry
+  
+    def initialize(options)
+      self.id           = options[:id]
+      self.name         = options[:name]
+      self.description  = options[:description]
+      self.face         = options[:face]
+      self.hands        = options[:hands]
+      self.mood         = options[:mood]
+      
+      self.level        = options[:level]
+      self.hp_cur       = options[:hp_cur]
+      self.hp_max       = options[:hp_max]
+      
+      self.atk_lo       = options[:atk_lo]
+      self.atk_hi       = options[:atk_hi]
+      self.dexterity    = options[:dexterity]
+      
+      self.inventory    = options[:inventory]
+      self.rox_to_give  = options[:rox_to_give]
+      self.xp_to_give   = options[:xp_to_give]
+      
+      self.battlecry    = options[:battlecry]
+    end
+    
+    def describe
+      status_text =  name.upcase.ljust(13)
+      status_text << "LEVEL: #{level.to_s.rjust(2)}, "
+      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)}, "
+      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)}, "
+      status_text << "DEX: #{dexterity.to_s.rjust(3)}, "
+      status_text << "XP: #{xp_to_give.to_s.rjust(3)}, "
+      status_text << "ROX: #{rox_to_give.to_s.rjust(3)}, "
+      status_text << "FACE: #{face.ljust(10)}, "
+      status_text << "HANDS: #{hands.ljust(10)}, "
+      status_text << "MOOD: #{mood.ljust(10)}\n"
+      status_text.to_s
+    end
+    
+    def take_damage(dmg)
+      self.hp_cur = hp_cur.to_i - dmg.to_i
+    end
+
+  end
+end

data/lib/gemwarrior/{player.rb → entities/player.rb}

@@ -1,4 +1,4 @@
-# lib/gemwarrior/player.rb
+# lib/gemwarrior/entities/player.rb
 # Player creature
 
 require_relative 'creature'
@@ -24,46 +24,37 @@ module Gemwarrior
     ERROR_ATTACK_OPTION_INVALID = 'That won\'t do anything against the monster.'
     
     attr_accessor :xp, :stam_cur, :stam_max, :atk_hi, :atk_lo, 
-                  :defense, :dexterity, :rox, :cur_loc
+                  :defense, :dexterity, :rox, :cur_loc,
+                  :god_mode
     
-    def initialize(
-      level, 
-      xp, 
-      hp_cur, 
-      hp_max, 
-      stam_cur, 
-      stam_max, 
-      atk_lo, 
-      atk_hi, 
-      defense,
-      dexterity,  
-      inventory, 
-      rox, 
-      cur_loc
-    )
+    def initialize(options)
       generate_player_identity
       
-      self.level = level
-      self.xp = xp
+      self.level      = options[:level]
+      self.xp         = options[:xp]
       
-      self.hp_cur = hp_cur
-      self.hp_max = hp_max
-      self.stam_cur = stam_cur
-      self.stam_max = stam_max
+      self.hp_cur     = options[:hp_cur]
+      self.hp_max     = options[:hp_max]
+      self.stam_cur   = options[:stam_cur]
+      self.stam_max   = options[:stam_max]
       
-      self.atk_lo = atk_lo
-      self.atk_hi = atk_hi
-      self.defense = defense
-      self.dexterity = dexterity
+      self.atk_lo     = options[:atk_lo]
+      self.atk_hi     = options[:atk_hi]
+      self.defense    = options[:defense]
+      self.dexterity  = options[:dexterity]
 
-      self.inventory = inventory
-      self.rox = rox
+      self.inventory  = options[:inventory]
+      self.rox        = options[:rox]
       
-      self.cur_loc = cur_loc
+      self.cur_loc    = options[:cur_loc]
+      
+      self.god_mode   = false
     end
 
-    def check_self
-      print_char_pic
+    def check_self(show_pic = true)
+      if show_pic
+        print_char_pic
+      end
       
       cur_weapon_name = ''
       if inventory.weapon.nil?
@@ -74,15 +65,16 @@ module Gemwarrior
         self.atk_hi = inventory.weapon.atk_hi
       end
 
-      self_text = "You check yourself. Currently breathing, wearing clothing, and with a few other specific characteristics: face is #{face}, hands are #{hands}, and general mood is #{mood}.\n\n"
-      self_text << "NAME: #{name}\n"
+      self_text =  "NAME: #{name}\n"
       self_text << "WPN : #{cur_weapon_name}\n"
       self_text << "LVL : #{level}\n"
       self_text << "XP  : #{xp}\n"
+      self_text << "HP  : #{hp_cur}|#{hp_max}\n"
       self_text << "ATK : #{atk_lo}-#{atk_hi}\n"
       self_text << "DEF : #{defense}\n"
       self_text << "DEX : #{dexterity}\n"
-      
+      self_text << "GOD : #{god_mode}\n\n"
+      self_text << "You check yourself. Currently breathing, wearing clothing, and with a few other specific characteristics: face is #{face}, hands are #{hands}, and general mood is #{mood}.\n"
     end
     
     def rest
@@ -149,60 +141,68 @@ module Gemwarrior
           new_loc_id = cur_loc.locs_connected[direction.to_sym]
           self.cur_loc = loc_by_id(locations, new_loc_id)
           print_traveling_text
-          cur_loc.checked_for_monsters = false
-          cur_loc.describe
+          self.cur_loc.checked_for_monsters = false
+          self.cur_loc.describe
         else
           ERROR_GO_PARAM_INVALID
         end
       end
     end
-  
+
     def attack(monster_name)
       if cur_loc.has_monster_to_attack?(monster_name)
-        puts "You decide to attack the #{monster_name}"
+        print_battle_line
+        puts "You decide to attack the #{monster_name}!"
         monster = cur_loc.monster_by_name(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)
-            puts "You have defeated #{monster.name}!"
-            puts "You have received #{monster.xp_to_give} XP!"
-            puts "You have gained #{monster.rox} barterable rox!"
-            update_player_stats(monster)
-            cur_loc.remove_monster(monster.name)
-            return 
-          elsif (hp_cur <= 0)
-            puts "You are dead, slain by the #{monster.name}!"
+            monster_death(monster)
             return
+          elsif (hp_cur <= 0 && !god_mode)
+            player_death(monster)
           end
-          
-          puts "\nYour options are 'fight', 'look', and 'run'."
+
+          puts
+          puts "[Fight/Attack][Look][Run]"
           puts "P :: #{hp_cur} HP\n"
-          puts "E :: #{monster.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
+          cmd = gets.chomp.downcase
           
+          # player action
           case cmd
-          when 'fight', 'f'
-            puts "You attack #{monster.name}#{inventory.weapon}!"
+          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(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 its general mood is #{monster.mood}."
+            puts "Its got some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
           when 'run', 'r'
-            escape = calculate_escape(monster)
-            if escape
+            if player_escape?(monster)
               monster.hp_cur = monster.hp_max
               puts "You successfully elude #{monster.name}!"
               return
@@ -212,11 +212,49 @@ module Gemwarrior
           else
             puts ERROR_ATTACK_OPTION_INVALID
           end
+          
+          # monster action
+          player_attacked_by(monster)
         end
       else
         ERROR_ATTACK_PARAM_INVALID
       end
     end
+
+    private
+    
+    # COMBAT
+    def update_player_stats(monster)
+      self.xp = xp + monster.xp_to_give
+      self.rox = rox + monster.rox_to_give
+    end
+    
+    def monster_death(monster)
+      puts "You have defeated #{monster.name}!"
+      puts "You have received #{monster.xp_to_give} XP!"
+      puts "You have found #{monster.rox_to_give} barterable rox on your slain opponent!"
+      print_battle_line
+      update_player_stats(monster)
+      cur_loc.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
+    end
     
     def cur_weapon_name
       unless inventory.weapon.nil?
@@ -233,7 +271,30 @@ module Gemwarrior
       end
     end
     
-    def calculate_escape(monster)
+    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
@@ -246,14 +307,12 @@ module Gemwarrior
         end
       end
     end
-  
-    private
    
-    def update_player_stats(monster)
-      self.xp = xp + monster.xp_to_give
-      self.rox = rox + monster.rox
+    def take_damage(dmg)
+      self.hp_cur = hp_cur.to_i - dmg.to_i
     end
     
+    # TRAVEL    
     def print_traveling_text
       loc = Thread.new do
         print "* "
@@ -263,6 +322,7 @@ module Gemwarrior
       loc.join
     end
     
+    # CHARACTER
     def print_char_pic
       char_pic = ""
       char_pic << "**********\n"
@@ -275,6 +335,7 @@ module Gemwarrior
       puts char_pic
     end
 
+    # INIT
     def generate_name
       name = []
       letter_max = rand(5..10)
@@ -309,5 +370,9 @@ module Gemwarrior
       self.hands = generate_hands
       self.mood = generate_mood
     end
+    
+    def print_battle_line
+      puts '**************************************'
+    end
   end
 end