gemwarrior 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d78c5c7f253648b1a60c476360477a02c301ac
-  data.tar.gz: 3e3a6d4bf69a3d9e97326a5e9436233fc4211a09
+  metadata.gz: 5f01219fe323d1a74d0205758b61084bbea01e4e
+  data.tar.gz: 1dc551158da4ddcb6737c7daa15c33e151eaf5a3
 SHA512:
-  metadata.gz: 37567688543f4b502781c1e8178269428031240afb4a9217b50e6f68c4475838a8b6b81c3f7365bbee5170aafc2f78d7c3986af6b7229137ffb267c99707808d
-  data.tar.gz: fc5d9729554cb7464e68e159c81e2cf288438949d43d20271d8ff9dc8086ec1d09be5a62a9a2baa43616d19e7f4ed1c6cbcf1bd3eab03249b327ed6399e50dfb
+  metadata.gz: 0099d78162db97ca70e0fc6760f103ee720667262a763c5a294d1c1fb505b2ac26827601673304c7eadb72674a1e2b28a0e5f0f0a1b4fdf77ca87aa22e962922
+  data.tar.gz: a9a84abd388aca04244c7afd9d558ac27ba460b4d2ba62505e12f1df3936791108e15d7f67aef06aaf9ebd1f6ec3dfa33a4a11bb870b4f4e5a1499e3ad74632c

data/README.md

@@ -1,50 +1,55 @@
-```
-/-+-+-+ +-+-+-+-+-+-+-\
-|G|E|M| |W|A|R|R|I|O|R|
-\-+-+-+ +-+-+-+-+-+-+-/
-```
-<small>logo courtesy of [ascii generator](http://www.network-science.de/ascii/)</small>
-
-**Gem Warrior** is a text adventure that takes place in the land of **Jool**, where randomized fortune is just as likely as *mayhem*.
-
-You take up the mantle of **1.upto(rand(5..10)) {print rand(65..90).chr}**, a gifted young acolyte who has been tasked by the queen herself, **Ruby**, to venture off into the unknown to recapture a **Shiny Thing<sup>tm</sup>** that holds great power within its crystallized boundaries. Unfortunately, it was stolen recently by a crazed madperson named **Emerald**, bent on using its frightening power for **Evil**. You are **Good**, obviously, and the rightful caretaker of such power, but he will not give it up willingly, and has cursed all the creatures of the land into doing his bidding, which is largely tearing you limb from limb.
-
-Start in your poor, super lame cottage, where you live alone, subsisting off the sale of polished rocks you scavenge all day for in the neighboring caves. Once tasked with your quest, travel throughout the land of Jool, eventually reaching the sky tower that Emerald resides in with his stolen goods, laughing to himself, occasionally.
-
-As you travel you will discover sights and sounds of the land, all of which are new to you because you don't really get out much. Visit towns with merchants willing to trade coin for wares they bought off of other adventurers who didn't last the previous attempts at thwartion. Sleep in makeshift huts to regain your health and magic points (or the ground, if that's all that's available), which are conveniently located in your peripheral vision (i.e. the console window). Eventually, if you're skilled (and I actually code it in), you'll reach **Emerald's Sky Tower**, part him from his **ShinyThing<sup>tm</sup>**, and then do what is "right".
-
-## How to Get to Jool
-
-1. `gem install gemwarrior`  
-2. `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...?).
-
-## 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`.
-
-`> c` - character check for visual identity  
-`> i [object]` - check your inventory (or an individual item within)  
-`> r` - take a load off  
-`> l [object]` - look at current location and items  
-`> t [object]` - take an item from a location  
-`> 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  
-`> ch [attribute]` - change some things about yourself  
-`> q` - quit this nonsense  
-
-To come:
-
-* ~~Ability to move between locations!~~
-* More locations to move between!
-* Monsters!
-* Ability to fight those monsters!
-* ~~Items you can pick up!~~
-* Quests!
-* Towns!
-* Merchants!
-* Sound FX!
-* Music!
-* Epic Length (whereby "Epic" I mean "maybe 30 minutes"?)!
+```
+/-+-+-+ +-+-+-+-+-+-+-\
+|G|E|M| |W|A|R|R|I|O|R|
+\-+-+-+ +-+-+-+-+-+-+-/
+```
+<small>logo courtesy of [ascii generator](http://www.network-science.de/ascii/)</small>
+
+[![Gem Version](https://badge.fury.io/rb/gemwarrior.svg)](http://badge.fury.io/rb/gemwarrior)
+
+**Gem Warrior** is a text adventure that takes place in the land of **Jool**, where randomized fortune is just as likely as *mayhem*.
+
+You take up the mantle of **1.upto(rand(5..10)) {print rand(65..90).chr}**, a gifted young acolyte who has been tasked by the queen herself, **Ruby**, to venture off into the unknown to recapture a **Shiny Thing<sup>tm</sup>** that holds great power within its crystallized boundaries. Unfortunately, it was stolen recently by a crazed madperson named **Emerald**, bent on using its frightening power for **Evil**. You are **Good**, obviously, and the rightful caretaker of such power, but he will not give it up willingly, and has cursed all the creatures of the land into doing his bidding, which is largely tearing you limb from limb.
+
+Start in your poor, super lame cottage, where you live alone, subsisting off the sale of polished rocks you scavenge all day for in the neighboring caves. Once tasked with your quest, travel throughout the land of Jool, eventually reaching the sky tower that Emerald resides in with his stolen goods, laughing to himself, occasionally.
+
+As you travel you will discover sights and sounds of the land, all of which are new to you because you don't really get out much. Visit towns with merchants willing to trade coin for wares they bought off of other adventurers who didn't last the previous attempts at thwartion. Sleep in makeshift huts to regain your health and magic points (or the ground, if that's all that's available), which are conveniently located in your peripheral vision (i.e. the console window). Eventually, if you're skilled (and I actually code it in), you'll reach **Emerald's Sky Tower**, part him from his **ShinyThing<sup>tm</sup>**, and then do what is "right".
+
+## How to Get to Jool
+
+1. `gem install gemwarrior`  
+2. `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...?).
+
+## 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`.
+
+`> c` - character check for visual identity  
+`> 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  
+`> t [object]` - take an item from a location  
+`> e [object]` - equip an item in your inventory as a weapon
+`> a [monster]` - attack a monster
+`> 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  
+`> ch [attribute]` - change some things about yourself  
+`> q` - quit this nonsense  
+
+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!
+* Merchants!
+* Sound FX!
+* Music!
+* Epic Length (whereby "Epic" I mean "maybe 30 minutes"?)!

