Skip to content

CTG & JGR Overtime #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
DESTROYGIRL merged 12 commits into from
Oct 2, 2025
Merged

CTG & JGR Overtime #1342

DESTROYGIRL merged 12 commits into from
Oct 2, 2025

Conversation

@DESTROYGIRL
Copy link
Contributor

@DESTROYGIRL DESTROYGIRL commented Sep 11, 2025 •
edited
Loading

Description

Continuation of #1108 by @AdamTadeusz which has been slimmed down.

In CTG:

  • Overtime is displayed on the round timer. The round timer will always be the thing showing you how much time is left
  • The grace duration is static, when the ghost is dropped is will always start counting down from the set grace duration UNLESS overtime is less than the grace duration, in which case it will just stick to the overtime left (to prevent any extension of overtime)
  • Round timer turns red when in grace / overtime is less than set grace duration
  • Grace decay remains as an option for testing with and without

In JGR:

  • If the Juggernaut is being controlled by the losing team when the timer hits zero, they can continue to score points until the JGR dies, or they gain more points than the opposing team

Toolchain

  • Windows MSVC VS2022

Linked Issues

AdamTadeusz and others added 5 commits April 28, 2025 22:26
@AdamTadeusz
ghost overtime
7f4f096
@AdamTadeusz
keep original timer, fade out inactive timer
8af5aa5
@DESTROYGIRL
Merge branch 'master' into 214_ghostOvertime
42e6cd8
@DESTROYGIRL
jgr overtime
9351e2b
@DESTROYGIRL
major streamline
59cac60 
- Overtime starts at 0 seconds
- Grace period always starts at the same amount of time
- HUD simplified to a single timer, turns red if in grace time
- Overtime timer stays the same (will continue counting) but will override the grace timer if it goes lower than the base grace time
@DESTROYGIRL DESTROYGIRL requested a review from a team September 11, 2025 14:00
@DESTROYGIRL DESTROYGIRL marked this pull request as draft September 11, 2025 16:55
@DESTROYGIRL
undo overtime start point change
93e1ba1
@DESTROYGIRL
fix
e742774 
- prevent grace timer being overriden by overtime timer when ghost is not held
- fix the overtime starting when it shouldnt
@DESTROYGIRL
Merge branch 'master' into jgr_overtime
2f46eef
@DESTROYGIRL
grace decay returns
0f7729d
@DESTROYGIRL DESTROYGIRL marked this pull request as ready for review September 12, 2025 11:23
sunzenshen
sunzenshen reviewed Sep 13, 2025
View reviewed changes
@sunzenshen sunzenshen requested a review from a team September 13, 2025 20:40
sunzenshen
sunzenshen previously approved these changes Sep 21, 2025
View reviewed changes
@sunzenshen sunzenshen requested review from a team and AdamTadeusz September 21, 2025 03:38
@AdamTadeusz AdamTadeusz mentioned this pull request Sep 21, 2025
Closed
Agiel
Agiel requested changes Oct 1, 2025
View reviewed changes
@DESTROYGIRL DESTROYGIRL merged commit 49c20da into NeotokyoRebuild:master Oct 2, 2025
7 checks passed
@DESTROYGIRL DESTROYGIRL deleted the jgr_overtime branch October 2, 2025 10:49
@DESTROYGIRL DESTROYGIRL added the CTG Related to the Capture The Ghost gamemode. label Dec 9, 2025
@DESTROYGIRL DESTROYGIRL added the JGR Related to the Juggernaut gamemode. label Dec 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Agiel Agiel Agiel approved these changes

@sunzenshen sunzenshen sunzenshen approved these changes

@AdamTadeusz AdamTadeusz Awaiting requested review from AdamTadeusz

Assignees

No one assigned

Labels

CTG Related to the Capture The Ghost gamemode. JGR Related to the Juggernaut gamemode.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Ghost overtime is implemented natively

4 participants

@DESTROYGIRL @Agiel @sunzenshen @AdamTadeusz