Role_priest::GetPriestResultRole()
trunk/include/role/counter_decide.php (diff) trunk/include/role/high_priest.php (diff) trunk/include/role/priest.php (diff)| @@ -13,7 +13,7 @@ | ||
| 13 | 13 | public function DecideVoteKill() { |
| 14 | 14 | if ($this->IsVoteKill()) return; |
| 15 | 15 | |
| 16 | - $stack = $this->GetVotePossible(); | |
| 16 | + $stack = $this->GetVotePossible(); | |
| 17 | 17 | foreach ($this->GetStack() as $actor => $target) { |
| 18 | 18 | if (in_array($actor, $stack) && in_array($target, $stack)) { |
| 19 | 19 | $this->SetVoteKill($this->GetCounterDecideTarget($actor, $target)); |
| @@ -10,7 +10,7 @@ | ||
| 10 | 10 | return DB::$ROOM->date < 5; |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - protected function GetOutputPriestRole() { | |
| 13 | + protected function GetPriestResultRole() { | |
| 14 | 14 | return DB::$ROOM->date % 2 == 0 ? 'priest' : 'bishop_priest'; |
| 15 | 15 | } |
| 16 | 16 |
| @@ -17,16 +17,11 @@ | ||
| 17 | 17 | |
| 18 | 18 | //司祭結果表示 (Mixin あり) |
| 19 | 19 | protected function OutputPriestResult() { |
| 20 | - RoleHTML::OutputResult($this->GetResult($this->GetOutputPriestRole())); | |
| 20 | + RoleHTML::OutputResult($this->GetPriestResultType($this->GetPriestResultRole())); | |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - //司祭結果表示役職取得 | |
| 24 | - protected function GetOutputPriestRole() { | |
| 25 | - return $this->role; | |
| 26 | - } | |
| 27 | - | |
| 28 | - //イベント名取得 | |
| 29 | - final protected function GetResult($role = null) { | |
| 23 | + //司祭結果表示能力取得 | |
| 24 | + final protected function GetPriestResultType($role = null) { | |
| 30 | 25 | if (is_null($role)) { |
| 31 | 26 | $role = $this->role; |
| 32 | 27 | } |
| @@ -33,6 +28,11 @@ | ||
| 33 | 28 | return strtoupper($role) . '_RESULT'; |
| 34 | 29 | } |
| 35 | 30 | |
| 31 | + //司祭結果表示役職取得 | |
| 32 | + protected function GetPriestResultRole() { | |
| 33 | + return $this->role; | |
| 34 | + } | |
| 35 | + | |
| 36 | 36 | //司祭情報収集 |
| 37 | 37 | final public function AggregatePriest() { |
| 38 | 38 | //-- 初期化 --// |
