• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2649 (tree)
Time2020-04-19 20:52:30
Authorumethyl

Log Message

OptionManager::IsRoomOpenCast()

Change Summary

Incremental Difference

--- trunk/include/option/auto_open_cast.php (revision 2648)
+++ trunk/include/option/auto_open_cast.php (revision 2649)
@@ -13,7 +13,7 @@
1313 return '自動公開 (蘇生能力者などが能力を持っている間だけ霊界が非公開になります)';
1414 }
1515
16- public function IsOpenCast() {
16+ public function IsRoomOpenCast() {
1717 return $this->IsUserOpenCast();
1818 }
1919 }
--- trunk/include/option/not_close_cast.php (revision 2648)
+++ trunk/include/option/not_close_cast.php (revision 2649)
@@ -12,7 +12,7 @@
1212 }
1313
1414 //霊界公開判定
15- public function IsOpenCast() {
15+ public function IsRoomOpenCast() {
1616 return true;
1717 }
1818
--- trunk/include/option/not_open_cast.php (revision 2648)
+++ trunk/include/option/not_open_cast.php (revision 2649)
@@ -13,7 +13,7 @@
1313 return '常時非公開 (誰がどの役職なのか公開されません。蘇生能力は有効です)';
1414 }
1515
16- public function IsOpenCast() {
16+ public function IsRoomOpenCast() {
1717 $user = DB::$USER->ByID(GM::ID); //身代わり君の蘇生辞退判定
1818 return $user->IsDummyBoy() && $user->IsDrop() && $this->IsUserOpenCast();
1919 }
--- trunk/include/option/option_class.php (revision 2648)
+++ trunk/include/option/option_class.php (revision 2649)
@@ -112,11 +112,11 @@
112112
113113 //-- Room --//
114114 //霊界公開判定
115- public static function IsOpenCast() {
116- //便宜上常時公開設定もオプションクラスは実装しているが、システム上は未設定 (null) になる
115+ public static function IsRoomOpenCast() {
116+ //便宜上常時公開設定もオプションクラスは実装しているが、システム上はオプション未設定になる
117117 foreach (OptionFilterData::$open_cast as $option) {
118118 if (DB::$ROOM->IsOption($option)) {
119- return OptionLoader::Load($option)->IsOpenCast();
119+ return OptionLoader::Load($option)->IsRoomOpenCast();
120120 }
121121 }
122122 return true;
--- trunk/include/room_class.php (revision 2648)
+++ trunk/include/room_class.php (revision 2649)
@@ -261,7 +261,7 @@
261261 public function IsOpenCast() {
262262 $data = 'open_cast';
263263 if ($this->Flag()->IsEmpty($data)) { //未設定ならキャッシュする
264- $this->Flag()->Set($data, OptionManager::IsOpenCast());
264+ $this->Flag()->Set($data, OptionManager::IsRoomOpenCast());
265265 }
266266 return $this->Flag()->Get($data);
267267 }
@@ -544,7 +544,9 @@
544544 //ゲーム開始
545545 public function Start() {
546546 $this->date++;
547- $this->SetScene($this->IsOption('open_day') ? RoomScene::DAY : RoomScene::NIGHT);
547+ $scene = $this->IsOption('open_day') ? RoomScene::DAY : RoomScene::NIGHT;
548+ Text::p($scene);
549+ $this->SetScene($scene);
548550 DB::$USER->GameStart();
549551 if (false === $this->IsTest()) {
550552 RoomDB::Start();
Show on old repository browser