From cc9706c41305ac1a41e47902c58ce4ccb27ccd2b Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 1 May 2019 02:06:51 +0900 Subject: [PATCH] =?UTF-8?q?m=EC=9E=A5=20=EC=9D=98=EB=B3=91=EC=9E=A5=20?= =?UTF-8?q?=EC=B4=88=20=EA=B0=95=ED=99=94!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_process_chief.php | 31 +++++++++++++++++++++++++------ hwe/func_process_personnel.php | 33 ++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index bbac1110..3e9a9bc8 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -1968,7 +1968,9 @@ function process_76(&$general) { $avgNation = MYDB_fetch_array($result); $gencount = 5 + Util::round($avgNation['gennum'] / 10); - $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) / 4 as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + + $dexTotal = $avgGen['dex_t']; //의병추가 $npc = 4; @@ -1979,25 +1981,42 @@ function process_76(&$general) { $stat_tier3 = GameConst::$defaultStatMin + rand()%6; $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3; $type = Util::choiceRandomUsingWeight([ - 'power'=>5, - 'intel'=>5, + 'power0'=>1, + 'power1'=>1, + 'power2'=>1, + 'intel'=>3, 'neutral'=>0 ]); switch($type){ - case 'power': + case 'power0': $leader = $stat_tier1; $power = $stat_tier2; $intel = $stat_tier3; + $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8]; + break; + case 'power1': + $leader = $stat_tier1; + $power = $stat_tier2; + $intel = $stat_tier3; + $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8]; + break; + case 'power2': + $leader = $stat_tier1; + $power = $stat_tier2; + $intel = $stat_tier3; + $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8]; break; case 'intel': $leader = $stat_tier1; $power = $stat_tier3; $intel = $stat_tier2; + $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8]; break; - case 'neutral': + default: $leader = $stat_tier3; $power = $stat_tier1; $intel = $stat_tier2; + $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4]; break; } // 국내 최고능치 기준으로 랜덤성 스케일링 @@ -2071,7 +2090,7 @@ function process_76(&$general) { '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','', '0','$bornyear','$deadyear', - '{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex40']}' + '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}' )", $connect ) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php index 9899edbb..10c6e192 100644 --- a/hwe/func_process_personnel.php +++ b/hwe/func_process_personnel.php @@ -389,32 +389,51 @@ function process_29(&$general) { $alllog[] = "●{$admin['month']}월:{$general['name']}{$josaYi} $name{$josaRa}는 인재를 {$scoutType}하였습니다!"; pushGeneralHistory($general, "●{$admin['year']}년 {$admin['month']}월:$name{$josaRa}는 인재를 {$scoutType}"); - $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) / 4 as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + + $dexTotal = $avgGen['dex_t']; //무장 40%, 지장 40%, 무지장 20% $stat_tier1 = GameConst::$defaultStatMax - 10 + rand()%11; $stat_tier3 = GameConst::$defaultStatMin + rand()%6; $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3; $type = Util::choiceRandomUsingWeight([ - 'power'=>4, - 'intel'=>4, - 'neutral'=>2 + 'power0'=>2, + 'power1'=>2, + 'power2'=>2, + 'intel'=>6, + 'neutral'=>3 ]); switch($type){ - case 'power': + case 'power0': $leader = $stat_tier1; $power = $stat_tier2; $intel = $stat_tier3; + $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8]; + break; + case 'power1': + $leader = $stat_tier1; + $power = $stat_tier2; + $intel = $stat_tier3; + $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8]; + break; + case 'power2': + $leader = $stat_tier1; + $power = $stat_tier2; + $intel = $stat_tier3; + $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8]; break; case 'intel': $leader = $stat_tier1; $power = $stat_tier3; $intel = $stat_tier2; + $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8]; break; - case 'neutral': + default: $leader = $stat_tier3; $power = $stat_tier1; $intel = $stat_tier2; + $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4]; break; } @@ -497,7 +516,7 @@ function process_29(&$general) { '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','', '0','$bornyear','$deadyear', - '{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex40']}' + '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}' )", $connect ) or Error(__LINE__.MYDB_error($connect),"");