Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-12-18 02:16:05 +01:00
Code Releases Activity

Temp fix for Kusudama blinding players on Training Mode (#669)

Browse Source 
* Temp fix for Kusudama blinding players on Training Mode

* oops
This commit is contained in:
DragonRatTiger / リュウコ 2024-08-04 05:25:57 -05:00 committed by GitHub
parent 2de208181f
commit f4cc6db1b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -692,7 +692,7 @@ namespace OpenTaiko {
public CAct演奏ステージ失敗 actStageFailed; public CAct演奏ステージ失敗 actStageFailed;
protected CAct演奏スクロール速度 act譜面スクロール速度; protected CAct演奏スクロール速度 act譜面スクロール速度;
protected CActImplRoll actRoll; protected CActImplRoll actRoll;
protected CActImplBalloon actBalloon; public CActImplBalloon actBalloon;
public CActImplCharacter actChara; public CActImplCharacter actChara;
protected CActImplRollEffect actRollChara; protected CActImplRollEffect actRollChara;
protected CActImplComboBalloon actComboBalloon; protected CActImplComboBalloon actComboBalloon;

20
OpenTaiko/src/Stages/07.Game/Taiko/CActImplBalloon.cs
View File

@ -48,9 +48,18 @@ namespace OpenTaiko {
return base.Draw(); return base.Draw();
} }
public void KusuIn() => KusudamaScript.KusuIn(); public void KusuIn() {
public void KusuBroke() => KusudamaScript.KusuBroke(); KusudamaScript.KusuIn();
public void KusuMiss() => KusudamaScript.KusuMiss(); KusudamaIsActive = true;
}
public void KusuBroke() {
KusudamaScript.KusuBroke();
KusudamaIsActive = false;
}
public void KusuMiss() {
KusudamaScript.KusuMiss();
KusudamaIsActive = false;
}
public enum EBalloonType { public enum EBalloonType {
BALLOON, BALLOON,
@ -58,12 +67,16 @@ namespace OpenTaiko {
FUSEROLL FUSEROLL
} }
public bool KusudamaIsActive { get; private set; } = false;
public void tDrawKusudama() { public void tDrawKusudama() {
if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) { if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) {
KusudamaScript.Update(); KusudamaScript.Update();
} }
if (!(OpenTaiko.stage演奏ドラム画面.bPAUSE && OpenTaiko.ConfigIni.bTokkunMode)) {
KusudamaScript.Draw(); KusudamaScript.Draw();
} }
}
public int On進行描画(int n連打ノルマ, int n連打数, int player, EBalloonType btype) { public int On進行描画(int n連打ノルマ, int n連打数, int player, EBalloonType btype) {
this.ct風船ふきだしアニメ.TickLoop(); this.ct風船ふきだしアニメ.TickLoop();
@ -141,6 +154,7 @@ namespace OpenTaiko {
if (TJAPlayer3.Tx.Kusudama != null) if (TJAPlayer3.Tx.Kusudama != null)
TJAPlayer3.Tx.Kusudama.t2D描画(0, 0); TJAPlayer3.Tx.Kusudama.t2D描画(0, 0);
*/ */
if (!(OpenTaiko.stage演奏ドラム画面.bPAUSE && OpenTaiko.ConfigIni.bTokkunMode))
this.tKusudamaNumber(n連打数); this.tKusudamaNumber(n連打数);
} }

4
OpenTaiko/src/Stages/07.Game/Taiko/CActImplTrainingMode.cs
View File

@ -344,6 +344,7 @@ namespace OpenTaiko {
OpenTaiko.stage演奏ドラム画面.bPAUSE = true; OpenTaiko.stage演奏ドラム画面.bPAUSE = true;
OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
this.bTrainingPAUSE = true; this.bTrainingPAUSE = true;
if (OpenTaiko.ConfigIni.bTokkunMode && OpenTaiko.stage演奏ドラム画面.actBalloon.KusudamaIsActive) OpenTaiko.stage演奏ドラム画面.actBalloon.KusuMiss();
this.tMatchWithTheChartDisplayPosition(false); this.tMatchWithTheChartDisplayPosition(false);
} }
@ -368,6 +369,7 @@ namespace OpenTaiko {
OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = 0; OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = 0;
OpenTaiko.stage演奏ドラム画面.t数値の初期化(true, true); OpenTaiko.stage演奏ドラム画面.t数値の初期化(true, true);
OpenTaiko.stage演奏ドラム画面.Activate(); OpenTaiko.stage演奏ドラム画面.Activate();
if (OpenTaiko.ConfigIni.bTokkunMode && OpenTaiko.stage演奏ドラム画面.actBalloon.KusudamaIsActive) OpenTaiko.stage演奏ドラム画面.actBalloon.KusuMiss();
for (int i = 0; i < dTX.listChip.Count; i++) { for (int i = 0; i < dTX.listChip.Count; i++) {
@ -461,7 +463,7 @@ namespace OpenTaiko {
private long nスクロール後ms; private long nスクロール後ms;
private long n最終演奏位置ms; private long n最終演奏位置ms;
private bool bTrainingPAUSE; public bool bTrainingPAUSE { get; private set; }
private bool bCurrentlyScrolling; private bool bCurrentlyScrolling;
private CCounter ctScrollCounter; private CCounter ctScrollCounter;