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

generalSource 폐기

Browse Source
This commit is contained in:
Hide_D
2018-10-17 16:01:38 +09:00
parent dbcfe6fc6e
commit 1004e5a8bd
14 changed files with 67 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_강행.php
+12 -10
View File
@@ -92,16 +92,18 @@ class che_강행 extends Command\GeneralCommand{
$general->setVar('city', $destCityID);
if($general->getVar('level') == 12 && $this->nation['level'] == 0){
$generalList = $db->query('SELECT no, name, city, nation, level FROM general WHERE nation=%i AND no!=%i', $general->getNationID(), $general->getID());
foreach($generalList as $targetRawGeneral){
$targetGeneralID = $targetRawGeneral['no'];
$targetGeneral = $this->getGeneralObjFromGeneralSource($targetGeneralID);
if($targetGeneral === null){
$targetGeneral = new General($targetRawGeneral, null, $env['year'], $env['month'], false);
}
$targetGeneral->setVar('city', $destCityID);
$targetGeneral->getLogger()->pushGeneralActionLog("방랑군 세력이 <G><b>{$destCityName}</b></>{$josaRo} 강행했습니다.", ActionLogger::PLAIN);
$targetGeneral = null;
$generalList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND no!=%i', $general->getNationID(), $general->getID());
if($generalList){
$db->update('general', [
'city'=>$destCityID
], 'no IN %li', $generalList);
}
foreach($generalList as $targetGeneralID){
$targetGeneral = General::createGeneralObjFromDB($targetGeneralID, [], 1);
$targetLogger = new ActionLogger($targetGeneralID, $general->getNationID(), $env['year'], $env['month']);
$targetLogger->pushGeneralActionLog("방랑군 세력이 <G><b>{$destCityName}</b></>{$josaRo} 강행했습니다.", ActionLogger::PLAIN);
$targetLogger->flush();
}
}
hwe/sammo/Command/General/che_기술연구.php
+1 -1
View File
@@ -131,7 +131,7 @@ class che_기술연구 extends che_상업투자{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_단련.php
+1 -1
View File
@@ -114,7 +114,7 @@ class che_단련 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_사기진작.php
+1 -1
View File
@@ -96,7 +96,7 @@ class che_사기진작 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_상업투자.php
+1 -1
View File
@@ -174,7 +174,7 @@ class che_상업투자 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_이동.php
+11 -10
View File
@@ -92,16 +92,17 @@ class che_이동 extends Command\GeneralCommand{
$general->setVar('city', $destCityID);
if($general->getVar('level') == 12 && $this->nation['level'] == 0){
$generalList = $db->query('SELECT no, name, city, nation, level FROM general WHERE nation=%i AND no!=%i', $general->getNationID(), $general->getID());
foreach($generalList as $targetRawGeneral){
$targetGeneralID = $targetRawGeneral['no'];
$targetGeneral = $this->getGeneralObjFromGeneralSource($targetGeneralID);
if($targetGeneral === null){
$targetGeneral = new General($targetRawGeneral, null, $env['year'], $env['month'], false);
}
$targetGeneral->setVar('city', $destCityID);
$targetGeneral->getLogger()->pushGeneralActionLog("방랑군 세력이 <G><b>{$destCityName}</b></>{$josaRo} 이동했습니다.", ActionLogger::PLAIN);
$targetGeneral = null;
$generalList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND no!=%i', $general->getNationID(), $general->getID());
if($generalList){
$db->update('general', [
'city'=>$destCityID
], 'no IN %li', $generalList);
}
foreach($generalList as $targetGeneralID){
$targetGeneral = General::createGeneralObjFromDB($targetGeneralID, [], 1);
$targetLogger = new ActionLogger($targetGeneralID, $general->getNationID(), $env['year'], $env['month']);
$targetLogger->pushGeneralActionLog("방랑군 세력이 <G><b>{$destCityName}</b></>{$josaRo} 이동했습니다.", ActionLogger::PLAIN);
$targetLogger->flush();
}
}
hwe/sammo/Command/General/che_정착장려.php
+1 -1
View File
@@ -161,7 +161,7 @@ class che_정착장려 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_주민선정.php
+1 -1
View File
@@ -158,7 +158,7 @@ class che_주민선정 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_집합.php
+12 -11
View File
@@ -81,16 +81,17 @@ class che_집합 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("<G><b>{$cityName}</b></>에서 집합을 실시했습니다. <1>$date</>");
$generalList = $db->query('SELECT no, name, city, nation, level FROM general WHERE nation=%i AND troop=%i AND no!=%i', $general->getNationID(), $troopID, $general->getID());
foreach($generalList as $targetRawGeneral){
$targetGeneralID = $targetRawGeneral['no'];
$targetGeneral = $this->getGeneralObjFromGeneralSource($targetGeneralID);
if($targetGeneral === null){
$targetGeneral = new General($targetRawGeneral, null, $env['year'], $env['month'], false);
}
$targetGeneral->setVar('city', $destCityID);
$targetGeneral->getLogger()->pushGeneralActionLog("{$troopName}의 부대원들은 <G><b>{$cityName}</b></>{$josaRo} 집합되었습니다.", ActionLogger::PLAIN);
$targetGeneral = null;
$generalList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND troop=%i AND no!=%i', $general->getNationID(), $troopID, $general->getID());
if($generalList){
$db->update('general', [
'city'=>$cityID
], 'no IN %li', $generalList);
}
foreach($generalList as $targetGeneralID){
$targetGeneral = General::createGeneralObjFromDB($targetGeneralID, [], 1);
$targetLogger = new ActionLogger($targetGeneralID, $general->getNationID(), $env['year'], $env['month']);
$targetLogger->pushGeneralActionLog("{$troopName}의 부대원들은 <G><b>{$cityName}</b></>{$josaRo} 집합되었습니다.", ActionLogger::PLAIN);
$targetLogger->flush();
}
$exp = 70;
@@ -106,7 +107,7 @@ class che_집합 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}
hwe/sammo/Command/General/che_훈련.php
+1 -1
View File
@@ -93,7 +93,7 @@ class che_훈련 extends Command\GeneralCommand{
$general->checkStatChange();
$general->applyDB($db);
uniqueItemEx($general->getVar('no'), $logger);
uniqueItemEx($general->getID(), $logger);
}