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

저격시 아이템이 무조건 소모되는 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-06-09 01:45:52 +09:00
parent 648ad23dcf
commit 4c44b751e3
1 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/BaseWarUnitTrigger.php
+104 -104
View File
@@ -1,104 +1,104 @@
<?php
namespace sammo;
abstract class BaseWarUnitTrigger extends ObjectTrigger{
/** @var WarUnit $object */
const TYPE_NONE = 0;
const TYPE_ITEM = 1;
const TYPE_CONSUMABLE_ITEM = 1 | 2;
protected $raiseType = self::TYPE_NONE;
public function __construct(WarUnit $unit, int $raiseType = 0){
$this->object = $unit;
$this->raiseType = $raiseType;
}
public function getUniqueID():string{
$priority = $this->priority;
$fqn = static::class;
if($this->object === null){
$objID = '';
}
else{
$objID = spl_object_id($this->object);
}
return "{$priority}_{$fqn}_{$objID}_{$this->raiseType}";
}
public function action(?array $env=null, $arg=null):?array{
if($env === null){
$env = [];
}
if(!key_exists('e_attacker', $env)){
$env['e_attacker'] = [];
}
if(!key_exists('e_defender', $env)){
$env['e_defender'] = [];
}
if($env['stopNextAction']??false){
return $env;
}
/** @var WarUnitGeneral $attacker */
/** @var WarUnit $defender */
[$attacker, $defender] = $arg;
/** @var WarUnit $self */
$self = $this->object;
$isAttacker = $self->isAttacker();
$oppose = $isAttacker?$defender:$attacker;
$selfEnv = $isAttacker?$env['e_attacker']:$env['e_defender'];
$opposeEnv = $isAttacker?$env['e_defender']:$env['e_attacker'];
$callNextAction = $this->actionWar($self, $oppose, $selfEnv, $opposeEnv);
$env['e_attacker'] = $isAttacker?$selfEnv:$opposeEnv;
$env['e_defender'] = $isAttacker?$opposeEnv:$selfEnv;
if(!$callNextAction){
$env['stopNextAction'] = true;
}
return $env;
}
abstract protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool;
public function processConsumableItem():bool{
if(!($this->raiseType & static::TYPE_ITEM)){
return false;
}
/** @var WarUnit $self */
$self = $this->object;
if($self->hasActivatedSkill('아이템사용')){
return false;
}
$self->activateSkill('아이템사용');
$item = $self->getGeneral()->getItem();
$itemName = $item->getName();
$itemRawName = $item->getRawName();
$self->activateSkill($itemName);
if (!($this->raiseType & static::TYPE_CONSUMABLE_ITEM)) {
return false;
}
if($self->hasActivatedSkill('아이템소모')){
return false;
}
$self->activateSkill('아이템소모');
$josaUl = JosaUtil::pick($itemRawName, '을');
$self->getLogger()->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
$self->getGeneral()->deleteItem();
return true;
}
}
<?php
namespace sammo;
abstract class BaseWarUnitTrigger extends ObjectTrigger{
/** @var WarUnit $object */
const TYPE_NONE = 0;
const TYPE_ITEM = 1;
const TYPE_CONSUMABLE_ITEM = 1 | 2;
protected $raiseType = self::TYPE_NONE;
public function __construct(WarUnit $unit, int $raiseType = 0){
$this->object = $unit;
$this->raiseType = $raiseType;
}
public function getUniqueID():string{
$priority = $this->priority;
$fqn = static::class;
if($this->object === null){
$objID = '';
}
else{
$objID = spl_object_id($this->object);
}
return "{$priority}_{$fqn}_{$objID}_{$this->raiseType}";
}
public function action(?array $env=null, $arg=null):?array{
if($env === null){
$env = [];
}
if(!key_exists('e_attacker', $env)){
$env['e_attacker'] = [];
}
if(!key_exists('e_defender', $env)){
$env['e_defender'] = [];
}
if($env['stopNextAction']??false){
return $env;
}
/** @var WarUnitGeneral $attacker */
/** @var WarUnit $defender */
[$attacker, $defender] = $arg;
/** @var WarUnit $self */
$self = $this->object;
$isAttacker = $self->isAttacker();
$oppose = $isAttacker?$defender:$attacker;
$selfEnv = $isAttacker?$env['e_attacker']:$env['e_defender'];
$opposeEnv = $isAttacker?$env['e_defender']:$env['e_attacker'];
$callNextAction = $this->actionWar($self, $oppose, $selfEnv, $opposeEnv);
$env['e_attacker'] = $isAttacker?$selfEnv:$opposeEnv;
$env['e_defender'] = $isAttacker?$opposeEnv:$selfEnv;
if(!$callNextAction){
$env['stopNextAction'] = true;
}
return $env;
}
abstract protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool;
public function processConsumableItem():bool{
if(!($this->raiseType & static::TYPE_ITEM)){
return false;
}
/** @var WarUnit $self */
$self = $this->object;
if($self->hasActivatedSkill('아이템사용')){
return false;
}
$self->activateSkill('아이템사용');
$item = $self->getGeneral()->getItem();
$itemName = $item->getName();
$itemRawName = $item->getRawName();
$self->activateSkill($itemName);
if ($this->raiseType != static::TYPE_CONSUMABLE_ITEM) {
return false;
}
if($self->hasActivatedSkill('아이템소모')){
return false;
}
$self->activateSkill('아이템소모');
$josaUl = JosaUtil::pick($itemRawName, '을');
$self->getLogger()->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
$self->getGeneral()->deleteItem();
return true;
}
}