diff --git a/hwe/a_history.php b/hwe/a_history.php index c94e3b33..0e594d21 100644 --- a/hwe/a_history.php +++ b/hwe/a_history.php @@ -46,7 +46,7 @@ $s = $s_year * 12 + $s_month; $e = $e_year * 12 + $e_month; if($serverID !== UniqueConst::$serverID){ - $mapTheme = $db->queryFirstColumn('SELECT map_theme FROM ng_games WHERE server_id=%s', $serverID)??'che'; + $mapTheme = $db->queryFirstColumn('SELECT map FROM ng_games WHERE server_id=%s', $serverID)??'che'; } else{ $mapTheme = $admin['map_theme']??'che'; diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php index 10ef1014..d6a1f163 100644 --- a/hwe/sammo/ResetHelper.php +++ b/hwe/sammo/ResetHelper.php @@ -226,7 +226,7 @@ class ResetHelper{ 'server_id'=>$serverID, 'date'=>$turntime, 'winner_nation'=>null, - 'map_theme'=>$scenarioObj->getMapTheme(), + 'map'=>$scenarioObj->getMapTheme(), 'scenario'=>$scenario, 'scenario_name'=>$scenarioObj->getTitle(), 'env'=>Json::encode($env) diff --git a/hwe/scenario/map/miniche.php b/hwe/scenario/map/miniche.php index eea0651a..3304571e 100644 --- a/hwe/scenario/map/miniche.php +++ b/hwe/scenario/map/miniche.php @@ -59,7 +59,7 @@ class CityConst extends CityConstBase{ [52, '요동', '소', 2937, 63, 59, 40, 59, 63, '동이', 543, 26, ['북평', '오환', '국내']], [53, '거록', '소', 2936, 61, 57, 40, 64, 58, '하북', 355, 100, ['진양', '남피', '업']], [54, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 392, 331, ['합비', '단양', '시상', '강하']], - [55, '패', '소', 2877, 64, 58, 40, 58, 59, '중원', 429, 220, ['진류', '복양', '하피', '초']], + [55, '패', '소', 2877, 64, 58, 40, 58, 59, '중원', 429, 220, ['진류', '복양', '하비', '초']], [56, '자동', '소', 2870, 57, 55, 40, 60, 58, '서촉', 62, 245, ['무도', '한중', '덕양']], [57, '광릉', '소', 2867, 61, 55, 40, 60, 62, '오월', 474, 273, ['하비', '건업']], [58, '장가', '소', 2853, 59, 62, 40, 58, 57, '남중', 136, 403, ['건녕', '영릉', '남만']], @@ -67,7 +67,7 @@ class CityConst extends CityConstBase{ [60, '월수', '소', 2828, 60, 59, 40, 58, 63, '남중', 39, 349, ['강주', '주제', '운남']], [61, '건안', '소', 2802, 57, 62, 40, 58, 63, '오월', 435, 427, ['단양', '회계', '산월']], [62, '신야', '소', 2786, 60, 62, 40, 58, 55, '초', 240, 262, ['상용', '완', '양양']], - [63, '탐라', '소', 2772, 60, 55, 40, 63, 62, '동이', 614, 264, ['웅진', '왜', '대']], + [63, '탐라', '소', 2772, 60, 55, 40, 63, 62, '동이', 614, 264, ['웅진', '왜', '오']], [64, '상동', '소', 2767, 58, 59, 40, 62, 58, '초', 285, 411, ['계양', '시상', '남해']], [65, '안정', '소', 2764, 57, 59, 40, 57, 62, '서북', 130, 131, ['강', '무위', '천수', '장안']], [66, '여남', '소', 2749, 63, 56, 40, 64, 64, '중원', 330, 259, ['완', '허창', '초', '수춘']],