rdgc-dm 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/rdgc/map/area.rb

@@ -79,6 +79,8 @@ module RDGC
         each do |x, y|
           set_tile(x, y, tile)
         end
+
+        self
       end
 
       def set_tile(x, y, tile)

data/lib/rdgc/map/blind_area.rb

@@ -11,6 +11,7 @@ module RDGC
       def set_blind(level)
         return unless [:none, :open, :blind, :dark].include?(level)
         @blind_level = level
+        self
       end
 
       def blind_level_none?
@@ -51,6 +52,7 @@ module RDGC
         @blind_mode = mode
         @blind_mode ||= BLIND_MODE_NORMAL
         init_blind
+        self
       end
 
       def blind_mode
@@ -76,10 +78,12 @@ module RDGC
             blind_data[x][y] = target
           end
         end
+
+        self
       end
 
       def visible?(x, y)
-        return false  unless has_xy?(x, y)
+        return false unless has_xy?(x, y)
         return true unless blind_mode?
         v = blind_data[x][y]
         return false unless v
@@ -91,7 +95,7 @@ module RDGC
       end
 
       def dark?(x, y)
-        return false  unless has_xy?(x, y)
+        return false unless has_xy?(x, y)
         blind_data[x][y] == :dark ? true : false
       end
 
@@ -112,11 +116,8 @@ module RDGC
             blind_data[x][y] = :none
           end
         end
-      end
 
-      def blind_data
-        @blind_data ||= Hash.new{|hash, key| hash[key] = {}}
-        @blind_data
+        self
       end
 
       def init_blind
@@ -128,12 +129,16 @@ module RDGC
         when BLIND_MODE_NORMAL
           init_blind_normal
         end
+
+        self
       end
 
       def init_blind_all(level)
         areas.each do |r|
           r.set_blind(level)
         end
+
+        self
       end
 
       def init_blind_normal
@@ -144,10 +149,27 @@ module RDGC
         roads.each do |r|
           r.set_blind(:blind)
         end
+
+        self
+      end
+
+      def blind_state(x, y)
+        return unless has_xy?(x, y)
+        blind_data[x][y]
+      end
+
+      def set_blind_state(x, y, state)
+        return unless has_xy?(x, y)
+        blind_data[x][y] = state
       end
 
       private
 
+      def blind_data
+        @blind_data ||= Hash.new{|hash, key| hash[key] = {}}
+        @blind_data
+      end
+
       def fill_dark_before_cancel
         areas.select{|r| r.blind_level_dark?}.each do |r|
           r.each do |x, y|

data/lib/rdgc/map/block.rb

@@ -14,6 +14,8 @@ module RDGC
 
         fill_room
         fill_roads
+
+        self
       end
 
       def fill_room
@@ -21,6 +23,8 @@ module RDGC
         room.each_tile do |x, y, t|
           set_tile(x, y, t)
         end
+
+        self
       end
 
       def fill_roads
@@ -30,6 +34,8 @@ module RDGC
             set_tile(x, y, t)
           end
         end
+
+        self
       end
 
       def room
@@ -101,6 +107,7 @@ module RDGC
         remove_room
         remove_roads
         remove_cross_point
+        self
       end
 
       def empty?

data/lib/rdgc/map/board.rb

@@ -19,6 +19,8 @@ module RDGC
 
         set_coordinates
         fill
+
+        self
       end
 
       def set_coordinates
@@ -27,6 +29,8 @@ module RDGC
         self.bottom = blocks.map(&:bottom).max
         self.left = blocks.map(&:left).min
         self.right = blocks.map(&:right).max
+
+        self
       end
 
       def fill
@@ -44,6 +48,8 @@ module RDGC
             set_tile(x, y, t)
           end
         end
+
+        self
       end
 
       def blocks

data/lib/rdgc/map/direction.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# coding: UTF-8
 module RDGC
   module Map
     class Direction

data/lib/rdgc/map/road.rb

@@ -11,6 +11,7 @@ module RDGC
 
       def fill
         fill_tile TileType::ROAD
+        self
       end
 
     end

data/lib/rdgc/map/room.rb

@@ -22,6 +22,7 @@ module RDGC
 
       def fill
         fill_tile TileType::ROOM
+        self
       end
 
       private

data/lib/rdgc/util/config.rb

@@ -4,68 +4,45 @@ module RDGC
     class Config
 
       DEFAULT_CONFIG = {
-        :min_room_size => 4,
-        :act_max_count => 200
+        :min_room_size => 4
       }
 
-      self.class.class_eval do
-        @config_hash = DEFAULT_CONFIG
-      end
-
-      def self.set(hash)
-        return if seted?
+      class << self
 
-        default = nil
-        self.class.class_eval do
-          default = @config_hash
-        end
+        def set(hash)
+          return if seted?
 
-        hash = default.merge(hash)
-
-        self.class.class_eval do
+          hash = DEFAULT_CONFIG.merge(hash)
           @config_hash = hash
           @seted = true
