gemwarrior 0.15.14 → 0.15.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b71d7a26b3d881e7451d4f0374a2ff847b08b2781190dc535da4be03216d93
-  data.tar.gz: 6706573b955217a0f75d5df3eaee248e0e199b8c8586d5f4a8245aa6b7a4d9fe
+  metadata.gz: c996dc01e73e72519d15b88e1501ac75c3e532c0bdba8cac30a3f92fa0f95436
+  data.tar.gz: db73dd1235537fe9bda964205b803ebb6a8c84aaec171cba53f93e25e0342c81
 SHA512:
-  metadata.gz: 9f3e6f2d65f809e9403d3d91f3daebe3c60bde70b017e2c4db6e0cb8367365716f144baf4c9fbb0a565a24503b65eb68da17b5c49b3fcc91ef66e1660c78483e
-  data.tar.gz: a8b4a0873299d590b9bc389d15e1e28c9594f39e480447b7ffc7ba5812bddeb091cf37ab77bfc92d570902aa849866c9d4bcf0cbab38081aedee33dd2476e2c2
+  metadata.gz: 59921e22525ab8b60f00a6c63a02ca916d4d5b38b7ac4d08e41da45ebfbabc1ae2ac6b98c945ba7896a4746c581077ec85d2edfbf8dc8dbc667b966156e7b829
+  data.tar.gz: f11c5b5b659d488a4a6eb3e8ad9115a97723ed38c10547bb906f0809031f8e0e7f2b53a5a3db9241fb94e18648fc17f79f44207997b4b41f6a3e06e65798ab32

data/lib/gemwarrior/game.rb

@@ -22,10 +22,10 @@ require_relative 'world'
 module Gemwarrior
   class Game
     # CONSTANTS
-    INVENTORY_DEFAULT             = Inventory.new
-    INVENTORY_DEBUG               = Inventory.new([Herb.new, Herb.new, Herb.new])
-    ROX_DEFAULT                   = 0
-    ROX_DEBUG                     = 300
+    INVENTORY_DEFAULT               = Inventory.new
+    INVENTORY_DEBUG                 = Inventory.new([Herb.new, Herb.new, Herb.new])
+    ROX_DEFAULT                     = 0
+    ROX_DEBUG                       = 300
 
     attr_accessor :world,
                   :evaluator,
@@ -35,81 +35,58 @@ module Gemwarrior
 
     def initialize(options)
       # set game options
-      GameOptions.add 'beast_mode', options.fetch(:beast_mode)
-      GameOptions.add 'debug_mode', options.fetch(:debug_mode)
-      GameOptions.add 'god_mode', options.fetch(:god_mode)
-      GameOptions.add 'sound_enabled', options.fetch(:sound_enabled)
-      GameOptions.add 'sound_system', options.fetch(:sound_system)
-      GameOptions.add 'sound_volume', options.fetch(:sound_volume)
-      GameOptions.add 'use_wordnik', options.fetch(:use_wordnik)
-      GameOptions.add 'fight_completion', options.fetch(:fight_completion)
+      self.init_game_options(options)
 
       # add classes for creatures, monsters, people, items, weapons, and armor to game
       # also add them to the global GameAssets
-      init_creatures
-      init_monsters
-      init_people
-      init_items
-      init_weapons
-      init_armor
+      self.init_creatures
+      self.init_monsters
+      self.init_people
+      self.init_items
+      self.init_weapons
+      self.init_armor
 
       # create new world based on yaml/marshall data
-      self.world               = init_world
+      self.world                    = init_world
 
       # update some player aspects to make more dynamic
-      world.player.name        = world.player.generate_name
-      world.player.face        = world.player.generate_face
-      world.player.hands       = world.player.generate_hands
-      world.player.mood        = world.player.generate_mood
-      world.player.inventory   = GameOptions.data['debug_mode'] ? INVENTORY_DEBUG : INVENTORY_DEFAULT
-      world.player.rox         = GameOptions.data['debug_mode'] ? ROX_DEBUG : ROX_DEFAULT
+      self.world.player.name        = world.player.generate_name
+      self.world.player.face        = world.player.generate_face
+      self.world.player.hands       = world.player.generate_hands
+      self.world.player.mood        = world.player.generate_mood
+      self.world.player.inventory   = GameOptions.data['debug_mode'] ? INVENTORY_DEBUG : INVENTORY_DEFAULT
+      self.world.player.rox         = GameOptions.data['debug_mode'] ? ROX_DEBUG : ROX_DEFAULT
 
       # set some global variables
