From 4424ec48cf4671c790cabc036d7afd6b2dffc506 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Jul 2018 10:59:01 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=ED=88=AC=EC=8B=9C=20=EB=B3=91?=
 =?UTF-8?q?=EC=A2=85=20=EB=AA=85=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/process_war.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index 18d24fd1..7b4556f6 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -527,13 +527,13 @@ function processWar($general, $city) {
             $opposeCrewType = GameUnitConst::byId($oppose['crewtype']);
 
             $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
-            $josaWa = JosaUtil::pick($opposeCrewType->name, '와');
+            $josaWa = JosaUtil::pick($generalCrewType->name, '와');
             $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaWa} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaYi} 대결합니다.";
             $josaUl = JosaUtil::pick($opposeCrewType->name, '을');
-            $josaRo = JosaUtil::pick($opposeCrewType->name, '로');
-            $log[] = "<C>●</>".$opposeCrewType->name."{$josaRo} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaUl} <M>공격</>합니다.";
-            $josaUl = JosaUtil::pick($opposeCrewType->name, '을');
-            $opplog[] = "<C>●</>".$opposeCrewType->name."{$josaRo} <Y>{$general['name']}</>의 ".$opposeCrewType->name."{$josaUl} <M>수비</>합니다.";
+            $josaRo = JosaUtil::pick($generalCrewType->name, '로');
+            $log[] = "<C>●</>".$generalCrewType->name."{$josaRo} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaUl} <M>공격</>합니다.";
+            $josaUl = JosaUtil::pick($generalCrewType->name, '을');
+            $opplog[] = "<C>●</>".$opposeCrewType->name."{$josaRo} <Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaUl} <M>수비</>합니다.";
 
             $oppAtmos = 0;
             if($oppose['item'] == 3) {