From 2b4de68f0ae1acfb8ab666d0bb9724ed23ca7880 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sun, 8 May 2022 20:15:03 +0900
Subject: [PATCH] =?UTF-8?q?refac:=20=EB=8D=94=EB=8A=94=20=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=EC=97=86=EC=96=B4=EC=A7=84=20betting=20table=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/API/General/Join.php        |  3 ---
 hwe/sammo/General.php                 |  1 -
 hwe/sammo/ResetHelper.php             | 23 -----------------------
 hwe/sammo/Scenario/GeneralBuilder.php |  3 ---
 hwe/sql/reset.sql                     |  1 -
 hwe/sql/schema.sql                    | 24 +-----------------------
 6 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/hwe/sammo/API/General/Join.php b/hwe/sammo/API/General/Join.php
index 5af127a9..f676cbdf 100644
--- a/hwe/sammo/API/General/Join.php
+++ b/hwe/sammo/API/General/Join.php
@@ -378,9 +378,6 @@ class Join extends \sammo\BaseAPI
             ];
         }
         $db->insert('rank_data', $rank_data);
-        $db->insert('betting', [
-            'general_id' => $generalID,
-        ]);
         $cityname = CityConst::byID($city)->name;
 
 
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index 5781a291..722239c8 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -686,7 +686,6 @@ class General implements iAction
         $db->delete('general', 'no=%i', $generalID);
         $db->delete('general_turn', 'general_id=%i', $generalID);
         $db->delete('rank_data', 'general_id=%i', $generalID);
-        $db->delete('betting', 'general_id=%i', $generalID);
         $this->updatedVar = [];
 
         $db->update('nation', [
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index 6c3621ae..994cb95a 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -286,26 +286,6 @@ class ResetHelper{
             'server_cnt'=>$serverCnt,
         ];
 
-        $db->insert('betting', [
-            'general_id'=>0,
-            'bet0'=>0,
-            'bet1'=>0,
-            'bet2'=>0,
-            'bet3'=>0,
-            'bet4'=>0,
-            'bet5'=>0,
-            'bet6'=>0,
-            'bet7'=>0,
-            'bet8'=>0,
-            'bet9'=>0,
-            'bet10'=>0,
-            'bet11'=>0,
-            'bet12'=>0,
-            'bet13'=>0,
-            'bet14'=>0,
-            'bet15'=>0,
-        ]);
-
         foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
             $db->insert('general', [
                 'owner'=>$admin['no'],
@@ -340,9 +320,6 @@ class ResetHelper{
                 ];
             }
             $db->insert('rank_data', $rank_data);
-            $db->insert('betting', [
-                'general_id'=>$generalID,
-            ]);
         }
 
         foreach($env as $key=>$value){
diff --git a/hwe/sammo/Scenario/GeneralBuilder.php b/hwe/sammo/Scenario/GeneralBuilder.php
index e6f52412..d6c0b5c3 100644
--- a/hwe/sammo/Scenario/GeneralBuilder.php
+++ b/hwe/sammo/Scenario/GeneralBuilder.php
@@ -723,9 +723,6 @@ class GeneralBuilder{
             ];
         }
         $db->insert('rank_data', $rank_data);
-        $db->insert('betting', [
-            'general_id'=>$this->generalID,
-        ]);
 
         return true; //생성되었다.
     }
diff --git a/hwe/sql/reset.sql b/hwe/sql/reset.sql
index 90015539..50094e6f 100644
--- a/hwe/sql/reset.sql
+++ b/hwe/sql/reset.sql
@@ -50,7 +50,6 @@ DROP TABLE IF EXISTS general_record;
 DROP TABLE IF EXISTS select_npc_token;
 DROP TABLE IF EXISTS select_pool;
 
-DROP TABLE IF EXISTS betting;
 DROP TABLE IF EXISTS rank_data;
 
 DROP TABLE IF EXISTS reserved_open;
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index ae1c5fd2..f6a15b67 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -602,29 +602,7 @@ CREATE TABLE IF NOT EXISTS `nation_env` (
 	UNIQUE INDEX `key` (`namespace`, `key`),
 	CONSTRAINT `json` CHECK (json_valid(`value`))
 ) COLLATE = 'utf8mb4_bin' ENGINE = Aria;
-##############################
-## 베팅
-##############################
-CREATE TABLE IF NOT EXISTS `betting` (
-	`general_id` INT(11) NOT NULL,
-	`bet0` INT(11) NOT NULL DEFAULT 0,
-	`bet1` INT(11) NOT NULL DEFAULT 0,
-	`bet2` INT(11) NOT NULL DEFAULT 0,
-	`bet3` INT(11) NOT NULL DEFAULT 0,
-	`bet4` INT(11) NOT NULL DEFAULT 0,
-	`bet5` INT(11) NOT NULL DEFAULT 0,
-	`bet6` INT(11) NOT NULL DEFAULT 0,
-	`bet7` INT(11) NOT NULL DEFAULT 0,
-	`bet8` INT(11) NOT NULL DEFAULT 0,
-	`bet9` INT(11) NOT NULL DEFAULT 0,
-	`bet10` INT(11) NOT NULL DEFAULT 0,
-	`bet11` INT(11) NOT NULL DEFAULT 0,
-	`bet12` INT(11) NOT NULL DEFAULT 0,
-	`bet13` INT(11) NOT NULL DEFAULT 0,
-	`bet14` INT(11) NOT NULL DEFAULT 0,
-	`bet15` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY (`general_id`)
-) ENGINE = Aria;
+
 ##############################
 ## 명장일람
 ##############################