data/lib/gemwarrior/defaults.rb

@@ -4,100 +4,134 @@
 module Gemwarrior
   module Entities
     module Monsters
-      MOB_ID_ALEXANDRAT = 0
-      MOB_NAME_ALEXANDRAT = 'Alexandrat'
-      MOB_DESC_ALEXANDRAT = 'Tiny, but fierce, color-changing rodent.'
-      MOB_LEVEL_ALEXANDRAT = 1
+      MOB_ID_ALEXANDRAT         = 0
+      MOB_NAME_ALEXANDRAT       = 'alexandrat'
+      MOB_DESC_ALEXANDRAT       = 'Tiny, but fierce, color-changing rodent.'
+      MOB_LEVEL_ALEXANDRAT      = 1
+      MOB_DEXTERITY_ALEXANDRAT  = 4
+      MOB_BATTLECRY_ALEXANDRAT  = 'Bitey, bitey!'
       
-      MOB_ID_AMBEROO = 1
-      MOB_NAME_AMBEROO = 'Amberoo'
-      MOB_DESC_AMBEROO = 'Fossilized and jumping around like an adorably dangerous threat from the past.'
-      MOB_LEVEL_AMBEROO = 1
+      MOB_ID_AMBEROO            = 1
+      MOB_NAME_AMBEROO          = 'amberoo'
+      MOB_DESC_AMBEROO          = 'Fossilized and jumping around like an adorably dangerous threat from the past.'
+      MOB_LEVEL_AMBEROO         = 1
+      MOB_DEXTERITY_AMBEROO     = 5
+      MOB_BATTLECRY_AMBEROO     = 'I\'m hoppin\' mad!'
       
-      MOB_ID_AMETHYSTLE = 2
-      MOB_NAME_AMETHYSTLE = 'Amethystle'
-      MOB_DESC_AMETHYSTLE = 'Sober and contemplative, it moves with purplish tentacles swaying in the breeze.'
-      MOB_LEVEL_AMETHYSTLE = 2
+      MOB_ID_AMETHYSTLE         = 2
+      MOB_NAME_AMETHYSTLE       = 'amethystle'
+      MOB_DESC_AMETHYSTLE       = 'Sober and contemplative, it moves with purplish tentacles swaying in the breeze.'
+      MOB_LEVEL_AMETHYSTLE      = 2
+      MOB_DEXTERITY_AMETHYSTLE  = 1
+      MOB_BATTLECRY_AMETHYSTLE  = 'You\'ve found yourself in quite the thorny issue!'
       
-      MOB_ID_AQUAMARINE = 3
-      MOB_NAME_AQUAMARINE = 'Aquamarine'
-      MOB_DESC_AQUAMARINE = 'It is but one of the few, the proud, the underwater.'
-      MOB_LEVEL_AQUAMARINE = 3
+      MOB_ID_AQUAMARINE         = 3
+      MOB_NAME_AQUAMARINE       = 'aquamarine'
+      MOB_DESC_AQUAMARINE       = 'It is but one of the few, the proud, the underwater.'
+      MOB_LEVEL_AQUAMARINE      = 3
+      MOB_DEXTERITY_AQUAMARINE  = 6
+      MOB_BATTLECRY_AQUAMARINE  = 'Attention! You are about to get smashed!'
       
-      MOB_ID_APATIGER = 4
-      MOB_NAME_APATIGER = 'Apatiger'
-      MOB_DESC_APATIGER = 'Apathetic about most everything as it lazes around, save for eating you.'
-      MOB_LEVEL_APATIGER = 4
+      MOB_ID_APATIGER           = 4
+      MOB_NAME_APATIGER         = 'apatiger'
+      MOB_DESC_APATIGER         = 'Apathetic about most everything as it lazes around, save for eating you.'
+      MOB_LEVEL_APATIGER        = 4
+      MOB_DEXTERITY_APATIGER    = 5
+      MOB_BATTLECRY_APATIGER    = 'Gggggggggrrrrrrrrrrrrrrrrooooooooooowwwwwwwwwwwwlllllllll!'
       
-      MOB_ID_BLOODSTORM = 5
-      MOB_NAME_BLOODSTORM = 'Bloodstorm'
-      MOB_DESC_BLOODSTORM = 'A literal swirling, maniacal vortex of human hemoglobin.'
-      MOB_LEVEL_BLOODSTORM = 5
+      MOB_ID_BLOODSTORM         = 5
+      MOB_NAME_BLOODSTORM       = 'bloodstorm'
+      MOB_DESC_BLOODSTORM       = 'A literal swirling, maniacal vortex of human hemoglobin.'
+      MOB_LEVEL_BLOODSTORM      = 5
+      MOB_DEXTERITY_BLOODSTORM  = 7
+      MOB_BATTLECRY_BLOODSTORM  = '/swirls'
       
