name2 -> owner_name (or orderName)
This commit is contained in:
@@ -319,7 +319,8 @@ class GameConstBase
|
||||
//'che_급습',
|
||||
],
|
||||
'기타'=>[
|
||||
//'che_국기변경'
|
||||
//'che_국기변경',
|
||||
//'che_국호변경',
|
||||
]
|
||||
];
|
||||
public static $retirementYear = 80;
|
||||
|
||||
@@ -833,7 +833,7 @@ class General implements iAction{
|
||||
'horse', 'weapon', 'book', 'item', 'last_turn'
|
||||
];
|
||||
$fullColumn = [
|
||||
'no', 'name', 'name2', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity',
|
||||
'no', 'name', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity',
|
||||
'leadership', 'leadership_exp', 'strength', 'strength_exp', 'intel', 'intel_exp', 'weapon', 'book', 'horse', 'item',
|
||||
'experience', 'dedication', 'level', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
|
||||
'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
|
||||
|
||||
@@ -98,7 +98,7 @@ class DyingMessage{
|
||||
$this->name = $general->getName();
|
||||
$this->npc = $general->getVar('npc');
|
||||
if($general->getVar('owner') > 0 && $general->getVar('startage') - $general->getVar('age') > 1){
|
||||
$this->realName = $general->getVar('name2');
|
||||
$this->realName = $general->getVar('owner_name');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ class TurnExecutionHelper
|
||||
// npc유저 삭턴시 npc로 전환
|
||||
if($general->getVar('npc') == 1 && $general->getVar('deadyear') > $gameStor->year){
|
||||
|
||||
$ownerName = $general->getVar('name2');
|
||||
$ownerName = $general->getVar('owner_name');
|
||||
$josaYi = JosaUtil::pick($ownerName, '이');
|
||||
|
||||
$logger->pushGlobalActionLog("{$ownerName}</>{$josaYi} <Y>{$generalName}</>의 육체에서 <S>유체이탈</>합니다!");
|
||||
@@ -185,7 +185,7 @@ class TurnExecutionHelper
|
||||
$general->setVar('npc', $general->getVar('npc_org'));
|
||||
$general->setVar('owner', 1);
|
||||
$general->setVar('defence_train', 80);
|
||||
$general->setVar('name2', null);
|
||||
$general->setVar('owner_name', null);
|
||||
}
|
||||
else{
|
||||
$general->applyDB($db);
|
||||
|
||||
Reference in New Issue
Block a user