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

몰수, 포상 구현, 증여 헌납 버그 수정

Browse Source
This commit is contained in:
Hide_D
2018-11-17 15:40:34 +09:00
parent ca6755d8b5
commit 99142fdde3
8 changed files with 383 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_증여.php
+2 -2
View File
@@ -117,7 +117,7 @@ class che_증여 extends Command\GeneralCommand{
$resName = $isGold?'금':'쌀';
$destGeneral = $this->destGeneralObj;
$amount = Util::valueFit($amount, $general->getVar($resKey));
$amount = Util::valueFit($amount, 0, $general->getVar($resKey));
$amountText = number_format($amount, 0);
$logger = $general->getLogger();
@@ -125,7 +125,7 @@ class che_증여 extends Command\GeneralCommand{
$destGeneral->increaseVarWithLimit($resKey, $amount);
$general->increaseVarWithLimit($resKey, -$amount, 0);
$destGeneral->getLogger()->pushGeneralActionLog("{$general->getName()}</>에게서 {$resName} <C>{$amountText}</>을 증여 받았습니다.");
$destGeneral->getLogger()->pushGeneralActionLog("{$general->getName()}</>에게서 {$resName} <C>{$amountText}</>을 증여 받았습니다.", ActionLogger::PLAIN);
$logger->pushGeneralActionLog("{$destGeneral->getName()}에게 {$resName} <C>$amountText</>을 증여했습니다. <1>$date</>");
$exp = 70;
hwe/sammo/Command/General/che_헌납.php
+1 -1
View File
@@ -96,7 +96,7 @@ class che_헌납 extends Command\GeneralCommand{
$resKey = $isGold?'gold':'rice';
$resName = $isGold?'금':'쌀';
$amount = Util::valueFit($amount, $general->getVar($resKey));
$amount = Util::valueFit($amount, 0, $general->getVar($resKey));
$amountText = number_format($amount, 0);
$logger = $general->getLogger();
hwe/sammo/Command/Nation/che_몰수.php
+168
View File
@@ -0,0 +1,168 @@
<?php
namespace sammo\Command\Nation;
use \sammo\{
DB, Util, JosaUtil,
General, DummyGeneral,
ActionLogger,
GameConst,
LastTurn,
GameUnitConst,
Command
};
use function \sammo\{
getDomesticExpLevelBonus,
CriticalRatioDomestic,
CriticalScoreEx
};
use \sammo\Constraint\Constraint;
use \sammo\Constraint\ConstraintHelper;
class che_몰수 extends Command\NationCommand{
static protected $actionName = '몰수';
protected function argTest():bool{
//NOTE: 사망 직전에 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
if(!key_exists('isGold', $this->arg)){
return false;
}
if(!key_exists('amount', $this->arg)){
return false;
}
if(!key_exists('destGeneralID', $this->arg)){
return false;
}
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
$destGeneralID = $this->arg['destGeneralID'];
if(!is_int($amount)){
return false;
}
$amount = Util::valueFit($amount, 100, 10000);
if(!is_bool($isGold)){
return false;
}
if(!is_int($destGeneralID)){
return false;
}
if($destGeneralID <= 0){
return false;
}
if($destGeneralID == $this->generalObj->getID()){
return false;
}
$this->arg = [
'isGold'=>$isGold,
'amount'=>$amount,
'destGeneralID'=>$destGeneralID
];
return true;
}
protected function init(){
$general = $this->generalObj;
$env = $this->env;
$this->setCity();
$this->setNation(['gold', 'rice']);
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], 1);
$this->setDestGeneral($destGeneral);
$relYear = $env['year'] - $env['startyear'];
$this->runnableConstraints=[
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
ConstraintHelper::NotOpeningPart($relYear),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ExistsDestGeneral(),
ConstraintHelper::FriendlyDestGeneral()
];
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
public function getPostReqTurn():int{
return 0;
}
public function run():bool{
if(!$this->isRunnable()){
throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
}
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$nation = $this->nation;
$nationID = $nation['nation'];
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
$resKey = $isGold?'gold':'rice';
$resName = $isGold?'금':'쌀';
$destGeneral = $this->destGeneralObj;
$amount = Util::valueFit($amount, 0, $general->getVar[$resKey]);
$amountText = number_format($amount, 0);
if($destGeneral->getVar('npc') >= 2 && Util::randBool(0.01)){
$npcTexts = [
'몰수를 하다니... 이것이 윗사람이 할 짓이란 말입니까...',
'사유재산까지 몰수해가면서 이 나라가 잘 될거라 믿습니까? 정말 이해할 수가 없군요...',
'내 돈 내놔라! 내 돈! 몰수가 왠 말이냐!',
'몰수해간 내 자금... 언젠가 몰래 다시 빼내올 것이다...',
'몰수로 인한 사기 저하는 몰수로 얻은 물자보다 더 손해란걸 모른단 말인가!'
];
$text = Util::choiceRandom($npcTexts);
$src = new MessageTarget(
$general->getID(),
$general->getName(),
$nationID,
$nation['name'],
$nation['color'],
GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
);
$msg = new Message(
Message::MSGTYPE_PUBLIC,
$src,
$src,
$str,
new \DateTime(),
new \DateTime('9999-12-31'),
[]
);
$msg->send();
}
$logger = $general->getLogger();
$destGeneral->increaseVarWithLimit($resKey, -$amount);
$db->update('nation', [
$resKey=>$db->sqleval('%b + %i', $resKey, $amount)
], 'nation=%i', $nationID);
$destGeneral->getLogger()->pushGeneralActionLog("{$resName} {$amountText}을 몰수 당했습니다.", ActionLogger::PLAIN);
$logger->pushGeneralActionLog("{$destGeneral->getName()}에게서 {$resName} <C>$amountText</>을 몰수했습니다. <1>$date</>");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
$destGeneral->applyDB($db);
return true;
}
}
hwe/sammo/Command/Nation/che_포상.php
+140
View File
@@ -0,0 +1,140 @@
<?php
namespace sammo\Command\Nation;
use \sammo\{
DB, Util, JosaUtil,
General, DummyGeneral,
ActionLogger,
GameConst,
LastTurn,
GameUnitConst,
Command
};
use function \sammo\{
getDomesticExpLevelBonus,
CriticalRatioDomestic,
CriticalScoreEx
};
use \sammo\Constraint\Constraint;
use \sammo\Constraint\ConstraintHelper;
class che_포상 extends Command\NationCommand{
static protected $actionName = '포상';
protected function argTest():bool{
//NOTE: 사망 직전에 '포상' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
if(!key_exists('isGold', $this->arg)){
return false;
}
if(!key_exists('amount', $this->arg)){
return false;
}
if(!key_exists('destGeneralID', $this->arg)){
return false;
}
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
$destGeneralID = $this->arg['destGeneralID'];
if(!is_int($amount)){
return false;
}
$amount = Util::valueFit($amount, 100, 10000);
if(!is_bool($isGold)){
return false;
}
if(!is_int($destGeneralID)){
return false;
}
if($destGeneralID <= 0){
return false;
}
if($destGeneralID == $this->generalObj->getID()){
return false;
}
$this->arg = [
'isGold'=>$isGold,
'amount'=>$amount,
'destGeneralID'=>$destGeneralID
];
return true;
}
protected function init(){
$general = $this->generalObj;
$this->setCity();
$this->setNation(['gold', 'rice']);
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], 1);
$this->setDestGeneral($destGeneral);
$this->runnableConstraints=[
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ExistsDestGeneral(),
ConstraintHelper::FriendlyDestGeneral()
];
if($this->arg['isGold']){
$this->runnableConstraints[] = ConstraintHelper::ReqNationGold(1);
}
else{
$this->runnableConstraints[] = ConstraintHelper::ReqGeneralRice(1+GameConst::$baserice);
}
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
public function getPostReqTurn():int{
return 0;
}
public function run():bool{
if(!$this->isRunnable()){
throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
}
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$nation = $this->nation;
$nationID = $nation['nation'];
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
$resKey = $isGold?'gold':'rice';
$resName = $isGold?'금':'쌀';
$destGeneral = $this->destGeneralObj;
$amount = Util::valueFit($amount, 0, $nation[$resKey]);
$amountText = number_format($amount, 0);
$logger = $general->getLogger();
$destGeneral->increaseVarWithLimit($resKey, $amount);
$db->update('nation', [
$resKey=>$db->sqleval('%b - %i', $resKey, $amount)
], 'nation=%i', $nationID);
$destGeneral->getLogger()->pushGeneralActionLog("{$resName} <C>{$amountText}</>을 포상으로 받았습니다.", ActionLogger::PLAIN);
$logger->pushGeneralActionLog("{$destGeneral->getName()}에게 {$resName} <C>$amountText</>을 수여했습니다. <1>$date</>");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
$destGeneral->applyDB($db);
return true;
}
}
hwe/sammo/Constraint/ContraintHelper.php
+8
View File
@@ -188,6 +188,14 @@ class ConstraintHelper{
return [__FUNCTION__, $key, $keyNick, $comp, $reqVal];
}
static function ReqNationGold(int $reqGold):array{
return [__FUNCTION__, $reqGold];
}
static function ReqNationRice(int $reqRice):array{
return [__FUNCTION__, $reqRice];
}
static function ReqNationValue($key, string $keyNick, string $comp, $reqVal):array{
return [__FUNCTION__, $key, $keyNick, $comp, $reqVal];
}
hwe/sammo/Constraint/ReqNationalGold.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace sammo\Constraint;
class ReqNationGold extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){
return false;
}
if(!key_exists('gold', $this->nation)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require gold in nation");
}
return true;
}
public function test():bool{
$this->checkInputValues();
$this->tested = true;
if($this->nation['gold'] < $this->arg){
return true;
}
$this->reason = "국고가 부족합니다.";
return false;
}
}
hwe/sammo/Constraint/ReqNationalRice.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace sammo\Constraint;
class ReqNationRice extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){
return false;
}
if(!key_exists('rice', $this->nation)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require rice in nation");
}
return true;
}
public function test():bool{
$this->checkInputValues();
$this->tested = true;
if($this->nation['rice'] < $this->arg){
return true;
}
$this->reason = "병량이 부족합니다.";
return false;
}
}