diff --git a/hwe/a_genList.php b/hwe/a_genList.php
index 4b6e8080..fa5b3617 100644
--- a/hwe/a_genList.php
+++ b/hwe/a_genList.php
@@ -185,7 +185,7 @@ foreach($generalList as $general){
| ".getHonor($general['experience'])." |
".getDed($general['dedication'])." |
";
- echo getLevel($general['level']);
+ echo getLevelText($general['level']);
echo " |
$leadership |
$strength |
diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php
index 5f29ce74..1d713a53 100644
--- a/hwe/a_kingdomList.php
+++ b/hwe/a_kingdomList.php
@@ -159,23 +159,23 @@ for($i=1; $i <= $count; $i++) {
".count($generals)." / {$citycount} |
- | ".getLevel(12, $nation['level'])." |
+ ".getLevelText(12, $nation['level'])." |
$l12 |
- ".getLevel(11, $nation['level'])." |
+ ".getLevelText(11, $nation['level'])." |
$l11 |
- ".getLevel(10, $nation['level'])." |
+ ".getLevelText(10, $nation['level'])." |
$l10 |
- ".getLevel( 9, $nation['level'])." |
+ ".getLevelText( 9, $nation['level'])." |
$l9 |
- | ".getLevel( 8, $nation['level'])." |
+ ".getLevelText( 8, $nation['level'])." |
$l8 |
- ".getLevel( 7, $nation['level'])." |
+ ".getLevelText( 7, $nation['level'])." |
$l7 |
- ".getLevel( 6, $nation['level'])." |
+ ".getLevelText( 6, $nation['level'])." |
$l6 |
- ".getLevel( 5, $nation['level'])." |
+ ".getLevelText( 5, $nation['level'])." |
$l5 |
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 63f91e89..6681d8ac 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -188,12 +188,12 @@ if($city['trade'] === null) {
$city['trade'] = "- ";
}
-$query = "select npc,mode,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city='{$city['city']}' order by dedication desc"; // 장수 목록
+$query = "select npc,defence_train,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city='{$city['city']}' order by dedication desc"; // 장수 목록
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult);
$generals = $db->query(
- 'SELECT npc,mode,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city=%i order by name',
+ 'SELECT npc,defence_train,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city=%i order by name',
$city['city']
);
@@ -253,7 +253,7 @@ for($j=0; $j < $gencount; $j++) {
$intelText = formatWounded($intel, $general['injury']);
$level = $general['level'];
- $levelText = getLevel($general['level']);
+ $levelText = getLevelText($general['level']);
if($general['level'] == 12) {
$leadershipBonus = $nationInfo['level'] * 2;
@@ -265,8 +265,8 @@ for($j=0; $j < $gencount; $j++) {
$leadershipBonusText = formatLeadershipBonus($leadershipBonus);
if($ourGeneral){
- $defenceMode = $general['mode'];
- $defenceModeText = formatDefenceMode($defenceMode);
+ $defenceTrain = $general['defence_train'];
+ $defenceTrainText = formatDefenceTrain($defenceTrain);
$crewType = $general['crewtype'];
$crewTypeText = GameUnitConst::byId($crewType)->name;
$crew = $general['crew'];
@@ -274,8 +274,8 @@ for($j=0; $j < $gencount; $j++) {
$atmos = $general['atmos'];
}
else{
- $defenceMode = 0;
- $defenceModeText = '';
+ $defenceTrain = 0;
+ $defenceTrainText = '';
$crewType = 0;
$crewTypeText = '';
$crew = $general['crew'];
@@ -317,8 +317,8 @@ for($j=0; $j < $gencount; $j++) {
'strengthText'=>$strengthText,
'intel'=>$intel,
'intelText'=>$intelText,
- 'defenceMode'=>$defenceMode,
- 'defenceModeText'=>$defenceModeText,
+ 'defenceTrain'=>$defenceTrain,
+ 'defenceTrainText'=>$defenceTrainText,
'crewType'=>$crewType,
'crewTypeText'=>$crewTypeText,
'crew'=>$crew,
@@ -371,33 +371,33 @@ foreach($generalsFormat as $general){
}
$armedGenTotal += 1;
- if($general['train'] >= 90 && $general['atmos'] >= 90){
+ $minTrain = min($general['train'], $general['atmos']);
+
+ if($minTrain >= 90){
$crew90 += $general['crew'];
$gen90 += 1;
}
$chkDef = false;
- if($general['train'] >= 80 && $general['atmos'] >= 80){
+
+ if($minTrain >= 80){
$crew80 += $general['crew'];
$gen80 += 1;
- if($general['defenceMode'] == 2){
- $crewDef += $general['crew'];
- $genDef += 1;
- $chkDef = true;
- }
}
- if($general['train'] >= 60 && $general['atmos'] >= 60){
+ if($minTrain >= 60){
$crew60 += $general['crew'];
$gen60 += 1;
-
- if($general['defenceMode'] == 1 && !$chkDef){
- $crewDef += $general['crew'];
- $genDef += 1;
- $chkDef = true;
- }
}
+ if($minTrain >= $general['defenceTrain']){
+ $crewDef += $general['crew'];
+ $genDef += 1;
+ $chkDef = true;
+ }
+
+
+
}
?>
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index b3e60444..831f3e05 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -103,7 +103,7 @@ switch ($type) {
}
$generals = $db->query(
- 'SELECT npc,mode,no,level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
+ 'SELECT npc,defence_train,no,level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
$me['nation'],
$orderSQL
);
@@ -168,12 +168,7 @@ foreach ($generals as &$general) {
//TODO: npc 코드를 일원화
$general['nameText'] = $name;
- switch ($general['mode']) {
- case 0: $mode = "×"; break;
- case 1: $mode = "○"; break;
- case 2: $mode = "◎"; break;
- }
- $general['modeText'] = $mode;
+ $general['modeText'] = formatDefenceTrain($general['defence_train']);
$general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';
diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php
index 87417b7c..eca284df 100644
--- a/hwe/b_myBossInfo.php
+++ b/hwe/b_myBossInfo.php
@@ -137,10 +137,10 @@ for($i=12; $i >= $lv; $i-=2) {
$imageTemp2 = GetImageURL($level[$i2]['imgsvr']??0);
?>
- |
+ |
");background-size:64px;'> |
(년) |
- |
+ |
");background-size:64px;'> |
(년) |
@@ -226,9 +226,9 @@ echo "
|
| 수 뇌 부 임 명 |
- | ".getLevel(12, $nation['level'])." |
+ ".getLevelText(12, $nation['level'])." |
{$general['name']} 【".CityConst::byID($general['city'])->name."】 |
- ".getLevel(11, $nation['level'])." |
+ ".getLevelText(11, $nation['level'])." |