-      MOB_ID_CITRINAGA = 6
-      MOB_NAME_CITRINAGA = 'Citrinaga'
-      MOB_DESC_CITRINAGA = 'Refreshing in its shiny, gleaming effectiveness at ending your life.'
-      MOB_LEVEL_CITRINAGA = 4
+      MOB_ID_CITRINAGA          = 6
+      MOB_NAME_CITRINAGA        = 'citrinaga'
+      MOB_DESC_CITRINAGA        = 'Refreshing in its shiny, gleaming effectiveness at ending your life.'
+      MOB_LEVEL_CITRINAGA       = 4
+      MOB_DEXTERITY_CITRINAGA   = 3
+      MOB_BATTLECRY_CITRINAGA   = 'Slice and dice so nice!'
       
-      MOB_ID_CORALIZ = 7
-      MOB_NAME_CORALIZ = 'Coraliz'
-      MOB_DESC_CORALIZ = 'Small blue lizard that slithers around, nipping at your ankles.'
-      MOB_LEVEL_CORALIZ = 3
+      MOB_ID_CORALIZ            = 7
+      MOB_NAME_CORALIZ          = 'coraliz'
+      MOB_DESC_CORALIZ          = 'Small blue lizard that slithers around, nipping at your ankles.'
+      MOB_LEVEL_CORALIZ         = 3
+      MOB_DEXTERITY_CORALIZ     = 6
+      MOB_BATTLECRY_CORALIZ     = 'Where am I? You\'ll never guess!'
       
-      MOB_ID_CUBICAT = 8
-      MOB_NAME_CUBICAT = 'Cubicat'
-      MOB_DESC_CUBICAT = 'Perfectly geometrically cubed feline, fresh from its woven enclosure, claws at the ready.'
-      MOB_LEVEL_CUBICAT = 4
+      MOB_ID_CUBICAT            = 8
+      MOB_NAME_CUBICAT          = 'cubicat'
+      MOB_DESC_CUBICAT          = 'Perfectly geometrically cubed feline, fresh from its woven enclosure, claws at the ready.'
+      MOB_LEVEL_CUBICAT         = 4
+      MOB_DEXTERITY_CUBICAT     = 6
+      MOB_BATTLECRY_CUBICAT     = 'I don\'t really care, as long as you die!'
       
-      MOB_ID_DIAMAN = 9
-      MOB_NAME_DIAMAN = 'Diaman'
-      MOB_DESC_DIAMAN = 'Crystalline structure in the form of a man, lumbering toward you, with outstretched, edged pincers.'
-      MOB_LEVEL_DIAMAN = 6
+      MOB_ID_DIAMAN             = 9
+      MOB_NAME_DIAMAN           = 'diaman'
+      MOB_DESC_DIAMAN           = 'Crystalline structure in the form of a man, lumbering toward you, with outstretched, edged pincers.'
+      MOB_LEVEL_DIAMAN          = 6
+      MOB_DEXTERITY_DIAMAN      = 10
+      MOB_BATTLECRY_DIAMAN      = 'Precious human, prepare to be lost to the annals of time!'
     end
 
     module Items
-      ITEM_ID_STONE = 0
-      ITEM_NAME_STONE = 'stone'
-      ITEM_DESC_STONE = 'A small, sharp mega pebble, suitable for tossing in amusement, and perhaps combat.'
-      ITEM_ID_BED = 1
-      ITEM_NAME_BED = 'bed'
-      ITEM_DESC_BED = 'The place where you sleep when you\'re not adventuring.'
-      ITEM_ID_STALACTITE = 2
-      ITEM_NAME_STALACTITE = 'stalactite'
-      ITEM_DESC_STALACTITE = 'Long protrusion of cave adornment, broken off and fallen to the ground, where the stalagmites sneer at it from.'
-      ITEM_ID_FEATHER = 3
-      ITEM_NAME_FEATHER = 'feather'
-      ITEM_DESC_FEATHER = 'Soft and tender, unlike the craven bird that probably shed it.'
-      ITEM_ID_GUN = 4
-      ITEM_NAME_GUN = 'gun'
-      ITEM_DESC_GUN = 'Pew pew goes this firearm, you suspect.'
+      ITEM_ID_STONE                 = 0
+      ITEM_NAME_STONE               = 'stone'
+      ITEM_DESC_STONE               = 'A small, sharp mega pebble, suitable for tossing in amusement, and perhaps combat.'
+      ITEM_ATK_LO_STONE             = 1
+      ITEM_ATK_HI_STONE             = 3
+      
+      ITEM_ID_BED                   = 1
+      ITEM_NAME_BED                 = 'bed'
+      ITEM_DESC_BED                 = 'The place where you sleep when you\'re not adventuring.'
+      ITEM_ATK_LO_BED               = nil
+      ITEM_ATK_HI_BED               = nil
+      
+      ITEM_ID_STALACTITE            = 2
+      ITEM_NAME_STALACTITE          = 'stalactite'
+      ITEM_DESC_STALACTITE          = 'Long protrusion of cave adornment, broken off and fallen to the ground, where the stalagmites sneer at it from.'
+      ITEM_ATK_LO_STALACTITE        = 1
+      ITEM_ATK_HI_STALACTITE        = 3
+      
+      ITEM_ID_FEATHER               = 3
+      ITEM_NAME_FEATHER             = 'feather'
+      ITEM_DESC_FEATHER             = 'Soft and tender, unlike the craven bird that probably shed it.'
+      ITEM_ATK_LO_FEATHER           = nil
+      ITEM_ATK_HI_FEATHER           = nil
+      
+      ITEM_ID_GUN                   = 4
+      ITEM_NAME_GUN                 = 'gun'
+      ITEM_DESC_GUN                 = 'Pew pew goes this firearm, you suspect.'
+      ITEM_ATK_LO_GUN               = 3
+      ITEM_ATK_HI_GUN               = 5
     end
 
     module Locations