-      world.duration           = { mins: 0, secs: 0, ms: 0 }
-      world.emerald_beaten     = false
-      world.shifty_to_jewel    = false
-      world.shifty_has_jeweled = false
+      self.world.duration           = { mins: 0, secs: 0, ms: 0 }
+      self.world.emerald_beaten     = false
+      self.world.shifty_to_jewel    = false
+      self.world.shifty_has_jeweled = false
 
-      # spawn bosses
-      ## Pain Quarry
-      world.location_by_name('pain_quarry-southeast').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-east').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-central').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-south').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-west').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-northwest').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      world.location_by_name('pain_quarry-north').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
-      ## River Bridge
-      world.location_by_name('river_bridge').bosses_abounding.push(Gemwarrior.const_get('Jaspern').new)
-      ## Throne Room
-      world.location_by_name('sky_tower-throne_room').bosses_abounding.push(Gemwarrior.const_get('Emerald').new)
+      # # spawn bosses
+      self.init_bosses
 
       # mark home as visited
-      world.location_by_name('home').visited = true
+      self.world.location_by_name('home').visited = true
 
       # create options file if not existing
-      update_options_file
-
-      # require needed files for selected sound_system if sound_enabled
-      if GameOptions.data['sound_enabled']
-        Audio.init
-      end
+      self.update_options_file
 
       # create the console
-      self.evaluator  = Evaluator.new(world)
-      self.repl       = Repl.new(self, world, evaluator)
+      self.evaluator                = Evaluator.new(world)
+      self.repl                     = Repl.new(self, world, evaluator)
 
       # enter Jool!
-      repl.start('look', options.fetch(:extra_command), options.fetch(:new_skip), options.fetch(:resume_skip))
+      self.repl.start('look', options.fetch(:extra_command), options.fetch(:new_skip), options.fetch(:resume_skip))
     end
 
     def update_options_file
       File.open(GameOptions.data['options_file_path'], 'w') do |f|
+        f.puts "fight_completion:#{GameOptions.data['fight_completion']}"
         f.puts "sound_enabled:#{GameOptions.data['sound_enabled']}"
         f.puts "sound_system:#{GameOptions.data['sound_system']}"
         f.puts "sound_volume:#{GameOptions.data['sound_volume']}"
         f.puts "use_wordnik:#{GameOptions.data['use_wordnik']}"
-        f.puts "fight_completion:#{GameOptions.data['fight_completion']}"
       end
     end
 
@@ -121,6 +98,37 @@ module Gemwarrior
       Gemwarrior.const_get(filename_to_string).new
     end
 
+    def init_game_options(options)
+      GameOptions.add 'beast_mode',       options.fetch(:beast_mode)
+      GameOptions.add 'debug_mode',       options.fetch(:debug_mode)
+      GameOptions.add 'fight_completion', options.fetch(:fight_completion)
+      GameOptions.add 'god_mode',         options.fetch(:god_mode)
+      GameOptions.add 'sound_enabled',    options.fetch(:sound_enabled)
+      GameOptions.add 'sound_system',     options.fetch(:sound_system)
+      GameOptions.add 'sound_volume',     options.fetch(:sound_volume)
+      GameOptions.add 'use_wordnik',      options.fetch(:use_wordnik)
+
+      # require needed files for selected sound_system if sound_enabled
+      if GameOptions.data['sound_enabled']
+        Audio.init
+      end
+    end
+
+    def init_bosses
+      ## Pain Quarry
+      world.location_by_name('pain_quarry-southeast').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-east').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-central').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-south').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-west').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-northwest').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      world.location_by_name('pain_quarry-north').bosses_abounding.push(Gemwarrior.const_get('Garynetty').new)
+      ## River Bridge
+      world.location_by_name('river_bridge').bosses_abounding.push(Gemwarrior.const_get('Jaspern').new)
+      ## Throne Room
+      world.location_by_name('sky_tower-throne_room').bosses_abounding.push(Gemwarrior.const_get('Emerald').new)
+    end
+
     def init_creatures
       Dir.glob(File.expand_path('../entities/creatures/*.rb', __FILE__)).each do |creature|
         require_relative creature

data/lib/gemwarrior/version.rb

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

metadata

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