Role_trap_mad::TrapKill()
trunk/include/role/trap_mad.php (diff)| @@ -84,10 +84,14 @@ | ||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | //罠発動 |
| 87 | - final public function TrapKill(User $user, $id) { | |
| 87 | + final public function TrapKill(User $user, $id, $delay = false) { | |
| 88 | 88 | $flag = $this->IsTrap($id); |
| 89 | 89 | if ($flag) { |
| 90 | - $this->TrapKillAction($user); | |
| 90 | + if ($delay) { | |
| 91 | + $this->AddSuccess($user->id, $this->GetTrapType()); | |
| 92 | + } else { | |
| 93 | + $this->TrapKillAction($user); | |
| 94 | + } | |
| 91 | 95 | } |
| 92 | 96 | return $this->GetTrapKillResult($flag); |
| 93 | 97 | } |
| @@ -109,11 +113,7 @@ | ||
| 109 | 113 | |
| 110 | 114 | //罠発動 (遅行発動型) |
| 111 | 115 | final public function DelayTrap(User $user, $id) { |
| 112 | - $flag = $this->IsTrap($id); | |
| 113 | - if ($flag) { | |
| 114 | - $this->AddSuccess($user->id, $this->GetTrapType()); | |
| 115 | - } | |
| 116 | - return $this->GetTrapKillResult($flag); | |
| 116 | + return $this->TrapKill($user, $id, true); | |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | //罠発動 (複合発動型) |
