Minor adjustments (#700)

* Correctly scale mini display for videos on >720p skins

* Stop drawing tower floor count on song select for now

* nvm i fixed it

* allow diff number to be positioned for tower/dan

* adjust OWM assets

* Correctly scale screenshots to intended size

* Do not rescale window when skin changes

* actually nevermind this looks better in white

* new skin ver 😃

* wait hang on i'm dumb

FDK/src/01.Framework/Core/Game.cs

@@ -176,7 +176,10 @@ namespace SampleFramework {
 
 					using SKBitmap sKBitmap = new(ViewportWidth, ViewportHeight - 1);
 					sKBitmap.SetPixels((IntPtr)pixels2);
-					action(sKBitmap);
+
+					using SKBitmap scaledBitmap = new(GameWindowSize.Width, GameWindowSize.Height);
+					if (sKBitmap.ScalePixels(scaledBitmap, SKFilterQuality.High)) action(scaledBitmap);
+					else action(sKBitmap);
 				}
 			});
 		}

OpenTaiko/System/Open-World Memories/SkinConfig.ini

@@ -1,6 +1,6 @@
 ;Skin information
 Name=Open-World Memories
-Version=0.6.0
+Version=0.6.0.1
 Creator=DashyDesu
 Resolution=1920,1080
 FontNameEN=Fonts/MPLUSRounded1c-Medium.ttf

OpenTaiko/System/Open-World Memories/SongSelectConfig.ini

@@ -24,7 +24,7 @@ SongSelect_Frame_Score_Y=530,587,645,703
 SongSelect_Level_Number_X=1353,1353,1353,1353
 SongSelect_Level_Number_Y=540,597,655,713
 SongSelect_Level_Number_Tower=1337,697
-SongSelect_Tower_Side=1324,622
+SongSelect_Tower_Side=1303,587
 SongSelect_Level_Number_Interval=13,0
 
 SongSelect_Preimage=1413,292
@@ -101,8 +101,8 @@ SongSelect_Branch_Offset=6,6
 
 ; == DONE
 SongSelect_FloorNum_Show=1
-SongSelect_FloorNum_X=1800
-SongSelect_FloorNum_Y=307
+SongSelect_FloorNum_X=1338
+SongSelect_FloorNum_Y=684
 SongSelect_FloorNum_Interval=45,0
 SongSelect_DanInfo_Show=1
 SongSelect_DanInfo_Icon_X=1501,1501,1501

OpenTaiko/src/Common/CSkin.cs

@@ -2455,15 +2455,25 @@ namespace OpenTaiko {
 									}
 								case "SongSelect_Difficulty_Number_X": {
 										string[] strSplit = strParam.Split(',');
-										for (int i = 0; i < 5; i++) {
+										int max = Math.Min(strSplit.Length, 7);
+										for (int i = 0; i < max; i++) {
 											SongSelect_Difficulty_Number_X[i] = int.Parse(strSplit[i]);
+											if (i == 4) {
+												SongSelect_Difficulty_Number_X[5] = SongSelect_Difficulty_Number_X[i];
+												SongSelect_Difficulty_Number_X[6] = SongSelect_Difficulty_Number_X[i];
+											}
 										}
 										break;
 									}
 								case "SongSelect_Difficulty_Number_Y": {
 										string[] strSplit = strParam.Split(',');
-										for (int i = 0; i < 5; i++) {
+										int max = Math.Min(strSplit.Length, 7);
+										for (int i = 0; i < max; i++) {
 											SongSelect_Difficulty_Number_Y[i] = int.Parse(strSplit[i]);
+											if (i == 4) {
+												SongSelect_Difficulty_Number_Y[5] = SongSelect_Difficulty_Number_Y[i];
+												SongSelect_Difficulty_Number_Y[6] = SongSelect_Difficulty_Number_Y[i];
+											}
 										}
 										break;
 									}
@@ -8098,8 +8108,8 @@ namespace OpenTaiko {
 		public int[] SongSelect_Difficulty_Star_Y = new int[] { 459, 459, 459, 459, 459 };
 		public int[] SongSelect_Difficulty_Star_Interval = new int[] { 10, 0 };
 
-		public int[] SongSelect_Difficulty_Number_X = new int[] { 498, 641, 784, 927, 927 };
-		public int[] SongSelect_Difficulty_Number_Y = new int[] { 435, 435, 435, 435, 435 };
+		public int[] SongSelect_Difficulty_Number_X = new int[] { 498, 641, 784, 927, 927, 927, 927 };
+		public int[] SongSelect_Difficulty_Number_Y = new int[] { 435, 435, 435, 435, 435, 435, 435 };
 		public int[] SongSelect_Difficulty_Number_Interval = new int[] { 11, 0 };
 
 		public int[][] SongSelect_Difficulty_Crown_X = new int[][] {

OpenTaiko/src/Common/OpenTaiko.cs

@@ -2879,7 +2879,7 @@ for (int i = 0; i < 3; i++) {
 			GameWindowSize.Width = nWidth;
 			GameWindowSize.Height = nHeight;
 
-			WindowSize = new Silk.NET.Maths.Vector2D<int>(nWidth, nHeight);
+			//WindowSize = new Silk.NET.Maths.Vector2D<int>(nWidth, nHeight);
 		}
 
 		public void RefreshSkin() {

OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs

@@ -40,7 +40,8 @@ namespace OpenTaiko {
 		}
 
 		public override int Draw() {
-			tFloorNumberDraw(OpenTaiko.Skin.SongSelect_FloorNum_X, OpenTaiko.Skin.SongSelect_FloorNum_Y, OpenTaiko.stageSongSelect.rNowSelectedSong.nTotalFloor);
+			if (OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[5] != null)
+			tFloorNumberDraw(OpenTaiko.Skin.SongSelect_FloorNum_X, OpenTaiko.Skin.SongSelect_FloorNum_Y, OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[5].譜面情報.nTotalFloor);
 
 			return 0;
 		}

OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs

@@ -48,7 +48,7 @@ namespace OpenTaiko {
 			if (this.rVD == null || this.tx描画用 == null || !OpenTaiko.ConfigIni.eClipDispType.HasFlag(EClipDispType.ウィンドウのみ))
 				return;
 
-			float[] fRatio = new float[] { 640.0f - 4.0f, 360.0f - 4.0f }; //中央下表示
+			float[] fRatio = new float[] { (SampleFramework.GameWindowSize.Width / 2) - 4.0f, (SampleFramework.GameWindowSize.Height / 2) - 4.0f }; //中央下表示
 
 			float ratio = Math.Min((float)(fRatio[0] / this.rVD.FrameSize.Width), (float)(fRatio[1] / this.rVD.FrameSize.Height));
 			this.tx描画用.vcScaleRatio.X = ratio;