Updated practice clock to use a zero exclusive display (matches offical clock better), tweaked sound timings a bit to match, disabled color changing on clock to match offical clock, misc. tweaks.

This commit is contained in:
2023-11-17 17:09:44 -06:00
parent 08bbd2c638
commit a8ebaebe4c
8 changed files with 21 additions and 15 deletions

View File

@@ -57,10 +57,9 @@ module TAC
end
def clock_time(time_left)
minutes = ((time_left + 0.5) / 60.0).floor
minutes = ((time_left + 1.0) / 60.0).floor
seconds = time_left.round % 60
seconds = "0#{seconds}" if seconds < 10
seconds = format("%02d", time_left.ceil % 60)
return "#{minutes}:#{seconds}" if time_left.round.even?
return "#{minutes}<c=999999>:</c>#{seconds}" if time_left.round.odd?

View File

@@ -33,8 +33,8 @@ module TAC
create_event(:change_countdown, 33.0, "0:08"),
create_event(:change_display, 33.0, :countdown),
create_event(:start_countdown, 33.0),
create_event(:play_sound, 34.5, :teleop_pickup_controllers),
create_event(:change_color, 37.0, :red),
create_event(:play_sound, 35.0, :teleop_pickup_controllers),
create_event(:change_color, 38.0, :red),
create_event(:play_sound, 38.0, :teleop_countdown),
create_event(:stop_countdown, 41.0),
].freeze
@@ -44,7 +44,7 @@ module TAC
create_event(:change_clock, 131.0, "0:30"),
create_event(:start_clock, 131.0),
create_event(:play_sound, 131.0, :end_game),
create_event(:play_sound, 158.0, :autonomous_countdown),
# create_event(:play_sound, 158.0, :autonomous_countdown), # Not played here anymore
create_event(:play_sound, 161.0, :end_match),
create_event(:stop_clock, 161.0),
].freeze
@@ -128,7 +128,7 @@ module TAC
elsif @countdown_running
return @countdown_time
else
return 60 * 2 + 30
return 0 # Clock defaults to showing "0:00" if there is no clock or countdown
end
end
end

View File

@@ -41,6 +41,12 @@ module TAC
Gosu::Color.rgb(150, 0, 0)
end
### --- ###
# OVERRIDE: offical CenterStage game clock no longer has colors
### --- ###
out = Gosu::Color::WHITE
@display_color = out
end

View File

@@ -16,7 +16,7 @@ module TAC
button "Open Folder", tip: "Open folder containing configurations", height: 1.0 do
if RUBY_PLATFORM =~ /mingw/
system("start \"#{TAC::CONFIGS_PATH}\"")
system("explorer \"#{TAC::CONFIGS_PATH.gsub("/", "\\")}\"")
elsif RUBY_PLATFORM =~ /darwin/
system("open \"#{TAC::CONFIGS_PATH}\"")
else

View File

@@ -9,11 +9,12 @@ module TAC
@roster ||= [
"Aubrey",
"Cayden",
"Connor",
"Ben",
"Dan",
"Gabe",
"Spencer",
"Sodi",
"Trent"
"Sodi"
]
@roles ||= [

View File

@@ -46,6 +46,7 @@ module TAC
def button_down(id)
super
pop_state
push_state(@next_state)
end
end

View File

@@ -7,7 +7,7 @@ module TAC
self.caption = "#{TAC::NAME} v#{TAC::VERSION} (#{TAC::RELEASE_NAME})"
@backend = Backend.new
@notification_manager = GosuNotifications::NotificationManager.new(window: self, edge: :bottom)
@notification_manager = CyberarmEngine::NotificationManager.new(window: self, edge: :bottom)
if ARGV.join.include?("--game-clock-remote-display")
push_state(PracticeGameClock::View, remote_control_mode: true)
@@ -26,9 +26,9 @@ module TAC
end
def update
super
@notification_manager.update
super
end
def needs_redraw?
@@ -37,7 +37,7 @@ module TAC
def toast(title, message = nil)
@notification_manager.create_notification(
priority: GosuNotifications::Notification::PRIORITY_HIGH,
priority: CyberarmEngine::Notification::PRIORITY_HIGH,
title: title,
tagline: message ? message : "",

View File

@@ -4,7 +4,6 @@ begin
rescue LoadError
require "cyberarm_engine"
end
require "gosu_notifications"
require "socket"
require "securerandom"
require "json"