From c1ec4f7083034e3293c26d939384e0372f9ea91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DragonRatTiger=20/=20=E3=83=AA=E3=83=A5=E3=82=A6=E3=82=B3?= Date: Tue, 20 Jun 2023 10:50:40 -0400 Subject: [PATCH] Chara Motion parameters are now used (#470) oopsie --- TJAPlayer3/Stages/01.StartUp/TextureLoader.cs | 38 +++++++++++-------- .../Taiko/CAct演奏Drumsキャラクター.cs | 28 +++++++------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index d68acdcb..d823a71a 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -1282,7 +1282,15 @@ namespace TJAPlayer3 } - + public int[] CreateNumberedArrayFromInt(int total) + { + int[] array = new int[total]; + for (int i = 0; i < total; i++) + { + array[i] = i; + } + return array; + } public CSkin.Cシステムサウンド VoiceSelectOggOrWav(string basePath) { @@ -1556,20 +1564,20 @@ namespace TJAPlayer3 TJAPlayer3.Skin.Characters_Balloon_Y[i] = new int[] { 0, 297, 0, 0 }; TJAPlayer3.Skin.Characters_Balloon_4P[i] = new int[] { 0, -176 }; TJAPlayer3.Skin.Characters_Balloon_5P[i] = new int[] { 0, -168 }; - TJAPlayer3.Skin.Characters_Motion_Normal[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_10Combo[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_Miss[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_MissDown[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_Clear[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_GoGo[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = new int[] { 0 }; - TJAPlayer3.Skin.Characters_Motion_Return[i] = new int[] { 0 }; + TJAPlayer3.Skin.Characters_Motion_Normal[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_10Combo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_Miss[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_MissDown[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_Clear[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_GoGo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]); + TJAPlayer3.Skin.Characters_Motion_Return[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Return_Ptn[i]); TJAPlayer3.Skin.Characters_Beat_Normal[i] = 1; TJAPlayer3.Skin.Characters_Beat_Miss[i] = 1; TJAPlayer3.Skin.Characters_Beat_MissDown[i] = 1; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs index 197ec10f..e5a9efd9 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs @@ -187,7 +187,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Normal[Character][TJAPlayer3.Skin.Characters_Motion_Normal[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -199,7 +199,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Missed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Normal_Missed[Character][TJAPlayer3.Skin.Characters_Motion_Miss[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -211,7 +211,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_MissedDown[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Normal_MissedDown[Character][TJAPlayer3.Skin.Characters_Motion_MissDown[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -223,7 +223,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Cleared[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Normal_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_Clear[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -235,7 +235,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Maxed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Normal_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_ClearMax[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -247,7 +247,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_GoGoTime[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_GoGoTime[Character][TJAPlayer3.Skin.Characters_Motion_GoGo[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -259,7 +259,7 @@ namespace TJAPlayer3 { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_GoGoTime_Maxed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_GoGoTime_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoMax[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; @@ -272,7 +272,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_10Combo[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_10Combo[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_10Combo[Character][TJAPlayer3.Skin.Characters_Motion_10Combo[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -285,7 +285,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_10Combo_Maxed[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_10Combo_Maxed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_10Combo_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_10ComboMax[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -298,7 +298,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_GoGoStart[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_GoGoStart[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_GoGoStart[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStart[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -311,7 +311,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -324,7 +324,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_Become_Cleared[Character] != null && TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Become_Cleared[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Become_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_ClearIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -337,7 +337,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_Become_Maxed[Character] != null && TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Become_Maxed[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Become_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_SoulIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { @@ -350,7 +350,7 @@ namespace TJAPlayer3 updateNormal(); if (TJAPlayer3.Tx.Characters_Return[Character] != null && TJAPlayer3.Skin.Characters_Return_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Return[Character][nNowCharaFrame[i]]; + nowChara = TJAPlayer3.Tx.Characters_Return[Character][TJAPlayer3.Skin.Characters_Motion_Return[Character][nNowCharaFrame[i]]]; } if (endAnime) {