gemwarrior 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e02eb07b6d2f5d85c69bff99e23d580e61326b
-  data.tar.gz: 8cc5438f267d75b010f7645d8da54d3dafa4a9c6
+  metadata.gz: d91e48c65260ba5b61f52b93ad8eea2b45fe8c18
+  data.tar.gz: cb95d7af28130ed0b74ad1f5f36d2c8d010f7244
 SHA512:
-  metadata.gz: 5736f18ee87c888f5a0f41ede0fbb6f5246735d6da39c6282e5649568de3d33cb0aa8d3470b0505c214af997ff0f542382dc016be5f169e6547cbf63536ad15b
-  data.tar.gz: d3d2fa237f23270f92bfaa0f73529708d9d755646dee38a1199952b7be1296a888c377a412f96073cb7fb04cfc23f2e427bb80ea73db0bb421f05e52c905d645
+  metadata.gz: 76d5776994978dbd5a4bd076ec5adb99e05f0ef1a6c047d570a0da16e8291e4483ad7577b4740c9ee6d68bb9aa5f4220526d49bc0cc2ab8e6c1455efb1063bda
+  data.tar.gz: 7d42296d573a9d911a8a49a6485c95b24cf0e8648899264c391d6394369a43f4042000a93c9f00a61d9f7cdbcdb221b197d468603686db1eccb3b20cf3ba0d40

data/bin/gemwarrior

@@ -8,7 +8,7 @@ require_relative '../lib/gemwarrior/game'
 GAME_NAME = "Gem Warrior"
 
 def parse_options
-  options = {:debug_mode => false, :god_mode => false, :beast_mode => false}
+  options = {:debug_mode => false, :god_mode => false, :beast_mode => false, :use_wordnik => false}
 
   optparse = OptionParser.new do |opts|
     opts.on('-v', '--version', 'Display version number and exit') do
@@ -27,6 +27,10 @@ def parse_options
     opts.on('-b', '--beast', 'Set beastmode to true on load') do
       options[:beast_mode] = true
     end
+    
+    opts.on('-w', '--wordnik', 'Use Wordnik to generate more diverse, dynamic descriptors of entities') do
+      options[:use_wordnik] = true
+    end
   end
 
   optparse.parse!()

data/gemwarrior.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json', '~> 1.8.2'
   spec.add_runtime_dependency 'colorize', '~> 0.7.7'
 
-  #spec.add_runtime_dependency 'feep', '~> 0.0.9'  
+  #spec.add_runtime_dependency 'feep', '~> 0.1.0'  
   #spec.add_runtime_dependency 'wordnik', '~> 4.12'
 
   spec.add_development_dependency 'pry-byebug', '~> 3.0'

data/lib/gemwarrior/game.rb

@@ -31,6 +31,8 @@ module Gemwarrior
       start_stats = PlayerLevels::get_level_stats(1)
       
       world.debug_mode      = options.fetch(:debug_mode)
+      world.use_wordnik     = options.fetch(:use_wordnik)
+      
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,
         :level              => start_stats[:level],

data/lib/gemwarrior/misc/version.rb

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

data/lib/gemwarrior/misc/wordlist.rb

@@ -6,25 +6,33 @@ require 'json'
 
 module Gemwarrior
   class WordList
-    STATIC_NOUN_VALUES = ["abutments", "asterisms", "bains", "blebs", "blowholes", "chapes", "civility", "crocuses", "dancers", "deniers", "diastoles", "dinges", "dualism", "ebullitions", "extremities", "fingering", "gabardines", "gullets", "knops", "nooks", "payments", "phaetons", "scalawags", "snickers", "specters", "splats", "squiggles", "thalamuses", "wallets", "xylophones"]
+    STATIC_ADJECTIVE_VALUES_VALUES = [
+      '5 o\'clock-shadowed', 'angry', 'aristocratic', 'calm', 'choice', 'clinical', 'cracked', 'depressed', 'dingy', 'excited', 'ginormous', 'handsome', 'hydrothermal', 'lackadaisical', 'man-sized', 'moist', 'non-venomous', 'picaresque', 'positive', 'relaxed', 'ruddy', 'smooth', 'shocked', 'sticky', 'tense', 'tingly', 'tired', 'toneless', 'unpolished', 'worn'
+    ]
+    STATIC_NOUN_VALUES = [
+      'arrestor', 'blockhead', 'busker', 'candlestick', 'cigarette', 'clavinet', 'cursor', 'degeneration', 'devotchka', 'drive', 'earthquake', 'genie', 'granddaddy', 'haunter', 'heater', 'locality', 'nitrogen', 'quitter', 'raccoon', 'radish', 'recession', 'sheepdog', 'smorgasbord', 'softener', 'sphere', 'stage-hand', 'tsunami', 'tuber', 'whatsit', 'zillionaire'
+    ]
+    STATIC_NOUN_PLURAL_VALUES = [
+      'abutments', 'asterisms', 'bains', 'blebs', 'blowholes', 'chapes', 'civility', 'crocuses', 'dancers', 'deniers', 'diastoles', 'dinges', 'dualism', 'ebullitions', 'extremities', 'fingering', 'gabardines', 'gullets', 'knops', 'nooks', 'payments', 'phaetons', 'scalawags', 'snickers', 'specters', 'splats', 'squiggles', 'thalamuses', 'wallets', 'xylophones'
+    ]
+    STATIC_VERB_VALUES = [
+      'accentuate', 'accompany', 'blatter', 'bully', 'collide', 'crusade', 'disallow', 'entitle', 'infest', 'lateral', 'micturate', 'mourn', 'munge', 'numb', 'outdraw', 'overstep', 'plummet', 'refill', 'refurnish', 'reroute', 'rumple', 'scupper', 'smoosh', 'spifflicate', 'straighten', 'synthesize', 'terrorize', 'unshift', 'vociferate'
+    ]
   