-      LOC_ID_HOME = 0
-      LOC_NAME_HOME = 'Home'
-      LOC_DESC_HOME = 'The little, unimportant, decrepit hut that you live in.'
-      LOC_CONNECTIONS_HOME = {:north => 4, :east => 1, :south => nil, :west => 3}
+      LOC_ID_HOME                   = 0
+      LOC_NAME_HOME                 = 'Home'
+      LOC_DESC_HOME                 = 'The little, unimportant, decrepit hut that you live in.'
+      LOC_CONNECTIONS_HOME          = {:north => 4, :east => 1, :south => nil, :west => 3}
     
-      LOC_ID_CAVE_ENTRANCE = 1
-      LOC_NAME_CAVE_ENTRANCE = 'Cave (Entrance)'
-      LOC_DESC_CAVE_ENTRANCE = 'A nearby, dank cavern\'s entrance, surely filled with stacktites, stonemites, and rocksites.'
+      LOC_ID_CAVE_ENTRANCE          = 1
+      LOC_NAME_CAVE_ENTRANCE        = 'Cave (Entrance)'
+      LOC_DESC_CAVE_ENTRANCE        = 'A nearby, dank cavern\'s entrance, surely filled with stacktites, stonemites, and rocksites.'
       LOC_CONNECTIONS_CAVE_ENTRANCE = {:north => nil, :east => 2, :south => nil, :west => 0}
       
-      LOC_ID_CAVE_ROOM1 = 2
-      LOC_NAME_CAVE_ROOM1 = 'Cave (Room1)'
-      LOC_DESC_CAVE_ROOM1 = 'Now inside the first cavernous room, you confirm that there are stacktites, stonemites, rocksites, and even one or two pebblejites.'
-      LOC_CONNECTIONS_CAVE_ROOM1 = {:north => nil, :east => nil, :south => nil, :west => 1}
+      LOC_ID_CAVE_ROOM1             = 2
+      LOC_NAME_CAVE_ROOM1           = 'Cave (Room1)'
+      LOC_DESC_CAVE_ROOM1           = 'Now inside the first cavernous room, you confirm that there are stacktites, stonemites, rocksites, and even one or two pebblejites.'
+      LOC_CONNECTIONS_CAVE_ROOM1    = {:north => nil, :east => nil, :south => nil, :west => 1}
   
-      LOC_ID_FOREST = 3
-      LOC_NAME_FOREST = 'Forest'
-      LOC_DESC_FOREST = 'Trees exist here, in droves.'
-      LOC_CONNECTIONS_FOREST = {:north => nil, :east => 0, :south => nil, :west => nil}
+      LOC_ID_FOREST                 = 3
+      LOC_NAME_FOREST               = 'Forest'
+      LOC_DESC_FOREST               = 'Trees exist here, in droves.'
+      LOC_CONNECTIONS_FOREST        = {:north => nil, :east => 0, :south => nil, :west => nil}
   
-      LOC_ID_SKYTOWER = 4
-      LOC_NAME_SKYTOWER = 'Emerald\'s Sky Tower'
-      LOC_DESC_SKYTOWER = 'The craziest guy that ever existed is around here somewhere amongst the cloud floors, snow walls, and ethereal vibe.'
-      LOC_CONNECTIONS_SKYTOWER = {:north => nil, :east => nil, :south => 0, :west => nil}
+      LOC_ID_SKYTOWER               = 4
+      LOC_NAME_SKYTOWER             = 'Emerald\'s Sky Tower'
+      LOC_DESC_SKYTOWER             = 'The craziest guy that ever existed is around here somewhere amongst the cloud floors, snow walls, and ethereal vibe.'
+      LOC_CONNECTIONS_SKYTOWER      = {:north => nil, :east => nil, :south => 0, :west => nil}
     end
   end
 end

data/lib/gemwarrior/evaluator.rb

@@ -14,20 +14,23 @@ module Gemwarrior
     CHANGE_PARAMS  = 'Options: name'
     
     ## ERRORS
-    ERROR_COMMAND_INVALID      = 'That\'s not something the game yet understands.'
-    ERROR_LIST_PARAM_MISSING   = 'You can\'t just "list". You gotta choose something to list.'
-    ERROR_CHANGE_PARAM_MISSING = 'Ch-ch-changes...aren\'t happening because you didn\'t specify what to change.'
-    ERROR_CHANGE_PARAM_INVALID = 'You can\'t change that...yet.'
-    ERROR_GO_PARAM_MISSING     = 'Just wander aimlessly? A direction would be nice.'
-    ERROR_TAKE_PARAM_MISSING   = 'You can\'t just "take". You gotta choose something to take.'
-    ERROR_DROP_PARAM_MISSING   = 'You can\'t just "drop". You gotta choose something to drop.'
+    ERROR_COMMAND_INVALID       = 'That\'s not something the game yet understands.'
+    ERROR_LIST_PARAM_MISSING    = 'You can\'t just "list". You gotta choose something to list.'
+    ERROR_CHANGE_PARAM_MISSING  = 'Ch-ch-changes...aren\'t happening because you didn\'t specify what to change.'
+    ERROR_CHANGE_PARAM_INVALID  = 'You can\'t change that...yet.'
+    ERROR_GO_PARAM_MISSING      = 'Just wander aimlessly? A direction would be nice.'
+    ERROR_ATTACK_PARAM_MISSING  = 'You can\'t just "attack". You gotta choose something to attack.'
+    ERROR_TAKE_PARAM_MISSING    = 'You can\'t just "take". You gotta choose something to take.'
+    ERROR_DROP_PARAM_MISSING    = 'You can\'t just "drop". You gotta choose something to drop.'
+    ERROR_EQUIP_PARAM_MISSING   = 'You can\'t just "equip". You gotta choose something to equip.'
+    ERROR_UNEQUIP_PARAM_MISSING = 'You can\'t just "unequip". You gotta choose something to unequip.'
     
     attr_accessor :world, :commands, :aliases, :descriptions
     
     def initialize(world)
       self.world = world
