2009-12-27：最少人数調整をフラグ管理可能に修正

コアタイムとする時間帯、コアタイム中の最小参加人数の取得先を設定ファイルに変更。
コアタイム中の最小参加人数変更処理の実施可否を設定ファイルに追加。

diff --git a/trunk/lib/compat1.9.rb b/trunk/lib/compat1.9.rb
index 4b11101..167b0a9 100644 (file)
--- a/trunk/lib/compat1.9.rb
+++ b/trunk/lib/compat1.9.rb
@@ -16,16 +16,17 @@ end
 
 # It's not 1.9.x feature, but extention of std. classes
 #
+#2009/12/27 mod:tkt:coretime get from the configuration file
 class Time
        def self.coretime?
                hour = Time.now.hour
-               (20 < hour && hour < 24)
+               ((S[:coretime_start] -1) < hour && hour < S[:coretime_end])
        end
        
        #2009/01/25 add tkt
        def self.coretimeThat?(time)
                hour = time.hour
-               (20 < hour && hour < 24)
+               ((S[:coretime_start] -1) < hour && hour < S[:coretime_end])
        end
        #2009/01/25 add tkt
 end

diff --git a/trunk/lib/config.rb.default b/trunk/lib/config.rb.default
index 00828ac..b0701fe 100644 (file)
--- a/trunk/lib/config.rb.default
+++ b/trunk/lib/config.rb.default
@@ -55,4 +55,8 @@ S = {\
        :guard_fixed_num => 8,#add 2008/11/07 tkt:guard is fixed for under this number
        :guard_fixed_day => 5,#add 2008/11/07 tkt:this day is guard fixed
        :epilogue_period_min => 10, #add 2008/12/7 tkt:minutes for epilogue modified, limit min.
+       :config_min_entries => true, #this flag enable to min_entries + config_min_entries_num
+       :config_min_entries_num => 2, #this num is add to min_entries
+       :coretime_start => 22, #this time is start of coretime
+       :coretime_end => 23, #this time is end of coretime
 }

diff --git a/trunk/lib/ms/activepage.rb b/trunk/lib/ms/activepage.rb
index 737f309..73b5edd 100644 (file)
--- a/trunk/lib/ms/activepage.rb
+++ b/trunk/lib/ms/activepage.rb
@@ -194,7 +194,8 @@ module ActivePage
                        case vil.state 
                        when Vil::State::Welcome
                                #2009/01/25 mod tkt for min_entries by coretime|| min_entries = (@vil.first_restart) ? S[:min_entries] : S[:apply_advance_num]
-                               min_entries = (@vil.first_restart) ? min_entries_num(@up, true) : S[:apply_advance_num]
+                               #2009/12/27 mod tkt for min_entries by configuration
+                               min_entries = (@vil.first_restart) ? min_entries_num(@up) : S[:apply_advance_num]
                                @orders << c(SHOW_UPDATE_PR, @vil.players.size, min_entries)
                                size = @vil.discussion_size(0)
                                if size > S[:log_max] - 50

diff --git a/trunk/lib/ms/page.rb b/trunk/lib/ms/page.rb
index 7403e15..6816f27 100644 (file)
--- a/trunk/lib/ms/page.rb
+++ b/trunk/lib/ms/page.rb
@@ -205,7 +205,8 @@ module Page
 
                        if @vil.state == Vil::State::Welcome
                                #2009/01/25 mod tkt for min_entries by coretime|| min_entries = (@vil.first_restart) ? S[:min_entries] : S[:apply_advance_num]
-                               min_entries = (@vil.first_restart) ? min_entries_num(@up, true) : S[:apply_advance_num]
+                               #2009/12/27 mod tkt for min_entries by configuration
+                               min_entries = (@vil.first_restart) ? min_entries_num(@up) : S[:apply_advance_num]
                                _ << c(SHOW_UPDATE_PR_STATIC, @up.hour, @up.min, @up.sec, min_entries)
                        else
                                _ << c(SHOW_UPDATE_STATIC, @up.hour, @up.min, @up.sec)

diff --git a/trunk/lib/ms/util.rb b/trunk/lib/ms/util.rb
index 536eb6e..82ac5bd 100644 (file)
--- a/trunk/lib/ms/util.rb
+++ b/trunk/lib/ms/util.rb
@@ -105,11 +105,18 @@ end
 
 #2009/01/25 add tkt
 #coretime:min_entries +1 -> else:min_entries.
-def min_entries_num(up, check = false)
-       (Time.coretimeThat?(up)) ? (S[:min_entries] + 1) : S[:min_entries]
+#2009/12/27 mod tkt
+# mod:added num get from the configuration file
+# add:config_min_entries_num()
+def min_entries_num(up)
+       min_check = S[:config_min_entries] ? (Time.coretimeThat?(up)) : S[:config_min_entries]
+       min_check ? config_min_entries_num() : S[:min_entries]
 end
 
-def min_entries_ready(check = false)
-       #min_entries_num(Time.now.to_f, check)
-       (Time.coretime?) ? (S[:min_entries] + 1) : S[:min_entries]
+def min_entries_ready()
+       min_entries_num(Time.now())
+end
+
+def config_min_entries_num()
+       S[:min_entries] + S[:config_min_entries_num]
 end
\ No newline at end of file

diff --git a/trunk/lib/ms/village/players.rb b/trunk/lib/ms/village/players.rb
index 0bce1ee..713100e 100644 (file)
--- a/trunk/lib/ms/village/players.rb
+++ b/trunk/lib/ms/village/players.rb
@@ -87,7 +87,8 @@ class Vil
 
                def ready?
                        #2009/01/25 mod tkt for min_entries by coretime|| size() >= S[:min_entries]
-                       size() >= min_entries_ready(true)
+                       #2009/12/27 mod tkt for min_entries by configuration
+                       size() >= min_entries_ready()
                end
 
                def adv_ready?