From e904911fd9e6621b0327efde521733e27f44ee98 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 20 Sep 2018 00:35:38 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9B=84=EB=B0=9C=20=EC=A3=BC=EC=9E=90?=
 =?UTF-8?q?=EC=97=90=EA=B2=8C,=20=EB=AA=85=EC=84=B1,=20=EC=A0=84=ED=8A=B9,?=
 =?UTF-8?q?=20=EB=82=B4=ED=8A=B9=EC=97=90=20=EB=8C=80=ED=95=B4=20=EC=9D=BC?=
 =?UTF-8?q?=EC=A0=95=20=EB=B6=80=EB=B6=84=20=EB=B3=B4=EC=83=81=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index a830e0c8..2748ab3a 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -155,26 +155,40 @@ $leader = $leader + $pleader;
 $power = $power + $ppower;
 $intel = $intel + $pintel;
 
+$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'startyear', 'year']);
+$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::round((80 - $age)/3) + $age;
+    $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age;
     $special2 = 0;
 }
 //내특
-$specage = Util::round((80 - $age)/12) + $age;
+$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age;
 $special = 0;
 
-$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level']);
-
 if ($admin['scenario'] >= 1000) {
     $specage2 = $age + 3;
     $specage = $age + 3;
 }
 
+if($relYear < 3){
+    $experience = 0;
+}
+else{
+    $expGenCount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation != 0 AND npc < 5');
+    $targetGenOrder = Util::round($expGenCount * 0.2);
+    $experience = $db->queryFirstField(
+        'SELECT experience FROM general WHERE nation != 0 AND npc < 5 ORDER BY experience ASC LIMIT %i - 1, 1', 
+        $targetGenOrder
+    );
+    $experience *= 0.8;
+}
+
 $turntime = getRandTurn($admin['turnterm']);
 
 $lastconnect = date('Y-m-d H:i:s');
@@ -211,7 +225,7 @@ $db->insert('general', [
     'leader' => $leader,
     'power' => $power,
     'intel' => $intel,
-    'experience' => 0,
+    'experience' => $experience,
     'dedication' => 0,
     'gold' => 1000,
     'rice' => 1000,