last change

scripts/multi/pl.lua

@@ -0,0 +1,84 @@
+--because we can ask the server for these we gotta doit some other way
+
+local volforceWindow = require("components.volforceWindow")
+local port = "multi/Players/"
+local path = "dan/"
+
+local UsBottom = gfx.CreateSkinImage("result/multi_4p/base.png",0)
+local UsTop = gfx.CreateSkinImage("result/multi_4p/top.png",0)
+
+local pos = {
+    gfx.CreateSkinImage("result/multi_4p/pos/1.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/2.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/3.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/4.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/5.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/6.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/7.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/8.png", 0),
+}
+
+local names = {
+    default = {
+        name  = "USC",
+        vf    = "0.000",
+        badge = gfx.CreateSkinImage("multi/Players/default/none.png",1),
+        plpn  = gfx.CreateSkinImage(port.."default/portrait.png",1),
+        ap    = gfx.CreateSkinImage(port.."default/appeal_card.png",1)
+    },
+}
+
+playercheck = function(name,text)
+    
+    local i = result.displayIndex
+
+        if name ~= names.default.name then
+            namestring   = names.default.name
+            forcestring  = names.default.vf
+            imgstring    = names.default.plpn
+            badgestring  = names.default.badge
+            appealstring = names.default.ap
+        end
+
+        gfx.LoadSkinFont('Digital-Serial-Bold.ttf')     
+        gfx.FontSize(26)
+                local posDWWidth, posDWHeight = gfx.ImageSize(UsBottom)
+                local posUPWidth, posUPHeight = gfx.ImageSize(UsTop)
+                local posWidth, posHeight = gfx.ImageSize(pos[i+1])
+                local multy = 16;
+                local multx = 0;
+                local half = 1.1
+                
+                gfx.BeginPath()
+                gfx.ImageRect(multx, multy,posDWWidth/half,posDWHeight/half,UsBottom,1,0)
+
+                gfx.BeginPath();
+                gfx.ImageRect(multx,multy, posDWWidth/1.17,posDWHeight/1.17,imgstring, 1, 0);
+
+                gfx.BeginPath()
+                gfx.ImageRect(multx, multy,posUPWidth/half,posUPHeight/half,UsTop,1,0)
+
+                gfx.BeginPath();
+                gfx.ImageRect(multx + 10, multy + 50, 103/1.17, 132/1.17, appealstring, 1, 0);
+
+                gfx.BeginPath()
+                gfx.ImageRect(multx+332.5, multy+240, 79/half/1.5, 69/half/1.5, badgeImage, 1, 0)
+
+                gfx.BeginPath()
+                gfx.ImageRect(multx+272, multy+80,posWidth/1.18,posHeight,pos[i+1],1,0)
+
+    gfx.Text(string.upper(namestring),multx+75,multy+248)
+    volforceWindow.render(0, multx+250,multy+155,42,true,forcestring)
+    gfx.BeginPath();
+    gfx.ImageRect(multx+135,multy+165, 107/1.17, 29/1.17,badgestring, 1, 0);
+
+    gfx.Text(text, multx + 15, multy + 294);
+    gfx.FontSize(24)
+    gfx.Text(string.format("%04d", math.floor(result.score/10000)), multx+221, multy+289)
+    local lastFourDigits = ((result.score / 10000) - math.floor(result.score / 10000))*10000
+    gfx.Text(string.format("%04d", math.floor(lastFourDigits)), multx+273, multy+289)
+
+end
+
+
+return playercheck

scripts/multi/roomList/droom.lua

@@ -4,6 +4,8 @@ local l_pw =   gfx.CreateSkinImage("multi/roomselect/pw_or_price_panel.png",1);
 
 local n_panel_ja =    gfx.CreateSkinImage("multi/roomselect/nautica/nautica_bg_jacket.png",1);
 
+local n_play_dot =    gfx.CreateSkinImage("multi/roomselect/nautica/nautica_pl_dot.png",1);
+
 local info_panel = gfx.CreateSkinImage("multi/roomselect/room_panel_name_or_song.png",1);
 
 local placeholderJacket = gfx.CreateSkinImage("song_select/loading.png", 0)
@@ -17,19 +19,22 @@ local draw_room = function(name, x, y,status, selected, hoverindex)
 
     local jw,jh = gfx.ImageSize(l_panel);
     gfx.BeginPath();
-    gfx.ImageRect(x/4.5,y, jw, jh, l_panel,1,0);
-
+    gfx.ImageRect(x/4.5,y, jw/1.17, jh/1.17, l_panel,1,0);
     
     local jw,jh = gfx.ImageSize(n_panel_ja);
     gfx.BeginPath();
-    gfx.ImageRect(x/4.5+3,y+5, jw, jh, n_panel_ja,1,0);
+    gfx.ImageRect(x/4.5+3,y+5, jw/1.25, jh/1.17, n_panel_ja,1,0);
 
     gfx.BeginPath();
-    gfx.ImageRect(x/4.5+10,y+22, jw/1.15,jh/1.25, jacket,1,0);
+    gfx.ImageRect(x/4.5+10,y+22, jw/1.45,jh/1.45, jacket,1,0);
 
     local jw,jh = gfx.ImageSize(info_panel);
     gfx.BeginPath();
-    gfx.ImageRect(x/2-5,y+5, jw, jh, info_panel,1,0);
+    gfx.ImageRect(x/2-5,y+5, jw/1.17, jh/1.17, info_panel,1,0);
+
+    local jw,jh = gfx.ImageSize(n_play_dot);
+    gfx.BeginPath();
+    gfx.ImageRect(x/4.5,y, jw/1.17, jh/1.17, n_play_dot,1,0);
 
     gfx.BeginPath();
     gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE);