-        end
 
-        true
-      end
-
-      def self.min_room_size
-        self.get(:min_room_size)
-      end
-
-      def self.min_block_size
-        # デフォルトのblock最小値 = 最小部屋サイズ+上下空き2+接線通路分1
-        self.min_room_size + 3
-      end
-
-      def self.act_max_count
-        self.get(:act_max_count)
-      end
+          true
+        end
 
-      def self.seted?
-        ret = false
-        self.class.class_eval do
-          ret = @seted
+        def get(key)
+          @config_hash ||= DEFAULT_CONFIG
+          @config_hash[key]
         end
-        ret
-      end
 
-      def self.get(key)
-        val = nil
-        self.class.class_eval do
-          val = @config_hash[key]
+        def seted?
+          @seted ? true : false
         end
-        val
-      end
 
-      def self.reset!
-        self.class.class_eval do
+        def reset!
           @config_hash = DEFAULT_CONFIG
           @seted = false
+          true
+        end
+
+        def min_room_size
+          get(:min_room_size)
+        end
+
+        def min_block_size
+          # デフォルトのblock最小値 = 最小部屋サイズ+上下空き2+接線通路分1
+          min_room_size + 3
         end
 
-        true
       end
 
     end

data/lib/rdgc/util/random_util.rb

@@ -3,6 +3,8 @@ module RDGC
   module Util
     module RandomUtil
 
+      module_function
+
       def bool_rand
         case rand(2)
         when 1
@@ -49,8 +51,6 @@ module RDGC
         ret
       end
 
-      module_function :bool_rand, :range_rand, :select_rand, :dice
-
     end
   end
 end
@@ -101,4 +101,10 @@ class Array
     ret
   end
 
-end
+  if RUBY_VERSION >= '1.9.1'
+    def choice
+      self.sample
+    end
+  end
+
+end

data/rdgc-dm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdgc-dm}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["parrot_studio"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-09-22}
   s.description = %q{    This gem is part of RDGC - Ruby(Random) Dungeon Game Core.
     RDGC is core of random dungeon game (like rogue), make dungeon, manage monsters etc.
 }
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Random Dungeon Maker from RDGC}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/spec/rdgc/map/08_blind_area_spec.rb

@@ -175,13 +175,18 @@ describe "blind mode" do
       @road2.blind_level_blind?.should be_true
     end
 
+    it "#blind_state/#set_blind_state will get/set blind_state" do
+      @board.set_blind_state(10, 9, :blind)
+      @board.blind_state(10, 9).should == :blind
+    end
+
     it "#fill_blind will fill blind_data as each area's blind_level" do
       @board.set_blind_mode
       @board.fill_blind
 
       @board.areas.each do |r|
         r.each do |x, y|
-          @board.blind_data[x][y].should == :blind
+          @board.blind_state(x, y).should == :blind
         end
       end
 
@@ -190,7 +195,7 @@ describe "blind mode" do
 
       @board.areas.each do |r|
         r.each do |x, y|
-          @board.blind_data[x][y].should == :none
+          @board.blind_state(x, y).should == :none
         end
       end
     end
@@ -204,7 +209,7 @@ describe "blind mode" do
       @room.each.all?{|x, y| @board.dark?(x, y)}.should be_true
 
       tx, ty = @room.random_point
-      @board.blind_data[tx][ty] = :none
+      @board.set_blind_state(tx, ty, :none)
       @board.dark?(tx, ty).should be_false
     end
 
@@ -216,7 +221,7 @@ describe "blind mode" do
 
       5.times do
         tx, ty = @room.random_point
-        @board.blind_data[tx][ty] = :none
+        @board.set_blind_state(tx, ty, :none)
       end
       @room.each.all?{|x, y| @board.dark?(x, y)}.should be_false
 
@@ -231,33 +236,33 @@ describe "blind mode" do
       @board.fill_blind
 
       @board.open_blind(10, 4, 0)
-      @board.blind_data[10][4].should == :none
-      @board.blind_data[10][3].should == :blind
-      @board.blind_data[10][5].should == :blind
+      @board.blind_state(10, 4).should == :none
+      @board.blind_state(10, 3).should == :blind
+      @board.blind_state(10, 5).should == :blind
 
       @board.open_blind(10, 4, 1)
-      @board.blind_data[10][4].should == :none
-      @board.blind_data[10][3].should == :none
-      @board.blind_data[10][5].should == :none
-      @board.blind_data[10][2].should == :blind
-      @board.blind_data[10][6].should == :blind
+      @board.blind_state(10, 4).should == :none
+      @board.blind_state(10, 3).should == :none
+      @board.blind_state(10, 5).should == :none
+      @board.blind_state(10, 2).should == :blind
+      @board.blind_state(10, 6).should == :blind
 
       @board.open_blind(10, 4, 2)
