getPersonalityClass 추가

hwe/func_converter.php

@@ -238,6 +238,26 @@ function getNationTypeClass(?string $type){
     new \InvalidArgumentException("{$type}은 올바른 국가 타입 클래스가 아님");
 }
 
+function getPersonalityClass(?string $type){
+    if($type === null){
+        $type = GameConst::$neutralPersonality;
+    }
+
+    static $basePath = __NAMESPACE__.'\\TriggerPersonality\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    $classPath = ($basePath.'che_'.$type);
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    new \InvalidArgumentException("{$type}은 올바른 성격 클래스가 아님");
+}
+
 function getGeneralSpecialDomesticClass(?string $type){
     if($type === null){
         $type = GameConst::$defaultSpecial;

hwe/sammo/GameConstBase.php

@@ -107,4 +107,12 @@ class GameConstBase
     ];
     /** @var array 기본 특기(공용) */
     public static $defaultSpecial = 'None';
+
+    /** @var array 기본 성향(공용) */
+    public static $neutralPersonality = 'None';
+    /** @var array 선택 가능한 성향 */
+    public static $availablePersonality = [
+        'che_안전', 'che_유지', 'che_재간', 'che_출세', 'che_할거', 'che_정복',
+        'che_패권', 'che_의협', 'che_대의', 'che_왕좌'    
+    ];
 }

hwe/sammo/General.php

@@ -20,10 +20,11 @@ class General{
     protected $logActivatedSkill = [];
     protected $isFinished = false;
 
-    
+
     protected $nationType;
     protected $levelObj;
     protected $specialDomesticObj;
+    protected $characteristicObj;
 
     public function __construct(array $raw, ?array $city, int $year, int $month){
         //TODO:  밖에서 가져오도록 하면 버그 확률이 높아짐. 필요한 raw 값을 직접 구해야함.
@@ -45,6 +46,7 @@ class General{
         $nationTypeClass = getNationTypeClass($staticNation['type']);
         $this->nationType = new $nationTypeClass;
         $this->levelObj = new TriggerGeneralLevel($this->raw, $city);
+        $this->levelObj = new TriggerGeneralLevel($this->raw, $city);
     }
 
     protected function clearActivatedSkill(){

hwe/sammo/TriggerPersonality/None.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 
 class None implements iActionTrigger{

hwe/sammo/TriggerPersonality/che_대의.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_안전.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_왕좌.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_유지.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_은둔.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_의협.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_재간.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_정복.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_출세.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_패권.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;
 

hwe/sammo/TriggerPersonality/che_할거.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\TriggerCharacter;
+namespace sammo\TriggerPersonality;
 use \sammo\iActionTrigger;
 use \sammo\General;