diff --git a/hwe/func.php b/hwe/func.php
index 4c1f7815..6979e89d 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -306,7 +306,7 @@ function myNationInfo(General $generalObj)
$text[] = "{$cmdName}: {$remainTurn}턴 뒤";
}
$nation['strategic_cmd_limit'] = $templates->render('tooltip', [
- 'text'=>$nation['strategic_cmd_limit'],
+ 'text'=>''.$nation['strategic_cmd_limit'].'',
'info'=>''.join('
', $text).'',
]);
}
diff --git a/hwe/sammo/ActionSpecialWar/che_격노.php b/hwe/sammo/ActionSpecialWar/che_격노.php
index 8f01139f..1bc95871 100644
--- a/hwe/sammo/ActionSpecialWar/che_격노.php
+++ b/hwe/sammo/ActionSpecialWar/che_격노.php
@@ -12,7 +12,7 @@ class che_격노 extends \sammo\BaseSpecial{
protected $id = 74;
protected $name = '격노';
- protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가)';
+ protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가), 격노마다 대미지 20% 추가 중첩';
static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
static $selectWeight = 1;
@@ -20,6 +20,11 @@ class che_격노 extends \sammo\BaseSpecial{
SpecialityHelper::STAT_STRENGTH,
];
+ public function getWarPowerMultiplier(WarUnit $unit):array{
+ $activatedCnt = $unit->hasActivatedSkillOnLog('격노');
+ return [1 + 0.2*$activatedCnt, 1];
+ }
+
public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
return new WarUnitTriggerCaller(
new che_격노시도($unit),
diff --git a/hwe/sammo/WarUnit.php b/hwe/sammo/WarUnit.php
index e0b9c33f..8d1cbe11 100644
--- a/hwe/sammo/WarUnit.php
+++ b/hwe/sammo/WarUnit.php
@@ -314,14 +314,11 @@ class WarUnit{
}
function hasActivatedSkill(string $skillName):bool{
- return $this->activatedSkill[$skillName] ?? false;
+ return $this->activatedSkill[$skillName]??false;
}
- function hasActivatedSkillOnLog(string $skillName):bool{
- if(key_exists($skillName, $this->logActivatedSkill)){
- return true;
- }
- return $this->hasActivatedSkill($skillName);
+ function hasActivatedSkillOnLog(string $skillName):int{
+ return ($this->logActivatedSkill[$skillName]??0)+($this->hasActivatedSkill($skillName)?1:0);
}
function activateSkill(... $skillNames){
diff --git a/hwe/sammo/WarUnitTrigger/che_격노시도.php b/hwe/sammo/WarUnitTrigger/che_격노시도.php
index d4b39d42..546bc516 100644
--- a/hwe/sammo/WarUnitTrigger/che_격노시도.php
+++ b/hwe/sammo/WarUnitTrigger/che_격노시도.php
@@ -22,14 +22,14 @@ class che_격노시도 extends BaseWarUnitTrigger{
if($oppose->hasActivatedSkill('필살')){
$self->activateSkill('격노');
$oppose->deactivateSkill('회피');
- if($self->isAttacker() && Util::randBool(1/3)){
+ if($self->isAttacker() && Util::randBool(1/2)){
$self->activateSkill('진노');
}
}
else if(Util::randBool(1/4)){
$self->activateSkill('격노');
$oppose->deactivateSkill('회피');
- if($self->isAttacker() && Util::randBool(1/3)){
+ if($self->isAttacker() && Util::randBool(1/2)){
$self->activateSkill('진노');
}
}