-      self.commands = %w(character inventory list rest look take drop go change help quit exit quit! exit!)
-      self.aliases = %w(c i ls r l t d g ch h q x qq xx)
+      self.commands = %w(character inventory list rest look take drop equip unequip go attack change help quit exit quit! exit!)
+      self.aliases = %w(c i ls r l t d e ue g a ch h q x qq xx)
       self.descriptions = [
         'Display character information',
         'Look in your inventory',
@@ -36,7 +39,10 @@ module Gemwarrior
         'Look around your current location',
         'Take item',
         'Drop item',
+        'Equip item',
+        'Unequip item',
         'Go in a direction',
+        'Attack a monster',
         'Change something',
         'This help menu',
         'Quit w/ confirmation',
@@ -95,12 +101,30 @@ module Gemwarrior
         else
           world.player.inventory.remove_item(param)
         end  
+      when 'equip', 'e'
+        if param.nil?
+          ERROR_EQUIP_PARAM_MISSING
+        else
+          world.player.inventory.equip_item(param)
+        end
+      when 'unequip', 'ue'
+        if param.nil?
+          ERROR_UNEQUIP_PARAM_MISSING
+        else
+          world.player.inventory.unequip_item(param)
+        end
       when 'go', 'g'
         if param.nil?
           ERROR_GO_PARAM_MISSING
         else
           world.player.go(world.locations, param)
         end
+      when 'attack', 'a'
+        if param.nil?
+          ERROR_ATTACK_PARAM_MISSING
+        else
+          world.player.attack(param)
+        end
       when 'change', 'ch'
         if param.nil?
           puts ERROR_CHANGE_PARAM_MISSING

data/lib/gemwarrior/game.rb

@@ -11,15 +11,19 @@ module Gemwarrior
   class Game
     # CONSTANTS
     ## PLAYER DEFAULTS
-    PLYR_LEVEL_DEFAULT = 1
-    PLYR_XP_DEFAULT = 0
-    PLYR_HP_CUR_DEFAULT = 10
-    PLYR_HP_MAX_DEFAULT = 10
-    PLYR_STAM_CUR_DEFAULT = 20
-    PLYR_STAM_MAX_DEFAULT = 20
-    PLYR_ATK_LO_DEFAULT = 1
-    PLYR_ATK_HI_DEFAULT = 2
-    PLYR_ROX_DEFAULT = 0
+    PLYR_LEVEL_DEFAULT      = 1
+    PLYR_XP_DEFAULT         = 0
+    PLYR_HP_CUR_DEFAULT     = 10
+    PLYR_HP_MAX_DEFAULT     = 10
+    PLYR_STAM_CUR_DEFAULT   = 20
+    PLYR_STAM_MAX_DEFAULT   = 20
+    PLYR_ATK_LO_DEFAULT     = 1
+    PLYR_ATK_HI_DEFAULT     = 2
+    PLYR_DEFENSE_DEFAULT    = 5
+    PLYR_DEXTERITY_DEFAULT  = 5
+    PLYR_INVENTORY_DEFAULT  = Inventory.new
+    PLYR_ROX_DEFAULT        = 0
+    PLYR_CUR_LOC_ID_DEFAULT = 0
 
     attr_accessor :world, :eval, :repl
     
@@ -35,9 +39,11 @@ module Gemwarrior
         PLYR_STAM_MAX_DEFAULT,
         PLYR_ATK_LO_DEFAULT,
         PLYR_ATK_HI_DEFAULT,
-        Inventory.new,
+        PLYR_DEFENSE_DEFAULT,
+        PLYR_DEXTERITY_DEFAULT,
+        PLYR_INVENTORY_DEFAULT,
         PLYR_ROX_DEFAULT,
-        world.loc_by_id(0)
+        world.loc_by_id(PLYR_CUR_LOC_ID_DEFAULT)
       )
 
       # create the console

data/lib/gemwarrior/inventory.rb

@@ -5,16 +5,21 @@ module Gemwarrior
   class Inventory
     # CONSTANTS
     ## ERRORS
-    ERROR_INVENTORY_EMPTY       = '...and find you currently have diddly-squat, which is nothing.'
-    ERROR_ITEM_REMOVE_INVALID   = 'Your inventory does not contain that item, so you can\'t drop it.'
-    ERROR_ITEM_ADD_UNTAKEABLE   = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
-    ERROR_ITEM_ADD_INVALID      = 'That item doesn\'t exist here.'
-    ERROR_ITEM_DESCRIBE_INVALID = 'You don\'t possess that.'
+    ERROR_INVENTORY_EMPTY         = '...and find you currently have diddly-squat, which is nothing.'
+    ERROR_ITEM_REMOVE_INVALID     = 'Your inventory does not contain that item, so you can\'t drop it.'
+    ERROR_ITEM_ADD_UNTAKEABLE     = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
+    ERROR_ITEM_ADD_INVALID        = 'That item doesn\'t exist here.'
+    ERROR_ITEM_DESCRIBE_INVALID   = 'You don\'t possess that.'
+    ERROR_ITEM_EQUIP_INVALID      = 'You don\'t have anything called that to equip.'
+    ERROR_ITEM_EQUIP_NONWEAPON    = 'That can\'t be equipped as a weapon.'
+    ERROR_ITEM_UNEQUIP_INVALID    = 'You don\'t have anything called that to unequip.'
+    ERROR_ITEM_UNEQUIP_NONWEAPON  = 'That can\'t be unequipped.'
     
