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

은퇴 연령 값을 GameConst로 이동

Browse Source
This commit is contained in:
Hide_D
2019-03-09 17:08:11 +09:00
parent 16a82a28ae
commit 568ff4b366
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+3 -3
View File
@@ -910,8 +910,8 @@ function generalInfo($no) {
if($nation['color'] == "") { $nation['color'] = "#000000"; } if($nation['color'] == "") { $nation['color'] = "#000000"; }
if($general['age'] < 60) { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; } if($general['age'] < GameConst::$retirementYear*0.75) { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; }
elseif($general['age'] < 80) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; } elseif($general['age'] < GameConst::$retirementYear) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; }
else { $general['age'] = "<font color=red>{$general['age']} 세</font>"; } else { $general['age'] = "<font color=red>{$general['age']} 세</font>"; }
$general['connect'] = Util::round($general['connect'] / 10) * 10; $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) { if($admin['isunited'] == 0) {
CheckHall($no); CheckHall($no);
} }
hwe/func_process_personnel.php
+2 -2
View File
@@ -466,8 +466,8 @@ function process_29(&$general) {
$bornyear = $admin['year']; $bornyear = $admin['year'];
$deadyear = $admin['year'] + 3; $deadyear = $admin['year'] + 3;
$age = 20; $age = 20;
$specage = Util::round((80 - $age)/12) + $age; $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age;
$specage2 = Util::round((80 - $age)/3) + $age; $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age;
//$specage = $age + 1 + rand() % 3; //$specage = $age + 1 + rand() % 3;
//$specage2 = $age + 5 + rand() % 5; //$specage2 = $age + 5 + rand() % 5;
// 20년 ~ 50년 // 20년 ~ 50년
hwe/join_post.php
+2 -2
View File
@@ -162,11 +162,11 @@ if ($genius) {
$specage2 = $age; $specage2 = $age;
$special2 = getSpecial2($leader, $power, $intel); $special2 = getSpecial2($leader, $power, $intel);
} else { } 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; $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; $special = 0;
if ($admin['scenario'] >= 1000) { if ($admin['scenario'] >= 1000) {
hwe/sammo/GameConstBase.php
+1
View File
@@ -93,4 +93,5 @@ class GameConstBase
public static $maxTurn = 24; public static $maxTurn = 24;
public static $statGradeLevel = 5; public static $statGradeLevel = 5;
public static $retirementYear = 80;
} }