Room::IsReplaceHumanGroup() -> OptionFilterData::$replace_human
trunk/include/data/option_filter_data_class.php (diff) trunk/include/option/chaos.php (diff) trunk/include/room_class.php (diff)| @@ -19,6 +19,12 @@ | ||
| 19 | 19 | //追加配役/闇鍋固定枠 |
| 20 | 20 | public static $cast_chaos_fix_role = ['topping', 'gerd', 'detective']; |
| 21 | 21 | |
| 22 | + //村人置換村グループ | |
| 23 | + public static $replace_human = [ | |
| 24 | + 'replace_human', 'full_mad', 'full_cupid', 'full_quiz', 'full_vampire', | |
| 25 | + 'full_chiroptera', 'full_patron', 'full_mania', 'full_unknown_mania' | |
| 26 | + ]; | |
| 27 | + | |
| 22 | 28 | //-- Cast::Execute() --// |
| 23 | 29 | //身代わり君固定配役 (順番依存あり) |
| 24 | 30 | public static $cast_dummy_boy_fix_role = ['quiz', 'gerd']; |
| @@ -146,7 +146,8 @@ | ||
| 146 | 146 | |
| 147 | 147 | //-- 村人上限補正 --// |
| 148 | 148 | if (true === $this->EnableCastChaosCalibration() && |
| 149 | - false === DB::$ROOM->IsReplaceHumanGroup() && ArrayFilter::Exists($role_list, 'human')) { | |
| 149 | + false === OptionManager::Exists('replace_human') && | |
| 150 | + ArrayFilter::Exists($role_list, 'human')) { | |
| 150 | 151 | $role = 'human'; |
| 151 | 152 | $count = $role_list[$role] - round($user_count / ChaosConfig::$max_human_rate); |
| 152 | 153 |
| @@ -118,15 +118,10 @@ | ||
| 118 | 118 | return $this->IsOption('quiz'); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - //村人置換村グループオプション判定 | |
| 122 | - public function IsReplaceHumanGroup() { | |
| 123 | - return $this->IsOption('replace_human') || $this->IsOptionGroup('full_'); | |
| 124 | - } | |
| 125 | - | |
| 126 | 121 | //闇鍋式希望制オプション判定 |
| 127 | 122 | public function IsChaosWish() { |
| 128 | 123 | return $this->IsOptionGroup('chaos') || $this->IsOption('duel') || |
| 129 | - $this->IsOption('festival') || $this->IsReplaceHumanGroup() || | |
| 124 | + $this->IsOption('festival') || OptionManager::Exists('replace_human') || | |
| 130 | 125 | $this->IsOptionGroup('change_'); |
| 131 | 126 | } |
| 132 | 127 |