-      @board.blind_data[10][4].should == :none
-      @board.blind_data[10][3].should == :none
-      @board.blind_data[10][2].should == :none
-      @board.blind_data[10][1].should == :blind
-
-      @board.blind_data[10][5].should == :none
-      @board.blind_data[9][5].should == :none
-      @board.blind_data[10][6].should == :none
-      @board.blind_data[11][5].should == :none
-
-      @board.blind_data[8][5].should == :blind
-      @board.blind_data[12][5].should == :blind
-      @board.blind_data[9][6].should == :blind
-      @board.blind_data[11][6].should == :blind
-      @board.blind_data[10][7].should == :blind
+      @board.blind_state(10, 4).should == :none
+      @board.blind_state(10, 3).should == :none
+      @board.blind_state(10, 2).should == :none
+      @board.blind_state(10, 1).should == :blind
+
+      @board.blind_state(10, 5).should == :none
+      @board.blind_state(9, 5).should == :none
+      @board.blind_state(10, 6).should == :none
+      @board.blind_state(11, 5).should == :none
+
+      @board.blind_state(8, 5).should == :blind
+      @board.blind_state(12, 5).should == :blind
+      @board.blind_state(9, 6).should == :blind
+      @board.blind_state(11, 6).should == :blind
+      @board.blind_state(10, 7).should == :blind
     end
 
     it "#open_blind will clear blind all of area for :open" do
@@ -265,13 +270,13 @@ describe "blind mode" do
       @board.fill_blind
 
       @board.open_blind(10, 4, 1)
-      @board.blind_data[10][4].should == :none
-      @board.blind_data[10][3].should == :none
-      @board.blind_data[10][5].should == :none
-      @board.blind_data[10][2].should == :blind
+      @board.blind_state(10, 4).should == :none
+      @board.blind_state(10, 3).should == :none
+      @board.blind_state(10, 5).should == :none
+      @board.blind_state(10, 2).should == :blind
 
       @room.each do |x, y|
-        @board.blind_data[x][y].should == :none
+        @board.blind_state(x, y).should == :none
       end
     end
 
@@ -283,25 +288,25 @@ describe "blind mode" do
       # 1歩目
       @board.open_blind(10, 5, 1)
 
-      @board.blind_data[10][4].should == :none
+      @board.blind_state(10, 4).should == :none
 
-      @board.blind_data[10][5].should == :none
-      @board.blind_data[9][5].should == :none
-      @board.blind_data[11][5].should == :none
-      @board.blind_data[10][6].should == :none
+      @board.blind_state(10, 5).should == :none
+      @board.blind_state(9, 5).should == :none
+      @board.blind_state(11, 5).should == :none
+      @board.blind_state(10, 6).should == :none
 
       # 2歩目
       @board.open_blind(10, 6, 1)
-      @board.blind_data[10][4].should == :none
+      @board.blind_state(10, 4).should == :none
 
-      @board.blind_data[10][6].should == :none
-      @board.blind_data[9][6].should == :none
-      @board.blind_data[11][6].should == :none
-      @board.blind_data[10][5].should == :none
-      @board.blind_data[10][7].should == :none
+      @board.blind_state(10, 6).should == :none
+      @board.blind_state(9, 6).should == :none
+      @board.blind_state(11, 6).should == :none
+      @board.blind_state(10, 5).should == :none
+      @board.blind_state(10, 7).should == :none
 
-      @board.blind_data[9][5].should == :dark
-      @board.blind_data[11][5].should == :dark
+      @board.blind_state(9, 5).should == :dark
+      @board.blind_state(11, 5).should == :dark
     end
 
     it "#visible?/#invisible?" do

data/spec/rdgc/util/01_config_spec.rb

@@ -8,35 +8,28 @@ describe RDGC::Util::Config do
   it "default value" do
     Util::Config.min_room_size.should == 4
     Util::Config.min_block_size.should == 7
-    Util::Config.act_max_count.should == 200
   end
 
   it "value change only once, and #reset! will force change default value" do
     val1 = {
-      :min_room_size => 5,
-      :act_max_count => 100
+      :min_room_size => 5
     }
 
     Util::Config.set(val1).should be_true
     Util::Config.min_room_size.should == 5
-    Util::Config.act_max_count.should == 100
 
     val2 = {
-      :min_room_size => 10,
-      :act_max_count => 80
+      :min_room_size => 10
     }
 
     Util::Config.set(val2).should be_false
     Util::Config.min_room_size.should == 5
-    Util::Config.act_max_count.should == 100
 
     Util::Config.reset!.should be_true
     Util::Config.min_room_size.should == 4
-    Util::Config.act_max_count.should == 200
 
     Util::Config.set(val2).should be_true
     Util::Config.min_room_size.should == 10
-    Util::Config.act_max_count.should == 80
 
     Util::Config.reset!.should be_true
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdgc-dm
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - parrot_studio
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +09:00
+date: 2010-09-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -77,25 +78,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Random Dungeon Maker from RDGC