@@ -194,25 +205,34 @@ $startYear = $gameStor->getValue('startyear');
-
diff --git a/hwe/func_converter.php b/hwe/func_converter.php
index 484d6b07..ef7503ed 100644
--- a/hwe/func_converter.php
+++ b/hwe/func_converter.php
@@ -441,74 +441,73 @@ function getTechCall($tech) : string {
return "{$techLevel}등급";
}
-function getDexCall($dex) : string {
- if($dex < 2500) { $str = '
F-'; }
- elseif($dex < 7500) { $str = '
F'; }
- elseif($dex < 15000) { $str = '
F+'; }
- elseif($dex < 25000) { $str = '
E-'; }
- elseif($dex < 37500) { $str = '
E'; }
- elseif($dex < 52500) { $str = '
E+'; }
- elseif($dex < 70000) { $str = '
D-'; }
- elseif($dex < 90000) { $str = '
D'; }
- elseif($dex < 112500) { $str = '
D+'; }
- elseif($dex < 137500) { $str = '
C-'; }
- elseif($dex < 165000) { $str = '
C'; }
- elseif($dex < 195000) { $str = '
C+'; }
- elseif($dex < 227500) { $str = '
B-'; }
- elseif($dex < 262500) { $str = '
B'; }
- elseif($dex < 300000) { $str = '
B+'; }
- elseif($dex < 340000) { $str = '
A-'; }
- elseif($dex < 382500) { $str = '
A'; }
- elseif($dex < 427500) { $str = '
A+'; }
- elseif($dex < 475000) { $str = '
S-'; }
- elseif($dex < 525000) { $str = '
S'; }
- elseif($dex < 577500) { $str = '
S+'; }
- elseif($dex < 632500) { $str = '
SS-'; }
- elseif($dex < 690000) { $str = '
SS'; }
- elseif($dex < 750000) { $str = '
SS+'; }
- elseif($dex < 812500) { $str = '
SSS-'; }
- elseif($dex < 877500) { $str = '
SSS'; }
- elseif($dex < 945000) { $str = '
SSS+'; }
- elseif($dex < 1015000) { $str = '
Z-'; }
- elseif($dex < 1087500) { $str = '
Z'; }
- elseif($dex < 1162500) { $str = '
Z+'; }
- else { $str = '
?'; }
- return $str;
+function getDexLevelList(): array{
+ return [
+ [0, 'navy', 'F-'],
+ [2500, 'navy', 'F'],
+ [7500, 'navy', 'F+'],
+ [15000, 'skyblue', 'E-'],
+ [25000, 'skyblue', 'E'],
+ [37500, 'skyblue', 'E+'],
+ [52500, 'seagreen', 'D-'],
+ [70000, 'seagreen', 'D'],
+ [90000, 'seagreen', 'D+'],
+ [112500, 'teal', 'C-'],
+ [137500, 'teal', 'C'],
+ [165000, 'teal', 'C+'],
+ [195000, 'limegreen', 'B-'],
+ [227500, 'limegreen', 'B'],
+ [262500, 'limegreen', 'B+'],
+ [300000, 'gold', 'A-'],
+ [340000, 'gold', 'A'],
+ [382500, 'gold', 'A+'],
+ [427500, 'darkorange', 'S-'],
+ [475000, 'darkorange', 'S'],
+ [525000, 'darkorange', 'S+'],
+ [577500, 'tomato', 'SS-'],
+ [632500, 'tomato', 'SS'],
+ [690000, 'tomato', 'SS+'],
+ [750000, 'red', 'SSS-'],
+ [812500, 'red', 'SSS'],
+ [877500, 'red', 'SSS+'],
+ [945000, 'darkviolet', 'Z-'],
+ [1015000, 'darkviolet', 'Z'],
+ [1087500, 'darkviolet', 'Z+'],
+ [1162500, 'white', '?']
+ ];
}
-function getDexLevel($dex) : int {
- if($dex < 2500) { $lvl = 0; }
- elseif($dex < 7500) { $lvl = 1; }
- elseif($dex < 15000) { $lvl = 2; }
- elseif($dex < 25000) { $lvl = 3; }
- elseif($dex < 37500) { $lvl = 4; }
- elseif($dex < 52500) { $lvl = 5; }
- elseif($dex < 70000) { $lvl = 6; }
- elseif($dex < 90000) { $lvl = 7; }
- elseif($dex < 112500) { $lvl = 8; }
- elseif($dex < 137500) { $lvl = 9; }
- elseif($dex < 165000) { $lvl = 10; }
- elseif($dex < 195000) { $lvl = 11; }
- elseif($dex < 227500) { $lvl = 12; }
- elseif($dex < 262500) { $lvl = 13; }
- elseif($dex < 300000) { $lvl = 14; }
- elseif($dex < 340000) { $lvl = 15; }
- elseif($dex < 382500) { $lvl = 16; }
- elseif($dex < 427500) { $lvl = 17; }
- elseif($dex < 475000) { $lvl = 18; }
- elseif($dex < 525000) { $lvl = 19; }
- elseif($dex < 577500) { $lvl = 20; }
- elseif($dex < 632500) { $lvl = 21; }
- elseif($dex < 690000) { $lvl = 22; }
- elseif($dex < 750000) { $lvl = 23; }
- elseif($dex < 812500) { $lvl = 24; }
- elseif($dex < 877500) { $lvl = 25; }
- elseif($dex < 945000) { $lvl = 26; }
- elseif($dex < 1015000) { $lvl = 27; }
- elseif($dex < 1087500) { $lvl = 28; }
- elseif($dex < 1162500) { $lvl = 29; }
- else { $lvl = 30; }
- return $lvl;
+function getDexCall(int $dex) : string {
+ if($dex < 0){
+ throw new \InvalidArgumentException();
+ }
+
+ $color = null;
+ $name = null;
+ foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+ if($dex < $dexKey){
+ break;
+ }
+ $color = $nextColor;
+ $name = $nextName;
+ }
+
+ return "
{$name}";
+}
+
+function getDexLevel(int $dex) : int {
+ if($dex < 0){
+ throw new \InvalidArgumentException();
+ }
+
+ $retVal = null;
+ foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+ if($dex < $dexKey){
+ break;
+ }
+ $retVal = $dexLevel;
+ }
+ return $dexLevel;
}
function getDexLog($dex1, $dex2) {
diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index bb0ecd09..9ec888d2 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -7,8 +7,16 @@ namespace sammo;
function getNationLevelList():array{
$table = [
- 7 => ['황제', 8, ]
+ 0 => ['방랑군', 2, 0],
+ 1 => ['호족', 2, 1],
+ 2 => ['군벌', 4, 2],
+ 3 => ['주자사', 4, 5],
+ 4 => ['주목', 6, 8],
+ 5 => ['공', 6, 11],
+ 6 => ['왕', 8, 16],
+ 7 => ['황제', 8, 21],
];
+ return $table;
}
function getNationTypeList():array{