gemwarrior 0.8.2 → 0.8.3

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/misc/version'
+require 'gemwarrior/version'
 
 Gem::Specification.new do |spec|
   spec.name            = 'gemwarrior'

data/lib/gemwarrior/entities/player.rb

@@ -3,33 +3,25 @@
 
 require_relative 'creature'
 require_relative '../battle'
+require_relative '../misc/name_generator'
 require_relative '../misc/player_levels'
 require_relative '../misc/wordlist'
 
 module Gemwarrior
   class Player < Creature
     include PlayerLevels
-  
-    # CONSTANTS
-    ## CHARACTER ATTRIBUTES
-    CHAR_UPPER_POOL       = (65..90).map{ |i| i.chr }
-    CHAR_LOWER_POOL       = (97..122).map{ |i| i.chr }
-    CHAR_LOWER_VOWEL_POOL = ['a','e','i','o','u','y']
-    
-    FACE_DESC   = ['smooth', 'tired', 'ruddy', 'moist', 'shocked', 'handsome', '5 o\'clock-shadowed']
-    HANDS_DESC  = ['worn', 'balled into fists', 'relaxed', 'cracked', 'tingly', 'mom\'s spaghetti']
-    MOOD_DESC   = ['calm', 'excited', 'depressed', 'tense', 'lackadaisical', 'angry', 'positive']
-    
+
     attr_accessor :stam_cur, :stam_max, :cur_coords, 
-                  :god_mode, :beast_mode
-    
+                  :god_mode, :beast_mode, :use_wordnik
+
     def initialize(options)
       self.name         = generate_name
       self.description  = options.fetch(:description)
+      self.use_wordnik  = options.fetch(:use_wordnik)
       
-      self.face         = generate_face
-      self.hands        = generate_hands
-      self.mood         = generate_mood
+      self.face         = generate_face(use_wordnik)
+      self.hands        = generate_hands(use_wordnik)
+      self.mood         = generate_mood(use_wordnik)
 
       self.level        = options.fetch(:level)
       self.xp           = options.fetch(:xp)
@@ -49,7 +41,7 @@ module Gemwarrior
       self.cur_coords   = options.fetch(:cur_coords)
       
       self.god_mode     = options.fetch(:god_mode)
-      self.beast_mode   = options.fetch(:beast_mode)
+      self.beast_mode   = options.fetch(:beast_mode)      
     end
 
     def check_self(debug_mode = false, show_pic = true)
@@ -125,8 +117,12 @@ module Gemwarrior
 
     def modify_name
       print "Enter new name: "
+
       new_name = gets.chomp!
-      if new_name.length < 3 || new_name.length > 10
+
+      if new_name.length <= 0
+        return "You continue on as #{name}."
+      elsif new_name.length < 3 || new_name.length > 10
         return "'#{new_name}' is an invalid length. Make it between 3 and 10 characters, please."
       else
         name_to_add = ""
@@ -135,7 +131,6 @@ module Gemwarrior
         self.name = name_to_add
         return "New name, '#{name}', accepted."
       end
-      return nil
     end
     
     def list_inventory
@@ -245,26 +240,22 @@ module Gemwarrior
 
     # INIT
     def generate_name
-      default_name = []
-      letter_max = rand(5..10)
-      default_name[0] = CHAR_UPPER_POOL[rand(0..25)]
-      default_name[1] = CHAR_LOWER_VOWEL_POOL[rand(0..5)]
-      2.upto(letter_max) do |i|
-        default_name[i] = CHAR_LOWER_POOL[rand(0..25)]
-      end
-      return default_name.join
+      NameGenerator.new('fantasy').generate_name
     end
     
-    def generate_face
-      FACE_DESC[rand(0..FACE_DESC.length-1)]
+    def generate_face(use_wordnik)
+      face_descriptors = WordList.new(use_wordnik, 'adjective')
+      face_descriptors.get_random_value
     end
     
-    def generate_hands
-      HANDS_DESC[rand(0..HANDS_DESC.length-1)]
+    def generate_hands(use_wordnik)
+      hand_descriptors = WordList.new(use_wordnik, 'adjective')
+      hand_descriptors.get_random_value
     end
     
-    def generate_mood
-      MOOD_DESC[rand(0..MOOD_DESC.length-1)]
+    def generate_mood(use_wordnik)
+      mood_descriptors = WordList.new(use_wordnik, 'adjective')
+      mood_descriptors.get_random_value
     end
   end
 end

data/lib/gemwarrior/game.rb

@@ -53,7 +53,8 @@ module Gemwarrior
         :cur_coords         => world.location_coords_by_name('Home'),
         
         :god_mode           => options.fetch(:god_mode),
-        :beast_mode         => options.fetch(:beast_mode)
+        :beast_mode         => options.fetch(:beast_mode),
+        :use_wordnik        => options.fetch(:use_wordnik)
       })
 
       # create the console

data/lib/gemwarrior/misc/name_generator.rb

