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

Revert "revert: LazyVarUpdater에 \BackedEnum 롤백"

Browse Source 
This reverts commit a88ec71b44.
This commit is contained in:
Hide_D
2022-08-26 22:16:06 +09:00
parent a88ec71b44
commit 7fe450bc07
2 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/LazyVarUpdater.php
+45 -12
View File
@@ -15,15 +15,21 @@ trait LazyVarUpdater{
return $this->raw; return $this->raw;
} }
function getVar(string $key){ function getVar(string|\BackedEnum $key){
if($key instanceof \BackedEnum){
$key = $key->value;
}
return $this->raw[$key]; return $this->raw[$key];
} }
function getVars(string ...$keys){ function getVars(string|\BackedEnum ...$keys){
return array_map([$this, 'getVar'], $keys); return array_map([$this, 'getVar'], $keys);
} }
function touchVar(string $key):bool{ function touchVar(string|\BackedEnum $key):bool{
if($key instanceof \BackedEnum){
$key = $key->value;
}
if(key_exists($key, $this->raw)){ if(key_exists($key, $this->raw)){
return false; return false;
} }
@@ -41,16 +47,25 @@ trait LazyVarUpdater{
} }
} }
function setVar(string $key, $value){ function setVar(string|\BackedEnum $key, $value){
if($key instanceof \BackedEnum){
$key = $key->value;
}
return $this->updateVar($key, $value); return $this->updateVar($key, $value);
} }
function getAuxVar(string $key){ function getAuxVar(string|\BackedEnum $key){
if($key instanceof \BackedEnum){
$key = $key->value;
}
$this->unpackAux(); $this->unpackAux();
return $this->raw['auxVar'][$key]??null; return $this->raw['auxVar'][$key]??null;
} }
function setAuxVar(string $key, $var){ function setAuxVar(string|\BackedEnum $key, $var){
if($key instanceof \BackedEnum){
$key = $key->value;
}
$oldVar = $this->getAuxVar($key); $oldVar = $this->getAuxVar($key);
if($oldVar === $var){ if($oldVar === $var){
@@ -66,7 +81,10 @@ trait LazyVarUpdater{
$this->auxUpdated = true; $this->auxUpdated = true;
} }
function updateVar(string $key, $value){ function updateVar(string|\BackedEnum $key, $value){
if($key instanceof \BackedEnum){
$key = $key->value;
}
if(($this->raw[$key]??null) === $value){ if(($this->raw[$key]??null) === $value){
return; return;
} }
@@ -76,7 +94,10 @@ trait LazyVarUpdater{
$this->raw[$key] = $value; $this->raw[$key] = $value;
} }
function updateVarWithLimit(string $key, $value, $min = null, $max = null){ function updateVarWithLimit(string|\BackedEnum $key, $value, $min = null, $max = null){
if($key instanceof \BackedEnum){
$key = $key->value;
}
if($min !== null && $value < $min){ if($min !== null && $value < $min){
$value = $min; $value = $min;
} }
@@ -86,8 +107,11 @@ trait LazyVarUpdater{
$this->updateVar($key, $value); $this->updateVar($key, $value);
} }
function increaseVar(string $key, $value) function increaseVar(string|\BackedEnum $key, $value)
{ {
if($key instanceof \BackedEnum){
$key = $key->value;
}
if($value === 0){ if($value === 0){
return; return;
} }
@@ -95,7 +119,10 @@ trait LazyVarUpdater{
$this->updateVar($key, $targetValue); $this->updateVar($key, $targetValue);
} }
function increaseVarWithLimit(string $key, $value, $min = null, $max = null){ function increaseVarWithLimit(string|\BackedEnum $key, $value, $min = null, $max = null){
if($key instanceof \BackedEnum){
$key = $key->value;
}
$targetValue = $this->raw[$key] + $value; $targetValue = $this->raw[$key] + $value;
if($min !== null && $targetValue < $min){ if($min !== null && $targetValue < $min){
$targetValue = $min; $targetValue = $min;
@@ -106,8 +133,11 @@ trait LazyVarUpdater{
$this->updateVar($key, $targetValue); $this->updateVar($key, $targetValue);
} }
function multiplyVar(string $key, $value) function multiplyVar(string|\BackedEnum $key, $value)
{ {
if($key instanceof \BackedEnum){
$key = $key->value;
}
if($value === 1){ if($value === 1){
return; return;
} }
@@ -115,7 +145,10 @@ trait LazyVarUpdater{
$this->updateVar($key, $targetValue); $this->updateVar($key, $targetValue);
} }
function multiplyVarWithLimit(string $key, $value, $min = null, $max = null){ function multiplyVarWithLimit(string|\BackedEnum $key, $value, $min = null, $max = null){
if($key instanceof \BackedEnum){
$key = $key->value;
}
$targetValue = $this->raw[$key] * $value; $targetValue = $this->raw[$key] * $value;
if($min !== null && $targetValue < $min){ if($min !== null && $targetValue < $min){
$targetValue = $min; $targetValue = $min;
hwe/sammo/WarUnitCity.php
+4 -1
View File
@@ -44,7 +44,10 @@ class WarUnitCity extends WarUnit{
return $this->getVar('name'); return $this->getVar('name');
} }
function getCityVar(string $key){ function getCityVar(string|\BackedEnum $key){
if($key instanceof \BackedEnum){
$key = $key->value;
}
return $this->raw[$key]; return $this->raw[$key];
} }