diff --git a/OpenTaiko/src/Common/CSkin.cs b/OpenTaiko/src/Common/CSkin.cs index edfc6d7f..895a35bc 100644 --- a/OpenTaiko/src/Common/CSkin.cs +++ b/OpenTaiko/src/Common/CSkin.cs @@ -8054,6 +8054,22 @@ namespace TJAPlayer3 NamePlate_Name_Offset_Full[i] = int.Parse(strSplit[i]); } } + else if (strCommand == "NamePlate_Name_Width_Normal") + { + NamePlate_Name_Width_Normal = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Name_Width_Full") + { + NamePlate_Name_Width_Full = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Title_Width") + { + NamePlate_Title_Width = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Dan_Width") + { + NamePlate_Dan_Width = int.Parse(strParam); + } else if (strCommand == "NamePlate_Font_Name_Size_Normal") { NamePlate_Font_Name_Size_Normal = int.Parse(strParam); @@ -9985,6 +10001,10 @@ namespace TJAPlayer3 public int[] NamePlate_Name_Offset_Normal = new int[] { 121, 36 }; public int[] NamePlate_Name_Offset_WithTitle = new int[] { 121, 44 }; public int[] NamePlate_Name_Offset_Full = new int[] { 144, 44 }; + public int NamePlate_Name_Width_Normal = 220; + public int NamePlate_Name_Width_Full = 120; + public int NamePlate_Title_Width = 160; + public int NamePlate_Dan_Width = 66; public int NamePlate_Font_Name_Size_Normal = 15; public int NamePlate_Font_Name_Size_WithTitle = 12; diff --git a/OpenTaiko/src/Stages/CNamePlate.cs b/OpenTaiko/src/Stages/CNamePlate.cs index 4a37e5bf..03531e43 100644 --- a/OpenTaiko/src/Stages/CNamePlate.cs +++ b/OpenTaiko/src/Stages/CNamePlate.cs @@ -156,18 +156,18 @@ namespace TJAPlayer3 // Name text squash (to add to skin config) if (TJAPlayer3.SaveFileInstances[player].data.Dan != "" && TJAPlayer3.SaveFileInstances[player].data.Dan != null) { - if (txName[player].szテクスチャサイズ.Width >= 120.0f) - txName[player].vc拡大縮小倍率.X = 120.0f / txName[player].szテクスチャサイズ.Width; + if (txName[player].szテクスチャサイズ.Width > TJAPlayer3.Skin.NamePlate_Name_Width_Full) + txName[player].vc拡大縮小倍率.X = (float)TJAPlayer3.Skin.NamePlate_Name_Width_Full / txName[player].szテクスチャサイズ.Width; } else { - if (txName[player].szテクスチャサイズ.Width >= 220.0f) - txName[player].vc拡大縮小倍率.X = 220.0f / txName[player].szテクスチャサイズ.Width; + if (txName[player].szテクスチャサイズ.Width > TJAPlayer3.Skin.NamePlate_Name_Width_Normal) + txName[player].vc拡大縮小倍率.X = (float)TJAPlayer3.Skin.NamePlate_Name_Width_Normal / txName[player].szテクスチャサイズ.Width; } // Dan text squash (to add to skin config) - if (txdan[player].szテクスチャサイズ.Width >= 66.0f) - txdan[player].vc拡大縮小倍率.X = 66.0f / txdan[player].szテクスチャサイズ.Width; + if (txdan[player].szテクスチャサイズ.Width > TJAPlayer3.Skin.NamePlate_Dan_Width) + txdan[player].vc拡大縮小倍率.X = (float)TJAPlayer3.Skin.NamePlate_Dan_Width / txdan[player].szテクスチャサイズ.Width; // Dan text if (TJAPlayer3.SaveFileInstances[player].data.Dan != "" && TJAPlayer3.SaveFileInstances[player].data.Dan != null) @@ -185,10 +185,10 @@ namespace TJAPlayer3 // Title text if (TJAPlayer3.SaveFileInstances[player].data.Title != "" && TJAPlayer3.SaveFileInstances[player].data.Title != null) { - if (txTitle[player].szテクスチャサイズ.Width >= 160) + if (txTitle[player].szテクスチャサイズ.Width > TJAPlayer3.Skin.NamePlate_Title_Width) { - txTitle[player].vc拡大縮小倍率.X = 160.0f / txTitle[player].szテクスチャサイズ.Width; - txTitle[player].vc拡大縮小倍率.Y = 160.0f / txTitle[player].szテクスチャサイズ.Width; + txTitle[player].vc拡大縮小倍率.X = (float)TJAPlayer3.Skin.NamePlate_Title_Width / txTitle[player].szテクスチャサイズ.Width; + txTitle[player].vc拡大縮小倍率.Y = (float)TJAPlayer3.Skin.NamePlate_Title_Width / txTitle[player].szテクスチャサイズ.Width; } txTitle[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Title_Offset[0], y + TJAPlayer3.Skin.NamePlate_Title_Offset[1]);