From 0b46303f9f5b99f0cf30f281cdfed948e10e2a4e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 1 May 2019 03:08:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EA=B0=84=EC=9D=B4=20=EC=A7=80?=
 =?UTF-8?q?=EB=82=A0=20=EC=88=98=EB=A1=9D=20=EC=A0=91=EA=B2=BD=20=EC=88=98?=
 =?UTF-8?q?=EB=8F=84=20=EB=86=8D=EC=83=81,=20=EC=84=B1=EC=88=98=EC=9D=98?=
 =?UTF-8?q?=20=EB=94=94=EB=B2=84=ED=94=84=EA=B0=80=20=EC=83=9D=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 1410e19d..20e4f07f 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -273,8 +273,15 @@ function process_1(&$general, $type) {
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
 
-        if($city['front'] == 1 && $city['city'] != $nation['capital']){
-            $score *= 0.5;
+        if($city['front'] == 1){
+            if($city['city'] == $nation['capital']){
+                $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
+                $score *= Util::valueFit($degrade, 0.5, 1);
+            }
+            else{
+                $score *= 0.5;
+            }
+            
         }
 
         $score += $city["$stype"];
@@ -571,14 +578,27 @@ function process_5(&$general, $type) {
         $exp = $score * 0.7;
         $ded = $score * 1.0;
 
-        if($city['front'] == 1 && $city['city'] != $nation['capital']){
-            if($stype == 'def'){
-                $score *= 0.5;
+        if($city['front'] == 1){
+            if($city['city'] == $nation['capital']){
+                if($stype == 'def'){
+                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
+                    $score *= Util::valueFit($degrade, 0.5, 1);
+                }
+                else{
+                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.0375;
+                    $score *= Util::valueFit($degrade, 0.25, 1);
+                }
             }
             else{
-                $score *= 0.25;
+                if($stype == 'def'){
+                    $score *= 0.5;
+                }
+                else{
+                    $score *= 0.25;
+                }
             }
             
+            
         }
 
         // 성격 보정