-    attr_accessor :inventory
+    attr_accessor :inventory, :weapon
     
-    def initialize(inventory = [])
+    def initialize(inventory = [], weapon = nil)
       self.inventory = inventory
+      self.weapon = weapon
     end
     
     def list_contents
@@ -22,7 +27,7 @@ module Gemwarrior
       if inventory.empty?
         return contents_text << ERROR_INVENTORY_EMPTY
       else
-        return contents_text << ": #{inventory.map(&:name).join ', '}"
+        return contents_text << ": #{inventory.map(&:name).join ', '}\n"
       end
     end
     
@@ -37,7 +42,43 @@ module Gemwarrior
         ERROR_ITEM_DESCRIBE_INVALID
       end
     end
-        
+    
+    def equip_item(item_name)
+      if inventory.map(&:name).include?(item_name)
+        inventory.each do |i|
+          if i.name.eql?(item_name)
+            if i.equippable
+              i.equipped = true
+              self.weapon = i
+              return "#{i.name} has been equipped"
+            else
+              ERROR_ITEM_EQUIP_NONWEAPON
+            end
+          end
+        end
+      else
+        ERROR_ITEM_EQUIP_INVALID
+      end
+    end
+    
+    def unequip_item(item_name)
+      if inventory.map(&:name).include?(item_name)
+        inventory.each do |i|
+          if i.name.eql?(item_name)
+            if i.equippable
+              i.equipped = false
+              self.weapon = nil
+              return "#{i.name} has been unequipped"
+            else
+              ERROR_ITEM_UNEQUIP_NONWEAPON
+            end
+          end
+        end
+      else
+        ERROR_ITEM_UNEQUIP_INVALID
+      end
+    end
+    
     def add_item(cur_loc, item_name)
       cur_loc.items.each do |i|
         if i.name.eql?(item_name)

data/lib/gemwarrior/item.rb

@@ -3,22 +3,28 @@
 
 module Gemwarrior
   class Item
-    attr_accessor :id, :name, :description, :takeable
+    attr_accessor :id, :name, :description, 
+                  :atk_lo, :atk_hi, :takeable, :equippable, :equipped
     
     def initialize(
       id, 
       name, 
       description,
-      takeable
+      atk_lo,
+      atk_hi,
+      takeable,
+      equippable, 
+      equipped = false
     )
       self.id = id
       self.name = name
       self.description = description
+      self.atk_lo = atk_lo
+      self.atk_hi = atk_hi
       self.takeable = takeable
+      self.equippable = equippable
+      self.equipped = equipped
     end
-    
-    def is_takeable?
-      takeable
-    end
+
   end
 end

data/lib/gemwarrior/location.rb

@@ -74,10 +74,28 @@ module Gemwarrior
       end
     end
 
+    def remove_monster(name)
+      if has_monster_to_attack?(name)
+        monsters_abounding.reject! { |monster| monster.name == name }
+      end
+    end
+    
     def has_loc_to_the?(direction)
       locs_connected[direction.to_sym]
     end
 
+    def has_monster_to_attack?(name)
+      monsters_abounding.map(&:name).include?(name.downcase)
+    end
+    
+    def monster_by_name(name)
+      monsters_abounding.each do |m|
+        if m.name.eql?(name)
+          return m
+        end
+      end
+    end
+    
     private
     
     def checked_for_monsters?
@@ -117,7 +135,7 @@ module Gemwarrior
     end
   
     def populate_monsters
-      checked_for_monsters = true
+      self.checked_for_monsters = true
       if has_monster?
         self.monsters_abounding = []
         return monsters_abounding.push(monsters_available[rand(0..monsters_available.length-1)])

data/lib/gemwarrior/monster.rb

@@ -5,7 +5,7 @@ require_relative 'creature'
 
 module Gemwarrior
   class Monster < Creature
-    attr_accessor :xp, :atk_hi, :atk_lo, :rox
+    attr_accessor :xp, :atk_hi, :atk_lo, :dexterity, :rox, :xp_to_give, :battlecry
   
     def initialize(
       id, 
@@ -19,8 +19,11 @@ module Gemwarrior
       hp_max, 
       atk_lo, 
       atk_hi, 
+      dexterity,
       inventory, 
-      rox
+      rox,
+      xp_to_give,
+      battlecry
     )
       self.id = id
       self.name = name
@@ -35,9 +38,17 @@ module Gemwarrior
       
       self.atk_lo = atk_lo
       self.atk_hi = atk_hi
+      self.dexterity = dexterity
       
       self.inventory = inventory
       self.rox = rox
+      self.xp_to_give = xp_to_give
+      
+      self.battlecry = battlecry
+    end
+    
+    def take_damage(dmg)
+      self.hp_cur = hp_cur.to_i - dmg.to_i
     end
 
   end

data/lib/gemwarrior/player.rb

@@ -19,9 +19,12 @@ module Gemwarrior
     PLYR_DESC_DEFAULT = 'Picked to do battle against a wizened madman for a shiny something or other for world-saving purposes, you\'re actually fairly able, as long as you\'ve had breakfast first.'
     
     ## ERRORS
