From 67dee551b694c9f8a39146f3cbdbdc173f18db82 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 12 Apr 2018 05:22:20 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=84=EC=9F=81=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EB=B2=84=EA=B7=B8=20=EC=9D=BC=EB=B6=80=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_diplomacy.php | 55 +++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index b3afb8fb..0b166c34 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -193,30 +193,37 @@ for($i=0; $i < $nationcount; $i++) {
 >
     <tr><td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td></tr>
     <?php foreach($realConflict as list($cityID, $cityName, $conflict)): ?>
-        <tr>
-            <td align=center width=48><?=$cityName?></td>
-            <td width=948>
-                <table 
-                    border=0
-                    cellspacing=0 
-                    cellpadding=0
-                    bordercolordark='gray'
-                    bordercolorlight='black'
-                    style='font-size:13px;word-break:break-all;'
-                    class='bg0'
-                >
-                <?php foreach($conflict as $conflictItem): ?>
-                    <tr>
-                        <td width=98 align=right style=color:".newColor($nationcolor[$nationID]).";background-color:<?=$conflictItem['color']?>;><?=$conflictItem['name']?>&nbsp;</td>
-                        <td width=48 align=right><?=$conflictItem['percent']?>%&nbsp;</td>
-                        <td width='<?=$conflictItem['percent']?>%' style=background-color:<?=$conflictItem['color']?>;></td>
-                        <td width=*></td>
-                    </tr>
-                <?php endforeach; ?>
-                </table>
-        
-            </td>
-        </tr>
+    <tr>
+        <td align=center width=48><?=$cityName?></td>
+        <td width=948>
+            <table 
+                border=0
+                cellspacing=0 
+                cellpadding=0
+                bordercolordark='gray'
+                bordercolorlight='black'
+                style='font-size:13px;word-break:break-all;'
+                class='bg0'
+            >
+            <?php foreach($conflict as $item): ?>
+                <tr>
+                    <td 
+                        width=98
+                        align=right 
+                        style='color:<?=newColor($item['color'])?>;background-color:<?=$item['color']?>;'
+                    ><?=$item['name']?>&nbsp;</td>
+                    <td width=48 align=right><?=$item['percent']?>%&nbsp;</td>
+                    <td 
+                        width='<?=$item['percent']?>%'
+                        style='background-color:<?=$item['color']?>;'
+                    ></td>
+                    <td width=*></td>
+                </tr>
+            <?php endforeach; ?>
+            </table>
+    
+        </td>
+    </tr>
     <?php endforeach; ?>
     <tr><td colspan=2 height=5 id=bg1></td></tr>
 </table>