diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/0.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/0.png new file mode 100644 index 00000000..df326128 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/1.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/1.png new file mode 100644 index 00000000..84297caa Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/10.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/10.png new file mode 100644 index 00000000..57fb6542 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/11.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/11.png new file mode 100644 index 00000000..4713a185 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/12.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/12.png new file mode 100644 index 00000000..6f86b6fc Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/12.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/2.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/2.png new file mode 100644 index 00000000..553df2a3 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/3.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/3.png new file mode 100644 index 00000000..4cee93d1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/4.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/4.png new file mode 100644 index 00000000..4c00ec64 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/5.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/5.png new file mode 100644 index 00000000..352d0fd6 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/6.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/6.png new file mode 100644 index 00000000..65c8c84c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/7.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/7.png new file mode 100644 index 00000000..d56055aa Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/8.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/8.png new file mode 100644 index 00000000..5f3ea438 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo/9.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo/9.png new file mode 100644 index 00000000..d24d973e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/0.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/0.png new file mode 100644 index 00000000..b31df03a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/1.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/1.png new file mode 100644 index 00000000..c3d34270 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/10.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/10.png new file mode 100644 index 00000000..5f37bc7a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/11.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/11.png new file mode 100644 index 00000000..8da7934e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/12.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/12.png new file mode 100644 index 00000000..5924021a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/12.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/13.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/13.png new file mode 100644 index 00000000..37e11b21 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/13.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/14.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/14.png new file mode 100644 index 00000000..53395cac Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/14.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/15.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/15.png new file mode 100644 index 00000000..455334bd Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/15.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/16.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/16.png new file mode 100644 index 00000000..bf5ec094 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/16.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/17.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/17.png new file mode 100644 index 00000000..03dad293 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/17.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/18.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/18.png new file mode 100644 index 00000000..5b376695 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/18.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/19.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/19.png new file mode 100644 index 00000000..a7aecb66 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/19.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/2.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/2.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/20.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/20.png new file mode 100644 index 00000000..df25fb44 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/20.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/21.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/21.png new file mode 100644 index 00000000..a4719555 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/21.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/22.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/22.png new file mode 100644 index 00000000..e573780c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/22.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/3.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/3.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/4.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/4.png new file mode 100644 index 00000000..aeabac8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/5.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/5.png new file mode 100644 index 00000000..4a7e1193 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/6.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/6.png new file mode 100644 index 00000000..e2e83f84 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/7.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/7.png new file mode 100644 index 00000000..cd3bb5fb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/8.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/8.png new file mode 100644 index 00000000..d35a0d8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/9.png b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/9.png new file mode 100644 index 00000000..e8523422 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/10combo_Max/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/0.png new file mode 100644 index 00000000..06519197 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/1.png new file mode 100644 index 00000000..4f90735a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/2.png new file mode 100644 index 00000000..62a28870 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Breaking/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/0.png new file mode 100644 index 00000000..432174d2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/1.png new file mode 100644 index 00000000..d375351a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/2.png new file mode 100644 index 00000000..ee1af2ae Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/3.png new file mode 100644 index 00000000..0a60ae1b Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/4.png new file mode 100644 index 00000000..b905b7b6 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/5.png new file mode 100644 index 00000000..916099dc Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/6.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/6.png new file mode 100644 index 00000000..beaad67f Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/7.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/7.png new file mode 100644 index 00000000..fe252fb5 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Broke/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/0.png new file mode 100644 index 00000000..ac9108bc Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/1.png new file mode 100644 index 00000000..3b4ce2f2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/2.png new file mode 100644 index 00000000..80bfaad1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/3.png new file mode 100644 index 00000000..7aa2fec3 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/4.png new file mode 100644 index 00000000..be925435 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/5.png new file mode 100644 index 00000000..b76888af Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/6.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/6.png new file mode 100644 index 00000000..1aef92bb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/7.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/7.png new file mode 100644 index 00000000..33fc96fd Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/8.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/8.png new file mode 100644 index 00000000..3b509816 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/9.png b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/9.png new file mode 100644 index 00000000..6b78e680 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Balloon_Miss/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/CharaConfig.txt b/OpenTaiko/Global/Characters/10 - AItritus/CharaConfig.txt new file mode 100644 index 00000000..cd796c6d --- /dev/null +++ b/OpenTaiko/Global/Characters/10 - AItritus/CharaConfig.txt @@ -0,0 +1,56 @@ +Chara_Resolution=1920,1080 +Heya_Chara_Render_Offset=830,0 + +;キャラのX座標。(1P,2P) +Game_Chara_X=-20,-20 + +;キャラのY座標。(1P,2P) +Game_Chara_Y=-85,720 + +;3人プレイ以上のキャラの座標。(X, Y) +Game_Chara_4P=164,102 + +;5人プレイのキャラの座標。(X, Y) +Game_Chara_5P=164,60 + +;キャラのX座標。(1P,2P) +Game_Chara_X_AI=678,923 + +;キャラのY座標。(1P,2P) +Game_Chara_Y_AI=300,300 + +;キャラの通常時モーション指定。(カンマ区切り) +Game_Chara_Motion_Normal=0,1,2,3,4,5 + +;キャラのクリア時モーション指定。(カンマ区切り) +Game_Chara_Motion_Clear=0,1,2,3,4,5 + +;キャラのゴーゴータイム時モーション指定。(４分の4拍子換算) +Game_Chara_Motion_GoGo=0,1,2,3 + +;キャラの通常時モーションが何拍子でループするか。(カンマ区切り) +Game_Chara_Beat_Normal=1 + +;キャラのクリア時モーションが何拍子でループするか。(カンマ区切り) +Game_Chara_Beat_Clear=1 + +;キャラのゴーゴータイム時モーションが何拍子でループするか。(カンマ区切り) +Game_Chara_Beat_GoGo=1 + +;ふうせん連打時のキャラ画像X座標。(1P,2P) +Game_Chara_Balloon_X=0,0 + +;ふうせん連打時のキャラ画像X座標。(1P,2P) +Game_Chara_Balloon_Y=-40,297 + +;ふうせん連打アクション時に使用するタイマーの更新間隔。(ms) +Game_Chara_Balloon_Timer=16 + +;ふうせん連打成功 / 失敗 のフェードアウトにかける時間 (ms) +Game_Chara_Balloon_FadeOut=60 + +;ふうせん連打時のキャラ画像X座標。(X,Y) +Game_Chara_Kusudama_X=435,1035,135,1335,735 + +;ふうせん連打時のキャラ画像Y座標。(X,Y) +Game_Chara_Kusudama_Y=630,630,630,630,630 diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/0.png new file mode 100644 index 00000000..1867c8a2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/1.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/2.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/3.png new file mode 100644 index 00000000..0f6981b7 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/4.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear/5.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/0.png new file mode 100644 index 00000000..1867c8a2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/1.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/2.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/3.png new file mode 100644 index 00000000..0f6981b7 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/4.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/5.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clear_Max/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/0.png new file mode 100644 index 00000000..b31df03a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/1.png new file mode 100644 index 00000000..c3d34270 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/10.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/10.png new file mode 100644 index 00000000..5f37bc7a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/11.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/11.png new file mode 100644 index 00000000..8da7934e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/12.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/12.png new file mode 100644 index 00000000..5924021a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/12.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/13.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/13.png new file mode 100644 index 00000000..37e11b21 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/13.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/14.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/14.png new file mode 100644 index 00000000..53395cac Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/14.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/15.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/15.png new file mode 100644 index 00000000..455334bd Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/15.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/16.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/16.png new file mode 100644 index 00000000..bf5ec094 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/16.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/17.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/17.png new file mode 100644 index 00000000..03dad293 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/17.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/18.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/18.png new file mode 100644 index 00000000..5b376695 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/18.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/19.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/19.png new file mode 100644 index 00000000..a7aecb66 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/19.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/2.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/20.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/20.png new file mode 100644 index 00000000..df25fb44 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/20.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/21.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/21.png new file mode 100644 index 00000000..a4719555 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/21.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/22.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/22.png new file mode 100644 index 00000000..e573780c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/22.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/3.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/4.png new file mode 100644 index 00000000..aeabac8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/5.png new file mode 100644 index 00000000..4a7e1193 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/6.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/6.png new file mode 100644 index 00000000..e2e83f84 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/7.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/7.png new file mode 100644 index 00000000..cd3bb5fb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/8.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/8.png new file mode 100644 index 00000000..d35a0d8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Clearin/9.png b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/9.png new file mode 100644 index 00000000..e8523422 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Clearin/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo/0.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/0.png new file mode 100644 index 00000000..52ac33d4 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo/1.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/1.png new file mode 100644 index 00000000..f282ccbb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo/2.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/2.png new file mode 100644 index 00000000..8d4f1e7e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo/3.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/3.png new file mode 100644 index 00000000..f25a9b6f Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/0.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/0.png new file mode 100644 index 00000000..70c22373 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/1.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/1.png new file mode 100644 index 00000000..8313edf3 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/10.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/10.png new file mode 100644 index 00000000..5f8b2b2e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/11.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/11.png new file mode 100644 index 00000000..e591a617 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/2.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/2.png new file mode 100644 index 00000000..b8446c9f Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/3.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/3.png new file mode 100644 index 00000000..547f4b5b Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/4.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/4.png new file mode 100644 index 00000000..b194eb89 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/5.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/5.png new file mode 100644 index 00000000..6acbf0df Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/6.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/6.png new file mode 100644 index 00000000..65892db2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/7.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/7.png new file mode 100644 index 00000000..438733b5 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/8.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/8.png new file mode 100644 index 00000000..49966ec7 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/9.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/9.png new file mode 100644 index 00000000..6fcc0522 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/0.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/0.png new file mode 100644 index 00000000..70c22373 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/1.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/1.png new file mode 100644 index 00000000..8313edf3 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/10.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/10.png new file mode 100644 index 00000000..5f8b2b2e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/11.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/11.png new file mode 100644 index 00000000..e591a617 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/2.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/2.png new file mode 100644 index 00000000..b8446c9f Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/3.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/3.png new file mode 100644 index 00000000..547f4b5b Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/4.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/4.png new file mode 100644 index 00000000..b194eb89 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/5.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/5.png new file mode 100644 index 00000000..6acbf0df Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/6.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/6.png new file mode 100644 index 00000000..65892db2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/7.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/7.png new file mode 100644 index 00000000..438733b5 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/8.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/8.png new file mode 100644 index 00000000..49966ec7 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/9.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/9.png new file mode 100644 index 00000000..6fcc0522 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGoStart_Max/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/0.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/0.png new file mode 100644 index 00000000..52ac33d4 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/1.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/1.png new file mode 100644 index 00000000..f282ccbb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/2.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/2.png new file mode 100644 index 00000000..8d4f1e7e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/3.png b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/3.png new file mode 100644 index 00000000..f25a9b6f Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/GoGo_Max/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Metadata.json b/OpenTaiko/Global/Characters/10 - AItritus/Metadata.json new file mode 100644 index 00000000..f2e9b833 --- /dev/null +++ b/OpenTaiko/Global/Characters/10 - AItritus/Metadata.json @@ -0,0 +1,5 @@ +{ + "name" : "AItritus", + "rarity": "Rare", + "author": "Dashy (OPTK)", +} \ No newline at end of file diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/0.png new file mode 100644 index 00000000..1867c8a2 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/1.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/2.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/3.png new file mode 100644 index 00000000..0f6981b7 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/4.png new file mode 100644 index 00000000..4eb6e0f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Normal/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Normal/5.png new file mode 100644 index 00000000..8ae485f1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Normal/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Render.png b/OpenTaiko/Global/Characters/10 - AItritus/Render.png new file mode 100644 index 00000000..6a478cf6 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Render.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/0.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/0.png new file mode 100644 index 00000000..b31df03a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/0.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/1.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/1.png new file mode 100644 index 00000000..c3d34270 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/1.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/10.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/10.png new file mode 100644 index 00000000..5f37bc7a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/10.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/11.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/11.png new file mode 100644 index 00000000..8da7934e Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/11.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/12.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/12.png new file mode 100644 index 00000000..5924021a Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/12.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/13.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/13.png new file mode 100644 index 00000000..37e11b21 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/13.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/14.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/14.png new file mode 100644 index 00000000..53395cac Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/14.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/15.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/15.png new file mode 100644 index 00000000..455334bd Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/15.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/16.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/16.png new file mode 100644 index 00000000..bf5ec094 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/16.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/17.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/17.png new file mode 100644 index 00000000..03dad293 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/17.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/18.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/18.png new file mode 100644 index 00000000..5b376695 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/18.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/19.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/19.png new file mode 100644 index 00000000..a7aecb66 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/19.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/2.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/2.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/2.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/20.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/20.png new file mode 100644 index 00000000..df25fb44 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/20.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/21.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/21.png new file mode 100644 index 00000000..a4719555 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/21.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/22.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/22.png new file mode 100644 index 00000000..e573780c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/22.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/3.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/3.png new file mode 100644 index 00000000..61a7f83c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/3.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/4.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/4.png new file mode 100644 index 00000000..aeabac8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/4.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/5.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/5.png new file mode 100644 index 00000000..4a7e1193 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/5.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/6.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/6.png new file mode 100644 index 00000000..e2e83f84 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/6.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/7.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/7.png new file mode 100644 index 00000000..cd3bb5fb Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/7.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/8.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/8.png new file mode 100644 index 00000000..d35a0d8c Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/8.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Soulin/9.png b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/9.png new file mode 100644 index 00000000..e8523422 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Soulin/9.png differ diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Unlock.json b/OpenTaiko/Global/Characters/10 - AItritus/Unlock.json new file mode 100644 index 00000000..d0cbae0d --- /dev/null +++ b/OpenTaiko/Global/Characters/10 - AItritus/Unlock.json @@ -0,0 +1,7 @@ +{ + "condition": "ch", + "type": "me", + "values": [ + 4444, + ], +} \ No newline at end of file diff --git a/OpenTaiko/Global/Characters/10 - AItritus/Welcome.ogg b/OpenTaiko/Global/Characters/10 - AItritus/Welcome.ogg new file mode 100644 index 00000000..15b982a1 Binary files /dev/null and b/OpenTaiko/Global/Characters/10 - AItritus/Welcome.ogg differ diff --git a/OpenTaiko/src/Common/CConfigIni.cs b/OpenTaiko/src/Common/CConfigIni.cs index d8ffd09e..4221c435 100644 --- a/OpenTaiko/src/Common/CConfigIni.cs +++ b/OpenTaiko/src/Common/CConfigIni.cs @@ -1067,6 +1067,12 @@ namespace TJAPlayer3 public int n非フォーカス時スリープms; // #23568 2010.11.04 ikanick add public int nフレーム毎スリープms; // #xxxxx 2011.11.27 yyagi add public int n演奏速度; + + public double SongPlaybackSpeed + { + get => ((double)n演奏速度) / 20.0; + } + public bool b演奏速度が一倍速であるとき以外音声を再生しない; public int n曲が選択されてからプレビュー音が鳴るまでのウェイトms; public int n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms; diff --git a/OpenTaiko/src/Songs/CDTX.cs b/OpenTaiko/src/Songs/CDTX.cs index a98e70df..57c9a6ed 100644 --- a/OpenTaiko/src/Songs/CDTX.cs +++ b/OpenTaiko/src/Songs/CDTX.cs @@ -1457,7 +1457,7 @@ namespace TJAPlayer3 foreach (CVideoDecoder cvd in this.listVD.Values) { cvd.InitRead(); - cvd.dbPlaySpeed = ((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0; + cvd.dbPlaySpeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; } } } @@ -1892,7 +1892,7 @@ namespace TJAPlayer3 CSound sound = wc.rSound[index]; if (sound != null) { - sound.PlaySpeed = ((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0; + sound.PlaySpeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; // 再生速度によって、WASAPI/ASIOで使う使用mixerが決まるため、付随情報の設定(音量/PAN)は、再生速度の設定後に行う // 2018-08-27 twopointzero - DON'T attempt to load (or queue scanning) loudness metadata here. diff --git a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs index 5f33b739..0624af32 100644 --- a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs +++ b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs @@ -1070,7 +1070,7 @@ namespace TJAPlayer3 //----------------- if( base.IsFirstDraw ) { - this.nスクロール用タイマ値 = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.nスクロール用タイマ値 = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); this.ct三角矢印アニメ.Start( 0, 9, 50, TJAPlayer3.Timer ); base.IsFirstDraw = false; diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs index a7cd8257..b0c732bd 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -3147,7 +3147,7 @@ namespace TJAPlayer3 private TitleTextureKey ttkGenerateBPMTexture(C曲リストノード node, Color forecolor, Color backcolor) { var _score = node.arスコア[tFetchDifficulty(node)].譜面情報; - var _speed = ((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0; + var _speed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; double[] bpms = new double[3] { _score.BaseBpm * _speed, diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs index cdef79f6..7b69aa60 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs @@ -43,7 +43,7 @@ namespace TJAPlayer3 //this.n速度変更制御タイマ.Drums = this.n速度変更制御タイマ.Guitar = this.n速度変更制御タイマ.Bass = (long)(CSound管理.rc演奏用タイマ.n現在時刻 * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); for (int i = 0; i < 5; i++) { - this.n速度変更制御タイマ[i] = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.n速度変更制御タイマ[i] = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs index f9c287cb..6d0b2a42 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs @@ -60,7 +60,7 @@ namespace TJAPlayer3 TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Song/G. Offset:{0:####0}/{1:####0} ms", TJAPlayer3.DTX.nBGMAdjust, TJAPlayer3.ConfigIni.nGlobalOffsetMs ) ); y -= 0x10; int num = ( TJAPlayer3.DTX.listChip.Count > 0 ) ? TJAPlayer3.DTX.listChip[ TJAPlayer3.DTX.listChip.Count - 1 ].n発声時刻ms : 0; - string str = "Time: " + ((((double)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) / 1000.0)).ToString("####0.00") + " / " + ((((double)num) / 1000.0)).ToString("####0.00"); + string str = "Time: " + ((((double)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) / 1000.0)).ToString("####0.00") + " / " + ((((double)num) / 1000.0)).ToString("####0.00"); TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, str ); y -= 0x10; TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Part: {0:####0}/{1:####0}", NowMeasure[0], NowMeasure[1] ) ); diff --git a/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs b/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs new file mode 100644 index 00000000..2a2e1819 --- /dev/null +++ b/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FDK; + +namespace TJAPlayer3 +{ + // Small static class which refers to the Tower mode important informations + static internal class CFloorManagement + { + public static void reinitialize(int life) + { + CFloorManagement.LastRegisteredFloor = 1; + CFloorManagement.MaxNumberOfLives = life; + CFloorManagement.CurrentNumberOfLives = life; + CFloorManagement.InvincibilityFrames = null; + } + + public static void reload() + { + CFloorManagement.LastRegisteredFloor = 1; + CFloorManagement.CurrentNumberOfLives = CFloorManagement.MaxNumberOfLives; + CFloorManagement.InvincibilityFrames = null; + } + + public static void damage() + { + if (CFloorManagement.InvincibilityFrames != null && CFloorManagement.InvincibilityFrames.CurrentValue < CFloorManagement.InvincibilityDurationSpeedDependent) + return; + + if (CFloorManagement.CurrentNumberOfLives > 0) + { + CFloorManagement.InvincibilityFrames = new CCounter(0, CFloorManagement.InvincibilityDurationSpeedDependent + 1000, 1, TJAPlayer3.Timer); + CFloorManagement.CurrentNumberOfLives--; + //TJAPlayer3.Skin.soundTowerMiss.t再生する(); + TJAPlayer3.Skin.voiceTowerMiss[TJAPlayer3.SaveFile]?.t再生する(); + } + } + + public static bool isBlinking() + { + if (CFloorManagement.InvincibilityFrames == null || CFloorManagement.InvincibilityFrames.CurrentValue >= CFloorManagement.InvincibilityDurationSpeedDependent) + return false; + + if (CFloorManagement.InvincibilityFrames.CurrentValue % 200 > 100) + return false; + + return true; + } + + public static void loopFrames() + { + if (CFloorManagement.InvincibilityFrames != null) + CFloorManagement.InvincibilityFrames.Tick(); + } + + public static int LastRegisteredFloor = 1; + public static int MaxNumberOfLives = 5; + public static int CurrentNumberOfLives = 5; + + public static double InvincibilityDurationSpeedDependent + { + get => ((double)InvincibilityDuration) / TJAPlayer3.ConfigIni.SongPlaybackSpeed; + } + + // ms + public static readonly int InvincibilityDuration = 2000; + public static CCounter InvincibilityFrames = null; + } +} diff --git a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs index 5eee1e34..83a3f263 100644 --- a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs @@ -507,7 +507,7 @@ namespace TJAPlayer3 } else { - db再生速度 = ( (double) TJAPlayer3.ConfigIni.n演奏速度 ) / 20.0; + db再生速度 = TJAPlayer3.ConfigIni.SongPlaybackSpeed; } bValidScore = ( TJAPlayer3.DTXVmode.Enabled ) ? false : true; @@ -1099,10 +1099,10 @@ namespace TJAPlayer3 { for (int i = 0; i < 5; i++) { - ctChipAnime[i] = new CCounter(0, 3, 60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i] * 1 / 4 / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0), SoundManager.PlayTimer); + ctChipAnime[i] = new CCounter(0, 3, 60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i] * 1 / 4 / TJAPlayer3.ConfigIni.SongPlaybackSpeed, SoundManager.PlayTimer); } - TJAPlayer3.stage演奏ドラム画面.PuchiChara.ChangeBPM(60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + TJAPlayer3.stage演奏ドラム画面.PuchiChara.ChangeBPM(60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] / TJAPlayer3.ConfigIni.SongPlaybackSpeed); } public void AddMixer( CSound cs, bool _b演奏終了後も再生が続くチップである ) @@ -1234,14 +1234,14 @@ namespace TJAPlayer3 //Debug.WriteLine("nAbsTime=" + (nTime - pChip.n発声時刻ms) + ", nDeltaTime=" + (nTime + nInputAdjustTime - pChip.n発声時刻ms)); if(NotesManager.IsRoll(pChip) || NotesManager.IsFuzeRoll(pChip)) { - if ((SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) > pChip.n発声時刻ms && (SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) < pChip.nノーツ終了時刻ms) + if ((SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) > pChip.n発声時刻ms && (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { return E判定.Perfect; } } else if(NotesManager.IsGenericBalloon(pChip)) { - if ((SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) >= pChip.n発声時刻ms - 17 && (SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) < pChip.nノーツ終了時刻ms) + if ((SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) >= pChip.n発声時刻ms - 17 && (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { return E判定.Perfect; } @@ -1260,11 +1260,11 @@ namespace TJAPlayer3 CConfigIni.CTimingZones tz = (_timingzonesAreEasy == true) ? TJAPlayer3.ConfigIni.tzLevels[timingShift] : TJAPlayer3.ConfigIni.tzLevels[2 + timingShift]; - if (nDeltaTime <= tz.nGoodZone * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (nDeltaTime <= tz.nGoodZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { return E判定.Perfect; } - if (nDeltaTime <= tz.nOkZone * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (nDeltaTime <= tz.nOkZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { if ( TJAPlayer3.ConfigIni.bJust[actual] == 1 && NotesManager.IsMissableNote(pChip)) // Just return E判定.Poor; @@ -1272,7 +1272,7 @@ namespace TJAPlayer3 } - if (nDeltaTime <= tz.nBadZone * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (nDeltaTime <= tz.nBadZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { if (TJAPlayer3.ConfigIni.bJust[actual] == 2 || !NotesManager.IsMissableNote(pChip)) // Safe return E判定.Good; @@ -1599,7 +1599,7 @@ namespace TJAPlayer3 protected bool tBalloonProcess( CDTX.CChip pChip, double dbProcess_time, int player ) { //if( dbProcess_time >= pChip.n発声時刻ms && dbProcess_time < pChip.nノーツ終了時刻ms ) - long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); bool IsKusudama = NotesManager.IsKusudama(pChip); bool IsFuze = NotesManager.IsFuzeRoll(pChip); @@ -1845,8 +1845,8 @@ namespace TJAPlayer3 if (this.bPAUSE == false && rollSpeed > 0) // && TJAPlayer3.ConfigIni.bAuto先生の連打) { - if (((SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) - * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (((SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + * TJAPlayer3.ConfigIni.SongPlaybackSpeed) > (pChip.n発声時刻ms + (1000.0 / (double)rollSpeed) * pChip.nRollCount)) { EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; @@ -1869,14 +1869,14 @@ namespace TJAPlayer3 if (pChip.nチャンネル番号 == 0x20 && _gt == EGameType.KONGA) nLane = 4; else if (pChip.nチャンネル番号 == 0x21 && _gt == EGameType.KONGA) nLane = 1; - this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 1, nLane, 0, nPlayer); + this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 1, nLane, 0, nPlayer); } } } if (!bAutoPlay && !rollEffectHit) { this.eRollState = E連打State.roll; - this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 1, nNowInput, 0, nPlayer); + this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 1, nNowInput, 0, nPlayer); } break; @@ -1941,7 +1941,7 @@ namespace TJAPlayer3 int balloonDuration = bAutoPlay ? (pChip.nノーツ終了時刻ms - pChip.n発声時刻ms) : 1000; - if ((SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) > + if ((SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) > (pChip.n発声時刻ms + (balloonDuration / (double)rollSpeed) * rollCount)) { if (this.nHand[nPlayer] == 0) @@ -1952,7 +1952,7 @@ namespace TJAPlayer3 TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); TJAPlayer3.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); - this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), nPlayer); + this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), nPlayer); } } } @@ -1960,7 +1960,7 @@ namespace TJAPlayer3 { if (!IsKusudama || nCurrentKusudamaCount > 0) { - this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), nPlayer); + this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), nPlayer); } } break; @@ -1968,7 +1968,7 @@ namespace TJAPlayer3 } else if (NotesManager.IsRollEnd(pChip)) { - if (pChip.nノーツ終了時刻ms <= (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) + if (pChip.nノーツ終了時刻ms <= (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { if (NotesManager.IsKusudama(pChip)) { @@ -3269,12 +3269,12 @@ namespace TJAPlayer3 //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eNormal, 0, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + db一小節後); + this.t分岐処理(CDTX.ECourse.eNormal, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eNormal, 0); TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eNormal, 0); @@ -3294,13 +3294,13 @@ namespace TJAPlayer3 //rc演奏用タイマ.n現在時刻msから引っ張ることに //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eExpert, 0, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + db一小節後); + this.t分岐処理(CDTX.ECourse.eExpert, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eExpert, 0); TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eExpert, 0); @@ -3320,13 +3320,13 @@ namespace TJAPlayer3 //rc演奏用タイマ.n現在時刻msから引っ張ることに //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eMaster, 0, (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + db一小節後); + this.t分岐処理(CDTX.ECourse.eMaster, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eMaster, 0); TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eMaster, 0); @@ -3522,7 +3522,7 @@ namespace TJAPlayer3 return true; } - var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); NowAIBattleSectionTime = (int)n現在時刻ms - NowAIBattleSection.StartTime; @@ -3667,7 +3667,7 @@ namespace TJAPlayer3 pChip.bHit = true; if ( configIni.bBGM音を発声する ) { - dTX.tチップの再生(pChip, SoundManager.PlayTimer.PrevResetTime + (long)(pChip.n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))); + dTX.tチップの再生(pChip, SoundManager.PlayTimer.PrevResetTime + (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)); } } break; @@ -4934,7 +4934,7 @@ namespace TJAPlayer3 break; } - var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); //for ( int nCurrentTopChip = this.n現在のトップChip; nCurrentTopChip < dTX.listChip.Count; nCurrentTopChip++ ) for ( int nCurrentTopChip = dTX.listChip.Count - 1; nCurrentTopChip > 0; nCurrentTopChip-- ) @@ -5223,7 +5223,7 @@ namespace TJAPlayer3 float bpm_time = 0; int last_input = 0; float last_bpm_change_time; - play_time = SoundManager.PlayTimer.NowTimeMs * (((float)TJAPlayer3.ConfigIni.n演奏速度) / 20.0f) - tja.nOFFSET; + play_time = SoundManager.PlayTimer.NowTimeMs * (float)TJAPlayer3.ConfigIni.SongPlaybackSpeed - tja.nOFFSET; for (int i = 1; ; i++) { @@ -5281,6 +5281,8 @@ namespace TJAPlayer3 NowAIBattleSectionCount = 0; NowAIBattleSectionTime = 0; + CFloorManagement.reload(); + for (int i = 0; i < AIBattleSections.Count; i++) { AIBattleSections[i].End = AIBattleSection.EndType.None; @@ -5506,7 +5508,7 @@ namespace TJAPlayer3 } #endregion #region [ 演奏開始の発声時刻msを取得し、タイマに設定 ] - int nStartTime = (int)(dTX.listChip[this.n現在のトップChip].n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + int nStartTime = (int)(dTX.listChip[this.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); SoundManager.PlayTimer.Reset(); // これでPAUSE解除されるので、次のPAUSEチェックは不要 //if ( !this.bPAUSE ) @@ -5523,7 +5525,7 @@ namespace TJAPlayer3 { CDTX.CChip pChip = dTX.listChip[ i ]; int nDuration = pChip.GetDuration(); - long n発声時刻ms = (long)(pChip.n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long n発声時刻ms = (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ((n発声時刻ms + nDuration > 0) && (n発声時刻ms <= nStartTime) && (nStartTime <= n発声時刻ms + nDuration)) { @@ -5535,7 +5537,7 @@ namespace TJAPlayer3 if ( ( wc.bIsBGMSound && TJAPlayer3.ConfigIni.bBGM音を発声する ) || ( !wc.bIsBGMSound ) ) { - TJAPlayer3.DTX.tチップの再生(pChip, (long)(SoundManager.PlayTimer.PrevResetTime) + (long)(pChip.n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))); + TJAPlayer3.DTX.tチップの再生(pChip, (long)(SoundManager.PlayTimer.PrevResetTime) + (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)); #region [ PAUSEする ] int j = wc.n現在再生中のサウンド番号; if ( wc.rSound[ j ] != null ) diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs index dbab3f27..96fa1645 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs @@ -63,11 +63,11 @@ namespace TJAPlayer3 { if( base.IsFirstDraw ) { - this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } - long num = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long num = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ( num < this.nフラッシュ制御タイマ ) { this.nフラッシュ制御タイマ = num; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs index a8d629ff..86652f4e 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs @@ -413,7 +413,7 @@ namespace TJAPlayer3 if( !this.st叩ききりまショー.ct残り時間.IsStoped || this.st叩ききりまショー.b加算アニメ中 == true ) { this.st叩ききりまショー.ct残り時間.Tick(); - if (!TJAPlayer3.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる((long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), 0, 5000, 0) || this.st叩ききりまショー.b加算アニメ中 == true) + if (!TJAPlayer3.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0, 5000, 0) || this.st叩ききりまショー.b加算アニメ中 == true) { this.st叩ききりまショー.bタイマー使用中 = false; this.st叩ききりまショー.ct残り時間.Stop(); @@ -537,7 +537,7 @@ namespace TJAPlayer3 double n延長する時間 = 0; //最後に延長した時刻から11秒経過していなければ延長を行わない。 - if (this.n最後に時間延長した時刻 + 11000 <= (SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) + if (this.n最後に時間延長した時刻 + 11000 <= (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { //1項目につき5秒 //-精度 @@ -655,7 +655,7 @@ namespace TJAPlayer3 #endregion - this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ( n延長する時間 < 0 ) n延長する時間 = 0; if( this.st叩ききりまショー.n区間ノート数 == 0 ) @@ -726,7 +726,7 @@ namespace TJAPlayer3 } - this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ( n延長する時間 < 0 ) n延長する時間 = 0; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsパッド.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsパッド.cs index bb114440..27755574 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsパッド.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsパッド.cs @@ -130,11 +130,11 @@ namespace TJAPlayer3 { if( base.IsFirstDraw ) { - this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); - this.nY座標制御タイマ = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.nY座標制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } - long num = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long num = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ( num < this.nフラッシュ制御タイマ ) { this.nフラッシュ制御タイマ = num; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs index 607d677f..b19ac79a 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs @@ -71,7 +71,7 @@ namespace TJAPlayer3 if (base.IsFirstDraw) { for (int i = 0; i < 5; i++) - this.stBranch[i].nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.stBranch[i].nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } @@ -712,7 +712,7 @@ namespace TJAPlayer3 } */ } - var nTime = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + var nTime = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { @@ -956,7 +956,7 @@ namespace TJAPlayer3 public void t判定枠移動(double db移動時間, int n移動px, int n移動方向, int nPlayer, int vJs) { - this.n移動開始時刻[nPlayer] = (int)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.n移動開始時刻[nPlayer] = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); this.n移動開始X[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[nPlayer]; this.n移動開始Y[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[nPlayer]; this.n総移動時間[nPlayer] = (int)(db移動時間 * 1000); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums特訓モード.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums特訓モード.cs index 55a29bd3..15b970bd 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums特訓モード.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums特訓モード.cs @@ -64,7 +64,7 @@ namespace TJAPlayer3 { bIsInGoGo = true; - var current = ((double)(pChip.db発声時刻ms * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))); + var current = ((double)(pChip.db発声時刻ms * TJAPlayer3.ConfigIni.SongPlaybackSpeed)); var width = 0; if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szテクスチャサイズ.Width; @@ -142,7 +142,7 @@ namespace TJAPlayer3 { for (int index = this.JumpPointList.Count - 1; index >= 0; index--) { - if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { this.n現在の小節線 = this.JumpPointList[index].Measure; TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.n現在の小節線; @@ -184,7 +184,7 @@ namespace TJAPlayer3 { for (int index = 0; index < this.JumpPointList.Count; index++) { - if (this.JumpPointList[index].Time >= SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)) + if (this.JumpPointList[index].Time >= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { this.n現在の小節線 = this.JumpPointList[index].Measure; TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.n現在の小節線; @@ -283,15 +283,15 @@ namespace TJAPlayer3 this.n現在の小節線 = TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0]; } - if (SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0) > this.n最終演奏位置ms) + if (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed > this.n最終演奏位置ms) { - this.n最終演奏位置ms = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.n最終演奏位置ms = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); } } } - var current = (double)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + var current = (double)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); var percentage = current / length; var currentWhite = (double)(this.n最終演奏位置ms); @@ -373,7 +373,7 @@ namespace TJAPlayer3 x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2; } - var PlaySpdtmp = TJAPlayer3.ConfigIni.n演奏速度 / 20.0d * 10.0d; + var PlaySpdtmp = TJAPlayer3.ConfigIni.SongPlaybackSpeed * 10.0d; PlaySpdtmp = Math.Round(PlaySpdtmp, MidpointRounding.AwayFromZero); var playSpd = PlaySpdtmp / 10.0d; @@ -510,14 +510,14 @@ namespace TJAPlayer3 if (doScroll) { - this.nスクロール後ms = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + this.nスクロール後ms = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); this.bスクロール中 = true; this.ctスクロールカウンター = new CCounter(0, TJAPlayer3.Skin.Game_Training_ScrollTime, 1, TJAPlayer3.Timer); } else { - SoundManager.PlayTimer.NowTimeMs = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + SoundManager.PlayTimer.NowTimeMs = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); this.nスクロール後ms = SoundManager.PlayTimer.NowTimeMs; } } @@ -526,8 +526,8 @@ namespace TJAPlayer3 { if (!this.bスクロール中 && this.b特訓PAUSE) { - if (!JumpPointList.Contains(new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), Measure = this.n現在の小節線 })) - JumpPointList.Add(new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), Measure = this.n現在の小節線 }); + if (!JumpPointList.Contains(new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed), Measure = this.n現在の小節線 })) + JumpPointList.Add(new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed), Measure = this.n現在の小節線 }); TJAPlayer3.Skin.sound特訓ジャンプポイント.t再生する(); JumpPointList.Sort((a, b) => a.Time.CompareTo(b.Time)); } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs index 43d52765..6480d847 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs @@ -9,57 +9,6 @@ using System.Collections.Generic; namespace TJAPlayer3 { - // Small static class which refers to the Tower mode important informations - static internal class CFloorManagement - { - public static void reinitialize(int life) - { - CFloorManagement.LastRegisteredFloor = 1; - CFloorManagement.MaxNumberOfLives = life; - CFloorManagement.CurrentNumberOfLives = life; - CFloorManagement.InvincibilityFrames = null; - } - - public static void damage() - { - if (CFloorManagement.InvincibilityFrames != null && CFloorManagement.InvincibilityFrames.CurrentValue < CFloorManagement.InvincibilityDuration) - return; - - if (CFloorManagement.CurrentNumberOfLives > 0) - { - CFloorManagement.InvincibilityFrames = new CCounter(0, CFloorManagement.InvincibilityDuration + 1000, 1, TJAPlayer3.Timer); - CFloorManagement.CurrentNumberOfLives--; - //TJAPlayer3.Skin.soundTowerMiss.t再生する(); - TJAPlayer3.Skin.voiceTowerMiss[TJAPlayer3.SaveFile]?.t再生する(); - } - } - - public static bool isBlinking() - { - if (CFloorManagement.InvincibilityFrames == null || CFloorManagement.InvincibilityFrames.CurrentValue >= CFloorManagement.InvincibilityDuration) - return false; - - if (CFloorManagement.InvincibilityFrames.CurrentValue % 200 > 100) - return false; - - return true; - } - - public static void loopFrames() - { - if (CFloorManagement.InvincibilityFrames != null) - CFloorManagement.InvincibilityFrames.Tick(); - } - - public static int LastRegisteredFloor = 1; - public static int MaxNumberOfLives = 5; - public static int CurrentNumberOfLives = 5; - - // ms - public static readonly int InvincibilityDuration = 2000; - public static CCounter InvincibilityFrames = null; - } - internal class CAct演奏Drums背景 : CActivity { // 本家っぽい背景を表示させるメソッド。 @@ -237,7 +186,7 @@ namespace TJAPlayer3 this.ctSlideAnimation = new CCounter(); this.ctClimbDuration = new CCounter(); - this.ctStandingAnimation = new CCounter(0, 1000, (60000f / (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.n演奏速度 / 20)) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter], TJAPlayer3.Timer); + this.ctStandingAnimation = new CCounter(0, 1000, (60000f / (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter], TJAPlayer3.Timer); this.ctClimbingAnimation = new CCounter(); this.ctRunningAnimation = new CCounter(); this.ctClearAnimation = new CCounter(); @@ -426,7 +375,7 @@ namespace TJAPlayer3 float nextPositionMax140 = Math.Min((TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) / (float)nightTime, 1f); if (bFloorChanged == true) - ctSlideAnimation.Start(0, 1000, 120f / ((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.n演奏速度 / 20), TJAPlayer3.Timer); + ctSlideAnimation.Start(0, 1000, 120f / ((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed), TJAPlayer3.Timer); float progressFactor = (nextPositionMax140 - currentFloorPositionMax140) * (ctSlideAnimation.CurrentValue / 1000f); @@ -515,7 +464,7 @@ namespace TJAPlayer3 if (bFloorChanged == true) { - float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.n演奏速度 / 20); + float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed); ctClimbDuration.Start(0, 1500, 120f / floorBPM, TJAPlayer3.Timer); ctStandingAnimation.Start(0, 1000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter], TJAPlayer3.Timer); ctClimbingAnimation.Start(0, 1000, (120000f / floorBPM) / TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[currentCharacter], TJAPlayer3.Timer); @@ -529,7 +478,7 @@ namespace TJAPlayer3 if (stageEnded && !TowerFinished && !isClimbing) { - float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.n演奏速度 / 20); + float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed); ctClearAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Clear[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[currentCharacter], TJAPlayer3.Timer); ctClearTiredAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Clear_Tired[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter], TJAPlayer3.Timer); ctFailAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Fail[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[currentCharacter], TJAPlayer3.Timer); @@ -616,7 +565,7 @@ namespace TJAPlayer3 #region [Miss icon] - if (CFloorManagement.InvincibilityFrames != null && CFloorManagement.InvincibilityFrames.CurrentValue < CFloorManagement.InvincibilityDuration) + if (CFloorManagement.InvincibilityFrames != null && CFloorManagement.InvincibilityFrames.CurrentValue < CFloorManagement.InvincibilityDurationSpeedDependent) { if (TJAPlayer3.Tx.Tower_Miss != null) TJAPlayer3.Tx.Tower_Miss.Opacity = Math.Min(255, 1000 - CFloorManagement.InvincibilityFrames.CurrentValue); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 13701e8a..006a29cc 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -293,7 +293,7 @@ namespace TJAPlayer3 { Details = Details.Substring(0, Math.Min(127, Details.Length)), State = "Playing" + (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] == true ? " (Auto)" : ""), - Timestamps = new Timestamps(DateTime.UtcNow, DateTime.UtcNow.AddMilliseconds(TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / (TJAPlayer3.ConfigIni.n演奏速度 / 20.0))), + Timestamps = new Timestamps(DateTime.UtcNow, DateTime.UtcNow.AddMilliseconds(TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)), Assets = new Assets() { SmallImageKey = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? difficultyName.ToLower() : "", @@ -585,7 +585,7 @@ namespace TJAPlayer3 this.t進行描画_演奏情報(); - if (TJAPlayer3.DTX.listLyric2.Count > ShownLyric2 && TJAPlayer3.DTX.listLyric2[ShownLyric2].Time < (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) + if (TJAPlayer3.DTX.listLyric2.Count > ShownLyric2 && TJAPlayer3.DTX.listLyric2[ShownLyric2].Time < (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { this.actPanel.t歌詞テクスチャを生成する(TJAPlayer3.DTX.listLyric2[ShownLyric2++].TextTex); } @@ -955,7 +955,7 @@ namespace TJAPlayer3 if( !inputEvent.Pressed ) continue; - long nTime = (long)(((SoundManager.PlayTimer.NowTimeMs + nInputAdjustTimeMs) * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))); + long nTime = (long)(((SoundManager.PlayTimer.NowTimeMs + nInputAdjustTimeMs) * TJAPlayer3.ConfigIni.SongPlaybackSpeed)); //int nPad09 = ( nPad == (int) Eパッド.HP ) ? (int) Eパッド.BD : nPad; // #27029 2012.1.5 yyagi bool bHitted = false; @@ -1407,7 +1407,7 @@ namespace TJAPlayer3 // Process big notes (judge big notes on) if (e判定 != E判定.Miss && ((_isBigNoteTaiko && TJAPlayer3.ConfigIni.b大音符判定) || _isPinkKonga)) { - double divided_songspeed = (double)TJAPlayer3.ConfigIni.n演奏速度 / 20.0; + double divided_songspeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; float time = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTimeMs * divided_songspeed); int nWaitTime = TJAPlayer3.ConfigIni.n両手判定の待ち時間; @@ -1862,7 +1862,7 @@ namespace TJAPlayer3 { if (!pChip.bHit) { - long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); if ((!pChip.bHit) && (pChip.n発声時刻ms <= nPlayTime)) { bool bAutoPlay = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer]; @@ -1978,7 +1978,7 @@ namespace TJAPlayer3 } #endregion - long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); long time = pChip.n発声時刻ms - __dbt; if( pChip.dbSCROLL_Y != 0.0 ) @@ -2185,7 +2185,7 @@ namespace TJAPlayer3 { int nSenotesX = 0; int nSenotesY = 0; - long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * (double)(TJAPlayer3.ConfigIni.n演奏速度 / 20.0)); + long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); switch (TJAPlayer3.ConfigIni.nPlayerCount) { @@ -2517,7 +2517,7 @@ namespace TJAPlayer3 if( pChip.dbSCROLL_Y != 0.0 ) { double _scrollSpeed = pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; - long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); @@ -2583,7 +2583,7 @@ namespace TJAPlayer3 var chkChip = this.chip現在処理中の連打チップ[i]; if (chkChip != null) { - long nowTime = (long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + long nowTime = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); //int n = this.chip現在処理中の連打チップ[i].nチャンネル番号; if ((NotesManager.IsGenericBalloon(chkChip) || NotesManager.IsKusudama(chkChip)) && (this.b連打中[i] == true)) { @@ -2617,7 +2617,7 @@ namespace TJAPlayer3 //CDTX.CChip chipNoHit = this.r指定時刻に一番近い未ヒットChip((int)CSound管理.rc演奏用タイマ.n現在時刻ms, 0); for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - CDTX.CChip chipNoHit = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)), i); + CDTX.CChip chipNoHit = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), i); EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(i)]; bool _isBigKaTaiko = NotesManager.IsBigKaTaiko(chipNoHit, _gt); @@ -2626,10 +2626,10 @@ namespace TJAPlayer3 if (chipNoHit != null && (_isBigDonTaiko || _isBigKaTaiko)) { - float timeC = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); + float timeC = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); int nWaitTime = TJAPlayer3.ConfigIni.n両手判定の待ち時間; if (chipNoHit.eNoteState == ENoteState.wait && timeC <= 110 - && chipNoHit.nProcessTime + nWaitTime <= (int)(SoundManager.PlayTimer.NowTime * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) + && chipNoHit.nProcessTime + nWaitTime <= (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { if (!_isSwapNote) {