From 9b1fc26676cea5bc4c1203f77c71a5550bebedc1 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sun, 12 May 2024 17:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E4=B9=8B=E5=89=8D=E4=B8=8D=E5=B0=8F?=
 =?UTF-8?q?=E5=BF=83=E5=88=A0=E4=BA=86finish=E6=97=B6=E4=B8=A2=E5=BC=83han?=
 =?UTF-8?q?d=20=E6=A1=86=E6=9E=B6=E8=B7=9F=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zenitha                    |  2 +-
 assets/game/basePlayer.lua |  1 +
 main.lua                   | 26 +++++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Zenitha b/Zenitha
index c876b2d3..e6ffbaf9 160000
--- a/Zenitha
+++ b/Zenitha
@@ -1 +1 @@
-Subproject commit c876b2d3f5c4e66ff40b3594e57196b15602c312
+Subproject commit e6ffbaf9cc7e5f505b2e0c2cc7450ddc777b0a5f
diff --git a/assets/game/basePlayer.lua b/assets/game/basePlayer.lua
index 1dc6a52a..8209bf38 100644
--- a/assets/game/basePlayer.lua
+++ b/assets/game/basePlayer.lua
@@ -240,6 +240,7 @@ function P:finish(reason)
     if self.finished then return end
     self.timing=false
     self.finished=reason
+    self.hand=false
     self.spawnTimer=1e99
 
     self:triggerEvent('gameOver',reason)
diff --git a/main.lua b/main.lua
index f3f82bc9..c9a62c3f 100644
--- a/main.lua
+++ b/main.lua
@@ -78,7 +78,7 @@ ZENITHA.setMaxFPS(260)
 ZENITHA.setDebugInfo{
     {"Cache", gcinfo},
     {"Tasks", TASK.getCount},
-    {"Mouse", function() local x,y=SCR.xOy:inverseTransformPoint(love.mouse.getPosition()) return math.floor(x+.5)..' '..math.floor(y+.5) end},
+    {"Mouse", function() return ("%d %d"):format(SCR.xOy:inverseTransformPoint(love.mouse.getPosition())) end},
     -- {"FMOD", function() local a,b,c=FMOD.studio:getMemoryUsage() return a..","..b..","..c end}, -- Only available in logging builds Fmod
 }
 
@@ -214,8 +214,30 @@ IMG.init{
     },
     title_techmino='assets/image/title_techmino.png',
     logo_fmod='assets/image/logo_fmod.png',
+    -- touhou=(function()
+    --     local path='assets/image/touhou/'
+    --     local L={}
+    --     for _,v in next,love.filesystem.getDirectoryItems(path) do
+    --         if FILE.isSafe(path..v) then
+    --             L[tonumber(v:match("%d+"))]=path..v
+    --         end
+    --     end
+    --     return L
+    -- end)(),
+    touhou={
+        ball='assets/image/touhou/ball.png',
+        reimu='assets/image/touhou/001.png',
+        marisa='assets/image/touhou/002.png',
+    },
+    heart={
+        'assets/image/heart/1.png',
+        'assets/image/heart/2.png',
+        'assets/image/heart/3.png',
+        'assets/image/heart/4.png',
+    },
 }
 
+Text=nil---@type Techmino.I18N
 LANG.add{
     en='assets/language/lang_en.lua',
     zh='assets/language/lang_zh.lua',
@@ -417,6 +439,8 @@ for _,v in next,{
     'gela_jelly',
 
     'acry_template',
+
+    'touhou.brik_reimu',
 } do
     if FILE.isSafe('assets/skin/'..v..'.lua') then
         SKIN.add(v,require('assets/skin/'..v))