• R/O
  • SSH
  • HTTPS

jinrousiki: コミット


コミットメタ情報

リビジョン2026 (tree)
日時2017-05-14 23:09:17
作者umethyl

ログメッセージ

RoleVoteTarget::SACRIFICE

変更サマリ

差分

--- trunk/include/role/guard.php (revision 2025)
+++ trunk/include/role/guard.php (revision 2026)
@@ -187,7 +187,7 @@
187187 //狩りスキップ対象者判定
188188 private function IgnoreHuntTarget(User $user) {
189189 //対象が身代わり死していた場合はスキップ
190- return RoleManager::Stack()->ExistsKey('sacrifice', $user->id) ||
190+ return RoleManager::Stack()->ExistsKey(RoleVoteTarget::SACRIFICE, $user->id) ||
191191 RoleUser::IsAvoidLovers($user, true);
192192 }
193193 }
--- trunk/include/role/protected.php (revision 2025)
+++ trunk/include/role/protected.php (revision 2026)
@@ -54,7 +54,7 @@
5454
5555 $id = Lottery::Get($stack);
5656 DB::$USER->Kill($id, DeadReason::SACRIFICE);
57- $this->AddStack($id, 'sacrifice');
57+ $this->AddStack($id, RoleVoteTarget::SACRIFICE);
5858 return true;
5959 }
6060 }
--- trunk/include/data/role_vote_data_class.php (revision 2025)
+++ trunk/include/data/role_vote_data_class.php (revision 2026)
@@ -71,6 +71,7 @@
7171 const DUMMY_GUARD = 'dummy_guard';
7272 const BARRIER_WIZARD = 'barrier_wizard';
7373 const ESCAPER = 'escaper';
74+ const SACRIFICE = 'sacrifice';
7475 const ANTI_VOODOO = 'anti_voodoo';
7576 const REVERSE_ASSASSIN = 'reverse_assassin';
7677 }
--- trunk/include/game_vote_functions.php (revision 2025)
+++ trunk/include/game_vote_functions.php (revision 2026)
@@ -857,7 +857,8 @@
857857 RoleVoteTarget::GATEKEEPER_GUARD,
858858 RoleVoteTarget::DUMMY_GUARD,
859859 RoleVoteTarget::BARRIER_WIZARD,
860- RoleVoteTarget::ESCAPER, 'sacrifice',
860+ RoleVoteTarget::ESCAPER,
861+ RoleVoteTarget::SACRIFICE,
861862 RoleVoteTarget::REVERSE_ASSASSIN,
862863 RoleVoteTarget::ANTI_VOODOO,
863864 RoleVoteSuccess::TRAPPED,
旧リポジトリブラウザで表示