From 19ce62997ba25b801423f396f5dc7cddcd75b3cb Mon Sep 17 00:00:00 2001
From: MrZ_26 <MrZ626@users.github.com>
Date: Thu, 13 Aug 2020 23:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua               | 30 +++++++++++++++++++-----------
 parts/gametoolfunc.lua |  2 --
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/main.lua b/main.lua
index 246d560c..ab664ad0 100644
--- a/main.lua
+++ b/main.lua
@@ -1,11 +1,11 @@
 --[[
-  ______             __                _
- /_  __/___   _____ / /_   ____ ___   (_)____   ____
-  / /  / _ \ / ___// __ \ / __ `__ \ / // __ \ / __ \
- / /  /  __// /__ / / / // / / / / // // / / // /_/ /
-/_/   \___/ \___//_/ /_//_/ /_/ /_//_//_/ /_/ \____/
-Techmino is my first "huge project"
-optimization is welcomed if you also love tetromino game
+	  ______             __                _
+	 /_  __/___   _____ / /_   ____ ___   (_)____   ____
+	  / /  / _ \ / ___// __ \ / __ `__ \ / // __ \ / __ \
+	 / /  /  __// /__ / / / // / / / / // // / / // /_/ /
+	/_/   \___/ \___//_/ /_//_/ /_/ /_//_//_/ /_/ \____/
+	Techmino is my first "huge project"
+	optimization is welcomed if you also love tetromino game
 ]]--
 
 --?
@@ -19,7 +19,6 @@ love.keyboard.setTextInput(false)
 love.mouse.setVisible(false)
 
 system=love.system.getOS()
-game={}
 mapCam={
 	sel=nil,--Selected mode ID
 
@@ -41,8 +40,8 @@ preField={h=20}for i=1,20 do preField[i]={0,0,0,0,0,0,0,0,0,0}end
 preBag={}
 
 game={
-	frame=0,			--Frame count
-	result=0,			--Game result
+	frame=0,			--Frame count 
+	result=false,		--Game result (string)
 	pauseTime=0,		--Time paused
 	pauseCount=0,		--Pausing count
 	garbageSpeed=1,		--Garbage timing speed
@@ -50,7 +49,16 @@ game={
 	warnLVL=0,			--Warning level (show)
 	recording=false,	--If recording
 	replaying=false,	--If replaying
-	rec={},				--Recording list, key-time
+	seed=math.random(999999999),--Game seed
+	setting={},			--Game settings
+	rec={},				--Recording list, key,time,key,time...
+
+	--Data for royale mode
+	stage=nil,			--Game stage
+	mostBadge=nil,		--Most badge owner
+	secBadge=nil,		--Second badge owner
+	mostDangerous=nil,	--Most dangerous player
+	secDangerous=nil,	--Second dangerous player
 }--Global game data
 players={alive={}}--Players data
 curMode=nil--Current mode object
diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index 03113002..80ea4740 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -310,7 +310,6 @@ function resetGameData()
 
 	destroyPlayers()
 	modeEnv=curMode.env
-	math.randomseed(game.seed)
 	curMode.load()--BG/BGM need redefine in custom,so up here
 	if modeEnv.task then
 		for i=1,#players do
@@ -363,7 +362,6 @@ function resetPartGameData(replaying)
 
 	destroyPlayers()
 	modeEnv=curMode.env
-	math.randomseed(game.seed)
 	curMode.load()
 	if modeEnv.task then
 		for i=1,#players do