-    ERROR_GO_PARAM_INVALID = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
+    ERROR_GO_PARAM_INVALID      = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
+    ERROR_ATTACK_PARAM_INVALID  = 'That monster doesn\'t exist here or can\'t be attacked.'
+    ERROR_ATTACK_OPTION_INVALID = 'That won\'t do anything against the monster.'
     
-    attr_accessor :xp, :stam_cur, :stam_max, :atk_hi, :atk_lo, :rox, :cur_loc
+    attr_accessor :xp, :stam_cur, :stam_max, :atk_hi, :atk_lo, 
+                  :defense, :dexterity, :rox, :cur_loc
     
     def initialize(
       level, 
@@ -32,6 +35,8 @@ module Gemwarrior
       stam_max, 
       atk_lo, 
       atk_hi, 
+      defense,
+      dexterity,  
       inventory, 
       rox, 
       cur_loc
@@ -48,7 +53,9 @@ module Gemwarrior
       
       self.atk_lo = atk_lo
       self.atk_hi = atk_hi
-      
+      self.defense = defense
+      self.dexterity = dexterity
+
       self.inventory = inventory
       self.rox = rox
       
@@ -57,7 +64,25 @@ module Gemwarrior
 
     def check_self
       print_char_pic
-      return "You check yourself. Currently breathing, wearing clothing, and with a few specific characteristics: face is #{@face}, hands are #{@hands}, and general mood is #{@mood}.\n"
+      
+      cur_weapon_name = ''
+      if inventory.weapon.nil?
+        cur_weapon_name = '(unarmed)'
+      else
+        cur_weapon_name = inventory.weapon.name
+        self.atk_lo = inventory.weapon.atk_lo
+        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 << "WPN : #{cur_weapon_name}\n"
+      self_text << "LVL : #{level}\n"
+      self_text << "XP  : #{xp}\n"
+      self_text << "ATK : #{atk_lo}-#{atk_hi}\n"
+      self_text << "DEF : #{defense}\n"
+      self_text << "DEX : #{dexterity}\n"
+      
     end
     
     def rest
@@ -132,7 +157,102 @@ module Gemwarrior
       end
     end
   
+    def attack(monster_name)
+      if cur_loc.has_monster_to_attack?(monster_name)
+        puts "You decide to attack the #{monster_name}"
+        monster = cur_loc.monster_by_name(monster_name)
+        puts "#{monster.name} cries out: #{monster.battlecry}"
+
+        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}!"
+            return
+          end
+          
+          puts "\nYour options are 'fight', 'look', and 'run'."
+          puts "P :: #{hp_cur} HP\n"
+          puts "E :: #{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
+          
+          case cmd
+          when 'fight', 'f'
+            puts "You attack #{monster.name}#{inventory.weapon}!"
+            dmg = calculate_mob_damage
+            if dmg > 0
+              puts "You wound it for #{dmg} point(s)!"
+              monster.take_damage(dmg)
+            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}."
+          when 'run', 'r'
+            escape = calculate_escape(monster)
+            if 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
+          end
+        end
+      else
+        ERROR_ATTACK_PARAM_INVALID
+      end
+    end
+    
+    def cur_weapon_name
+      unless inventory.weapon.nil?
+        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_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
+  
     private
+   
+    def update_player_stats(monster)
+      self.xp = xp + monster.xp_to_give
+      self.rox = rox + monster.rox
+    end
     
     def print_traveling_text
       loc = Thread.new do

data/lib/gemwarrior/repl.rb

@@ -76,10 +76,11 @@ module Gemwarrior
     end
     
     def prompt
