From ef3d2258f5052528b60619da8e6957c9d315e08d Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 2 May 2019 02:15:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EC=9D=B8=EB=8D=95/?= =?UTF-8?q?=EC=A0=80=EA=B2=A9,=20=EB=B6=80=EB=8C=80=EC=9E=A5=20=EC=9D=98?= =?UTF-8?q?=EC=88=A0=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_gamerule.php | 2 +- hwe/func_process_chief.php | 2 +- hwe/func_process_personnel.php | 6 +++--- hwe/join_post.php | 29 ++++++++--------------------- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 03132efc..eefefd72 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -1044,7 +1044,7 @@ function updateNationState() { $lastAssemblerID += 1; $npcObj = new Scenario\NPC( 999, sprintf('부대장%3d',$lastAssemblerID), null, $nation['nation'], null, - 10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15, '은둔', '척사' + 10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15, '은둔', '의술' ); $npcObj->npc = 5; $npcObj->build($admin); diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 3e9a9bc8..2bec49e1 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -2088,7 +2088,7 @@ function process_76(&$general) { '$npccount','$npc','$npc','$affinity','$name','$picture','{$nation['nation']}', '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', - '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','', + '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','20','0','70','0','', '0','$bornyear','$deadyear', '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}' )", diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php index 10c6e192..bfeda504 100644 --- a/hwe/func_process_personnel.php +++ b/hwe/func_process_personnel.php @@ -495,8 +495,8 @@ function process_29(&$general) { $bornyear = $admin['year']; $deadyear = $admin['year'] + 3; $age = 20; - $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age; - $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age; + $specage = $age; + $specage2 = $age; //$specage = $age + 1 + rand() % 3; //$specage2 = $age + 5 + rand() % 5; // 20년 ~ 50년 @@ -514,7 +514,7 @@ function process_29(&$general) { '$npccount','$npc','$npc','$affinity','$name','$picture','$scoutNation', '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', - '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','', + '0','0','0','$turntime','$killturn','$age','1','$personal','20','$specage','70','$specage2','', '0','$bornyear','$deadyear', '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}' )", diff --git a/hwe/join_post.php b/hwe/join_post.php index 2452534c..fff35dad 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -157,17 +157,13 @@ $admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'starty $relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0); $age = 20 + ($pleader + $ppower + $pintel) * 2 - (mt_rand(0, 1)); -// 아직 남았고 천재등록상태이면 특기 부여 -if ($genius) { - $specage2 = $age; - $special2 = getSpecial2($leader, $power, $intel); -} else { - $specage2 = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/4 - $relYear / 2), 3) + $age; - $special2 = 0; -} +// 특기 부여 +$specage2 = $age; +$special2 = 70; + //내특 -$specage = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/12 - $relYear / 2), 3) + $age; -$special = 0; +$specage = $age; +$special = 20; if ($admin['scenario'] >= 1000) { $specage2 = $age + 3; @@ -256,14 +252,8 @@ $log = []; $mylog = []; $josaRa = JosaUtil::pick($name, '라'); -if ($genius) { - $log[0] = "●{$gameStor->month}월:{$cityname}에서 {$name}{$josaRa}는 기재가 천하에 이름을 알립니다."; - $log[1] = "●{$gameStor->month}월:".getGenSpecial($special2)." 특기를 가진 천재의 등장으로 온 천하가 떠들썩합니다."; +$log[0] = "●{$gameStor->month}월:{$cityname}에서 {$name}{$josaRa}는 호걸이 천하에 이름을 알립니다."; - pushWorldHistory(["●{$gameStor->year}년 {$gameStor->month}월:【천재】{$cityname}에 천재가 등장했습니다."], $gameStor->year, $gameStor->month); -} else { - $log[0] = "●{$gameStor->month}월:{$cityname}에서 {$name}{$josaRa}는 호걸이 천하에 이름을 알립니다."; -} pushGeneralHistory($me, "●{$gameStor->year}년 {$gameStor->month}월:{$name}, {$cityname}에서 큰 뜻을 품다."); $mylog[] = "●삼국지 모의전투 PHP의 세계에 오신 것을 환영합니다 ^o^"; $mylog[] = "●처음 하시는 경우에는 도움말을 참고하시고,"; @@ -271,10 +261,7 @@ $mylog[] = "●문의사항이 있으시면 게시판에 글을 남겨주 $mylog[] = "●부디 즐거운 삼모전 되시길 바랍니다 ^^"; $mylog[] = "●통솔 $pleader 무력 $ppower 지력 $pintel 의 보너스를 받으셨습니다."; $mylog[] = "●연령은 $age세로 시작합니다."; -if ($genius) { - $mylog[] = "●축하합니다! 천재로 태어나 처음부터 ".getGenSpecial($special2)." 특기를 가지게 됩니다!"; - pushGeneralHistory($me, "●{$gameStor->year}년 {$gameStor->month}월:".getGenSpecial($special2)." 특기를 가진 천재로 탄생."); -} + pushGenLog($me, $mylog); pushGeneralPublicRecord($log, $gameStor->year, $gameStor->month);