fix: RoundTime behaviour on F4

ikemen-engine · Jan 15, 2025 · 2165c38 · 2165c38
1 parent b5c515d
commit 2165c38
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/data/dizzy.zss b/data/dizzy.zss
@@ -199,7 +199,7 @@ if !dizzy || time > 300 {
 
 if !const(Default.Enable.Dizzy) || isHelper || teamSide = 0 {
 	# Do nothing, global code disabled locally or executed by helper/stage
-} else if roundState = 0 {
+} else if roundTime = 0 {
 	# Initialize points and variables
 	dizzyPointsSet{value: dizzyPointsMax}
 	map(_iksys_dizzyPointsTimer) := 0;

diff --git a/data/functions.zss b/data/functions.zss
@@ -226,7 +226,7 @@ ignoreHitPause{
 
 if teamSide = 0 {
 	# Do nothing, global code executed by stage
-} else if roundState = 0 {
+} else if roundTime = 0 {
 	map(_iksys_firstAttackFlag) := 0;
 	map(_iksys_counterHitFlag) := 0;
 	map(_iksys_technicalFlag) := 0;

diff --git a/data/guardbreak.zss b/data/guardbreak.zss
@@ -144,7 +144,7 @@ if time >= 60 {
 
 if !const(Default.Enable.GuardBreak) || isHelper || teamSide = 0 {
 	# Do nothing, global code disabled locally or executed by helper/stage
-} else if roundState = 0 {
+} else if roundTime = 0 {
 	# Initialize points and variables
 	guardPointsSet{value: guardPointsMax}
 	map(_iksys_guardPointsTimer) := 0;

diff --git a/data/score.zss b/data/score.zss
@@ -5,7 +5,7 @@
 
 if !const(Default.Enable.Score) || teamSide = 0 {
 	# do nothing, global code disabled locally or executed by stage
-} else if roundState = 0 {
+} else if roundTime = 0 {
 	map(_iksys_scoreTimeVitalFlag) := 0;
 } else if roundState = 4 && !isHelper {
 	# score: time vital bonus

diff --git a/data/tag.zss b/data/tag.zss
@@ -227,7 +227,7 @@ if animTime >= 0 {
 
 if !const(Default.Enable.Tag) || isHelper || teamSide = 0 {
 	# do nothing, global code disabled locally or executed by helper/stage
-} else if roundState = 0 && teamMode = Tag {
+} else if roundTime = 0 && teamMode = Tag {
 	map(_iksys_tagActive) := 1;
 	map(_iksys_tagLastId) := 0;
 	map(_iksys_tagPartnerId) := 0;

diff --git a/data/training.zss b/data/training.zss
@@ -37,8 +37,14 @@ if player($pn),ctrl = 0 {
 [StateDef -4]
 
 ignoreHitPause if gameMode = "training" && teamSide = 2 && !isHelper {
-	if roundState = 0 {
+	if roundTime = 0 {
 		# Round start reset
+		map(_iksys_trainingDummyControl) := 0;
+		map(_iksys_trainingDummyMode) := 0;
+		map(_iksys_trainingGuardMode) := 0;
+		map(_iksys_trainingFallRecovery) := 0;
+		map(_iksys_trainingDistance) := 0;
+		map(_iksys_trainingButtonJam) := 0;
 		powerSet{value: player(1),powerMax; redirectid: player(1),id}
 		powerSet{value: player(2),powerMax; redirectid: player(2),id}
 		map(_iksys_trainingLifeTimer) := 0;

diff --git a/src/system.go b/src/system.go
@@ -1167,8 +1167,14 @@ func (s *System) addFrameTime(t float32) bool {
 	return true
 }
 func (s *System) resetFrameTime() {
-	s.tickCount, s.oldTickCount, s.tickCountF, s.lastTick, s.absTickCountF = 0, -1, 0, 0, 0
-	s.nextAddTime, s.oldNextAddTime = 1, 1
+	// Without this workaround, for some reason, sys.tickCount (RoundTime trigger) starts with 1 when the round is restarted via F4.
+	if s.roundResetFlg {
+		s.tickCount, s.oldTickCount, s.tickCountF, s.lastTick, s.absTickCountF = -1, -2, -1, -1, -1
+		s.nextAddTime, s.oldNextAddTime = 0, 0
+	} else {
+		s.tickCount, s.oldTickCount, s.tickCountF, s.lastTick, s.absTickCountF = 0, -1, 0, 0, 0
+		s.nextAddTime, s.oldNextAddTime = 1, 1
+	}
 }
 
 func (s *System) charUpdate() {