-      prompt_template = "\n[LV:%3s][XP:%3s][HP:%3s|%-3s][STM:%2s|%-2s] -- [%s @ %s]"
+      prompt_template = "\n[LV:%3s][XP:%3s][ROX:%3s] -- [HP:%3s|%-3s][STM:%2s|%-2s] -- [%s @ %s]"
       prompt_vars_arr = [
         world.player.level,
         world.player.xp,
+        world.player.rox,
         world.player.hp_cur, 
         world.player.hp_max,
         world.player.stam_cur,

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -82,8 +82,11 @@ module Gemwarrior
           MOB_LEVEL_ALEXANDRAT * 5,
           MOB_LEVEL_ALEXANDRAT * 2,
           MOB_LEVEL_ALEXANDRAT * 2,
+          MOB_DEXTERITY_ALEXANDRAT,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_ALEXANDRAT * rand(1..2),
+          MOB_BATTLECRY_ALEXANDRAT
         )
       )
       monsters.push(Monster.new(
@@ -98,8 +101,11 @@ module Gemwarrior
           MOB_LEVEL_AMBEROO * 5,
           MOB_LEVEL_AMBEROO * 2,
           MOB_LEVEL_AMBEROO * 2,
+          MOB_DEXTERITY_AMBEROO,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_AMBEROO * rand(1..2),
+          MOB_BATTLECRY_AMBEROO
         )
       )
       monsters.push(Monster.new(
@@ -114,24 +120,11 @@ module Gemwarrior
           MOB_LEVEL_AMETHYSTLE * 5,
           MOB_LEVEL_AMETHYSTLE * 2,
           MOB_LEVEL_AMETHYSTLE * 2,
+          MOB_DEXTERITY_AMETHYSTLE,
           Inventory.new,
-          rand(0..10)
-        )
-      )
-      monsters.push(Monster.new(
-          MOB_ID_AQUAMARINE, 
-          MOB_NAME_AQUAMARINE, 
-          MOB_DESC_AQUAMARINE,
-          'strained', 
-          'hairy', 
-          'tempered',
-          MOB_LEVEL_AQUAMARINE,
-          MOB_LEVEL_AQUAMARINE * 5,
-          MOB_LEVEL_AQUAMARINE * 5,
-          MOB_LEVEL_AQUAMARINE * 2,
-          MOB_LEVEL_AQUAMARINE * 2,
-          Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_AMETHYSTLE * rand(1..2),
+          MOB_BATTLECRY_AMETHYSTLE
         )
       )
       monsters.push(Monster.new(
@@ -146,8 +139,30 @@ module Gemwarrior
           MOB_LEVEL_APATIGER * 5,
           MOB_LEVEL_APATIGER * 2,
           MOB_LEVEL_APATIGER * 2,
+          MOB_DEXTERITY_APATIGER,
+          Inventory.new,
+          rand(0..10),
+          MOB_LEVEL_APATIGER * rand(1..2),
+          MOB_BATTLECRY_APATIGER
+        )
+      )
+      monsters.push(Monster.new(
+          MOB_ID_AQUAMARINE, 
+          MOB_NAME_AQUAMARINE, 
+          MOB_DESC_AQUAMARINE,
+          'strained', 
+          'hairy', 
+          'tempered',
+          MOB_LEVEL_AQUAMARINE,
+          MOB_LEVEL_AQUAMARINE * 5,
+          MOB_LEVEL_AQUAMARINE * 5,
+          MOB_LEVEL_AQUAMARINE * 2,
+          MOB_LEVEL_AQUAMARINE * 2,
+          MOB_DEXTERITY_AQUAMARINE,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_AQUAMARINE * rand(1..2),
+          MOB_BATTLECRY_AQUAMARINE
         )
       )
       monsters.push(Monster.new(
@@ -162,8 +177,11 @@ module Gemwarrior
           MOB_LEVEL_BLOODSTORM * 5,
           MOB_LEVEL_BLOODSTORM * 2,
           MOB_LEVEL_BLOODSTORM * 2,
+          MOB_DEXTERITY_BLOODSTORM,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_BLOODSTORM * rand(2..3),
+          MOB_BATTLECRY_BLOODSTORM
         )
       )
       monsters.push(Monster.new(
@@ -178,8 +196,11 @@ module Gemwarrior
           MOB_LEVEL_CITRINAGA * 5,
           MOB_LEVEL_CITRINAGA * 2,
           MOB_LEVEL_CITRINAGA * 2,
+          MOB_DEXTERITY_CITRINAGA,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_CITRINAGA * rand(2..3),
+          MOB_BATTLECRY_CITRINAGA
         )
       )
       monsters.push(Monster.new(
@@ -194,8 +215,11 @@ module Gemwarrior
           MOB_LEVEL_CORALIZ * 5,
           MOB_LEVEL_CORALIZ * 2,
           MOB_LEVEL_CORALIZ * 2,
+          MOB_DEXTERITY_CORALIZ,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_CORALIZ * rand(2..3),
+          MOB_BATTLECRY_CORALIZ
         )
       )
       monsters.push(Monster.new(
@@ -210,8 +234,11 @@ module Gemwarrior
           MOB_LEVEL_CUBICAT * 5,
           MOB_LEVEL_CUBICAT * 2,
           MOB_LEVEL_CUBICAT * 2,
+          MOB_DEXTERITY_CUBICAT,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_CUBICAT * rand(3..4),
+          MOB_BATTLECRY_CUBICAT
         )
       )
       monsters.push(Monster.new(
@@ -226,8 +253,11 @@ module Gemwarrior
           MOB_LEVEL_DIAMAN * 5,
           MOB_LEVEL_DIAMAN * 2,
           MOB_LEVEL_DIAMAN * 2,
+          MOB_DEXTERITY_DIAMAN,
           Inventory.new,
-          rand(0..10)
+          rand(0..10),
+          MOB_LEVEL_DIAMAN * rand(3..5),
+          MOB_BATTLECRY_DIAMAN
         )
       )
     end
@@ -238,6 +268,9 @@ module Gemwarrior
           ITEM_ID_STONE, 
           ITEM_NAME_STONE, 
           ITEM_DESC_STONE,
+          ITEM_ATK_LO_STONE,
+          ITEM_ATK_HI_STONE,
+          true,
           true
         )
       )
@@ -245,6 +278,9 @@ module Gemwarrior
           ITEM_ID_BED, 
           ITEM_NAME_BED, 
           ITEM_DESC_BED,
+          ITEM_ATK_LO_BED,
+          ITEM_ATK_HI_BED,
+          false,
           false
         )
       )
@@ -252,6 +288,9 @@ module Gemwarrior
           ITEM_ID_STALACTITE, 
           ITEM_NAME_STALACTITE, 
           ITEM_DESC_STALACTITE,
+          ITEM_ATK_LO_STALACTITE,
+          ITEM_ATK_HI_STALACTITE,
+          true,
           true
         )
       )
@@ -259,13 +298,19 @@ module Gemwarrior
           ITEM_ID_FEATHER, 
           ITEM_NAME_FEATHER, 
           ITEM_DESC_FEATHER,
-          true
+          ITEM_ATK_LO_FEATHER,
+          ITEM_ATK_HI_FEATHER,
+          true,
+          false
         )
       )
       items.push(Item.new(
           ITEM_ID_GUN, 
           ITEM_NAME_GUN, 
           ITEM_DESC_GUN,
+          ITEM_ATK_LO_GUN,
+          ITEM_ATK_HI_GUN,
+          true,
           true
         )
       )

metadata

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