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

gen123 => officer432

Browse Source
This commit is contained in:
Hide_D
2019-10-05 02:45:20 +09:00
parent 614cd1c96f
commit 61da4e56c1
27 changed files with 299 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_귀환.php
+11 -5
View File
@@ -69,13 +69,19 @@ class che_귀환 extends Command\GeneralCommand{
$generalID = $general->getID();
$date = substr($general->getVar('turntime'),11,5);
switch($general->getVar('level')){
case 2: [$cityID, $cityName] = $db->queryFirstList('SELECT city, name FROM city WHERE gen3=%i', $generalID); break;
case 3: [$cityID, $cityName] = $db->queryFirstList('SELECT city, name FROM city WHERE gen2=%i', $generalID); break;
case 4: [$cityID, $cityName] = $db->queryFirstList('SELECT city, name FROM city WHERE gen1=%i', $generalID); break;
default: [$cityID, $cityName] = $db->queryFirstList('SELECT city, name FROM city WHERE city=%i', $this->nation['capital']); break;
$generalLevel = $general->getVar('level');
$target = null;
if(2 <= $generalLevel && 4 <= $generalLevel){
$target = $db->queryFirstList(
'SELECT city, name FROM city WHERE %b=%i AND nation = %i',
'officer'.$general->getVar('level'), $generalID, $general->getNationID()
);
}
if(!$target){
$target = $db->queryFirstList('SELECT city, name FROM city WHERE city=%i', $this->nation['capital']);
}
[$cityID, $cityName] = $target;
$josaRo = JosaUtil::pick($cityName, '로');
$logger = $general->getLogger();
hwe/sammo/Command/General/che_모반시도.php
+8 -11
View File
@@ -81,20 +81,17 @@ class che_모반시도 extends Command\GeneralCommand{
$logger = $general->getLogger();
$lordLogger = $this->destGeneralObj->getLogger();
$generalLevel = $general->getVar('level');
$general->setVar('level', 12);
$lordGeneral->setVar('level', 1);
$lordGeneral->multiplyVar('experience', 0.7);
$db->update('city', [
'gen1'=>0
], 'gen1=%i', $general->getID());
$db->update('city', [
'gen2'=>0
], 'gen2=%i', $general->getID());
$db->update('city', [
'gen3'=>0
], 'gen3=%i', $general->getID());
if(2 <= $generalLevel && $generalLevel <= 4){
$db->update('city', [
'officer'.$generalLevel=>0
], "officer{$generalLevel}=%i", $general->getID());
}
$josaYi = JosaUtil::pick($generalName, '이');
$logger->pushGlobalHistoryLog("<Y><b>【모반】</b></><Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>의 군주 자리를 찬탈했습니다.");
$logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <Y>{$lordName}</>에게서 군주자리를 찬탈");
hwe/sammo/Command/General/che_방랑.php
+3 -3
View File
@@ -121,9 +121,9 @@ class che_방랑 extends Command\GeneralCommand{
$db->update('city', [
'nation'=>0,
'front'=>0,
'gen1'=>0,
'gen2'=>0,
'gen3'=>0,
'officer4'=>0,
'officer3'=>0,
'officer2'=>0,
'conflict'=>'{}'
], 'nation=%i', $nationID);
hwe/sammo/Command/General/che_선양.php
+6 -9
View File
@@ -102,19 +102,16 @@ class che_선양 extends Command\GeneralCommand{
$logger = $general->getLogger();
$destLogger = $destGeneral->getLogger();
$destGeneralLevel = $destGeneral->getVar('level');
$destGeneral->setVar('level', 12);
$general->setVar('level', 1);
$general->multiplyVar('experience', 0.7);
$db->update('city', [
'gen1'=>0
], 'gen1=%i', $destGeneral->getID());
$db->update('city', [
'gen2'=>0
], 'gen2=%i', $destGeneral->getID());
$db->update('city', [
'gen3'=>0
], 'gen3=%i', $destGeneral->getID());
if(2 <= $destGeneralLevel && $destGeneralLevel <= 4){
$db->update('city', [
'officer'.$destGeneralLevel=>0
], "officer{$destGeneralLevel}=%i", $destGeneral->getID());
}
$josaYi = JosaUtil::pick($generalName, '이');
$logger->pushGlobalHistoryLog("<Y><b>【선양】</b></><Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>의 군주 자리를 <Y>{$destGeneralName}</>에게 선양했습니다.");