|
@@ -31,7 +31,7 @@ discard block |
|
|
block discarded – undo |
|
31
|
31
|
*/ |
|
32
|
32
|
public function setTemplate(string $template): void { |
|
33
|
33
|
if(!is_file($template)) { |
|
34
|
|
- throw new \RuntimeException("File $template does not exist."); |
|
|
34
|
+ throw new \RuntimeException("file $template does not exist."); |
|
35
|
35
|
} |
|
36
|
36
|
$this->template = $template; |
|
37
|
37
|
} |
|
@@ -54,14 +54,14 @@ discard block |
|
|
block discarded – undo |
|
54
|
54
|
case CombatLogEntry::ACTION_ATTACK: |
|
55
|
55
|
$message = ($item->result) ? "combat.log.attackHits" : "combat.log.attackFails"; |
|
56
|
56
|
$text = $this->translator->translate($message, $item->amount, ["character1" => $character1, "character2" => $character2]); |
|
57
|
|
- if($item->result AND $item->character2->hitpoints < 1) { |
|
|
57
|
+ if($item->result and $item->character2->hitpoints < 1) { |
|
58
|
58
|
$text .= $this->translator->translate("combat.log.characterFalls"); |
|
59
|
59
|
} |
|
60
|
60
|
return $text; |
|
61
|
61
|
case CombatLogEntry::ACTION_SKILL_ATTACK: |
|
62
|
62
|
$message = ($item->result) ? "combat.log.specialAttackHits" : "combat.log.specialAttackFails"; |
|
63
|
63
|
$text = $this->translator->translate($message, $item->amount, ["character1" => $character1, "character2" => $character2, "name" => $item->name]); |
|
64
|
|
- if($item->result AND $item->character2->hitpoints < 1) { |
|
|
64
|
+ if($item->result and $item->character2->hitpoints < 1) { |
|
65
|
65
|
$text .= $this->translator->translate("combat.log.characterFalls"); |
|
66
|
66
|
} |
|
67
|
67
|
return $text; |
Please login to merge, or discard this patch.