-    attr_accessor :type, :limit, :words, :error
+    attr_accessor :use_wordnik, :type, :limit, :words, :error
   
-    def initialize(type, limit = 10)
-      self.type = type
-      self.limit = limit
-      self.words = populate_words(type, limit)
-      self.error = nil
+    def initialize(use_wordnik = false, type = 'noun', limit = 10)
+      self.use_wordnik  = use_wordnik
+      self.type         = type
+      self.limit        = limit
+      self.words        = populate_words(type, limit)
+      self.error        = nil
     end
 
     def get_random_value
       random_value = words[rand(0..limit)]
 
-      if random_value.nil?
-        get_random_value
-      else
-        return random_value
-      end
+      return random_value.nil? ? get_random_value : random_value
     end
     
     def list_words
@@ -37,51 +45,68 @@ module Gemwarrior
       url = 'http://api.wordnik.com:80/v4/words.json/randomWords'
       api_key = ENV['WORDNIK_API_KEY']
 
-      case type
-      when 'noun', 'noun-plural', 'adjective', 'verb'
-      else
-        return get_static_values
-      end
-      
-      json_return = HTTP.get(
-        url, 
-        :params => { 
-          :hasDictionaryDef => true,  
-          :includePartOfSpeech => type, 
-          :minCorpusCount => 1, 
-          :maxCorpusCount => -1, 
-          :minDictionaryCount => 1,
-          :maxDictionaryCount => -1,
-          :minLength => 5,
-          :maxLength => 12,
-          :sortBy => 'alpha',
-          :sortOrder => 'asc',
-          :limit => limit,
-          :api_key => api_key
-        }
-      )
-      
-      json_data = JSON.parse(json_return.to_s)
-
-      if json_data.include?('type') && json_data.include?('message')
-        error = "wordnik #{json_data['type']}: #{json_data['message']}"
-        return get_static_values
-      else
-        word_list = []
-        json_data.map {|j| word_list.push(j['word'])}
-        if word_list.length > 0
-          return word_list
+      unless api_key.nil? || use_wordnik == false
+        case type
+        when 'noun', 'noun-plural', 'adjective', 'verb'
         else
-          error = 'Empty array from Wordnik'
+          error = 'invalid wordlist type'
+          return
+        end
+        
+        json_return = HTTP.get(
+          url, 
+          :params => { 
+            :hasDictionaryDef => true,  
+            :includePartOfSpeech => type, 
+            :minCorpusCount => 1, 
+            :maxCorpusCount => -1, 
+            :minDictionaryCount => 1,
+            :maxDictionaryCount => -1,
+            :minLength => 5,
+            :maxLength => 12,
+            :sortBy => 'alpha',
+            :sortOrder => 'asc',
+            :limit => limit,
+            :api_key => api_key
+          }
+        )
+        
+        json_data = JSON.parse(json_return.to_s)
+
+        if json_data.include?('type') && json_data.include?('message')
+          error = "wordnik #{json_data['type']}: #{json_data['message']}"
           return get_static_values
+        else
+          word_list = []
+          json_data.map {|j| word_list.push(j['word'])}
+          if word_list.length > 0
+            return word_list
+          else
+            error = 'Empty array from Wordnik'
+            return get_static_values(type)
+          end
         end
       end
+      
+      return get_static_values(type)
     end
     
-    def get_static_values
+    def get_static_values(type = nil)
       static_values = []
       0.upto(10) do
-        static_values.push(STATIC_NOUN_VALUES[rand(0..STATIC_NOUN_VALUES.length-1)])
+        case type
+        when 'noun'
+          static_values.push(STATIC_NOUN_VALUES[rand(0..STATIC_NOUN_VALUES.length-1)])
+        when 'noun-plural'
+          static_values.push(STATIC_NOUN_PLURAL_VALUES[rand(0..STATIC_NOUN_PLURAL_VALUES.length-1)])
+        when 'adjective'
+          static_values.push(STATIC_ADJECTIVE_VALUES[rand(0..STATIC_ADJECTIVE_VALUES.length-1)])
+        when 'verb'
+          static_values.push(STATIC_VERB_VALUES[rand(0..STATIC_VERB_VALUES.length-1)])
+        else
+          error = 'invalid wordlist type'
+          return 
+        end
       end
       return static_values
     end

data/lib/gemwarrior/repl.rb

@@ -65,9 +65,9 @@ module Gemwarrior
     end
     
     def print_fortune
-      noun1_values = WordList.new('noun-plural')
-      noun2_values = WordList.new('noun-plural')
-      noun3_values = WordList.new('noun-plural')
+      noun1_values = WordList.new(world.use_wordnik, 'noun-plural')
+      noun2_values = WordList.new(world.use_wordnik, 'noun-plural')
+      noun3_values = WordList.new(world.use_wordnik, 'noun-plural')
 
       puts "* Remember: #{noun1_values.get_random_value} and #{noun2_values.get_random_value} are the key to #{noun3_values.get_random_value} *\n\n"
     end

data/lib/gemwarrior/world.rb

@@ -15,7 +15,7 @@ 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
+    attr_accessor :monsters, :locations, :player, :debug_mode, :use_wordnik
   
     def initialize
       self.monsters   = init_monsters

metadata

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