@@ -0,0 +1,168 @@
+# lib/gemwarrior/misc/name_generator.rb
+# NameGenerator Ruby class (translated from name_generator.js)
+# written and released to the public domain by drow <drow@bin.sh>
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+require 'yaml'
+
+class NameGenerator
+  attr_accessor :name_set, :type, :chain_cache
+
+  def initialize(type)
+    self.type         = type
+    self.name_set     = get_name_set(self.type)
+    self.chain_cache  = {}
+  end
+
+  # load sample names
+  def get_name_set(type)
+    names = []
+    names_data = YAML.load_file("data/#{type}_names.yml")
+    names_data.each do |n|
+      names.push(n)
+    end
+    return names
+  end
+  
+  # generator function
+  def generate_name
+    chain = nil
+
+    if (chain = markov_chain(self.type))
+      return markov_name(chain)
+    end
+    
+    return ''
+  end
+
+  # generate multiple
+  def generate_names(count = 1)
+    list = []
+
+    for i in 1..count
+      list.push(generate_name)
+    end
+    
+    return list
+  end
+
+  # get markov chain by type
+  def markov_chain(type)
+    chain = nil
+
+    if (chain = chain_cache[type])
+      return chain
+    else
+      if (list = name_set)
+        chain = nil
+        if (chain = construct_chain(list))
+          chain_cache[type] = chain
+          return chain
+        end
+      end
+    end
+    
+    return false
+  end
+
+  # construct markov chain from list of names
+  def construct_chain(list)
+    chain = {}
+
+    for i in 0..list.length-1
+      names = list[i].split(/\s+/)
+      chain = incr_chain(chain, 'parts', names.length)
+
+      for j in 0..names.length-1
+        name = names[j].nil? ? [] : names[j]
+        chain = incr_chain(chain, 'name_len', name.length)
+
+        c = name[0, 1]
+        chain = incr_chain(chain, 'initial', c)
+
+        string = name[1..name.length]
+        last_c = c
+
+        while string.length > 0 do
+          c = string[0, 1]
+          chain = incr_chain(chain, last_c, c)
+
+          string = string[1..string.length]
+          last_c = c
+        end
+      end
+    end
+    
+    return scale_chain(chain)
+  end
+
+  def incr_chain(chain, key, token)
+    if chain[key]
+      if chain[key][token]
+        chain[key][token] += 1
+      else
+        chain[key][token] = 1
+      end
+    else
+      chain[key] = {}
+      chain[key][token] = 1
+    end
+    
+    return chain
+  end
+
+  def scale_chain(chain)
+    table_len = {}
+
+    chain.each do |key, subkey|
+      table_len[key] = 0
+
+      subkey.each do |subkey, value|
+        count = value
+        weighted = (count ** 1.3).floor
+
+        chain[key][subkey] = weighted
+        table_len[key] += weighted
+      end
+    end
+    
+    chain['table_len'] = table_len
+
+    return chain
+  end
+
+  # construct name from markov chain
+  def markov_name(chain)
+    parts = select_link(chain, 'parts')
+    names = []
+
+    for i in 0..parts-1
+      name_len = select_link(chain, 'name_len')
+      c = select_link(chain, 'initial')
+      name = c
+      last_c = c
+
+      while name.length < name_len do
+        c = select_link(chain, last_c)
+        name += c
+        last_c = c
+      end
+      names.push(name)
+    end
+
+    return names.join(' ')
+  end
+
+  def select_link(chain, key)
+    len = chain['table_len'][key]
+    idx = (rand() * len).floor
+
+    t = 0
+    chain[key].each do |chain_key, chain_value|
+      t += chain_value
+      return chain_key if (idx < t)
+    end
+    
+    return '-'
+  end
+end

data/lib/gemwarrior/misc/wordlist.rb

@@ -6,7 +6,7 @@ require 'json'
 
 module Gemwarrior
   class WordList
-    STATIC_ADJECTIVE_VALUES_VALUES = [
+    STATIC_ADJECTIVE_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 = [

data/lib/gemwarrior/{misc/version.rb → version.rb}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -185,6 +185,7 @@ files:
 - README.md
 - Rakefile
 - bin/gemwarrior
+- data/fantasy_names.yml
 - data/locations.yml
 - gemwarrior.gemspec
 - lib/gemwarrior/arena.rb
@@ -241,10 +242,11 @@ files:
 - lib/gemwarrior/inventory.rb
 - lib/gemwarrior/misc/animation.rb
 - lib/gemwarrior/misc/music.rb
+- lib/gemwarrior/misc/name_generator.rb
 - lib/gemwarrior/misc/player_levels.rb
-- lib/gemwarrior/misc/version.rb
 - lib/gemwarrior/misc/wordlist.rb
 - lib/gemwarrior/repl.rb
+- lib/gemwarrior/version.rb
 - lib/gemwarrior/world.rb
 - spec/rubywarrior_spec.rb
 - spec/spec_helper.rb
@@ -268,10 +270,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: RPG as RubyGem
-test_files:
-- spec/rubywarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []