Squashed commit of the following:
commit3ef363a01eAuthor: hide_d <hided62@gmail.com> Date: Mon Sep 6 02:30:00 2021 +0900 fix: 은퇴 시 숙련 포인트를 지나치게 많이 받는 문제 수정 commit9e68bc90c2Author: hide_d <hided62@gmail.com> Date: Mon Sep 6 02:17:56 2021 +0900 재야에서 도시보기 warning commitd2590607c2Author: hide_d <hided62@gmail.com> Date: Sun Sep 5 23:05:06 2021 +0900 fix: div 0 commit2bce6e4f02Author: hide_d <hided62@gmail.com> Date: Sun Sep 5 23:02:52 2021 +0900 warning 메시지 수정 commite64812da72Author: hide_d <hided62@gmail.com> Date: Sat Sep 4 03:42:09 2021 +0900 fix: m장, 의병장 숙련이 설정되지 않는 버그 수정 commit7cd40fca03Author: hide_d <hided62@gmail.com> Date: Sat Aug 21 16:04:03 2021 +0900 fix: 모병/징병에서 조건 검사부 통솔 계산값 commitd1568a3b2cAuthor: hide_d <hided62@gmail.com> Date: Sat Aug 21 02:50:54 2021 +0900 허보에 수몰이 같이 들어간 버그 수정 commite7dcc84afcAuthor: hide_d <hided62@gmail.com> Date: Thu Aug 19 14:51:50 2021 +0900 REAMDME.md 버전 수정 commit8eaa940d4eAuthor: hide_d <hided62@gmail.com> Date: Wed Aug 18 20:40:37 2021 +0900 Revert "fix: 7.2에서 오동작 버그 수정" This reverts commit9997675b1d. commit9997675b1dAuthor: hide_d <hided62@gmail.com> Date: Wed Aug 18 20:32:47 2021 +0900 fix: 7.2에서 오동작 버그 수정 commit9ef566f11fAuthor: hide_d <hided62@gmail.com> Date: Wed Aug 18 20:26:31 2021 +0900 fix: 아이템중 WarActivateSkill 관련 중첩 해제 버그 수정
This commit is contained in:
@@ -16,22 +16,22 @@ class GeneralBuilder{
|
||||
|
||||
protected $owner = 0;
|
||||
protected $ownerName = null;
|
||||
protected $affinity=null;
|
||||
protected $affinity=null;
|
||||
protected $nameCustomPrefix=null;
|
||||
protected $name;
|
||||
protected $name;
|
||||
protected $imgsvr = 0;
|
||||
protected $picturePath;
|
||||
protected $nationID;
|
||||
protected $cityID;
|
||||
protected $leadership=null;
|
||||
protected $strength=null;
|
||||
protected $intel=null;
|
||||
protected $picturePath;
|
||||
protected $nationID;
|
||||
protected $cityID;
|
||||
protected $leadership=null;
|
||||
protected $strength=null;
|
||||
protected $intel=null;
|
||||
protected $officerLevel;
|
||||
protected $birth=null;
|
||||
protected $death=null;
|
||||
protected $birth=null;
|
||||
protected $death=null;
|
||||
protected $ego=null;
|
||||
protected $specialDomestic=null;
|
||||
protected $specialWar=null;
|
||||
protected $specialDomestic=null;
|
||||
protected $specialWar=null;
|
||||
protected $npc = 2;
|
||||
protected $text;
|
||||
static $prefixList = [
|
||||
@@ -42,7 +42,7 @@ class GeneralBuilder{
|
||||
4 => 'ⓖ', //의병장(전략)
|
||||
5 => '㉥', //부대장
|
||||
6 => 'ⓤ', //unselectable npc, 빙의 불가 npc
|
||||
|
||||
|
||||
9 => 'ⓞ', //오랑캐?
|
||||
];
|
||||
|
||||
@@ -66,12 +66,12 @@ class GeneralBuilder{
|
||||
protected $aux = [];
|
||||
|
||||
public function __construct(
|
||||
string $name,
|
||||
string $name,
|
||||
bool $isDynamicImageSvr,
|
||||
$picturePath,
|
||||
$picturePath,
|
||||
int $nationID
|
||||
){
|
||||
|
||||
|
||||
$this->name = $name;
|
||||
$this->imgsvr = $isDynamicImageSvr;
|
||||
$this->picturePath = $picturePath;
|
||||
@@ -144,7 +144,7 @@ class GeneralBuilder{
|
||||
$this->specialDomestic = $specialDomestic;
|
||||
$this->specialWar = $specialWar;
|
||||
return $this;
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function setOfficerLevel(int $level):self{
|
||||
@@ -380,7 +380,7 @@ class GeneralBuilder{
|
||||
if($this->specialWar === null){
|
||||
$this->specialWar = GameConst::$defaultSpecialWar;
|
||||
}
|
||||
|
||||
|
||||
if($this->killturn === null && $this->owner){
|
||||
$this->killturn = 5;
|
||||
}
|
||||
@@ -408,7 +408,7 @@ class GeneralBuilder{
|
||||
$this->death = $this->birth+Util::randRangeInt(60, 80);
|
||||
}
|
||||
|
||||
|
||||
|
||||
if($this->specAge===null){
|
||||
$age = $env['year']-$this->birth;
|
||||
$relYear = Util::valueFit($env['year'] - $env['startyear'], 0);
|
||||
@@ -459,7 +459,7 @@ class GeneralBuilder{
|
||||
}
|
||||
}
|
||||
|
||||
if($this->dex1 === null){
|
||||
if(!$this->dex1 && in_array('dex_t', $avgGen)){
|
||||
$dexTotal = $avgGen['dex_t'];
|
||||
if ($pickType == '무') {
|
||||
$dexVal = Util::choiceRandom([
|
||||
@@ -532,7 +532,7 @@ class GeneralBuilder{
|
||||
public function build($env){
|
||||
//scenario에 life==1인 경우 수명 제한이 없어지는 모양.
|
||||
|
||||
|
||||
|
||||
|
||||
if(!key_exists('stored_icons', $env)){
|
||||
try{
|
||||
@@ -542,7 +542,7 @@ class GeneralBuilder{
|
||||
catch(\Exception $e){
|
||||
$storedIcons = [];
|
||||
}
|
||||
|
||||
|
||||
$env['stored_icons'] = $storedIcons;
|
||||
}
|
||||
|
||||
@@ -559,7 +559,7 @@ class GeneralBuilder{
|
||||
else{
|
||||
$name = $this->nameCustomPrefix.$this->name;
|
||||
}
|
||||
|
||||
|
||||
$this->realName = $name;
|
||||
|
||||
if($this->death <= $year){
|
||||
@@ -635,7 +635,6 @@ class GeneralBuilder{
|
||||
'@phan-var array<string,string|int> $cityObj';
|
||||
$this->cityID = $cityObj['id'];
|
||||
}
|
||||
|
||||
|
||||
$experience = $this->experience?:$age * 100;
|
||||
$dedication = $this->dedication?:$age * 100;
|
||||
|
||||
Reference in New Issue
Block a user