diff --git a/lib/game_clock/clock.rb b/lib/game_clock/clock.rb index cc30942..b6309ea 100644 --- a/lib/game_clock/clock.rb +++ b/lib/game_clock/clock.rb @@ -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}:#{seconds}" if time_left.round.odd? diff --git a/lib/game_clock/clock_controller.rb b/lib/game_clock/clock_controller.rb index 2e87cdc..cd93f83 100644 --- a/lib/game_clock/clock_controller.rb +++ b/lib/game_clock/clock_controller.rb @@ -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 diff --git a/lib/game_clock/event_handlers.rb b/lib/game_clock/event_handlers.rb index 62e0945..522c966 100644 --- a/lib/game_clock/event_handlers.rb +++ b/lib/game_clock/event_handlers.rb @@ -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 diff --git a/lib/pages/configurations.rb b/lib/pages/configurations.rb index 9fafed7..36cdd55 100644 --- a/lib/pages/configurations.rb +++ b/lib/pages/configurations.rb @@ -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 diff --git a/lib/pages/drive_team_rotation_generator.rb b/lib/pages/drive_team_rotation_generator.rb index 2d55489..7dcdfcf 100644 --- a/lib/pages/drive_team_rotation_generator.rb +++ b/lib/pages/drive_team_rotation_generator.rb @@ -9,11 +9,12 @@ module TAC @roster ||= [ "Aubrey", "Cayden", + "Connor", + "Ben", "Dan", "Gabe", "Spencer", - "Sodi", - "Trent" + "Sodi" ] @roles ||= [ diff --git a/lib/states/boot.rb b/lib/states/boot.rb index 392ab1a..f5aae74 100644 --- a/lib/states/boot.rb +++ b/lib/states/boot.rb @@ -46,6 +46,7 @@ module TAC def button_down(id) super + pop_state push_state(@next_state) end end diff --git a/lib/window.rb b/lib/window.rb index ca704a1..0fa8ec0 100644 --- a/lib/window.rb +++ b/lib/window.rb @@ -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 : "", diff --git a/timecrafters_configuration_tool.rb b/timecrafters_configuration_tool.rb index 6311b32..7e77067 100644 --- a/timecrafters_configuration_tool.rb +++ b/timecrafters_configuration_tool.rb @@ -4,7 +4,6 @@ begin rescue LoadError require "cyberarm_engine" end -require "gosu_notifications" require "socket" require "securerandom" require "json"