diff --git a/TJAPlayer3/Common/CSkin.cs b/TJAPlayer3/Common/CSkin.cs index 2597ed1d..7801ba14 100644 --- a/TJAPlayer3/Common/CSkin.cs +++ b/TJAPlayer3/Common/CSkin.cs @@ -2033,6 +2033,22 @@ namespace TJAPlayer3 SongSelect_Level_Number_Y[i] = int.Parse(strSplit[i]); } } + else if (strCommand == "SongSelect_Level_Number_Tower") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + SongSelect_Level_Number_Tower[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "SongSelect_Tower_Side") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + SongSelect_Tower_Side[i] = int.Parse(strSplit[i]); + } + } else if (strCommand == "SongSelect_Level_Number_Interval") { string[] strSplit = strParam.Split(','); @@ -8091,6 +8107,8 @@ namespace TJAPlayer3 public int[] SongSelect_Level_Number_X = new int[] { 485, 607, 729, 851 }; public int[] SongSelect_Level_Number_Y = new int[] { 400, 400, 400, 400 }; + public int[] SongSelect_Level_Number_Tower = new int[] { 485, 400 }; + public int[] SongSelect_Tower_Side = new int[] { 485, 400 }; public int[] SongSelect_Level_X = new int[] { 485, 607, 729, 851 }; public int[] SongSelect_Level_Y = new int[] { 400, 400, 400, 400 }; diff --git a/TJAPlayer3/Songs/CDTX.cs b/TJAPlayer3/Songs/CDTX.cs index 3c4c724a..99d9a960 100644 --- a/TJAPlayer3/Songs/CDTX.cs +++ b/TJAPlayer3/Songs/CDTX.cs @@ -1146,6 +1146,12 @@ namespace TJAPlayer3 eNone, ePlus } + + public enum ESide + { + eNormal, + eEx + } public class CLine { public int n小節番号; @@ -1208,6 +1214,7 @@ namespace TJAPlayer3 public bool bLyrics; public int[] LEVELtaiko = new int[(int)Difficulty.Total] { -1, -1, -1, -1, -1, -1, -1 }; public ELevelIcon[] LEVELtaikoIcon = new ELevelIcon[(int)Difficulty.Total] { ELevelIcon.eNone, ELevelIcon.eNone, ELevelIcon.eNone, ELevelIcon.eNone, ELevelIcon.eNone, ELevelIcon.eNone, ELevelIcon.eNone }; + public ESide SIDE; public CSongUniqueID uniqueID; // Tower lifes @@ -1387,6 +1394,7 @@ namespace TJAPlayer3 this.SUBTITLE = ""; this.ARTIST = ""; this.COMMENT = ""; + this.SIDE = ESide.eEx; this.PANEL = ""; this.GENRE = ""; this.MAKER = ""; @@ -5362,6 +5370,11 @@ namespace TJAPlayer3 this.MAKER = strCommandParam; } } + else if (strCommandName.Equals("SIDE")) + { + if (!string.IsNullOrEmpty(strCommandParam) && strCommandParam.Equals("Normal")) + this.SIDE = ESide.eNormal; + } else if (strCommandName.Equals("EXPLICIT")) { if (!string.IsNullOrEmpty(strCommandParam)) @@ -6655,8 +6668,8 @@ namespace TJAPlayer3 { this.t入力_パラメータ食い込みチェック("COMMENT", ref strコマンド, ref strパラメータ); this.COMMENT = strパラメータ; - } - //----------------- + } + //----------------- #endregion #region [ GENRE ] //----------------- diff --git a/TJAPlayer3/Songs/CSong管理.cs b/TJAPlayer3/Songs/CSong管理.cs index c4a35fd7..3b93a199 100644 --- a/TJAPlayer3/Songs/CSong管理.cs +++ b/TJAPlayer3/Songs/CSong管理.cs @@ -223,6 +223,7 @@ namespace TJAPlayer3 c曲リストノード.strサブタイトル = dtx.SUBTITLE; c曲リストノード.strジャンル = dtx.GENRE; c曲リストノード.strMaker = dtx.MAKER; + c曲リストノード.nSide = dtx.SIDE; c曲リストノード.bExplicit = dtx.EXPLICIT; if (c曲リストノード.r親ノード != null && c曲リストノード.r親ノード.strジャンル != "") { @@ -348,6 +349,7 @@ namespace TJAPlayer3 c曲リストノード.strタイトル = dtx.TITLE; c曲リストノード.strサブタイトル = dtx.SUBTITLE; c曲リストノード.strMaker = dtx.MAKER; + c曲リストノード.nSide = dtx.SIDE; c曲リストノード.bExplicit = dtx.EXPLICIT; if (dtx.List_DanSongs != null) diff --git a/TJAPlayer3/Songs/C曲リストノード.cs b/TJAPlayer3/Songs/C曲リストノード.cs index 1d4afc47..b9ec2af7 100644 --- a/TJAPlayer3/Songs/C曲リストノード.cs +++ b/TJAPlayer3/Songs/C曲リストノード.cs @@ -72,6 +72,7 @@ namespace TJAPlayer3 public Dan_C[] Dan_C; public string strサブタイトル = ""; public string strMaker = ""; + public CDTX.ESide nSide = CDTX.ESide.eEx; public bool bExplicit = false; public string strBreadcrumbs = ""; // #27060 2011.2.27 yyagi; MUSIC BOXのパンくずリスト (曲リスト構造内の絶対位置捕捉のために使う) public string strSkinPath = ""; // #28195 2012.5.4 yyagi; box.defでのスキン切り替え対応 diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index 365667d1..f1f61307 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -217,6 +217,9 @@ namespace TJAPlayer3 SongSelect_Frame_Score[0] = TxC(SONGSELECT + @"Frame_Score.png"); SongSelect_Frame_Score[1] = TxC(SONGSELECT + @"Frame_Score_Tower.png"); + SongSelect_Frame_Score[2] = TxC(SONGSELECT + @"Frame_Score_Dan.png"); + + SongSelect_Tower_Side = TxC(SONGSELECT + @"Tower_Side.png"); SongSelect_Frame_Box = TxC(SONGSELECT + @"Frame_Box.png"); SongSelect_Frame_BackBox = TxC(SONGSELECT + @"Frame_BackBox.png"); @@ -1904,6 +1907,7 @@ namespace TJAPlayer3 SongSelect_Song_Number, SongSelect_BoardNumber, SongSelect_Difficulty_Cymbol, + SongSelect_Tower_Side, SongSelect_Favorite, SongSelect_High_Score, @@ -1918,7 +1922,7 @@ namespace TJAPlayer3 SongSelect_Bar_Genre, SongSelect_Box_Chara, SongSelect_ScoreWindow = new CTexture[(int)Difficulty.Total], - SongSelect_Frame_Score = new CTexture[2], + SongSelect_Frame_Score = new CTexture[3], SongSelect_NamePlate = new CTexture[1], SongSelect_Song_Panel = new CTexture[4], SongSelect_Coin_Slot = new CTexture[4], diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs index 1f048d37..2ff414d7 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -1881,19 +1881,34 @@ namespace TJAPlayer3 #region [Displayables] - int width = TJAPlayer3.Tx.SongSelect_Frame_Score[1].sz画像サイズ.Width / 5; - int height = TJAPlayer3.Tx.SongSelect_Frame_Score[1].sz画像サイズ.Height; + TJAPlayer3.Tx.SongSelect_Frame_Score[1]?.t2D描画(TJAPlayer3.app.Device, 0, 0); - TJAPlayer3.Tx.SongSelect_Frame_Score[1].t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.SongSelect_Frame_Score_X[(diff - 5)], TJAPlayer3.Skin.SongSelect_Frame_Score_Y[(diff - 5)], new Rectangle(width * (diff - 5), 0, width, height)); + var _level_number = (diff == 5) ? TJAPlayer3.Skin.SongSelect_Level_Number_Tower : TJAPlayer3.Skin.SongSelect_Level_Number_Tower; - if (avaliable) + + if (avaliable) { - t小文字表示(TJAPlayer3.Skin.SongSelect_Level_Number_X[(diff - 5)], TJAPlayer3.Skin.SongSelect_Level_Number_Y[(diff - 5)], + t小文字表示(_level_number[0], _level_number[1], TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[diff], diff, TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nLevelIcon[diff] ); + if (diff == 5) + { + var _sidet = TJAPlayer3.Tx.SongSelect_Tower_Side; + if (_sidet != null) + { + var _side = (TJAPlayer3.stage選曲.r現在選択中の曲.nSide == CDTX.ESide.eNormal) ? 0 : 1; + var _sc = _sidet.sz画像サイズ.Width / 2; + _sidet.t2D描画(TJAPlayer3.app.Device, + TJAPlayer3.Skin.SongSelect_Tower_Side[0], + TJAPlayer3.Skin.SongSelect_Tower_Side[1], + new Rectangle(_side * _sc, 0, _sc, _sidet.sz画像サイズ.Height)); + } + + } + if (TJAPlayer3.Tx.SongSelect_Level != null) { int level_width = TJAPlayer3.Tx.SongSelect_Level.szテクスチャサイズ.Width / 7; diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs index fc1b2230..62caf2af 100644 --- a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs +++ b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs @@ -1099,6 +1099,12 @@ namespace TJAPlayer3 } } + + // Diff = Tower and SIDE is Normal + if (diff == (int)Difficulty.Tower) + { + _timingzonesAreEasy = TJAPlayer3.stage選曲.r確定された曲.nSide == CDTX.ESide.eNormal; + } return _timingzonesAreEasy; } diff --git a/Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/DeceiverTerminus.ogg b/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/DeceiverTerminus.ogg similarity index 100% rename from Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/DeceiverTerminus.ogg rename to Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/DeceiverTerminus.ogg diff --git a/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/DeceiverTerminus.tja b/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/DeceiverTerminus.tja new file mode 100644 index 00000000..dc54388c --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/DeceiverTerminus.tja @@ -0,0 +1,371 @@ +TITLE:Deceiver's Terminus +SUBTITLE:--H5 +WAVE:DeceiverTerminus.ogg +BPM:190.00 +OFFSET:-0.236 +DEMOSTART:284.408 +SIDE:Normal +MAKER:Komi + +COURSE:Tower +LEVEL:5 +LIFE:13 +BALLOON:6,8,6,11 + +#START +#MEASURE 4/4 +0, +0, +0, +0, +10020000, +0, +10020000, +02, +10020000, +0, +10020010, +02000000, +10020000, +0, +10020000, +02, +10020000, +0, +10020010, +02000000, +10020201, +01010000, +10020201, +01010000, +10020202, +01020000, +10020010, +02000000, +10020201, +01010000, +10020201, +01010000, +10020202, +01020200, +10020010, +02700008, +2221, +00101120, +10202001, +00211011, +2221, +10201120, +10120121, +0121, +2221, +00101120, +10202001, +00211011, +2221, +10201120, +1111, +10101011, +1111, +10101022, +1111, +1111, +2222, +5008, + +#GOGOSTART +20120102, +01020110, +20120102, +01020012, +01020102, +01020110, +20120201, +01010112, +20120102, +01020110, +20120102, +01020012, +01020102, +01020110, +20120201, +01010110, +10020201, +01010000, +10020201, +01010000, +10020202, +01020000, +10020010, +02000000, +10020201, +01010000, +10020201, +01010000, +10020202, +01020000, +10020010, +02001011, + +#GOGOEND +2221, +00101120, +10202001, +00211011, +2221, +10201120, +10120121, +0121, +2221, +00101120, +10202001, +00211011, +2221, +10201120, +1111, +10101011, +1111, +10101022, +1111, +1111, +2222, +0004, +1111, +1158, +1111, +5822, +0111, +10101111, +2111, +10101111, +2121, +20201111, +1111, +5822, +1111, +10101111, +1111, +10101110, +10020000, +0, +10020000, +02, +10020000, +0, +10020010, +02000000, +10020000, +0, +10020000, +00000200, +00100200, +0, +#MEASURE 2/4 +0, +#BPMCHANGE 152.000000 +#MEASURE 4/4 +10000000 +#SCROLL 0.850000 +100000000 +#SCROLL 0.730000 +2000000, +0 +#SCROLL 0.580000 +20000000000, + +#SCROLL 0.480000 +1122, +1121, +1122, + + +#MEASURE 15/16 +102000102000000, +#BPMCHANGE 152.000000 +#MEASURE 4/4 + +#SCROLL 1.000000 +22101120, +20102210, +11202021, +11212111, + +#GOGOSTART +10210112, +10102021, +10112020, +10112021, +10210112, +10102021, +10112020, +10112021, +10000004, +4444, +4444, +4000400040040040, +4444, +4444, +4444, +4004004040004010, +#BPMCHANGE 205.000000 + +#GOGOEND + +#SCROLL 0.600000 +2, +0, +10020000, +02, +10020000, +0, +10020010, +02000000, +10020000, +0, +10020000, +02, +10020000, +0, +10010010, +02000000, + +#SCROLL 0.800000 +10020201, +01010000, +10020201, +01010000, +10020202, +01020000, +10020010, +02000000, + +#SCROLL 1.000000 +10020201, +01010000, +10020201, +01010020, +1112, +1212, +1111, +70000008, +2221, +00101120, +10202001, +00211011, +2221, +10201120, +10120121, +0121, +2221, +00101120, +10202001, +00211011, +2221, +10201120, +1111, +10101011, +1111, +10101022, +1111, +1111, +2222, +4, + +#GOGOSTART +1111, +10120020, +1111, +10120020, +1111, +10120020, + +#GOGOEND +20202220, +2224, + +#GOGOSTART +1111, +10120020, +1111, +10120020, +1111, +10120020, +1111, +10120111, +10020101, +01010011, +10020101, +01012222, + +#GOGOEND +2111, +10101111, +2111, +10101120, +200 +#GOGOSTART +20101, +01010011, +10020101, +01012222, + +#GOGOEND +2111, +10101111, +2111, +10101120, +#BPMCHANGE 200.000000 +20120102, +01020110, +20120102, +01020012, +01020102, +01020110, +20120201, +01010112, +20120102, +01020110, +20120102, +01020012, +01020102, +01020110, +20120201, +01010110, + +#SCROLL 0.800000 +10020201, +01010000, +10020201, +01010000, +10020202, +01020000, +10020010, +02000000, +10020201, +01010000, +10020201, +01010000, +10020202, +01020200, +10020010, +00002000700000000000000000000800, +10020000, +0, +10020000, +02, +10020000, +0, +10020010, +02000000, +10020000, +0, +01002000, +0002, +00010020, +0, +0, +12, +0100000000200070, +0, +8, +#END diff --git a/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/uniqueID.json b/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/uniqueID.json new file mode 100644 index 00000000..9be90fd4 --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/01 - Sweet/DeceiverTerminus (Tower - Ama)/uniqueID.json @@ -0,0 +1,4 @@ +{ + "id": "aiLPG8trKe9RvcUcuhVPKNl5xu34UJbyzbBpF0pDBfta5p8gFKXws5YmcxHvrjMT", + "url": "" +} diff --git a/Test/Songs/S2 Taiko Towers/01 - Sweet/box.def b/Test/Songs/S2 Taiko Towers/01 - Sweet/box.def new file mode 100644 index 00000000..6237de92 --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/01 - Sweet/box.def @@ -0,0 +1,9 @@ +#TITLE:Tower (甘口) +#GENRE:太鼓タワー +#BOXEXPLANATION1:Easy tower charts for +#BOXEXPLANATION2:players of all skill ranges ! +#BACKCOLOR:#222222 +#BOXCOLOR:#f6ff00 +#BOXTYPE:0 +#BGTYPE:8 +#BOXCHARA:10 \ No newline at end of file diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.ogg b/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.ogg new file mode 100644 index 00000000..5e363470 Binary files /dev/null and b/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.ogg differ diff --git a/Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/DeceiverTerminus.tja b/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.tja similarity index 99% rename from Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/DeceiverTerminus.tja rename to Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.tja index 94e13ef3..430449c1 100644 --- a/Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/DeceiverTerminus.tja +++ b/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/DeceiverTerminus.tja @@ -4,9 +4,11 @@ WAVE:DeceiverTerminus.ogg BPM:190.00 OFFSET:-0.236 DEMOSTART:284.408 +SIDE:Ex +MAKER:Komi COURSE:Tower -LEVEL:10 +LEVEL:10.4 LIFE:8 BALLOON:10,10,39 diff --git a/Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/uniqueID.json b/Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/uniqueID.json similarity index 100% rename from Test/Songs/S2 Taiko Towers/DeceiverTerminus (Tower)/uniqueID.json rename to Test/Songs/S2 Taiko Towers/02 - Spicy/DeceiverTerminus (Tower - Kara)/uniqueID.json diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.ogg b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.ogg new file mode 100644 index 00000000..279af1c4 Binary files /dev/null and b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.ogg differ diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.png b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.png new file mode 100644 index 00000000..f1f5465b Binary files /dev/null and b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.png differ diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.tja b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.tja new file mode 100644 index 00000000..d2b04f3a --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/Synthsea.tja @@ -0,0 +1,442 @@ +TITLE:Synthsea +SUBTITLE:--Taichenko +BPM:190 +WAVE:Synthsea.ogg +OFFSET:0 +DEMOSTART:141.473 +PREIMAGE:Synthsea.png +SCOREMODE:2 +MAKER:Taichenko_oni + +COURSE:Tower +LEVEL:10.5 +LIFE:6 +BALLOON: +SCOREINIT:350 +SCOREDIFF:0 + +#START +#SCROLL 0.8 +3, +1, +11, +1, +1, +1, +11, +1, + +3, +1, +11, +1011, +1, +1, +1011, +1, + +#SCROLL 1 +3001, +20104002, +3021, +4142, +30200210, +40021240, +12220210, +40021000, + +3221, +20104002, +30222010, +4142, +300000000000200000200000200200200200202020200000, +400000200000222200400000, +300000000000200000200000200200200200202020200000, +4212, + +3201, +20104022, +3221, +4142, +30200210, +40021240, +12220210, +40021000, + +3221, +2140, +3241, +202020200200200000100000400000000000200000000000, +10224010, +2142, +10224010, +2141, + +#SCROLL 0.8 +1, +1, +11, +1, +1, +1, +1, +1, + +#SCROLL 1 +1000201110102000, +1010201210102000, +1000201210102000, +1010201022102000, +1000201110102000, +1010201210102000, +1000201210102000, +1011201020102000, + +100000000100200000100100100000100000200000101010, +1010201122102012, +1000201110102022, +1010201122102000, +100000000100200000100100100000100000200000101010, +1010201122102012, +1010202220102010, +4, + +1000201210102011, +1001201022102012, +1000201110102012, +1010201122102000, +1000202220102022, +1022221020102012, +1000222020102012, +1010201020202222, + +1001201022102222, +1021202120102222, +1001202221102022, +1201202120212012, +1001201011112011, +1010201020102012, +1001201011112012, +1010201020202222, + +1002102010121020, +1021202121102012, +1001202221012222, +1000201120102020, +1011102020102020, +1022202220102010, +1011102020111020, +100100100200100000101010200000200000200200200200, + +1001202011112012, +1001201122102022, +1221221211212221, +2112112121112211, +100000000100200000200000100100100000200000101010, +1001201120102000, +1221222122112211, +2021101120202222, + +#SCROLL 0.8 +1001, +0110, +1001, +0110, +1001, +0110, +1001, +4, + +#SCROLL 1 +#GOGOSTART +1001201210102022, +1010201120102022, +1001201122102012, +1010201120102222, +1001201120102022, +1110201202102012, +1001201111012012, +1010201022102222, + +1001201210102012, +1010201122102222, +1001201222102012, +1011201120102222, +1001201210102012, +1110201202112012, +1001201221012012, +1010201022102022, + +1001201210102022, +1010201122102222, +1001201122102012, +1010201120102222, +1001201120102022, +1110201202102012, +1001201111012012, +1010201022102222, + +1001202211102012, +1010201122102212, +1001201221102012, +1011201220102222, +1001221210102012, +1101201221012012, +1001201121012012, +1010201022102022, +#GOGOEND + +1, +, +, +, +2, +, +2, +22, + +1111, +#BPMCHANGE 192 +1111, +#BPMCHANGE 194 +1111, +#BPMCHANGE 196 +1111, +#BPMCHANGE 198 +1111 +#BPMCHANGE 200 +1111, +#BPMCHANGE 202 +1111 +#BPMCHANGE 204 +1111, +#BPMCHANGE 208 +1111 +#BPMCHANGE 212 +1111 +#BPMCHANGE 216 +1111 +#BPMCHANGE 222 +1110, +#BPMCHANGE 222 +3000300030301011, + +#GOGOSTART +1022102011112012, +1011201022102012, +1011201011112012, +1011201022102011, +1010400010112010, +2210201122102011, +2011201121102010, +#GOGOEND +3000300030301011, + +#GOGOSTART +1021102210102012, +1010201022102012, +1021102210102012, +1010201022102011, +1010400010221020, +1110201121102011, +2011201121102010, +3000300030301011, +#GOGOEND + +1111, +10101011, +1111, +1010100010102022, +12121212, +1020102010202022, +12121212, +12121400, + +1000201110102022, +1000201210102022, +1010201110102022, +1010201022102010, +1020201020002011, +1010201022102010, +12211201, +0020001020102022, + +#GOGOSTART +1010201110102022, +1010201022102222, +1020201000112010, +2210201022102010, +1000201110201122, +1022201022102121, +1010201110201121, +#GOGOEND +1020102010102222, + +#GOGOSTART +1021001010210111, +1021011110210010, +2211112212212211, +211211212111111 +#GOGOEND +1, +#GOGOSTART +101200 +#GOGOEND +10 +#GOGOSTART +101201 +#GOGOEND +11, +#GOGOSTART +101201 +#GOGOEND +11 +#GOGOSTART +101200 +#GOGOEND +11, +#GOGOSTART +2211221122122122, +#GOGOEND +1101101111011011, + +#MEASURE 1/8 +1, +#SCROLL 4.49 +, +#SCROLL 4.09 +, +#SCROLL 4.09 +, +#SCROLL 3.72 +, +#SCROLL 3.72 +, +#SCROLL 3.39 +, +#SCROLL 3.39 +, +#SCROLL 3.09 +, +#SCROLL 3.09 +, +#SCROLL 2.81 +, +#SCROLL 2.81 +, +#SCROLL 2.56 +, +#SCROLL 2.56 +, +#SCROLL 2.33 +, +#SCROLL 2.33 +, +#SCROLL 2.12 +, +#SCROLL 2.12 +, +#SCROLL 1.93 +, +#SCROLL 1.93 +, +#SCROLL 1.76 +, +#SCROLL 1.76 +, +#SCROLL 1.6 +, +#SCROLL 1.6 +, +#SCROLL 1.46 +, +#SCROLL 1.46 +, +#SCROLL 1.33 +, +#SCROLL 1.33 +, +#SCROLL 1.21 +, +#SCROLL 1.21 +, +#SCROLL 1.1 +, +#SCROLL 1.1 +, + +#MEASURE 4/4 +#SCROLL 1 +#GOGOSTART + +#BARLINEON +#GOGOSTART +3000201110102022, +1010201120102122, +1021102011112011, +1010201212102011, +1000201210102011, +2210201120102211, +2011201022102011, +2011201120112222, + +1000201110102012, +1010201120102211, +1010201210102222, +1011201022102000, +1022102210102211, +1011201122102222, +1022102211102010, +#GOGOEND +1000100010102222, + +#GOGOSTART +1011201212102022, +1010201120102222, +1021102011112012, +1010201212102011, +1000201212102011, +2010201122102211, +2011201022102011, +2011201210112222, + +1000202210102012, +1210201120102211, +1010201210102222, +1111201022102211, +1022102210102211, +1011201122102222, +1022102210221020, +3000300030101111, +#GOGOEND + +1, +#BARLINEOFF +, +, +, +, +, + +#BARLINEON +#BPMCHANGE 111 +20202220, +20222020, +20202220, +22202020, +20202220, +20222020, +20202220, +2222, + +1001002001002011, +100000000100000000100000000000101010200000100100, +1011010200222111, +100000000100000000100000400000101010200000100100, +1001002001002011, +100000000100000000100000000000101010200000100100, +1011010200222111, +1001001040102020, + +3, +#END diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/uniqueID.json b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/uniqueID.json new file mode 100644 index 00000000..90f6222c --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/02 - Spicy/Synthsea (Tower - Kara)/uniqueID.json @@ -0,0 +1,4 @@ +{ + "id": "PbeAUbrEslf88bcFIUFx4RwpntUPRy2FYs4LT55Hi4X2Q8MYROOm5d5ZotYNwhw2", + "url": "" +} \ No newline at end of file diff --git a/Test/Songs/S2 Taiko Towers/02 - Spicy/box.def b/Test/Songs/S2 Taiko Towers/02 - Spicy/box.def new file mode 100644 index 00000000..a89c3ea2 --- /dev/null +++ b/Test/Songs/S2 Taiko Towers/02 - Spicy/box.def @@ -0,0 +1,9 @@ +#TITLE:Tower (辛口) +#GENRE:太鼓タワー +#BOXEXPLANATION1:Difficult Tower charts +#BOXEXPLANATION2:for true champions ! +#BACKCOLOR:#222222 +#BOXCOLOR:#ff5e00 +#BOXTYPE:0 +#BGTYPE:8 +#BOXCHARA:10 \ No newline at end of file diff --git a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.ogg b/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.ogg deleted file mode 100644 index 4f16a762..00000000 Binary files a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.ogg and /dev/null differ diff --git a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.tja b/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.tja deleted file mode 100644 index 3eec006a..00000000 --- a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/Gewissenbisse.tja +++ /dev/null @@ -1,271 +0,0 @@ -TITLE:Gewissenbisse -SUBTITLE:--Sukima Altera vs ALTERNATiVE THEORY -WAVE:Gewissenbisse.ogg -BPM:170.00 -OFFSET:-0.000 -DEMOSTART:107.294 - -COURSE:Tower -LEVEL:9 -LIFE:6 -BALLOON:43,1 - -#START -7, -0, -0, -0008, -12, -11, -0, -0, -12, -11, -0, -0, -12, -11, -0, -0, -22, -200020 -#SCROLL 1.400000 -58, -#SCROLL 1.800000 -58 -#SCROLL 2.200000 -58 -#SCROLL 2.600000 -58 -#SCROLL 3.000000 -58, - -#SCROLL 0.400000 -2122, - -#SCROLL 1.200000 -1022102210221010, -1022102210101020, -1022102210221010, -1022102210107080, -1022102211221020, -1022102210221120, -1022102211221020, -2022202220222220, -2011101120111011, -2011101120111011, -2011101120111011, -2011201120111010, -2011101120111011, -2011101120111011, -2011101120111011, -2111211121112111, -2011101120111011, -2011101120111011, -2011101120111011, -2011201120111010, -2011101120111011, -2011101120111011, -2 -#SCROLL 1.080000 -2 -#SCROLL 0.970000 -2 -#SCROLL 0.870000 -2 -#SCROLL 0.780000 -2 -#SCROLL 0.700000 -2 -#SCROLL 0.630000 -2 -#SCROLL 0.570000 -2, -2 -#SCROLL 0.630000 -2 -#SCROLL 0.700000 -2 -#SCROLL 0.780000 -2 -#SCROLL 0.870000 -2 -#SCROLL 0.970000 -2 -#SCROLL 1.080000 -2 -#SCROLL 1.200000 -2 -#SCROLL 1.320000 -2 -#SCROLL 1.450000 -2 -#SCROLL 1.590000 -2 -#SCROLL 1.750000 -2 -#SCROLL 1.920000 -2 -#SCROLL 2.110000 -2 -#SCROLL 2.320000 -2 -#SCROLL 2.550000 -2, - -#SCROLL 1.000000 -12, -21, -12, -2110, -12, -21, -12, -2122, -12, -21, -12, -2110, -12, -21, -12, - -#SCROLL 0.300000 -2122, - -#SCROLL 0.800000 -1012202120102011, -20002000100010202000200010001110, -2001202120102011, -2020101220201000, -1012202120102011, -20002000100010202000200010001110, -2001202120102011, -2020202220201020, -1012202120102011, -20002000100010202000200010001110, -2001202120102011, -2020101220201000, -12121212, -12121212, -1122112211221122, -11221122 -#SCROLL 0.450000 -20102020, - -#SCROLL 1.100000 - -#GOGOSTART -1012202120112011, -20002000100010202000200010001110, -2011202120112011, -2020101220201111, -1012202120112011, -20002000100010202000200010001110, -2111202120112011, -2021202220221121, -1012202120112011, -20002000100010202000200010001110, -2011202120112011, -2020101220201111, -1012202120112011, -20002000100010202000200010001110, -2111202120112011, -2021202220221121, -2010201120221010, -2012201120201020, -2010201120221010, -2011201121212120, -2010201120221010, -2012201120201020, -2010201120221010, -2011202020112120, -2010201120221010, -2012201120201020, -2010201120221010, -2011201121212120, -2010201120221010, -2012201120201020, -2010201120221010, -2011202020112120, -1012202120112011, -20002000100010202010200010001110, -2011202120112011, -2020101221202010, -2012202120112011, -20002000100010202010200010001110, -11111111, -1111111111111111, -1001202120102010, -20002000100010202000200010001110, -2001202120102010, -2020101220201000, -1001202120102010, -20002000100010202000200010001110, -2 -#SCROLL 1.080000 -2 -#SCROLL 0.970000 -2 -#SCROLL 0.870000 -2 -#SCROLL 0.780000 -2 -#SCROLL 0.700000 -2 -#SCROLL 0.630000 -2 -#SCROLL 0.570000 -2, -2 -#SCROLL 0.630000 -2 -#SCROLL 0.700000 -2 -#SCROLL 0.780000 -2 -#SCROLL 0.870000 -2 -#SCROLL 0.970000 -2 -#SCROLL 1.080000 -2 -#SCROLL 1.200000 -2 -#SCROLL 1.320000 -2 -#SCROLL 1.450000 -2 -#SCROLL 1.590000 -2 -#SCROLL 1.750000 -2 -#SCROLL 1.920000 -2 -#SCROLL 2.110000 -2 -#SCROLL 2.320000 -2 -#SCROLL 2.550000 -2, - -#SCROLL 0.750000 - -#GOGOEND -2002202220202020, -20002000200020202000200020002220, -2002202220202020, -2020202220202000, -2002202220202020, -20002000200020202000200020002220, -2002202220202020, -2020202220202020, -2002202220202020, -20002000200020202000200020002220, -2002202220202020, -2020202220202000, -2002202220202020, -20002000200020202000200020002220, -2002202220202020, -2020202220202020, -#END diff --git a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/uniqueID.json b/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/uniqueID.json deleted file mode 100644 index 6c49e22b..00000000 --- a/Test/Songs/S2 Taiko Towers/Gewissenbisse (Tower)/uniqueID.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "id": "vbcOR1duQBzqFmAn5R9XUm9wZ1c6OBfRtZMJhbhaeCRoxsM7Ds0oiYeCuU6mQN6m", - "url": "" -} \ No newline at end of file