diff --git a/hwe/func.php b/hwe/func.php index 822b13d6..c1042744 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -910,8 +910,8 @@ function generalInfo($no) { if($nation['color'] == "") { $nation['color'] = "#000000"; } - if($general['age'] < 60) { $general['age'] = "{$general['age']} 세"; } - elseif($general['age'] < 80) { $general['age'] = "{$general['age']} 세"; } + if($general['age'] < GameConst::$retirementYear*0.75) { $general['age'] = "{$general['age']} 세"; } + elseif($general['age'] < GameConst::$retirementYear) { $general['age'] = "{$general['age']} 세"; } else { $general['age'] = "{$general['age']} 세"; } $general['connect'] = Util::round($general['connect'] / 10) * 10; @@ -2078,7 +2078,7 @@ function updateTurntime($no) { } } - if($general['age'] >= 80 && $general['npc'] == 0) { + if($general['age'] >= GameConst::$retirementYear && $general['npc'] == 0) { if($admin['isunited'] == 0) { CheckHall($no); } diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php index de6769ac..cc8fcead 100644 --- a/hwe/func_process_personnel.php +++ b/hwe/func_process_personnel.php @@ -466,8 +466,8 @@ function process_29(&$general) { $bornyear = $admin['year']; $deadyear = $admin['year'] + 3; $age = 20; - $specage = Util::round((80 - $age)/12) + $age; - $specage2 = Util::round((80 - $age)/3) + $age; + $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age; + $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age; //$specage = $age + 1 + rand() % 3; //$specage2 = $age + 5 + rand() % 5; // 20년 ~ 50년 diff --git a/hwe/join_post.php b/hwe/join_post.php index c02132d9..2452534c 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -162,11 +162,11 @@ if ($genius) { $specage2 = $age; $special2 = getSpecial2($leader, $power, $intel); } else { - $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age; + $specage2 = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/4 - $relYear / 2), 3) + $age; $special2 = 0; } //내특 -$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age; +$specage = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/12 - $relYear / 2), 3) + $age; $special = 0; if ($admin['scenario'] >= 1000) { diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php index 3a8dc3ce..33e6fab2 100644 --- a/hwe/sammo/GameConstBase.php +++ b/hwe/sammo/GameConstBase.php @@ -93,4 +93,5 @@ class GameConstBase public static $maxTurn = 24; public static $statGradeLevel = 5; + public static $retirementYear = 80; }