gemwarrior 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbc1cea21340d6f201df93b5bedcec926abf6ba
-  data.tar.gz: 805f497d5ea72852d423db7ceb2d40fff0bc61f3
+  metadata.gz: 94628a3d356ed158ed51481416e444b112791db7
+  data.tar.gz: cdbdbba0955d78638e3e20cd37ad146465edf5ac
 SHA512:
-  metadata.gz: 0bcd871ce8cbd6ecec2f4e125b7d722df99f658484d507b28f125c6b167f51abce918250abdd9ce88e70d1c585150e6e0c9bc9853eaaec2b5474d1f6559a42ef
-  data.tar.gz: 3fbb5bb7ce1e33788a99d7a746618f65374d05351fbaf1deea3c0fd35cfdd0d60c8009c4f04792292cbfe69688677bca85c2e421715f23ed01c8ba6916f405e6
+  metadata.gz: 7eb29f7a90ec1d667a35a14a4a51ee77f9562601184ca2b1f9b27632b3493b26ac3f1265691cb463fadb4eb1882217525ceecca1bf7a36a06e7651610f3c2d11
+  data.tar.gz: eebf77c6e7c393394be3a430817b084169d6a53d900c590cb1b4ea474276408c813844434e04802dd72db7f5fbad33ed1d980222c15f6aec337f708e2676a46d

data/README.md

@@ -26,21 +26,21 @@ Run the commands above and you'll be whisked away to Jool, ready to start or con
 
 ## Main Commands
 
-`> c` - character check for visual identity  
-`> i  [object]` - check your inventory (or an individual item within)  
-`> 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  
-`> g  [direction]` - go in a direction, if possible  
-`> a  [monster]` - attack a monster  
-`> ch [attribute]` - change some things about yourself  
-`> h` - display available commands  
-`> q` - quit this nonsense w/ prompt  
-`> qq` - quit this nonsense w/o prompt  
+`> character` - character check for visual identity  
+`> inventory [object]` - check your inventory (or an individual item within)  
+`> rest` - take a load off and replenish hp  
+`> look      [object]` - look at current location and its items and monsters  
+`> take      [object]` - take an item from a location  
+`> use       [object]` - use an item from your inventory or current location  
+`> drop      [object]` - drop an item from your inventory  
+`> equip     [object]` - designate an item in your inventory your weapon  
+`> unequip   [object]` - stop using an item in your inventory as your weapon
+`> go        [direction]` - go in a direction, if possible (north|east|south|west work as shortcuts)
+`> attack    [monster]` - attack a monster  
+`> change    [attribute]` - change some things about yourself  
+`> help` - display available commands  
+`> quit` - quit this nonsense w/ prompt  
+`> quit!` - quit this nonsense w/o prompt  
 
 ## In Progress, Yanno
 

data/lib/gemwarrior/evaluator.rb

@@ -22,6 +22,7 @@ module Gemwarrior
     ERROR_LOOK_AT_PARAM_MISSING         = 'You cannot just "look at". You gotta choose something to look at.'
     ERROR_GO_PARAM_MISSING              = 'Just wander aimlessly? A direction would be nice.'
     ERROR_GO_PARAM_INVALID              = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
+    ERROR_DIRECTION_PARAM_INVALID       = 'You cannot go to that place.'
     ERROR_ATTACK_PARAM_MISSING          = 'You cannot just "attack". You gotta choose something to attack.'
     ERROR_ATTACK_PARAM_INVALID          = 'That monster does not exist here or can\'t be attacked.'
     ERROR_TAKE_PARAM_MISSING            = 'You cannot just "take". You gotta choose something to take.'
@@ -64,8 +65,8 @@ module Gemwarrior
         'Rest, but ensure battle for testing'
       ]
 
-      self.commands = %w(character inventory rest look take use drop equip unequip go attack change help quit quit!)
-      self.aliases = %w(c i r l t u d e ue g a ch h q qq)
+      self.commands = %w(character inventory rest look take use drop equip unequip go north east south west attack change help quit quit!)
+      self.aliases = %w(c i r l t u d eq ue g n e s w a ch h q qq)
       self.extras = %w(exit exit! x xx fight f)
       self.cmd_descriptions = [
         'Display character information',
@@ -78,6 +79,10 @@ module Gemwarrior
         'Equip item',
         'Unequip item',
         'Go in a direction',
+        'Go north (shortcut)',
+        'Go east (shortcut)',
+        'Go south (shortcut)',
+        'Go west (shortcut)',
         'Attack a monster',
         'Change something',
         'This help menu',
@@ -436,7 +441,7 @@ module Gemwarrior
         else
           world.player.inventory.drop_item(param1)
         end  
-      when 'equip', 'e'
+      when 'equip', 'eq'
         if param1.nil?
           ERROR_EQUIP_PARAM_MISSING
         else
@@ -454,13 +459,31 @@ module Gemwarrior
           GO_PARAMS
         else
           direction = param1
-          if world.can_move?(direction)
-            world.player.go(world.locations, param1, world.sound)
-            world.location_by_coords(world.player.cur_coords).checked_for_monsters = false
-            world.describe(world.location_by_coords(world.player.cur_coords))
-          else
-            ERROR_GO_PARAM_INVALID
-          end
+          try_to_move_player(direction)
+        end
+      when 'n'
+        if param1
+          ERROR_DIRECTION_PARAM_INVALID
+        else
+          try_to_move_player('north')
+        end
+      when 'e'
+        if param1
+          ERROR_DIRECTION_PARAM_INVALID
+        else
+          try_to_move_player('east')
+        end
+      when 's'
+        if param1
+          ERROR_DIRECTION_PARAM_INVALID
+        else
+          try_to_move_player('south')
+        end
+      when 'w'
+        if param1
+          ERROR_DIRECTION_PARAM_INVALID
+        else
+          try_to_move_player('west')
         end
       when 'attack', 'a', 'fight', 'f'
         if param1.nil?
@@ -511,6 +534,16 @@ module Gemwarrior
 
     private
 
+    def try_to_move_player(direction)
+      if world.can_move?(direction)
+        world.player.go(world.locations, direction, world.sound)
+        world.location_by_coords(world.player.cur_coords).checked_for_monsters = false
+        world.describe(world.location_by_coords(world.player.cur_coords))
+      else
+        return ERROR_GO_PARAM_INVALID
+      end
+    end
+
     def player_death_resurrection
       puts 'Somehow, though, your adventure does not end here. Instead, you are whisked back home via some magical force, a bit worse for the weary and somewhat poorer, but ALIVE!'.colorize(:yellow)
       world.player.hp_cur = 1

data/lib/gemwarrior/version.rb

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

metadata

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