From 804b9a1d71d12cb0bdf5dd3928ce89eae265c7e7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 11 Oct 2018 00:33:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=91=EA=B2=BD=20=EB=B0=A9=EC=8B=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.=20=EC=83=81=EC=97=85=20=ED=88=AC=EC=9E=90?=
 =?UTF-8?q?=EC=9D=98=20=EC=A0=91=EA=B2=BD=EC=8B=9D=EB=8F=84=20=EA=B0=99?=
 =?UTF-8?q?=EC=9D=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php                      | 12 ++++++------
 hwe/sammo/Command/General/che_상업투자.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index 83d19278..0790f614 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -241,20 +241,20 @@ function SetNationFront($nationNo) {
         'front'=>0
     ], 'nation=%i', $nationNo);
 
-    if($adj3){
+    if($adj1){
         $db->update('city', [
-            'front'=>3,
-        ], 'nation=%i and city in %li', $nationNo, array_keys($adj3));
+            'front'=>1,
+        ], 'nation=%i and city in %li', $nationNo, array_keys($adj1));
     }
     if($adj2){
         $db->update('city', [
             'front'=>2,
         ], 'nation=%i and city in %li', $nationNo, array_keys($adj2));
     }
-    if($adj1){
+    if($adj3){
         $db->update('city', [
-            'front'=>1,
-        ], 'nation=%i and city in %li', $nationNo, array_keys($adj1));
+            'front'=>3,
+        ], 'nation=%i and city in %li', $nationNo, array_keys($adj3));
     }
 }
 
diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php
index 174e68d3..ce4018df 100644
--- a/hwe/sammo/Command/General/che_상업투자.php
+++ b/hwe/sammo/Command/General/che_상업투자.php
@@ -148,7 +148,7 @@ class che_상업투자 extends Command\GeneralCommand{
         $exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
         $ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
 
-        if($this->city['front'] == 1 && $this->nation['capital'] != $this->city['city']){
+        if(in_array($this->city['front'], [1, 3]) && $this->nation['capital'] != $this->city['city']){
             $score *= static::$debuffFront;
         }