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

Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

Browse Source
This commit is contained in:
Hide_D
2020-06-09 20:30:41 +09:00
parent e0f32eddc4 75a704c196
commit b538bfc27e
7 changed files with 1351 additions and 1353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_command.php
+4 -4
View File
@@ -284,14 +284,14 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
$turnList[$turnIdx] = true;
}
else if($turnIdx == -1){
//홀수
foreach(Util::range(1, GameConst::$maxTurn, 2) as $subIdx){
//홀수, 0부터 맞다.
foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
$turnList[$subIdx] = true;
}
}
else if($turnIdx == -2){
//짝수
foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
//짝수, 1부터 맞다.
foreach(Util::range(1, GameConst::$maxTurn, 2) as $subIdx){
$turnList[$subIdx] = true;
}
}
hwe/sammo/BaseWarUnitTrigger.php
+1 -1
View File
@@ -86,7 +86,7 @@ abstract class BaseWarUnitTrigger extends ObjectTrigger{
$itemRawName = $item->getRawName();
$self->activateSkill($itemName);
if (!($this->raiseType & static::TYPE_CONSUMABLE_ITEM)) {
if ($this->raiseType != static::TYPE_CONSUMABLE_ITEM) {
return false;
}
hwe/sammo/Command/General/che_기술연구.php
+2 -2
View File
@@ -70,8 +70,8 @@ class che_기술연구 extends che_상업투자{
if($trust < 80){
$successRatio *= $trust / 80;
}
$successRatio = $general->onCalcDomestic(static::$cityKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$cityKey, 'fail', $failRatio);
$successRatio = $general->onCalcDomestic(static::$actionKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$actionKey, 'fail', $failRatio);
$successRatio = Util::valueFit($successRatio, 0, 1);
$failRatio = Util::valueFit($failRatio, 0, 1 - $successRatio);
hwe/sammo/Command/General/che_상업투자.php
+2 -2
View File
@@ -142,8 +142,8 @@ class che_상업투자 extends Command\GeneralCommand{
if($trust < 80){
$successRatio *= $trust / 80;
}
$successRatio = $general->onCalcDomestic(static::$cityKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$cityKey, 'fail', $failRatio);
$successRatio = $general->onCalcDomestic(static::$actionKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$actionKey, 'fail', $failRatio);
$successRatio = Util::valueFit($successRatio, 0, 1);
$failRatio = Util::valueFit($failRatio, 0, 1 - $successRatio);
hwe/sammo/Command/General/che_정착장려.php
+2 -2
View File
@@ -127,8 +127,8 @@ class che_정착장려 extends Command\GeneralCommand{
$score = Util::valueFit($this->calcBaseScore(), 1);
['success'=>$successRatio, 'fail'=>$failRatio] = CriticalRatioDomestic($general, static::$statKey);
$successRatio = $general->onCalcDomestic(static::$cityKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$cityKey, 'fail', $failRatio);
$successRatio = $general->onCalcDomestic(static::$actionKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$actionKey, 'fail', $failRatio);
$successRatio = Util::valueFit($successRatio, 0, 1);
$failRatio = Util::valueFit($failRatio, 0, 1 - $successRatio);
hwe/sammo/Command/General/che_주민선정.php
+2 -2
View File
@@ -128,8 +128,8 @@ class che_주민선정 extends Command\GeneralCommand{
$score = Util::valueFit($this->calcBaseScore(), 1);
['success'=>$successRatio, 'fail'=>$failRatio] = CriticalRatioDomestic($general, static::$statKey);
$successRatio = $general->onCalcDomestic(static::$cityKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$cityKey, 'fail', $failRatio);
$successRatio = $general->onCalcDomestic(static::$actionKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$actionKey, 'fail', $failRatio);
$successRatio = Util::valueFit($successRatio, 0, 1);
$failRatio = Util::valueFit($failRatio, 0, 1 - $successRatio);
hwe/sammo/WarUnitTrigger/che_계략시도.php
+3 -5
View File
@@ -30,11 +30,6 @@ class che_계략시도 extends BaseWarUnitTrigger{
$general = $self->getGeneral();
$crewType = $general->getCrewTypeObj();
if($crewType->magicCoef <= 0){
//NOTE: -인 경우를 고려해야하나? 계략 맞을 확률 증가?
return true;
}
if($self->hasActivatedSkill('계략불가')){
return true;
}
@@ -43,6 +38,9 @@ class che_계략시도 extends BaseWarUnitTrigger{
$magicTrialProb *= $crewType->magicCoef;
$magicTrialProb = $general->onCalcStat($general, 'warMagicTrialProb', $magicTrialProb);
if($magicTrialProb <= 0){
return true;
}
if(!Util::randBool($magicTrialProb)){
return true;