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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-04-24 02:36:50 +09:00
parent 5d1b39ca49
commit 5de5a77902
13 changed files with 160 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/BaseCommand.php
+1 -1
View File
@@ -49,7 +49,7 @@ abstract class BaseCommand{
protected $alternative = null;
static protected $isInitStatic = false;
static protected $isInitStatic = true;
protected static function initStatic(){
}
hwe/sammo/Command/General/che_랜덤임관.php
+2 -2
View File
@@ -255,9 +255,9 @@ class che_랜덤임관 extends Command\GeneralCommand{
$relYear = $env['year'] - $env['startyear'];
if($general->getVar('npc') == 1 || $relYear >= 3){
$joinedNations = Join::decode($general->getVar('nations'));
$joinedNations = Json::decode($general->getVar('nations'));
$joinedNations[] = $destNationID;
$general->setVar('nations', Join::encode($joinedNations));
$general->setVar('nations', Json::encode($joinedNations));
}
$general->increaseVar('experience', $exp);
hwe/sammo/Command/General/che_모병.php
+1
View File
@@ -15,6 +15,7 @@ class che_모병 extends che_징병{
static protected $actionName = '모병';
static protected $costOffset = 2;
static protected $isInitStatic = false;
protected static function initStatic()
{
static::$defaultTrain = GameConst::$defaultTrainHigh;
hwe/sammo/Command/General/che_임관.php
+2 -2
View File
@@ -162,9 +162,9 @@ class che_임관 extends Command\GeneralCommand{
$relYear = $env['year'] - $env['startyear'];
if($general->getVar('npc') == 1 || $relYear >= 3){
$joinedNations = Join::decode($general->getVar('nations'));
$joinedNations = Json::decode($general->getVar('nations'));
$joinedNations[] = $destNationID;
$general->setVar('nations', Join::encode($joinedNations));
$general->setVar('nations', Json::encode($joinedNations));
}
$general->increaseVar('experience', $exp);
hwe/sammo/Command/General/che_징병.php
+1
View File
@@ -35,6 +35,7 @@ class che_징병 extends Command\GeneralCommand{
protected $reqCrewType;
protected $currCrewType;
static protected $isInitStatic = false;
protected static function initStatic()
{
static::$defaultTrain = GameConst::$defaultTrainLow;
hwe/sammo/GeneralAI.php
+28 -4
View File
@@ -1253,18 +1253,42 @@ class GeneralAI{
}
if($general->getVar('rice') < $baseArmRice && $general->getVar('gold') >= $baseArmGold * 3){
return ['che_군량매매', ['buyRice'=>true, 'amount'=> $general->getVar('gold') - $baseArmGold]];
return [
'che_군량매매',
[
'buyRice'=>true,
'amount'=> Util::toInt($general->getVar('gold') - $baseArmGold)
]
];
}
if($general->getVar('gold') < $baseArmGold && $general->getVar('gold') >= $baseArmRice * 3){
return ['che_군량매매', ['buyRice'=>false, 'amount'=> $general->getVar('rice') - $baseArmRice]];
return [
'che_군량매매',
[
'buyRice'=>false,
'amount'=> Util::toInt($general->getVar('rice') - $baseArmRice)
]
];
}
}
else{
if($general->getVar('rice') < $this->baseDevelCost && $general->getVar('gold') >= $this->baseDevelCost * 3){
return ['che_군량매매', ['buyRice'=>true, 'amount'=> $general->getVar('gold') - $this->baseDevelCost]];
return [
'che_군량매매',
[
'buyRice'=>true,
'amount'=> Util::toInt($general->getVar('gold') - $this->baseDevelCost)
]
];
}
if($general->getVar('gold') < $this->baseDevelCost && $general->getVar('gold') >= $this->baseDevelCost * 3){
return ['che_군량매매', ['buyRice'=>false, 'amount'=> $general->getVar('rice') - $this->baseDevelCost]];
return [
'che_군량매매',
[
'buyRice'=>false,
'amount'=> Util::toInt($general->getVar('rice') - $this->baseDevelCost)
]
];
}
}
hwe/sammo/Scenario/NPC.php
+1 -1
View File
@@ -229,7 +229,7 @@ class NPC{
$duplicateCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE name LIKE %s', $name.'%') + 1;
if($duplicateCnt > 1){
$name = "{$name}($duplicateCnt}";
$name = "{$name}{$duplicateCnt}";
}
$this->realName = $name;