7人及び9人の編成の初日部屋割りを3人部屋ベースに変更

diff --git a/trunk/lib/config.rb.default b/trunk/lib/config.rb.default
index 5cb503c..c23dd3d 100644 (file)
--- a/trunk/lib/config.rb.default
+++ b/trunk/lib/config.rb.default
@@ -53,4 +53,5 @@ S = {\
        :index_info => 3,
        :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.
 }

diff --git a/trunk/lib/ms/village.rb b/trunk/lib/ms/village.rb
index 06f298a..e7adc55 100644 (file)
--- a/trunk/lib/ms/village.rb
+++ b/trunk/lib/ms/village.rb
@@ -434,7 +434,23 @@ class Vil
        #######################################################
 
        def start_sun
-               period = (@state == State::Party) ? S[:epilogue_period] : @period
+               #mod 2008/11/08 tkt : for epilogue time change, yes, i know this code is not good...
+               #to-do attached plyaers.size and period time
+               #period = (@state == State::Party) ? S[:epilogue_period] : @period
+               period = @period
+               if @state == State::Party
+                       period = 1 * @players.size * (@date - 1)
+                       $logger.debug('epilogue_period#{period}  plaersize#{@players.size} date#{(@date - 1)}')
+                       if period < S[:epilogue_period_min]
+                               period = S[:epilogue_period_min]
+                       elsif (@players.size >= 8 || (period > S[:epilogue_period]))
+                               period = S[:epilogue_period]
+                       end
+                       #period = (@state == State::Party) ? period_epi : @period               
+               end
+               
+               #mod 2008/11/08 end
+               
                up_uptime(period)
                # up_uptime(@period)
                @phase = Phase::Sun
@@ -589,7 +605,8 @@ class Vil
                addlog(room_res(c(ROOM_VOTING, pl.name, mate.name)))
 
                @voting.delete(mate)
-               if (@rule == Rule::Standard || @date != 1)
+               #if (@rule == Rule::Standard || @date != 1) mod 2008/11/08 tkt:change rule for 3 members room
+               if (@date != 1 || (@rule == Rule::Standard && (@players.size % 2 == 0)))
                        @players.room_map([pl, mate])
                else # Advance
                        last_room = @players.mates.last