From fd4d10e6e7c2bddbada4f5440ea26234ce1db259 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 10 May 2020 04:50:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=83=81=20=EA=B8=B0=EC=A4=80=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/msg.js                              | 10 +++++++++-
 hwe/sammo/Command/General/che_상업투자.php |  4 +---
 hwe/sammo/Command/General/che_정착장려.php |  4 +---
 hwe/sammo/Command/General/che_주민선정.php |  4 +---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index 42b15d2c..5af7a5e7 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -332,7 +332,15 @@ function refreshMailboxList(obj){
     generalList = {};
 
     
-    
+    obj.nation.sort(function(lhs, rhs){
+        if(lhs.mailbox == myNation.mailbox){
+            return -1;
+        }
+        if(rhs.mailbox == myNation.mailbox){
+            return 1;
+        }
+        return lhs.mailbox - rhs.mailbox;
+    })
 
     $.each(obj.nation, function(){
         var nation = this;
diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php
index 965c4b3b..17e86fc6 100644
--- a/hwe/sammo/Command/General/che_상업투자.php
+++ b/hwe/sammo/Command/General/che_상업투자.php
@@ -89,9 +89,7 @@ class che_상업투자 extends Command\GeneralCommand{
 
     
     public function getCompensationStyle():?int{
-        $develCost = $this->env['develcost'];
-        $reqGold = $this->getCost()[0];
-        return $develCost <=>$reqGold;
+        return $this->generalObj->onCalcDomestic(static::$actionKey, 'score', 100)<=>100;
     }
     
     public function getPreReqTurn():int{
diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php
index b3eeb25a..762c2dd5 100644
--- a/hwe/sammo/Command/General/che_정착장려.php
+++ b/hwe/sammo/Command/General/che_정착장려.php
@@ -87,9 +87,7 @@ class che_정착장려 extends Command\GeneralCommand{
     }
 
     public function getCompensationStyle():?int{
-        $develCost = $this->env['develcost'] * 2;
-        $reqGold = $this->getCost()[1];
-        return $develCost <=>$reqGold;
+        return 100<=>$this->generalObj->onCalcDomestic(static::$actionKey, 'score', 100);
     }
     
     public function getPreReqTurn():int{
diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php
index 988f8f4c..e5bbc005 100644
--- a/hwe/sammo/Command/General/che_주민선정.php
+++ b/hwe/sammo/Command/General/che_주민선정.php
@@ -87,9 +87,7 @@ class che_주민선정 extends Command\GeneralCommand{
     }
 
     public function getCompensationStyle():?int{
-        $develCost = $this->env['develcost'] * 2;
-        $reqGold = $this->getCost()[1];
-        return $develCost <=>$reqGold;
+        return 100<=>$this->generalObj->onCalcDomestic(static::$actionKey, 'score', 100);
     }
     
     public function getPreReqTurn():int{