• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2682 (tree)
Time2020-07-04 23:43:45
Authorumethyl

Log Message

Room::IsReplaceHumanGroup() -> OptionFilterData::$replace_human

Change Summary

Incremental Difference

--- trunk/include/data/option_filter_data_class.php (revision 2681)
+++ trunk/include/data/option_filter_data_class.php (revision 2682)
@@ -19,6 +19,12 @@
1919 //追加配役/闇鍋固定枠
2020 public static $cast_chaos_fix_role = ['topping', 'gerd', 'detective'];
2121
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+
2228 //-- Cast::Execute() --//
2329 //身代わり君固定配役 (順番依存あり)
2430 public static $cast_dummy_boy_fix_role = ['quiz', 'gerd'];
--- trunk/include/option/chaos.php (revision 2681)
+++ trunk/include/option/chaos.php (revision 2682)
@@ -146,7 +146,8 @@
146146
147147 //-- 村人上限補正 --//
148148 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')) {
150151 $role = 'human';
151152 $count = $role_list[$role] - round($user_count / ChaosConfig::$max_human_rate);
152153
--- trunk/include/room_class.php (revision 2681)
+++ trunk/include/room_class.php (revision 2682)
@@ -118,15 +118,10 @@
118118 return $this->IsOption('quiz');
119119 }
120120
121- //村人置換村グループオプション判定
122- public function IsReplaceHumanGroup() {
123- return $this->IsOption('replace_human') || $this->IsOptionGroup('full_');
124- }
125-
126121 //闇鍋式希望制オプション判定
127122 public function IsChaosWish() {
128123 return $this->IsOptionGroup('chaos') || $this->IsOption('duel') ||
129- $this->IsOption('festival') || $this->IsReplaceHumanGroup() ||
124+ $this->IsOption('festival') || OptionManager::Exists('replace_human') ||
130125 $this->IsOptionGroup('change_');
131126 }
132127
Show on old repository browser