Fun mods selectable on mod select screen
This commit is contained in:
0aubsq
parent
4a7f2978f5
commit
a7ba427064
@ -802,6 +802,7 @@ namespace TJAPlayer3
|
||||
public int[] nScrollSpeed;
|
||||
public int[] nTimingZones;
|
||||
public EGameType[] nGameType;
|
||||
public EFunMods[] nFunMods;
|
||||
public string strDTXManiaのバージョン;
|
||||
public string str曲データ検索パス;
|
||||
public string FontName;
|
||||
@ -1451,6 +1452,7 @@ namespace TJAPlayer3
|
||||
this.nScrollSpeed = new int[4] { 9, 9, 9, 9 };
|
||||
this.nTimingZones = new int[4] { 2, 2, 2, 2 };
|
||||
this.nGameType = new EGameType[4] { EGameType.TAIKO, EGameType.TAIKO, EGameType.TAIKO, EGameType.TAIKO };
|
||||
this.nFunMods = new EFunMods[4] { EFunMods.NONE, EFunMods.NONE, EFunMods.NONE, EFunMods.NONE };
|
||||
this.nInputAdjustTimeMs = 0;
|
||||
this.nGlobalOffsetMs = 0;
|
||||
this.nJudgeLinePosOffset = new STDGBVALUE<int>(); // #31602 2013.6.23 yyagi
|
||||
@ -2064,6 +2066,12 @@ namespace TJAPlayer3
|
||||
sw.WriteLine("Gametype3P={0}", (int)this.nGameType[2]);
|
||||
sw.WriteLine("Gametype4P={0}", (int)this.nGameType[3]);
|
||||
sw.WriteLine();
|
||||
sw.WriteLine("; Fun Mods (0 : None, 1 : Avalanche (random scroll speed per note/chip), 2 : Minesweeper (replace randomly notes by bombs))");
|
||||
sw.WriteLine("FunMods1P={0}", (int)this.nFunMods[0]);
|
||||
sw.WriteLine("FunMods2P={0}", (int)this.nFunMods[1]);
|
||||
sw.WriteLine("FunMods3P={0}", (int)this.nFunMods[2]);
|
||||
sw.WriteLine("FunMods4P={0}", (int)this.nFunMods[3]);
|
||||
sw.WriteLine();
|
||||
sw.WriteLine( "; 演奏速度(5～40)(→x5/20～x40/20)" );
|
||||
sw.WriteLine( "PlaySpeed={0}", this.n演奏速度 );
|
||||
sw.WriteLine();
|
||||
@ -2989,6 +2997,27 @@ namespace TJAPlayer3
|
||||
|
||||
#endregion
|
||||
|
||||
#region [Fun mods]
|
||||
|
||||
else if (str3.Equals("FunMods1P"))
|
||||
{
|
||||
this.nFunMods[0] = (EFunMods)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, (int)EFunMods.TOTAL - 1, (int)this.nFunMods[0]);
|
||||
}
|
||||
else if (str3.Equals("FunMods2P"))
|
||||
{
|
||||
this.nFunMods[1] = (EFunMods)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, (int)EFunMods.TOTAL - 1, (int)this.nFunMods[1]);
|
||||
}
|
||||
else if (str3.Equals("FunMods3P"))
|
||||
{
|
||||
this.nFunMods[2] = (EFunMods)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, (int)EFunMods.TOTAL - 1, (int)this.nFunMods[2]);
|
||||
}
|
||||
else if (str3.Equals("FunMods4P"))
|
||||
{
|
||||
this.nFunMods[3] = (EFunMods)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, (int)EFunMods.TOTAL - 1, (int)this.nFunMods[3]);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region [Stealh]
|
||||
|
||||
else if (str3.Equals("TaikoStealth1P") || str3.Equals("TaikoStealth"))
|
||||
|
||||
@ -184,6 +184,7 @@ namespace TJAPlayer3
|
||||
NONE,
|
||||
AVALANCHE,
|
||||
MINESWEEPER,
|
||||
TOTAL,
|
||||
}
|
||||
|
||||
public enum EGameType
|
||||
|
||||
@ -294,6 +294,9 @@ namespace TJAPlayer3
|
||||
[512] = "Game Type",
|
||||
[513] = "Taiko",
|
||||
[514] = "Konga",
|
||||
[515] = "Fun mods",
|
||||
[516] = "Avalanche",
|
||||
[517] = "Minesweeper",
|
||||
|
||||
[1000] = "Reached floor",
|
||||
[1001] = "F",
|
||||
|
||||
@ -285,6 +285,9 @@ namespace TJAPlayer3
|
||||
[512] = "Type de jeu",
|
||||
[513] = "Taiko",
|
||||
[514] = "Konga",
|
||||
[515] = "Extras",
|
||||
[516] = "Avalanche",
|
||||
[517] = "Démineur",
|
||||
|
||||
[1000] = "Étage atteint",
|
||||
[1001] = "",
|
||||
|
||||
@ -348,6 +348,9 @@ namespace TJAPlayer3
|
||||
[512] = "ゲームタイプ",
|
||||
[513] = "太鼓",
|
||||
[514] = "コンガ",
|
||||
[515] = "余分なモード",
|
||||
[516] = "雪崩",
|
||||
[517] = "掃海",
|
||||
|
||||
[1000] = "到達階数",
|
||||
[1001] = "階",
|
||||
|
||||
@ -1703,15 +1703,7 @@ namespace TJAPlayer3
|
||||
{
|
||||
Random rnd = new System.Random();
|
||||
|
||||
var eFun = EFunMods.NONE;
|
||||
|
||||
// Placeholder
|
||||
/*
|
||||
if (player == 1)
|
||||
eFun = EFunMods.AVALANCHE;
|
||||
else
|
||||
eFun = EFunMods.MINESWEEPER;
|
||||
*/
|
||||
var eFun = TJAPlayer3.ConfigIni.nFunMods[TJAPlayer3.GetActualPlayer(player)];
|
||||
|
||||
switch (eFun)
|
||||
{
|
||||
|
||||
@ -78,6 +78,10 @@ namespace TJAPlayer3
|
||||
txGameType[0] = OptionTypeTx(CLangManager.LangInstance.GetString(513), Color.White, Color.Black);
|
||||
txGameType[1] = OptionTypeTx(CLangManager.LangInstance.GetString(514), Color.White, Color.Black);
|
||||
|
||||
txFunMods[0] = OptionTypeTx(CLangManager.LangInstance.GetString(9000), Color.White, Color.Black);
|
||||
txFunMods[1] = OptionTypeTx(CLangManager.LangInstance.GetString(516), Color.White, Color.Black);
|
||||
txFunMods[2] = OptionTypeTx(CLangManager.LangInstance.GetString(517), Color.White, Color.Black);
|
||||
|
||||
txNone = OptionTypeTx(CLangManager.LangInstance.GetString(9007), Color.White, Color.Black);
|
||||
|
||||
hsInfo = TJAPlayer3.Skin.hsHitSoundsInformations;
|
||||
@ -108,6 +112,7 @@ namespace TJAPlayer3
|
||||
OptionType[8] = OptionTypeTx(CLangManager.LangInstance.GetString(9013), Color.White, Color.Black);
|
||||
OptionType[9] = OptionTypeTx(CLangManager.LangInstance.GetString(10), Color.White, Color.Black);
|
||||
OptionType[10] = OptionTypeTx(CLangManager.LangInstance.GetString(9015), Color.White, Color.Black);
|
||||
OptionType[11] = OptionTypeTx(CLangManager.LangInstance.GetString(515), Color.White, Color.Black);
|
||||
|
||||
var _timingColors = new Color[] { Color.LimeGreen, Color.YellowGreen, Color.White, Color.Orange, Color.Red };
|
||||
for (int i = 0; i < 5; i++)
|
||||
@ -195,6 +200,7 @@ namespace TJAPlayer3
|
||||
txSwitch[nAutoMode],
|
||||
txSongSpeed[nSongSpeed],
|
||||
txOtoiro[nOtoiro],
|
||||
txFunMods[nFunMods],
|
||||
};
|
||||
|
||||
var _shift = player == 1 ? 640 : 0;
|
||||
@ -281,11 +287,11 @@ namespace TJAPlayer3
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int nOptionCount = 10;
|
||||
public int nOptionCount = 11;
|
||||
|
||||
public CCounter ctOpen;
|
||||
public CCounter ctClose;
|
||||
public CTexture[] OptionType = new CTexture[11];
|
||||
public CTexture[] OptionType = new CTexture[12];
|
||||
|
||||
public int NowCount;
|
||||
public int[] NowCountType = new int[8];
|
||||
@ -327,6 +333,9 @@ namespace TJAPlayer3
|
||||
public CTexture[] txGameType = new CTexture[2];
|
||||
public int nGameType = 0;
|
||||
|
||||
public CTexture[] txFunMods = new CTexture[3];
|
||||
public int nFunMods = 0;
|
||||
|
||||
public CTexture[] txModMults = new CTexture[2];
|
||||
|
||||
public CTexture OptionTypeTx(string str文字, Color forecolor, Color backcolor)
|
||||
@ -391,7 +400,9 @@ namespace TJAPlayer3
|
||||
case 10:
|
||||
ShiftVal(left, ref nOtoiro, txOtoiro.Length - 1, 0);
|
||||
break;
|
||||
|
||||
case 11:
|
||||
ShiftVal(left, ref nFunMods, txFunMods.Length - 1, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -474,6 +485,12 @@ namespace TJAPlayer3
|
||||
|
||||
#endregion
|
||||
|
||||
#region [Fun mods]
|
||||
|
||||
nFunMods = (int)TJAPlayer3.ConfigIni.nFunMods[actual];
|
||||
|
||||
#endregion
|
||||
|
||||
#region [ GameMode ]
|
||||
|
||||
if (TJAPlayer3.ConfigIni.bTokkunMode == true)
|
||||
@ -594,10 +611,16 @@ namespace TJAPlayer3
|
||||
|
||||
#region [GameType]
|
||||
|
||||
TJAPlayer3.ConfigIni.nGameType[actual] = (EGameType)nGameType;
|
||||
TJAPlayer3.ConfigIni.nGameType[actual] = (EGameType)nGameType;
|
||||
|
||||
#endregion
|
||||
|
||||
#region [Fun mods]
|
||||
|
||||
TJAPlayer3.ConfigIni.nFunMods[actual] = (EFunMods)nFunMods;
|
||||
|
||||
#endregion
|
||||
|
||||
#region [ GameMode ]
|
||||
|
||||
if (nGameMode == 0)
|
||||
|
||||
@ -247,6 +247,9 @@
|
||||
512 : "Game Type" mod name
|
||||
513 : "Taiko" game type mod option
|
||||
514 : "Konga" game type mod option
|
||||
515 : "Fun mods" mod name
|
||||
516 : "Avalanche" fun mod option
|
||||
517 : "Minesweeper" fun mod option
|
||||
|
||||
# In-game pause menu (0090X)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user