gemwarrior 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa970470b56b3fca1a179770c50bad1f38a1f57
-  data.tar.gz: 96e1f509bf41a79603c9347503bf7241b32f78e0
+  metadata.gz: 4bbc1cea21340d6f201df93b5bedcec926abf6ba
+  data.tar.gz: 805f497d5ea72852d423db7ceb2d40fff0bc61f3
 SHA512:
-  metadata.gz: 682e6ea04e48e876382c1a6c20853dbc6aa574aa8c06129b27f9fff075507f11e062e60a4cce06a0ee896cc6d0b055572d1c8842c5dcc69abc6f85acd61c3d77
-  data.tar.gz: 6ff0815d861be3ad5fee9e1671e9906956637564ebc8ed8b7215f967ac3a68ae886e8069f4da561c87cf04920bd6729864bdf3f6f3523582241c41533a98bbb8
+  metadata.gz: 0bcd871ce8cbd6ecec2f4e125b7d722df99f658484d507b28f125c6b167f51abce918250abdd9ce88e70d1c585150e6e0c9bc9853eaaec2b5474d1f6559a42ef
+  data.tar.gz: 3fbb5bb7ce1e33788a99d7a746618f65374d05351fbaf1deea3c0fd35cfdd0d60c8009c4f04792292cbfe69688677bca85c2e421715f23ed01c8ba6916f405e6

data/README.md

@@ -19,21 +19,19 @@ As you travel you will discover sights and sounds of the land, all of which are
 
 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`  
+2. `(sudo) gem install gemwarrior`  
 3. `gemwarrior`
 
 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
-
-This is in super-hyper-turbo-edition pre-pre-pre-alpha right now, but a working console prompt, some commands (type `h` for a list), and a few locations exist already. Each time you start the game a new hero will be created with a randomized name, but you can change that with `> change name`.
+## Main Commands
 
 `> c` - character check for visual identity  
 `> i  [object]` - check your inventory (or an individual item within)  
-`> 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  
 `> t  [object]` - take an item from a location  
