版本推进

main.lua

@@ -25,7 +25,7 @@ TIME=love.timer.getTime
 
 -- Global Vars & Settings
 SFXPACKS={'chiptune'}
-VOCPACKS={'miya','mono','xiaoya','miku'}
+VOCPACKS={'miya','mono','xiaoya','miku','zundamon'}
 FIRSTLAUNCH=false
 DAILYLAUNCH=false
 
@@ -272,6 +272,7 @@ IMG.init{
     xiaoyaCH='media/image/characters/xiaoya.png',
     xiaoyaOmino='media/image/characters/xiaoya_Omino.png',
     mikuCH='media/image/characters/miku.png',
+    zundamonCH='media/image/characters/zundamon.png',
     z={
         character='media/image/characters/z_character.png',
         screen1='media/image/characters/z_screen1.png',
@@ -502,6 +503,7 @@ LANG.init('zh',
         ja=require'parts.language.lang_ja',
         symbol=require'parts.language.lang_symbol',
         zh_code=require'parts.language.lang_zh_code',
+        vi=require'parts.language.lang_vi',
         -- 1. Add language file to LANG folder;
         -- 2. Require it;
         -- 3. Add a button in parts/scenes/lang.lua;

parts/gameFuncs.lua

@@ -715,14 +715,7 @@ do-- function freshPlayerPosition(sudden)
                 end end
                 return l
             end)(),
-            [MATH.inf]=(function()
+            [MATH.inf]={main={340,75,1}},
-                local l={main={340,75,1}}
-                for y=-3,3 do for x=0,6 do
-                    table.insert(l,{290-47*x,340+92*y,.075})
-                    table.insert(l,{940+47*x,340+92*y,.075})
-                end end
-                return l
-            end)(),
         },
         dead={
             [1]={{340,75,1}},
@@ -890,7 +883,15 @@ do-- function freshPlayerPosition(sudden)
 
         if alive then
             for i=1,#L do
-                L[i][method](L[i],unpack(posList[i==1 and 'main' or i-1]))
+                if i==1 then
+                    if SETTING.portrait then-- WARNING: Brutly scaling up to 2x only for 1P, will cause many other visual issues.
+                        L[i][method](L[i],36,-260,2)
+                    else
+                        L[i][method](L[i],unpack(posList['main']))
+                    end
+                else
+                    L[i][method](L[i],unpack(posList[i-1]))
+                end
             end
         else
             for i=1,#L do

parts/language/lang_en.lua

@@ -334,9 +334,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Performances",
         "Electric283",
@@ -942,7 +942,6 @@ return {
         "6next 1hold!",
         "6next 6hold?!",
         "A choke a day keeps record away",
-        "Achievement system coming soon!",
         "ALL SPIN!",
         "Am G F G",
         "B2B2B???",

parts/language/lang_es.lua

@@ -17,7 +17,7 @@ return {
     playedLong="[Anti-adicción] Estuviste jugando un buen rato hoy. Recuerda descansar de vez en cuando.",
     playedTooMuch="[Anti-adicción] ¡Has jugado mucho por hoy! No puedes jugar más.",
     settingWarn="¡Ten cuidado con modificar esto!",
-    -- settingWarn2="This setting takes effect after restart",
+    settingWarn2="Los ajustes se aplicarán luego de reiniciar",
 
     atkModeName={"Al azar","Medallas","KOs","Atacantes"},
     royale_remain="$1 Jugadores Restantes",
@@ -187,7 +187,7 @@ return {
     leaveRoom="$1 salió de la sala.",
     roomRemoved="Sala removida",
     ready="LISTO",
-    spectating="Espectando",
+    spectating="Especteando",
 
 
 
@@ -334,9 +334,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Performances",
         "Electric283",
@@ -532,8 +532,8 @@ return {
             power="Inf. de Batería",
             clean="Fast Draw",
             fullscreen="Pant. Completa",
-            -- portrait="Portrait",
+            portrait="Vertical",
-            -- msaa="MSAA level",
+            msaa="Nivel de MSAA",
 
             bg_on="Fondo Normal",
             bg_off="Sin Fondo",
@@ -737,10 +737,10 @@ return {
             label="Etiq.",
         },
         login={
-            -- title="Sign In",
+            title="Registrarse",
-            -- ticket="Auth Ticket",
+            ticket="Ticket de Verif.",
-            -- authorize="Open Authorizing Page",
+            authorize="Abrir página de Verificación",
-            -- submit="Submit",
+            submit="Enviar",
         },
         reset_password={
             title="Restablecer Contraseña",

parts/language/lang_fr.lua

@@ -302,9 +302,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Performance",
         "Electric283",

parts/language/lang_id.lua

@@ -335,9 +335,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Pertunjukan",
         "Electric283",

parts/language/lang_ja.lua

@@ -336,9 +336,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "パフォーマンス",
         "Electric283",
@@ -747,10 +747,10 @@ return {
             label="ラベル",
         },
         logi={
-            -- title="Sign In",
+            title="サインイン",
-            -- ticket="Auth Ticket",
+            ticket="認証チケット",
-            -- authorize="Open Authorizing Page",
+            authorize="認証ページにアクセス",
-            -- submit="Submit",
+            submit="送信",
         },
         reset_password={
             title="パスワード再設定",
@@ -980,6 +980,7 @@ getTip={refuseCopy=true,
         "B2B2B2Bは可能?",
         "Back-to-Back Techrash, 10 REN, PC!",
         "音楽や効果音の制作に協力いただける方は大歓迎です!",
+        "ここに流れるネタも募集中です!",
         "Bridge Clearが間もなく実装されます!",
         "Color Clearが間もなく実装されます!",
         "DASとARRを低くすると、速くなるけど操作が難しくなる!",
@@ -1004,10 +1005,12 @@ getTip={refuseCopy=true,
         "Techminoは\"Technique\"と\"Tetromino\"を掛け合わせ造語です!",
         "Techminoプレイヤーの未来はあなた達のものです!",
         "TetroDictionary is now available in English.",
+        "TetroDictionaryの日本語版もあります",
         " while (false)",
         "ZS JL T O I",
         "ゲーム内にはモード選択マップからじゃ入れない隠しモードがいくつかあります!",
         "このゲームでは全てのSpinに火力補正があります!",
+        "テクミノのAll spin気持ちよすぎだろ!!",
         "このゲームのほとんどの楽曲はBeepboxを用いて作曲されました!",
         "サーバーが不規則に落ちます",
         "スタッフロールの背景に流れている名前はスポンサーの名前です!",
@@ -1050,6 +1053,7 @@ getTip={refuseCopy=true,
         {C.R,"\"DMCA濫用\""},
         {C.R,"DD",C.Z," 砲=",C.P,"TS",C.R,"D",C.Z,"+",C.P,"TS",C.R,"D",C.Z," 砲"},
         {C.R,"DT",C.Z," 砲=",C.P,"TS",C.R,"D",C.Z,"+",C.P,"TS",C.R,"T",C.Z," 砲"},
+        {C.R,"DKS",C.Z,"=",C.P,"TS",C.R,"T",C.Z,"+",C.R,"DT",C.Z," 砲"},
         {C.R,"LrL ",C.G,"RlR ",C.B,"LLr ",C.O,"RRl ",C.P,"RRR ",C.P,"LLL ",C.C,"FFF ",C.Y,"RfR ",C.Y,"RRf ",C.Y,"rFF"},
         {C.Y,"O-Spin Triple!"},
         {C.Z,"なんだって? ",C.lC,"X-Spin?"},

parts/language/lang_pt.lua

@@ -323,9 +323,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Performance",
         "Electric283",

parts/language/lang_zh.lua

@@ -335,9 +335,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "演出",
         "Electric283",
@@ -1068,6 +1068,7 @@ return {
         "Techmino 濂界帺锛",
         "Techmino console了解一下",
         "Techmino: App意外退出。",
+        "Techmino: 耗电异常 ——在后台阻止系统休眠",
         "Techmino.exe 已停止工作",
         "TechminOS coming s∞n",
         "viod main[]",

parts/language/lang_zh_code.lua

@@ -283,10 +283,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        -- "XMiao",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
-        "幽灵3383",
         "",
         "演出",
         "Electric283",

parts/language/lang_zh_trad.lua

@@ -335,9 +335,9 @@ return {
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
-        "sakurw",
+        "XMiao",
-        "Airun",
+        "sakurw, Airun, 幽灵3383",
-        "幽灵3383",
+        "Shard Nguyễn, Squishy và cộng đồng TVN",
         "",
         "Performances",
         "Electric283",

parts/net.lua

@@ -154,8 +154,10 @@ function NET.login(auto)
                 return
             end
         end
-
+        if auto then
             SCN.go('login')
+        end
+
         WAIT.interrupt()
     end)
 end

parts/patron.lua

@@ -15,6 +15,7 @@ return {
     {font=65,name="世界沃德"},
     {font=65,name="Petris"},
     {font=65,name="Zakeru"},
+    {font=65,name="亮君舞"},
     {font=65,name="Dysprosium"},
     {font=65,name="HitachiMako"},
     {font=65,name="我慌死了"},
@@ -23,7 +24,6 @@ return {
     {font=65,name="奏之章"},
     {font=65,name="猫宫"},
     {font=65,name="Notypey"},
-    {font=65,name="亮君"},
     {font=65,name="gggf127"},
     {font=65,name="柴影"},
     {font=65,name="怀沙"},
@@ -33,6 +33,7 @@ return {
     {font=65,name="[**浩]"},
     {font=65,name="sakurw"},
     {font=65,name="[**霖]"},
+    {font=65,name="KK"},
 
     {font=25,name="八零哥"},
     {font=25,name="蕴空之灵"},

parts/player/player.lua

@@ -2676,13 +2676,6 @@ local function update_dead(P,dt)
     _updateMisc(P,dt)
 end
 function Player:_die()
-    do
-        local p=TABLE.find(PLY_ALIVE,self)
-        if p then
-            PLY_ALIVE[p]=PLY_ALIVE[#PLY_ALIVE]
-            rem(PLY_ALIVE)
-        end
-    end
     self.alive=false
     self.timing=false
     self.control=false
@@ -2845,6 +2838,13 @@ function Player:lose(force)
             end
         end
     end
+    do
+        local p=TABLE.find(PLY_ALIVE,self)
+        if p then
+            PLY_ALIVE[p]=PLY_ALIVE[#PLY_ALIVE]
+            rem(PLY_ALIVE)
+        end
+    end
     self:_die()
     self.result='lose'
     if self.gameEnv.layout=='royale' then
@@ -2907,21 +2907,12 @@ function Player:lose(force)
         self:dropPosition()
         freshPlayerPosition('update')
 
-        local cur=PLY_ALIVE[1].group
+        for i=1,#PLY_ALIVE-1 do
-        for i=2,#PLY_ALIVE do
+            if PLY_ALIVE[i].group==0 or PLY_ALIVE[i].group~=PLY_ALIVE[i+1].group then
-            local g=PLY_ALIVE[i].group
-            if cur==0 then
-                if g==0 then-- Two team 0, not finished
-                    goto BREAK_notFinished
-                else-- Remember this may-be-last team
-                    if i==#PLY_ALIVE then goto BREAK_notFinished end
-                    cur=g
-                end
-            elseif g==0 or cur~=g then-- Find another team, not finished
                 goto BREAK_notFinished
             end
         end
-        -- Only 1 team survived, all winner
+        -- Only 1 people or only 1 team survived, they win
         for i=1,#PLY_ALIVE do
             PLY_ALIVE[i]:win()
         end

parts/scenes/lang.lua

@@ -8,13 +8,15 @@ local langList={
     id="Bahasa Indonesia",
     ja="日本語",
     symbol="?????",
-    zh_code="Code(zh);"
+    zh_code="Code(zh);",
+    vi="Tiếng Việt",
 }
 local languages={
     "Language  Langue  Lingua",
     "语言  言語  언어",
     "Idioma  Línguas  Sprache",
     "Язык  Γλώσσα  Bahasa",
+	"Ngôn ngữ", 
 }
 local curLang=1
 
@@ -57,7 +59,7 @@ scene.widgetList={
     WIDGET.newButton{x=640,y=210,w=330,h=100,font=40, fText=langList.pt,      color='A',sound='click',code=function()_setLang('pt') end},
     WIDGET.newButton{x=640,y=330,w=330,h=100,font=40, fText=langList.symbol,  color='G',sound='click',code=function()_setLang('symbol') end},
     WIDGET.newButton{x=640,y=450,w=330,h=100,font=40, fText=langList.ja,      color='J',sound='click',code=function()_setLang('ja') end},
-    WIDGET.newKey   {x=640,y=570,w=330,h=100,font=40, fText='',               color='L'},
+    WIDGET.newButton{x=640,y=570,w=330,h=100,font=40, fText=langList.vi,      color='L',sound='click',code=function()_setLang('vi') end},
 
     WIDGET.newButton{x=1000,y=210,w=330,h=100,font=40,fText=langList.zh,      color='C',sound='click',code=function()_setLang('zh') end},
     WIDGET.newButton{x=1000,y=330,w=330,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad') end},