From 85cb91071e9d578a7774dffd8033783670c1167c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 15 Aug 2020 03:46:43 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=8F=84=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=8C=80?=
 =?UTF-8?q?=ED=8F=AD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php         |  75 ++++++++++++++++++++----
 hwe/js/map.js                 |   4 +-
 hwe/templates/cityGeneral.php | 104 +++++++++++++++++-----------------
 3 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 770aad53..46228962 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -148,8 +148,30 @@ echo "
 unset($city);
 
 // 첩보된 도시까지만 허용
-if($valid == 0 && $userGrade < 5) {
+
+$showDetailedInfo = false;
+if($valid){
+    $showDetailedInfo = true;
+}
+
+if(!key_exists($citylist, CityConst::all())){
     $citylist = $me['city'];
+    $showDetailedInfo = true;
+    $valid = 1;
+}
+
+if($userGrade >= 5){
+    $valid = true;
+}
+
+if(!$valid) {
+    $ownCities = Util::convertArrayToSetLike($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND nation != 0', $me['nation']));
+    foreach(array_keys(CityConst::byID($citylist)->path) as $pathID){
+        if(key_exists($pathID, $ownCities)){
+            $showDetailedInfo = true;
+            break;
+        }
+    }
 }
 
 
@@ -172,11 +194,35 @@ if($city['trade'] === null) {
 }
 
 $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
-$generals = $db->query(
-    'SELECT %l from general where city=%i order by name',
-    Util::formatListOfBackticks($dbColumns),
-    $city['city']
-);
+if($showDetailedInfo){
+    $generals = $db->query(
+        'SELECT %l from general where city=%i order by name',
+        Util::formatListOfBackticks($dbColumns),
+        $city['city']
+    );
+}
+else{
+    $generals = [];
+}
+
+if($valid){
+    $city['trustText'] = round($city['trust'], 1);
+    $city['popRateText'] = round($city['pop']/$city['pop_max']*100, 2);
+}
+else{
+    $city['agri'] = '?';
+    $city['comm'] = '?';
+    $city['pop'] = '?';
+    $city['secu'] = '?';
+    $city['trustText'] = '?';
+    $city['popRateText'] = '?';
+
+    if($city['nation'] != 0){
+        $city['def'] = '?';
+        $city['wall'] = '?';
+    }
+}
+
 
 $generalTurnList = [];
 
@@ -257,6 +303,10 @@ foreach($generals as $general){
         $crew = $general['crew'];
         $train = -1;
         $atmos = -1;
+
+        if(!$valid){
+            $crew = -1;
+        }
     }
 
     $nation = $general['nation'];
@@ -331,7 +381,9 @@ foreach($generalsFormat as $general){
     }
     if($general['nation'] != $myNation['nation']){
         $enemyCnt += 1;
-        $enemyCrew += $general['crew'];
+        if($general['crew'] >= 0){
+            $enemyCrew += $general['crew'];
+        }
         if($general['crew'] > 0){
             $enemyArmedCnt += 1;
         }
@@ -402,11 +454,11 @@ foreach($generalsFormat as $general){
     </tr>
     <tr>
         <td align=center class=bg1>민심</td>
-        <td align=center><?=round($city['trust'], 1)?></td>
+        <td align=center><?=$city['trustText']?></td>
         <td align=center class=bg1>시세</td>
         <td align=center><?=$city['trade']?>%</td>
         <td align=center class=bg1>인구</td>
-        <td align=center><?=round($city['pop']/$city['pop_max']*100, 2)?>%</td>
+        <td align=center><?=$city['popRateText']?>%</td>
         <td align=center class=bg1>태수</td>
         <td align=center><?=$officer[4]['name']?></td>
         <td align=center class=bg1>군사</td>
@@ -430,11 +482,12 @@ foreach($generalsFormat as $general){
     </tr>
     <tr>
         <td align=center class=bg1>장수</td>
-        <td colspan=11><?=join(', ', $generalsName)?></td>
+        <td colspan=11><?=$showDetailedInfo?join(', ', $generalsName):'<span style="color:gray">알 수 없음</span>'?></td>
     </tr>
 </table>
 
 <br>
+<?php if($showDetailedInfo): ?>
 <table align=center class='tb_layout bg0'>
 <thead>
     <tr>
@@ -459,7 +512,7 @@ foreach($generalsFormat as $general){
 ?>
 </tbody>
 </table>
-
+<?php endif; ?>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
diff --git a/hwe/js/map.js b/hwe/js/map.js
index 871ad48f..f2bcd3e7 100644
--- a/hwe/js/map.js
+++ b/hwe/js/map.js
@@ -235,10 +235,10 @@ function reloadWorldMap(option, drawTarget) {
         }
 
         function mergeClickable(city) {
-            //clickable = (remainSpy << 3) | (ourCity << 2) | (shownByGeneral << 1) | clickableAll
+            //clickable = (defaultCity << 4 ) | (remainSpy << 3) | (ourCity << 2) | (shownByGeneral << 1) | clickableAll
             var id = city.id;
             var nationId = city.nationId;
-            var clickable = 0;
+            var clickable = 16;
             if (id in spyList) {
                 clickable |= spyList[id] << 3;
             }
diff --git a/hwe/templates/cityGeneral.php b/hwe/templates/cityGeneral.php
index 2c04feb2..f342eae8 100644
--- a/hwe/templates/cityGeneral.php
+++ b/hwe/templates/cityGeneral.php
@@ -1,53 +1,53 @@
-<tr
-    data-is-our-general="<?=$ourGeneral?'true':'false'?>"
-    data-is-npc="<?=$isNPC?'true':'false'?>"
-    data-general-wounded="<?=$wounded?>"
-    data-general-name="<?=$this->e($name)?>"
-    data-general-leadership="<?=$leadership?>"
-    data-general-strength="<?=$strength?>"
-    data-general-intel="<?=$intel?>"
-    data-general-officer-level="<?=$officerLevel?>"
-    data-general-leadership-bonus="<?=$leadershipBonus?>"
-<?php if($ourGeneral): ?>
-    data-general-defence-train="<?=$defenceTrain?>"
-    data-general-crew-type="<?=$crewType?>"
-    data-general-crew="<?=$crew?>"
-    data-general-train="<?=$train?>"
-    data-general-atmos="<?=$atmos?>"
-<?php else: ?>
-    data-general-crew="<?=$crew?>"
-<?php endif; ?>
-    data-general-nation="<?=$nation?>"
-    data-general-nation-name="<?=$nationName?>"
->
-    <td height="64"><img class='generalIcon' width='64' height='64' src='<?=$iconPath?>'></td>
-    <td><?=$nameText?></td>
-    <td><?=$leadershipText?><?=$leadershipBonusText?></td>
-    <td><?=$strengthText?></td>
-    <td><?=$intelText?></td>
-    <td class="general_officer_level"><?=$officerLevelText?></td>
-<?php if($ourGeneral): ?>
-    <td><?=$defenceTrainText?></td>
-    <td class="general_crew_type"><?=$crewTypeText?></td>
-    <td><?=$crew?></td>
-    <td><?=$train?></td>
-    <td><?=$atmos?></td>
-    <?php if($isNPC): ?>
-    <td>NPC 장수</td>    
-    <?php else: ?>
-    <td class="general_turn_text"><?=$turnText?></td>
-    <?php endif; ?>
-<?php else: ?>
-    <td>?</td>
-    <td class="general_crew_type">?</td>
-    <td><?=$crew?></td>
-    <td>?</td>
-    <td>?</td>
-    <?php if($nation!==0): ?>
-    <td>【<?=$nationName?>】 장수</td>
-    <?php else: ?>
-    <td>재 야</td>
-    <?php endif; ?>
-<?php endif; ?>
-    
+<tr
+    data-is-our-general="<?=$ourGeneral?'true':'false'?>"
+    data-is-npc="<?=$isNPC?'true':'false'?>"
+    data-general-wounded="<?=$wounded?>"
+    data-general-name="<?=$this->e($name)?>"
+    data-general-leadership="<?=$leadership?>"
+    data-general-strength="<?=$strength?>"
+    data-general-intel="<?=$intel?>"
+    data-general-officer-level="<?=$officerLevel?>"
+    data-general-leadership-bonus="<?=$leadershipBonus?>"
+<?php if($ourGeneral): ?>
+    data-general-defence-train="<?=$defenceTrain?>"
+    data-general-crew-type="<?=$crewType?>"
+    data-general-crew="<?=$crew?>"
+    data-general-train="<?=$train?>"
+    data-general-atmos="<?=$atmos?>"
+<?php else: ?>
+    data-general-crew="<?=$crew?>"
+<?php endif; ?>
+    data-general-nation="<?=$nation?>"
+    data-general-nation-name="<?=$nationName?>"
+>
+    <td height="64"><img class='generalIcon' width='64' height='64' src='<?=$iconPath?>'></td>
+    <td><?=$nameText?></td>
+    <td><?=$leadershipText?><?=$leadershipBonusText?></td>
+    <td><?=$strengthText?></td>
+    <td><?=$intelText?></td>
+    <td class="general_officer_level"><?=$officerLevelText?></td>
+<?php if($ourGeneral): ?>
+    <td><?=$defenceTrainText?></td>
+    <td class="general_crew_type"><?=$crewTypeText?></td>
+    <td><?=$crew?></td>
+    <td><?=$train?></td>
+    <td><?=$atmos?></td>
+    <?php if($isNPC): ?>
+    <td>NPC 장수</td>    
+    <?php else: ?>
+    <td class="general_turn_text"><?=$turnText?></td>
+    <?php endif; ?>
+<?php else: ?>
+    <td>?</td>
+    <td class="general_crew_type">?</td>
+    <td><?=$crew>=0?$crew:'?'?></td>
+    <td>?</td>
+    <td>?</td>
+    <?php if($nation!==0): ?>
+    <td>【<?=$nationName?>】 장수</td>
+    <?php else: ?>
+    <td>재 야</td>
+    <?php endif; ?>
+<?php endif; ?>
+    
 </tr>
\ No newline at end of file