From 79d74b1ed14a64f7dc725c0be38ee019c84513ac Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 29 Mar 2018 00:57:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=B1=EC=9D=B8=20=EC=97=B0=EB=A0=B9(14?=
 =?UTF-8?q?=EC=84=B8=3F=3F)=EB=A5=BC=20GameConst=EB=A1=9C=20=EC=A0=95?=
 =?UTF-8?q?=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/sammo/GameConst.php    | 4 +++-
 twe/sammo/Scenario.php     | 2 +-
 twe/sammo/Scenario/NPC.php | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/twe/sammo/GameConst.php b/twe/sammo/GameConst.php
index 7755a211..b92888cb 100644
--- a/twe/sammo/GameConst.php
+++ b/twe/sammo/GameConst.php
@@ -67,5 +67,7 @@ class GameConst{
     /** @var int 최저 병량(긴급시) */
     public static $minNationalRice = 0;
     /** @var float 군량 매매시 세율*/
-    public static $taxrate = 0.01;    
+    public static $taxrate = 0.01;   
+    /** @var float 성인 연령 */
+    public static $adultAge = 14;
 }
\ No newline at end of file
diff --git a/twe/sammo/Scenario.php b/twe/sammo/Scenario.php
index b5afb8f7..6507699c 100644
--- a/twe/sammo/Scenario.php
+++ b/twe/sammo/Scenario.php
@@ -316,7 +316,7 @@ class Scenario{
         $remainGenerals = $this->buildGenerals($env);
 
         foreach($remainGenerals as $birth=>$actions){
-            $targetYear = $birth + 14;//FIXME: 14가 어디서 튀어나왔나?
+            $targetYear = $birth + \sammo\GameConst::$adultAge;
 
             $actions[] = ['DeleteEvent'];
             $this->events[] = [
diff --git a/twe/sammo/Scenario/NPC.php b/twe/sammo/Scenario/NPC.php
index 5059fc47..89fa34ce 100644
--- a/twe/sammo/Scenario/NPC.php
+++ b/twe/sammo/Scenario/NPC.php
@@ -79,7 +79,7 @@ class NPC{
 
         $db = DB::db();
 
-        if($age == 14 && $month == 1){//FIXME: 14가 어디서 튀어나왔나?
+        if($age == \sammo\GameConst::$adultAge && $month == 1){//FIXME: 14가 어디서 튀어나왔나?
             \sammo\pushHistory(["<C>●</>1월:<Y>$name</>(이)가 성인이 되어 <S>등장</>했습니다."]);
         }