@@ -40,7 +45,7 @@ local draw_room = function(name, x, y,status, selected, hoverindex)
     gfx.FontSize(24);
     local jw,jh = gfx.ImageSize(l_pw);
     gfx.BeginPath();
-    gfx.ImageRect(x+xnum-5,y+ynum+29, jw, jh, l_pw,1,0);
+    gfx.ImageRect(x+xnum-5,y+ynum+29, jw/1.17, jh/1.17, l_pw,1,0);
     gfx.Text(stats[2].." / "..stats[4], x+xnum+2.5,y+ynum+52.5);
 
 end;

scripts/multiplayerscreen.lua

@@ -774,6 +774,7 @@ button_pressed = function(button)
         toggle_rotate();
     end
     if button == game.BUTTON_BTD then
+        new_room()
         for i, user in ipairs(lobby_users) do
                 if lobby_users[i] == user then
                     kick_user(user);

scripts/result.lua

@@ -7,6 +7,7 @@ local DiffRectangle = require('components.diff_rectangle');
 local lang = require("language.call")
 local dancheck = require("components.dancheck");
 local volforceAmount = game.GetSkinSetting('_volforce');
+local playercheck = require("multi.pl")
 
 local crew = game.GetSkinSetting("single_idol")
 local betacrew = game.GetSkinSetting("beta_idol")
@@ -73,6 +74,17 @@ local irGB = {
     string.upper("Update!")
 }
 
+local pos = {
+    gfx.CreateSkinImage("result/multi_4p/pos/1.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/2.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/3.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/4.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/5.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/6.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/7.png", 0),
+    gfx.CreateSkinImage("result/multi_4p/pos/8.png", 0),
+}
+
 local fixed = false
 
 if fixed then
@@ -85,20 +97,6 @@ local gaugeTypeMirrorImage = gfx.CreateSkinImage("result/gauge_type_badges/mirro
 local gaugeTypeRandomImage = gfx.CreateSkinImage("result/gauge_type_badges/random.png", 0);
 local gaugeTypeMirrorRandomImage = gfx.CreateSkinImage("result/gauge_type_badges/random_mirror.png", 0);
 
-local UsBottom = gfx.CreateSkinImage("result/multi_4p/base.png",0)
-local UsTop = gfx.CreateSkinImage("result/multi_4p/top.png",0)
-
-local pos = {
-    gfx.CreateSkinImage("result/multi_4p/pos/1.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/2.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/3.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/4.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/5.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/6.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/7.png", 0),
-    gfx.CreateSkinImage("result/multi_4p/pos/8.png", 0),
-}
-
 local gradeImages = {
     S = gfx.CreateSkinImage("common/grades/S.png", 0),
     AAA_P = gfx.CreateSkinImage("common/grades/AAA+.png", 0),
@@ -522,7 +520,7 @@ local drawRightPanelContent = function()
     badgeData = clearBadgeImages[result.badge + 1] or clearBadgeImages[1]
     if (result.autoplay) then
         badgeData = clearBadgeImages[7]; -- Display AUTOPLAY badge
-    elseif result.uid ~= nil or (badgeData[1] or result.badge == 0) then
+    elseif result.uid ~= nil and (badgeData[1] or result.badge == 0) then
         badgeData = clearBadgeImages[8]; -- Display SAVED badge
     end
 
@@ -820,7 +818,6 @@ local drawmultipanelcontent = function(deltaTime)
             return
         else
 
-        local i = result.displayIndex
         if result.badge == 0 then
             badgeImage = badgeImages[1]
         elseif result.badge == 1 then
@@ -835,35 +832,13 @@ local drawmultipanelcontent = function(deltaTime)
             badgeImage = badgeImages[6]
         end
  
-        gfx.LoadSkinFont('Digital-Serial-Bold.ttf')     
-        gfx.FontSize(26)
-                local posDWWidth, posDWHeight = gfx.ImageSize(UsBottom)
-                local posUPWidth, posUPHeight = gfx.ImageSize(UsTop)
-                local posWidth, posHeight = gfx.ImageSize(pos[i+1])
-                local multy = 16;
-                local multx = 0;
-                local half = 1.1
+        playercheck(result.playerName,irText)
 
-                gfx.BeginPath()
-                gfx.ImageRect(multx, multy,posDWWidth/half,posDWHeight/half,UsBottom,1,0)
-
-                gfx.BeginPath()
-                gfx.ImageRect(multx, multy,posUPWidth/half,posUPHeight/half,UsTop,1,0)
-
-                gfx.BeginPath()
-                gfx.ImageRect(multx+332.5, multy+240, 79/half/1.5, 69/half/1.5, badgeImage, 1, 0)
-
-                gfx.BeginPath()
-                gfx.ImageRect(multx+272, multy+80,posWidth/1.18,posHeight,pos[i+1],1,0)
-
-        gfx.Text(string.upper(result.playerName),multx+75,multy+247)
-
-        gfx.Text(irText, multx + 15, multy + 294);
-        gfx.FontSize(24)
-        gfx.Text(string.format("%04d", math.floor(result.score/10000)), multx+221, multy+294)
-        local lastFourDigits = ((result.score / 10000) - math.floor(result.score / 10000))*10000
-        gfx.Text(string.format("%04d", math.floor(lastFourDigits)), multx+273, multy+294)
- --[[
+        local i = result.displayIndex
+        local posWidth, posHeight = gfx.ImageSize(pos[i+1])
+        gfx.BeginPath()
+        gfx.ImageRect(450, 1600,posWidth/1.18,posHeight,pos[i+1],1,0)
+--[[
       
         local gaugeFillImage = gaugeEffPassFillImage;
         local gaugeBreakpoint = 0;