devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: 중복되는 WarUnitTrigger의 priority 정정

Browse Source
This commit is contained in:
Hide_D
2022-07-25 00:29:20 +09:00
parent 7ebfd960b1
commit 0f8a8011be
16 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/WarUnitTrigger/che_격노발동.php
+1 -1
View File
@@ -25,7 +25,7 @@ class che_격노발동 extends BaseWarUnitTrigger{
$self->getLogger()->pushGeneralBattleDetailLog("상대의 {$targetAct}에 <C>{$reaction}</>했다!</>", ActionLogger::PLAIN);
$oppose->getLogger()->pushGeneralBattleDetailLog("{$targetAct}에 상대가 <R>{$reaction}</>했다!</>", ActionLogger::PLAIN);
if($is진노){
$self->addBonusPhase(1);
}
hwe/sammo/WarUnitTrigger/che_격노시도.php
+1 -1
View File
@@ -9,7 +9,7 @@ use sammo\ObjectTrigger;
use sammo\Util;
class che_격노시도 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 300;
protected $priority = ObjectTrigger::PRIORITY_BODY + 400;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$oppose->hasActivatedSkill('필살') && !$oppose->hasActivatedSkill('회피')){
hwe/sammo/WarUnitTrigger/che_계략발동.php
+1 -1
View File
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
use sammo\ActionLogger;
class che_계략발동 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 100;
protected $priority = ObjectTrigger::PRIORITY_POST + 300;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->hasActivatedSkill('계략')){
hwe/sammo/WarUnitTrigger/che_계략실패.php
+1 -1
View File
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
use sammo\ActionLogger;
class che_계략실패 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 200;
protected $priority = ObjectTrigger::PRIORITY_POST + 300;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->hasActivatedSkill('계략실패')){
hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
+1 -1
View File
@@ -14,7 +14,7 @@ use sammo\ObjectTrigger;
class che_궁병선제사격 extends BaseWarUnitTrigger
{
protected $priority = ObjectTrigger::PRIORITY_BEGIN;
protected $priority = ObjectTrigger::PRIORITY_BEGIN + 50;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv): bool
{
hwe/sammo/WarUnitTrigger/che_기병병종전투.php
+1 -1
View File
@@ -9,7 +9,7 @@ use sammo\Util;
use sammo\ObjectTrigger;
class che_기병병종전투 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_FINAL; //최후미
protected $priority = ObjectTrigger::PRIORITY_FINAL + 100; //최후미
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->isAttacker()){
hwe/sammo/WarUnitTrigger/che_반계발동.php
+2 -2
View File
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
use sammo\ActionLogger;
class che_반계발동 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 150;
protected $priority = ObjectTrigger::PRIORITY_POST + 250;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->hasActivatedSkill('반계')){
@@ -20,7 +20,7 @@ class che_반계발동 extends BaseWarUnitTrigger{
$general = $self->getGeneral();
[$opposeMagic, $damage] = $opposeEnv['magic'];
$josaUl = \sammo\JosaUtil::pick($opposeMagic, '을');
hwe/sammo/WarUnitTrigger/che_방어력증가5p.php
+1 -1
View File
@@ -9,7 +9,7 @@ use sammo\Util;
use sammo\ObjectTrigger;
class che_방어력증가5p extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_FINAL; //최후미
protected $priority = ObjectTrigger::PRIORITY_FINAL + 200; //최후미
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->isAttacker()){
hwe/sammo/WarUnitTrigger/che_성벽부상무효.php
+1 -1
View File
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
use sammo\ObjectTrigger;
class che_성벽부상무효 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_BEGIN + 100;
protected $priority = ObjectTrigger::PRIORITY_BEGIN + 150;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
assert($self instanceof WarUnitGeneral, 'General만 발동 가능');
hwe/sammo/WarUnitTrigger/che_약탈발동.php
+1 -1
View File
@@ -14,7 +14,7 @@ use sammo\GameConst;
class che_약탈발동 extends BaseWarUnitTrigger
{
protected $priority = ObjectTrigger::PRIORITY_POST + 400;
protected $priority = ObjectTrigger::PRIORITY_POST + 350;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv): bool
{
hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php
+1 -1
View File
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
use sammo\ActionLogger;
class che_전멸시페이즈증가 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 700;
protected $priority = ObjectTrigger::PRIORITY_POST + 800;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
/** @var WarUnitGeneral $self */
hwe/sammo/WarUnitTrigger/che_전투치료발동.php
+1 -1
View File
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
use sammo\ActionLogger;
class che_전투치료발동 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_POST + 300;
protected $priority = ObjectTrigger::PRIORITY_POST + 550;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!$self->hasActivatedSkill('치료')){
hwe/sammo/WarUnitTrigger/che_전투치료시도.php
+1 -1
View File
@@ -9,7 +9,7 @@ use sammo\Util;
use sammo\ObjectTrigger;
class che_전투치료시도 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_PRE + 300;
protected $priority = ObjectTrigger::PRIORITY_PRE + 350;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
assert($self instanceof WarUnitGeneral, 'General만 발동 가능');
hwe/sammo/WarUnitTrigger/che_필살시도.php
+1 -1
View File
@@ -9,7 +9,7 @@ use sammo\ObjectTrigger;
use sammo\Util;
class che_필살시도 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_PRE + 100;
protected $priority = ObjectTrigger::PRIORITY_PRE + 120;
protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
if(!($self instanceof WarUnitGeneral)){
hwe/sammo/WarUnitTrigger/능력치변경.php
+2 -2
View File
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
use sammo\ObjectTrigger;
class 능력치변경 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_BEGIN;
protected $priority = ObjectTrigger::PRIORITY_BEGIN + 10;
protected $variable;
protected $operator;
@@ -54,7 +54,7 @@ class 능력치변경 extends BaseWarUnitTrigger{
}
$this->processConsumableItem();
return true;
}
}
hwe/sammo/WarUnitTrigger/전투력보정.php
+1 -1
View File
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
use sammo\ObjectTrigger;
class 전투력보정 extends BaseWarUnitTrigger{
protected $priority = ObjectTrigger::PRIORITY_BEGIN;
protected $priority = ObjectTrigger::PRIORITY_BEGIN + 20;
public function __construct(WarUnit $unit, protected int|float $attackerWarPowerMultiplier, protected int|float $defenderWarPowerMultiplier = 1){
$this->object = $unit;