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

leader->leadership, power->strength

Browse Source
This commit is contained in:
Hide_D
2019-10-04 18:07:42 +09:00
parent 2ff74a2b68
commit 4c3cc8547c
101 changed files with 770 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_강행.php
+1 -1
View File
@@ -127,7 +127,7 @@ class che_강행 extends Command\GeneralCommand{
[$reqGold, $reqRice] = $this->getCost();
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVar('experience', $exp);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_견문.php
+3 -3
View File
@@ -72,10 +72,10 @@ class che_견문 extends Command\GeneralCommand{
$exp += 60;
}
if($type & SightseeingMessage::IncLeadership){
$general->increaseVar('leader2', 2);
$general->increaseVar('leadership2', 2);
}
if($type & SightseeingMessage::IncPower){
$general->increaseVar('power2', 2);
if($type & SightseeingMessage::IncStrength){
$general->increaseVar('strength2', 2);
}
if($type & SightseeingMessage::IncIntel){
$general->increaseVar('intel2', 2);
hwe/sammo/Command/General/che_군량매매.php
+2 -2
View File
@@ -161,8 +161,8 @@ class che_군량매매 extends Command\GeneralCommand{
$ded = $general->onCalcStat($general, 'dedication', $ded);
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
'power2'=>$general->getPower(false, false, false, false),
'leadership2'=>$general->getLeadership(false, false, false, false),
'strength2'=>$general->getStrength(false, false, false, false),
'intel2'=>$general->getIntel(false, false, false, false)
]);
hwe/sammo/Command/General/che_귀환.php
+1 -1
View File
@@ -91,7 +91,7 @@ class che_귀환 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_단련.php
+2 -2
View File
@@ -101,8 +101,8 @@ class che_단련 extends Command\GeneralCommand{
$general->addDex($general->getCrewTypeObj(), $score, false);
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
'power2'=>$general->getPower(false, false, false, false),
'leadership2'=>$general->getLeadership(false, false, false, false),
'strength2'=>$general->getStrength(false, false, false, false),
'intel2'=>$general->getIntel(false, false, false, false)
]);
[$reqGold, $reqRice] = $this->getCost();
hwe/sammo/Command/General/che_물자조달.php
+3 -3
View File
@@ -73,7 +73,7 @@ class che_물자조달 extends Command\GeneralCommand{
['쌀', 'rice']
]);
$score = $general->getLeadership() + $general->getPower() + $general->getIntel();
$score = $general->getLeadership() + $general->getStrength() + $general->getIntel();
$score *= getDomesticExpLevelBonus($general->getVar('explevel'));
$score *= Util::randRange(0.8, 1.2);
@@ -107,8 +107,8 @@ class che_물자조달 extends Command\GeneralCommand{
$ded = $general->onCalcStat($general, 'dedication', $ded);
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
'power2'=>$general->getPower(false, false, false, false),
'leadership2'=>$general->getLeadership(false, false, false, false),
'strength2'=>$general->getStrength(false, false, false, false),
'intel2'=>$general->getIntel(false, false, false, false)
]);
hwe/sammo/Command/General/che_사기진작.php
+1 -1
View File
@@ -93,7 +93,7 @@ class che_사기진작 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
hwe/sammo/Command/General/che_상업투자.php
+5 -5
View File
@@ -32,8 +32,8 @@ class che_상업투자 extends Command\GeneralCommand{
public function getCommandDetailTitle():string{
$name = $this->getName();
$statTypeBase = [
'leader'=>'통솔경험',
'power'=>'무력경험',
'leadership'=>'통솔경험',
'strength'=>'무력경험',
'intel'=>'지력경험',
];
$statType = $statTypeBase[static::$statKey];
@@ -100,10 +100,10 @@ class che_상업투자 extends Command\GeneralCommand{
if(static::$statKey == 'intel'){
$score = $general->getIntel(true, true, true, false);
}
else if(static::$statKey == 'power'){
$score = $general->getPower(true, true, true, false);
else if(static::$statKey == 'strength'){
$score = $general->getStrength(true, true, true, false);
}
else if(static::$statKey == 'leader'){
else if(static::$statKey == 'leadership'){
$score = $general->getLeadership(true, true, true, false);
}
else{
hwe/sammo/Command/General/che_선동.php
+1 -1
View File
@@ -12,7 +12,7 @@ use \sammo\{
class che_선동 extends che_화계{
static protected $actionName = '선동';
static protected $statType = 'leader';
static protected $statType = 'leadership';
static protected $injuryGeneral = true;
protected function affectDestCity(int $injuryCount){
hwe/sammo/Command/General/che_성벽보수.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo\Command\General;
class che_성벽보수 extends che_상업투자{
static protected $cityKey = 'wall';
static protected $statKey = 'power';
static protected $statKey = 'strength';
static protected $actionKey = '성벽';
static protected $actionName = '성벽 보수';
static protected $debuffFront = 0.25;
hwe/sammo/Command/General/che_수비강화.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo\Command\General;
class che_수비강화 extends che_상업투자{
static protected $cityKey = 'def';
static protected $statKey = 'power';
static protected $statKey = 'strength';
static protected $actionKey = '수비';
static protected $actionName = '수비 강화';
static protected $debuffFront = 0.5;
hwe/sammo/Command/General/che_이동.php
+1 -1
View File
@@ -125,7 +125,7 @@ class che_이동 extends Command\GeneralCommand{
[$reqGold, $reqRice] = $this->getCost();
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVar('experience', $exp);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_인재탐색.php
+23 -23
View File
@@ -98,8 +98,8 @@ class che_인재탐색 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("인재를 찾을 수 없었습니다. <1>$date</>");
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
'power2'=>$general->getPower(false, false, false, false),
'leadership2'=>$general->getLeadership(false, false, false, false),
'strength2'=>$general->getStrength(false, false, false, false),
'intel2'=>$general->getIntel(false, false, false, false)
]);
[$reqGold, $reqRice] = $this->getCost();
@@ -148,45 +148,45 @@ class che_인재탐색 extends Command\GeneralCommand{
}
$avgGen = $db->queryFirstRow(
'SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp,
'SELECT max(leadership+strength+intel) as stat_sum, avg(dedication) as ded,avg(experience) as exp,
avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40
from general where nation=%i',
$nationID
);
if($pickType == '무'){
$leader = $subStat;
$power = $mainStat;
$leadership = $subStat;
$strength = $mainStat;
$intel = $otherStat;
}
else if($pickType == '지'){
$leader = $subStat;
$power = $otherStat;
$leadership = $subStat;
$strength = $otherStat;
$intel = $mainStat;
}
else{
$leader = $otherStat;
$power = $subStat;
$leadership = $otherStat;
$strength = $subStat;
$intel = $mainStat;
}
// 국내 최고능치 기준으로 랜덤성 스케일링
$maxLPI = $avgGen['lpi'];
$maxLPI = $avgGen['stat_sum'];
if($maxLPI > 210) {
$leader *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.6, 0.9);
$power *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.6, 0.9);
$leadership *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.6, 0.9);
$strength *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.6, 0.9);
$intel *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.6, 0.9);
} elseif($maxLPI > 180) {
$leader *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
$power *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
$intel *= $avgGen['lpi'] / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
$leadership *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
$strength *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
$intel *= $avgGen['stat_sum'] / GameConst::$defaultStatTotal * Util::randRange(0.75, 0.95);
} else {
$leader *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.9, 1);
$power *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.9, 1);
$leadership *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.9, 1);
$strength *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.9, 1);
$intel *= $maxLPI / GameConst::$defaultStatTotal * Util::randRange(0.9, 1);
}
$leader = Util::round($leader);
$power = Util::round($power);
$leadership = Util::round($leadership);
$strength = Util::round($strength);
$intel = Util::round($intel);
$isOurNation = $this->nation['scout'] == 0;
@@ -199,8 +199,8 @@ class che_인재탐색 extends Command\GeneralCommand{
null,
$isOurNation?$nationID:0,
$general->getCityID(),
$leader,
$power,
$leadership,
$strength,
$intel,
$isOurNation?1:0,
$age,
@@ -245,8 +245,8 @@ class che_인재탐색 extends Command\GeneralCommand{
$logger->pushGeneralHistoryLog("<Y>$npcName</>{$josaRa}는 <C>인재</>를 {$scoutType}");
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
'power2'=>$general->getPower(false, false, false, false),
'leadership2'=>$general->getLeadership(false, false, false, false),
'strength2'=>$general->getStrength(false, false, false, false),
'intel2'=>$general->getIntel(false, false, false, false)
]);
[$reqGold, $reqRice] = $this->getCost();
hwe/sammo/Command/General/che_전투태세.php
+1 -1
View File
@@ -123,7 +123,7 @@ class che_전투태세 extends Command\GeneralCommand{
$general->addDex($general->getCrewTypeObj(), $crew / 100 * 3, false);
$general->increaseVar('leader2', 3);
$general->increaseVar('leadership2', 3);
$general->setResultTurn($turnResult);
$general->checkStatChange();
tryUniqueItemLottery($general);
hwe/sammo/Command/General/che_정착장려.php
+2 -2
View File
@@ -24,7 +24,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_정착장려 extends Command\GeneralCommand{
static protected $cityKey = 'pop';
static protected $statKey = 'leader';
static protected $statKey = 'leadership';
static protected $actionKey = '인구';
static protected $actionName = '정착 장려';
@@ -74,7 +74,7 @@ class che_정착장려 extends Command\GeneralCommand{
protected function calcBaseScore():float{
$general = $this->generalObj;
if(static::$statKey == 'leader'){
if(static::$statKey == 'leadership'){
$score = $general->getLeadership(true, true, true, false);
}
else{
hwe/sammo/Command/General/che_주민선정.php
+2 -2
View File
@@ -24,7 +24,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_주민선정 extends Command\GeneralCommand{
static protected $cityKey = 'trust';
static protected $statKey = 'leader';
static protected $statKey = 'leadership';
static protected $actionKey = '민심';
static protected $actionName = '주민 선정';
@@ -74,7 +74,7 @@ class che_주민선정 extends Command\GeneralCommand{
protected function calcBaseScore():float{
$general = $this->generalObj;
if(static::$statKey == 'leader'){
if(static::$statKey == 'leadership'){
$score = $general->getLeadership(true, true, true, false);
}
else{
hwe/sammo/Command/General/che_증여.php
+1 -1
View File
@@ -140,7 +140,7 @@ class che_증여 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
hwe/sammo/Command/General/che_집합.php
+1 -1
View File
@@ -101,7 +101,7 @@ class che_집합 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
hwe/sammo/Command/General/che_징병.php
+1 -1
View File
@@ -190,7 +190,7 @@ class che_징병 extends Command\GeneralCommand{
$general->increaseVar('dedication', $ded);
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVarWithLimit('rice', -$reqRice, 0);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
hwe/sammo/Command/General/che_첩보.php
+1 -1
View File
@@ -175,7 +175,7 @@ class che_첩보 extends Command\GeneralCommand{
$general->increaseVarWithLimit('rice', -$reqRice, 0);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_치안강화.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo\Command\General;
class che_치안강화 extends che_상업투자{
static protected $cityKey = 'secu';
static protected $statKey = 'power';
static protected $statKey = 'strength';
static protected $actionKey = '치안';
static protected $actionName = '치안 강화';
static protected $debuffFront = 1;
hwe/sammo/Command/General/che_탈취.php
+1 -1
View File
@@ -12,7 +12,7 @@ use \sammo\{
class che_탈취 extends che_화계{
static protected $actionName = '탈취';
static protected $statType = 'power';
static protected $statType = 'strength';
static protected $injuryGeneral = false;
protected function affectDestCity(int $injuryCount){
hwe/sammo/Command/General/che_파괴.php
+1 -1
View File
@@ -12,7 +12,7 @@ use \sammo\{
class che_파괴 extends che_화계{
static protected $actionName = '파괴';
static protected $statType = 'power';
static protected $statType = 'strength';
static protected $injuryGeneral = true;
protected function affectDestCity(int $injuryCount){
hwe/sammo/Command/General/che_헌납.php
+1 -1
View File
@@ -121,7 +121,7 @@ class che_헌납 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
hwe/sammo/Command/General/che_화계.php
+7 -7
View File
@@ -49,11 +49,11 @@ class che_화계 extends Command\GeneralCommand{
$general = $this->generalObj;
$nation = $this->nation;
if($statType === 'leader'){
if($statType === 'leadership'){
$genScore = $general->getLeadership();
}
else if($statType === 'power'){
$genScore = $general->getPower();
else if($statType === 'strength'){
$genScore = $general->getStrength();
}
else if($statType === 'intel'){
$genScore = $general->getIntel();
@@ -80,11 +80,11 @@ class che_화계 extends Command\GeneralCommand{
continue;
}
if($statType === 'leader'){
if($statType === 'leadership'){
$genScore = $destGeneral->getLeadership();
}
else if($statType === 'power'){
$genScore = $destGeneral->getPower();
else if($statType === 'strength'){
$genScore = $destGeneral->getStrength();
}
else if($statType === 'intel'){
$genScore = $destGeneral->getIntel();
@@ -218,7 +218,7 @@ class che_화계 extends Command\GeneralCommand{
[$year, $month] = [$env['year'], $env['month']];
foreach($db->query(
'SELECT `no`,name,city,nation,level,leader,horse,power,weap,intel,book,item,last_turn,injury,special,special2 FROM general WHERE city = %i',
'SELECT `no`,name,city,nation,level,leadership,horse,strength,weap,intel,book,item,last_turn,injury,special,special2 FROM general WHERE city = %i',
$destCityID,
$destNationID
) as $rawDestCityGeneral){
hwe/sammo/Command/General/che_훈련.php
+1 -1
View File
@@ -89,7 +89,7 @@ class che_훈련 extends Command\GeneralCommand{
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
$general->increaseVar('leader2', 1);
$general->increaseVar('leadership2', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);