+`> u  [object]` - use an item from your inventory or current location
 `> 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  
@@ -44,21 +42,10 @@ This is in super-hyper-turbo-edition pre-pre-pre-alpha right now, but a working
 `> q` - quit this nonsense w/ prompt  
 `> qq` - quit this nonsense w/o prompt  
 
-To come:
+## In Progress, Yanno
+
+This is in beta testing right now, and if you wish to help out in an official way, please visit [the main Gem Warrior homepage](http://gw.codana.me).
+
+## Current Issues
 
-* ~~Ability to move between locations!~~
-* ~~Monsters!~~
-* ~~Ability to fight those monsters!~~
-* ~~Monsters to fight back!~~
-* ~~Items you can pick up!~~
-* ~~Main Boss and Win State!~~
-* Saving!
-* Loading of said saved state!
-* More locations to move between!
-* Randomized worlds!
-* Quests (maybe)!
-* Towns (maybe)!
-* Merchants (maybe)!
-* Sound FX!
-* Music!
-* Epic Length (whereby "Epic" I mean "maybe 30 minutes"?)!
+My old list of issues/features has been moved to the [Github issues section](https://github.com/michaelchadwick/gemwarrior/issues). Feel free to add any bugs you find while playing, or any requests for new features, over there.

data/bin/gemwarrior

@@ -9,42 +9,47 @@ GAME_NAME = 'Gem Warrior'
 
 def parse_options
   options = {
-    :debug_mode   => false, 
-    :god_mode     => false, 
-    :beast_mode   => false, 
-    :use_wordnik  => false, 
-    :sound        => false,
-    :new_game     => false
+    :beast_mode     => false, 
+    :debug_mode     => false, 
+    :god_mode       => false, 
+    :new_game       => false,
+    :sound          => false,
+    :use_wordnik    => false, 
+    :extra_command  => nil
   }
 
   optparse = OptionParser.new do |opts|
-    opts.on('-v', '--version', 'Display version number and exit') do
-      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
-      exit
+    opts.on('-b', '--beast', 'Enable debug[beastmode]') do
+      options[:beast_mode] = true
     end
 
-    opts.on('-d', '--debug', 'Turn debug on') do
+    opts.on('-d', '--debug', 'Enable debug commands in-game') do
       options[:debug_mode] = true
     end
 
-    opts.on('-g', '--god', 'Set godmode to true on load') do
+    opts.on('-g', '--god', 'Enable debug[godmode]') do
       options[:god_mode] = true
     end
 
-    opts.on('-b', '--beast', 'Set beastmode to true on load') do
-      options[:beast_mode] = true
+    opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
+      options[:new_game] = true
+    end
+    
+    opts.on('-s', '--sound', 'Enable sound (experimental)') do
+      options[:sound] = true
     end
 
-    opts.on('-w', '--wordnik', 'Use Wordnik to generate more diverse, dynamic descriptors of entities') do
-      options[:use_wordnik] = true
+    opts.on('-v', '--version', 'Display version number and exit') do
+      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
+      exit
     end
 
-    opts.on('-s', '--sound', 'Turn sound on') do
-      options[:sound] = true
+    opts.on('-w', '--wordnik', 'Enable Wordnik to generate more diverse, dynamic descriptors of entities') do
+      options[:use_wordnik] = true
     end
-    
-    opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
-      options[:new_game] = true
+
+    opts.on('-x', '--extra COMMAND', 'Run a command immediately upon beginning the game') do |xc|
+      options[:extra_command] = xc.to_s
     end
   end
 
@@ -65,7 +70,6 @@ end
 
 begin
   options = parse_options
-
   Gemwarrior::Game.new(options)
 rescue => error
   print_error(error)

data/lib/gemwarrior/entities/player.rb

@@ -75,9 +75,8 @@ module Gemwarrior
       else
         abilities = Formatting::upstyle(special_abilities.collect { |x| x.to_s }).join(', ')
       end
-
       self_text =  "NAME      : #{self.name}\n"
-      self_text << "POSITION  : #{self.cur_coords.values.to_a}\n"
+      self_text << "POSITION  : #{self.cur_coords.values.to_a}\n" if debug_mode
       self_text << "WEAPON    : #{weapon_slot}\n"
       self_text << "LEVEL     : #{self.level}\n"
       self_text << "EXPERIENCE: #{self.xp}\n"
@@ -91,9 +90,15 @@ module Gemwarrior
         self_text << "BEAST_MODE: #{self.beast_mode}\n"
       end
 
-      self_text << "\n#{self.description}\n\n"
+      self_text << "\n"
+
+      self_text << "[Your Story]\n#{self.description}"
 
-      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"
+      self_text << "\n\n"
+
+      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and feeling, generally, #{self.mood.colorize(:yellow)}."
+      
+      self_text << "\n"
     end
 
     def rest(world, tent_uses = nil, ensure_fight = false)

data/lib/gemwarrior/evaluator.rb

@@ -261,7 +261,8 @@ module Gemwarrior
       # normal commands
       case command
       when 'character', 'c'
-        world.player.check_self(world.debug_mode)
+        # bypass puts so it prints out with newlines properly
+        print world.player.check_self(world.debug_mode)
       when 'inventory', 'i'
         if param1
           world.player.inventory.describe_item(param1)

data/lib/gemwarrior/game.rb

@@ -39,6 +39,7 @@ module Gemwarrior
       world.use_wordnik     = options.fetch(:use_wordnik)
       world.sound           = options.fetch(:sound)
       world.new_game        = options.fetch(:new_game)
+      world.extra_command   = options.fetch(:extra_command)
 
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,
@@ -66,7 +67,7 @@ module Gemwarrior
       self.repl = Repl.new(world, eval)
 
       # enter Jool!
-      repl.start('look')
+      repl.start('look', world.extra_command)
     end
 
   end

data/lib/gemwarrior/repl.rb

@@ -30,8 +30,8 @@ module Gemwarrior
       self.eval   = evaluator
     end
 
-    def start(initialCommand = nil)
-      setup_screen(initialCommand)
+    def start(initial_command = nil, extra_command = nil)
+      setup_screen(initial_command, extra_command)
 
       clocker = Clocker.new
 
@@ -220,7 +220,7 @@ module Gemwarrior
       end
     end
 
-    def setup_screen(initialCommand = nil)
+    def setup_screen(initial_command = nil, extra_command = nil)
       # welcome player to game
       clear_screen
       print_logo
@@ -235,7 +235,8 @@ module Gemwarrior
       end
 
       # hook to do something right off the bat
-      puts eval.evaluate(initialCommand) unless initialCommand.nil?
+      puts eval.evaluate(initial_command) unless initial_command.nil?
+      puts eval.evaluate(extra_command) unless extra_command.nil?
     end
 
     def prompt

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.9.19'
+  VERSION = '0.9.20'
 end

data/lib/gemwarrior/world.rb

@@ -17,7 +17,8 @@ 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, :debug_mode, :use_wordnik, :sound, :new_game
+    attr_accessor :monsters, :locations, :player, 
+                  :debug_mode, :use_wordnik, :sound, :new_game, :extra_command
 
     def initialize
       self.monsters   = init_monsters
@@ -145,21 +146,21 @@ module Gemwarrior
 
     def describe(point)
       desc_text = ''
-      desc_text << "[ #{point.name} ]".colorize(:green)
+      desc_text << "[>>> #{point.name.upcase} <<<]".colorize(:cyan)
 
       if debug_mode
         desc_text << " DL[#{point.danger_level.to_s}] MLR[#{point.monster_level_range.to_s}]".colorize(:yellow)
       end
 
       desc_text << "\n"
-      desc_text << point.description
+      desc_text << point.description.colorize(:green)
 
       point.populate_monsters(self.monsters) unless point.checked_for_monsters?
 
-      desc_text << "\n >> Curious object(s): #{point.list_items.join(', ')}" unless point.list_items.empty?
-      desc_text << "\n >> Monster(s) abound: #{point.list_monsters.join(', ')}" unless point.list_monsters.empty?
-      desc_text << "\n >> Boss(es) abound: #{point.list_bosses.join(', ')}" unless point.list_bosses.empty?
-      desc_text << "\n >> Paths: #{point.list_paths.join(', ')}"
+      desc_text << "\n >> Monster(s): #{point.list_monsters.join(', ')}".colorize(:yellow) unless point.list_monsters.empty?
+      desc_text << "\n >> Boss(es):   #{point.list_bosses.join(', ')}".colorize(:red) unless point.list_bosses.empty?
+      desc_text << "\n >> Thing(s):   #{point.list_items.join(', ')}".colorize(:white) unless point.list_items.empty?
+      desc_text << "\n >> Path(s):    #{point.list_paths.join(', ')}".colorize(:white)
 
       if debug_mode
         desc_text << "\n >>> Actionable words: "

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -308,6 +308,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files:
-- spec/rubywarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []