diff --git a/hwe/_admin2.php b/hwe/_admin2.php
index 87b2bb2b..2ccb1358 100644
--- a/hwe/_admin2.php
+++ b/hwe/_admin2.php
@@ -59,10 +59,10 @@ $db = DB::db();
if ($general['block'] > 0) {
$style .= "background-color:red;";
}
- if ($general['npc'] >= 2) {
- $style .= "color:cyan;";
- } elseif ($general['npc'] == 1) {
- $style .= "color:skyblue;";
+
+ $npcColor = getNPCColor($general['npc']);
+ if($npcColor !== null){
+ $style .= "color:{$npcColor};";
}
echo "
diff --git a/hwe/_admin4.php b/hwe/_admin4.php
index 2ef4c18f..39795c54 100644
--- a/hwe/_admin4.php
+++ b/hwe/_admin4.php
@@ -70,13 +70,10 @@ function colorBlockedName($general)
if ($general['block'] > 0) {
$style .= "background-color:red;";
}
- if ($general['npc'] >= 2) {
- $style .= "color:cyan;";
- } elseif ($general['npc'] == 1) {
- $style .= "color:skyblue;";
- }
- if ($general['con'] > $conlimit) {
- $style .= "color:red;";
+
+ $npcColor = getNPCColor($general['npc']);
+ if($npcColor !== null){
+ $style .= "color:{$npcColor};";
}
echo "
diff --git a/hwe/a_genList.php b/hwe/a_genList.php
index b83e4e3b..750c1da5 100644
--- a/hwe/a_genList.php
+++ b/hwe/a_genList.php
@@ -155,13 +155,7 @@ if ($gameStor->isunited) {
- if ($general['npc'] >= 2) {
- $name = "{$general['name']}";
- } elseif ($general['npc'] == 1) {
- $name = "{$general['name']}";
- } else {
- $name = "{$general['name']}";
- }
+ $name = formatName($general['name'], $general['npc']);
if (key_exists($general['owner'], $ownerNameList)) {
$name = $name . '
(' . $ownerNameList[$general['owner']] . ')';
diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php
index c4977075..3c3f2e43 100644
--- a/hwe/a_kingdomList.php
+++ b/hwe/a_kingdomList.php
@@ -145,13 +145,7 @@ if ($con >= 2) {
| μ₯μ μΌλ : ";
foreach ($generals as $general) {
- if ($general['npc'] >= 2) {
- echo "{$general['name']}, ";
- } elseif ($general['npc'] == 1) {
- echo "{$general['name']}, ";
- } else {
- echo "{$general['name']}, ";
- }
+ echo formatName($general['name'], $general['npc']).', ';
}
echo "
|
diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 70285953..bed219ad 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -132,11 +132,8 @@ if ($str3) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+
+ $general['name'] = formatName($general['name'], $general['npc']);
echo "{$general['name']} | ";
}
@@ -162,11 +159,7 @@ if ($str3) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -208,11 +201,7 @@ if ($str3) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -254,11 +243,7 @@ if ($str3) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -300,11 +285,7 @@ if ($str3) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php
index 015559e7..8d2a6c7d 100644
--- a/hwe/b_myGenInfo.php
+++ b/hwe/b_myGenInfo.php
@@ -146,13 +146,7 @@ if ($gameStor->isunited) {
$intel = "{$general['intel']}";
}
- if ($general['npc'] >= 2) {
- $name = "{$general['name']}";
- } elseif ($general['npc'] == 1) {
- $name = "{$general['name']}";
- } else {
- $name = "{$general['name']}";
- }
+ $name = formatName($general['name'], $general['npc']);
if (key_exists($general['owner'], $ownerNameList)) {
$name = $name . '
(' . $ownerNameList[$general['owner']] . ')';
diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index cb4bc0d6..b486f61d 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -240,11 +240,7 @@ switch ($admin['tnmt_type']) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
echo "{$general['name']} | ";
}
@@ -270,11 +266,7 @@ switch ($admin['tnmt_type']) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -316,11 +308,7 @@ switch ($admin['tnmt_type']) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -363,11 +351,7 @@ switch ($admin['tnmt_type']) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
@@ -409,11 +393,7 @@ switch ($admin['tnmt_type']) {
if ($general['name'] == "") {
$general['name'] = "-";
}
- if ($general['npc'] >= 2) {
- $general['name'] = "" . $general['name'] . "";
- } elseif ($general['npc'] == 1) {
- $general['name'] = "" . $general['name'] . "";
- }
+ $general['name'] = formatName($general['name'], $general['npc']);
if ($general['win'] > 0) {
$line[$i] = "";
$cent[intdiv($i, 2)] = "";
diff --git a/hwe/func_template.php b/hwe/func_template.php
index 6f264148..5ef56848 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -215,14 +215,35 @@ function formatLeadershipBonus(int $value): string
return "+{$value}";
}
+function getNPCColor(int $npc): ?string{
+ if ($npc == 1) {
+ return 'skyblue';
+ }
+ if ($npc == 4){
+ return 'deepskyblue';
+ }
+ if ($npc == 5){
+ return 'darkcyan';
+ }
+ if ($npc == 6){
+ return 'mediumaquamarine';
+ }
+
+ if ($npc > 1) {
+ return 'cyan';
+ }
+
+ return null;
+}
+
function formatName(string $name, int $npc): string
{
- if ($npc == 1) {
- $name = "$name";
- } else if ($npc > 1) {
- $name = "$name";
+ $color = getNPCColor($npc);
+ if($color === null){
+ return $name;
}
- return $name;
+
+ return "$name";
}
function getMapTheme(): string
diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php
index d3d8c3cc..0fe0b0cc 100644
--- a/hwe/func_tournament.php
+++ b/hwe/func_tournament.php
@@ -261,10 +261,8 @@ function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl,
$k += 1;
if ($prmt > 0) {
$name = "" . $name . "";
- } elseif ($npc >= 2) {
- $name = "" . $name . "";
- } elseif ($npc == 1) {
- $name = "" . $name . "";
+ } else if($npc > 0){
+ $name = formatName($name, $npc);
}
echo "| $k | $name | $abil | $tgame | $win | $draw | $lose | $gd | $gl |
";
}
diff --git a/hwe/ts/common_legacy.ts b/hwe/ts/common_legacy.ts
index 3a6ecc3c..7773309b 100644
--- a/hwe/ts/common_legacy.ts
+++ b/hwe/ts/common_legacy.ts
@@ -79,7 +79,16 @@ function br2nl (text) {
}
*/
-export function getNpcColor(npcType: number): 'cyan' | 'skyblue' | null {
+export function getNpcColor(npcType: number): 'skyblue' | 'cyan' | 'deepskyblue' | 'darkcyan' | 'mediumaquamarine' | null {
+ if (npcType == 6){
+ return 'mediumaquamarine';
+ }
+ if (npcType == 5){
+ return 'darkcyan';
+ }
+ if (npcType == 4){
+ return 'deepskyblue';
+ }
if (npcType >= 2) {
return 'cyan';
}
diff --git a/hwe/ts/select_npc.ts b/hwe/ts/select_npc.ts
index 092eca73..0757c91c 100644
--- a/hwe/ts/select_npc.ts
+++ b/hwe/ts/select_npc.ts
@@ -306,10 +306,8 @@ function printGeneralList(value: GeneralListResponse) {
if (general.reserved == 1) {
general.userCSS = 'color:violet';
- } else if (general.npc >= 2) {
- general.userCSS = 'color:cyan';
- } else if (general.npc == 1) {
- general.userCSS = 'color:skyblue';
+ } else if (general.npc > 0) {
+ general.userCSS = `color:${getNPCColor(general.npc)}`;
}
if (general.ownerName) {
@@ -458,4 +456,8 @@ $(function ($) {
_printGeneralList();
})
-});
\ No newline at end of file
+});
+
+function getNPCColor(npc: number) {
+ throw new Error('Function not implemented.');
+}