From b733b70ad84de144aeec0345b583acce87189105 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 6 Mar 2019 01:44:24 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=A9=EC=A0=9C=EA=B0=80=20=EC=9E=88?=
 =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=ED=99=A9=EC=A0=9C.=20?=
 =?UTF-8?q?=EC=97=86=EC=9C=BC=EB=A9=B4=20=EC=9D=B4=EC=A0=84=20=EC=B2=9C?=
 =?UTF-8?q?=ED=86=B5=20=EA=B5=B0=EC=A3=BC=EC=9D=98=20=EB=AA=85=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20=EA=B0=9C?=
 =?UTF-8?q?=EC=B5=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_tournament.php   | 22 ++++++++++++++++++----
 hwe/sammo/ResetHelper.php |  5 ++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php
index 206117e1..9be9527f 100644
--- a/hwe/func_tournament.php
+++ b/hwe/func_tournament.php
@@ -235,6 +235,8 @@ function startTournament($auto, $type) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
+    $prevWinner = $gameStor->prev_winner;
+
     eraseTnmtFightLogAll();
 
     switch($auto) {
@@ -263,12 +265,24 @@ function startTournament($auto, $type) {
     $query = "truncate tournament";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+    $opener = $db->queryFirstField('SELECT `general`.`name` FROM `general` JOIN `nation` ON `general`.`nation` = `nation`.`nation` WHERE `general`.`level` = 12 AND `nation`.`level` = 7 ORDER BY rand() LIMIT 1');
+    if(!$opener){
+        $opener = $gameStor->prev_winner;
+    }
+
+    if($opener){
+        $openerText = "황제 <Y>{$opener}</>의 명으로 ";
+    }
+    else{
+        $openerText = '';
+    }
+
     $history = [];
     switch($type) {
-    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
-    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
-    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
-    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
+    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
+    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
+    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
+    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
     }
     pushWorldHistory($history, $admin['year'], $admin['month']);
 }
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index bc398df4..fd1582bc 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -164,6 +164,8 @@ class ResetHelper{
             'plock'=>1
         ]);
 
+        $prevWinner = $db->queryFirstField('SELECT l12name FROM emperior ORDER BY `no` DESC LIMIT 1');
+
         CityConst::build();
         $cityPositions = [];
         foreach(CityConst::all() as $city){
@@ -235,7 +237,8 @@ class ResetHelper{
             'npcmode'=>$npcmode,
             'extended_general'=>$extend,
             'fiction'=>$fiction,
-            'tnmt_trig'=>$tournament_trig
+            'tnmt_trig'=>$tournament_trig,
+            'prev_winner'=>$prevWinner
         ];
 
         foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){