Refactored ROOT_PATH to be a subfolder in the current user's home directory (configs and settings will not need to be manually moved between updates)

respectively.

Gemfile

@@ -2,8 +2,6 @@ source "https://rubygems.org"
 
 gem "cyberarm_engine"
 gem "gosu_notifications"
-gem "ffi"
-gem "clipboard"
 
 group :packaging do
   gem "ocra"

Gemfile.lock

@@ -1,20 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    clipboard (1.3.6)
     cri (2.1.0)
-    cyberarm_engine (0.19.1)
+    cyberarm_engine (0.23.0)
-      clipboard (~> 1.3.5)
+      excon (~> 0.88)
-      excon (~> 0.78.0)
       gosu (~> 1.1)
       gosu_more_drawables (~> 0.3)
-    excon (0.78.1)
+    excon (0.104.0)
-    ffi (1.15.4-x64-mingw32)
+    gosu (1.4.6)
-    gosu (1.2.0)
     gosu_more_drawables (0.3.1)
     gosu_notifications (0.1.0)
     ocra (1.3.11)
-    rake (13.0.6)
+    rake (13.1.0)
     releasy (0.2.3)
       bundler (>= 1.2.1)
       cri (~> 2.1.0)
@@ -22,16 +19,15 @@ GEM
       rake (>= 0.9.2.2)
 
 PLATFORMS
+  x64-mingw-ucrt
   x64-mingw32
   x86_64-linux
 
 DEPENDENCIES
-  clipboard
   cyberarm_engine
-  ffi
   gosu_notifications
   ocra
   releasy
 
 BUNDLED WITH
-   2.2.28
+   2.4.3

README.md

@@ -1 +1,42 @@
 # TimeCrafters Configuration Tool for Desktop
+A desktop app for editing, either locally or remotely, JSON configuration files on the Robot Controller/Rev Control Hub.
+
+![Screenshot of Editor](https://raw.githubusercontent.com/TimeCrafters/timecrafters_configuration_tool_desktop/master/media/screenshots/screenshot_editor.png)
+
+## Features
+* TACNET - **T**imeCrafters **A**uxiliary **C**onfiguration **NET**work.
+  * Enables syncing configurations between devices.
+
+* Multiple Configurations
+  * Create multiple configurations for specific robots/projects.
+
+* Presets
+  * Save Groups or Actions as Presets to quickly add pre-configurated Groups and Actions.
+
+* Search
+  * Search through the active configurations Groups, Actions, Variables and Presets.
+
+* Built-in practice clock
+  * Supports multiple screens or network remote control.
+  * Supports official clock sounds (must be added manually.)
+  * Built-in jukebox.
+
+* Simulator
+  * Create a simple 2D simulation of your robot's path.
+
+* Field Planner
+  * Estimate distances on the field using imperial or metric units.
+
+## Usage
+* Download from [Releases](https://github.com/TimeCrafters/timecrafters_configuration_tool_desktop/releases/latest)
+
+## Developing
+* Install [Ruby](https://ruby-lang.org)
+* Run `bundle install`
+* Run `bundle exec ruby timecrafters_configuration_tool.rb`
+
+## Contributing
+* Clone this repo and create a new branch for your feature/patch.
+* Author your changes
+* Commit your changes and push to your fork
+* Open a pull request

Rakefile

@@ -18,12 +18,12 @@ Releasy::Project.new do
     "media/music/.gitkeep",
     "media/particles/.gitkeep"
   ]
-  exclude_encoding # Applications that don't use advanced encoding (e.g. Japanese characters) can save build size with this.
+  # exclude_encoding # Applications that don't use advanced encoding (e.g. Japanese characters) can save build size with this.
   verbose
 
   add_build :windows_folder do
     icon "media/icon.ico"
-    executable_type :console # Assuming you don't want it to run with a console window.
+    executable_type :windows # Assuming you don't want it to run with a console window.
     add_package :exe # Windows self-extracting archive.
   end
 end

lib/backend.rb

@@ -2,6 +2,8 @@ module TAC
   class Backend
     attr_reader :config, :settings, :tacnet
     def initialize
+      create_directories
+
       load_settings
       load_config(@settings.config) if @settings.config && File.exist?("#{TAC::CONFIGS_PATH}/#{@settings.config}.json")
       @tacnet = TACNET.new
@@ -42,13 +44,13 @@ module TAC
     end
 
     def move_config(old_name, new_name)
-      if not File.exists?("#{TAC::CONFIGS_PATH}/#{old_name}.json") or
+      if not File.exist?("#{TAC::CONFIGS_PATH}/#{old_name}.json") or
         File.directory?("#{TAC::CONFIGS_PATH}/#{old_name}.json")
         # move_config: Can not move config file "#{old_name}" does not exist!
         return false
       end
 
-      if File.exists?("#{TAC::CONFIGS_PATH}/#{new_name}.json") &&
+      if File.exist?("#{TAC::CONFIGS_PATH}/#{new_name}.json") &&
         !File.directory?("#{TAC::CONFIGS_PATH}/#{old_name}.json")
         # move_config: Config file "#{new_name}" already exist!
         return false
@@ -61,7 +63,7 @@ module TAC
     end
 
     def delete_config(config_name)
-      FileUtils.rm("#{TAC::CONFIGS_PATH}/#{config_name}.json") if File.exists?("#{TAC::CONFIGS_PATH}/#{config_name}.json")
+      FileUtils.rm("#{TAC::CONFIGS_PATH}/#{config_name}.json") if File.exist?("#{TAC::CONFIGS_PATH}/#{config_name}.json")
     end
 
 
@@ -101,7 +103,7 @@ module TAC
     end
 
     def refresh_tacnet_status
-      $window.current_state.refresh_tacnet_status
+      CyberarmEngine::Window.instance.current_state.refresh_tacnet_status
     end
 
 
@@ -113,6 +115,12 @@ module TAC
       @settings_changed
     end
 
+    def create_directories
+      FileUtils.mkdir_p(TAC::ROOT_PATH) unless File.exist?(TAC::ROOT_PATH)
+      FileUtils.mkdir_p(TAC::CONFIGS_PATH) unless File.exist?(TAC::CONFIGS_PATH)
+      # FileUtils.mkdir_p(TAC::SETTINGS_PATH) unless File.exist?(TAC::SETTINGS_PATH)
+    end
+
     def load_settings
       if File.exist?(TAC::SETTINGS_PATH)
         @settings = TAC::Settings.new

lib/dialog.rb

@@ -5,51 +5,32 @@ module TAC
       background Gosu::Color.new(0xaa_000000)
 
       @title = @options[:title] ? @options[:title] : "#{self.class}"
-      @window_width, @window_height = window.width, window.height
-      @previous_state = window.previous_state
 
-      @dialog_root = stack width: 0.25, border_thickness: 2, border_color: [TAC::Palette::TIMECRAFTERS_PRIMARY, TAC::Palette::TIMECRAFTERS_SECONDARY] do
+      @dialog_root = stack(width: 0.25, h_align: :center, v_align: :center, border_thickness: 2, border_color: [TAC::Palette::TIMECRAFTERS_PRIMARY, TAC::Palette::TIMECRAFTERS_SECONDARY]) do
         # Title bar
-        @titlebar = flow width: 1.0 do
+        @titlebar = flow(width: 1.0, height: 36) do
           background [TAC::Palette::TIMECRAFTERS_PRIMARY, TAC::Palette::TIMECRAFTERS_SECONDARY]
 
-          # title
+          label @title, text_size: THEME_SUBHEADING_TEXT_SIZE, font: TAC::THEME_BOLD_FONT, fill: true, text_align: :center, text_border: true, text_border_color: 0xaa_222222, text_border_size: 1
-          flow width: 0.9 do
-            label @title, text_size: THEME_SUBHEADING_TEXT_SIZE, width: 1.0, text_align: :center, text_border: true, text_border_color: 0xff_222222, text_border_size: 1
-          end
 
-          # Buttons
+          button get_image("#{TAC::MEDIA_PATH}/icons/cross.png"), image_height: 1.0, **THEME_DANGER_BUTTON do
-          flow width: 0.0999 do
-            button get_image("#{TAC::ROOT_PATH}/media/icons/cross.png"), image_width: 1.0, **THEME_DANGER_BUTTON do
             close
           end
         end
-        end
 
         # Dialog body
-        @dialog_content = stack width: 1.0 do
+        @dialog_content = stack(width: 1.0, scroll: true) do
         end
       end
 
       @dialog_content.clear do
         build
       end
-
-      @root_container.recalculate
-      @root_container.recalculate
-      @root_container.recalculate
-
-      center_dialog
     end
 
     def build
     end
 
-    def center_dialog
-      @dialog_root.style.x = window.width / 2 - @dialog_root.width / 2
-      @dialog_root.style.y = window.height / 2 - @dialog_root.height / 2
-    end
-
     def name_filter(text)
       text.match(/[A-Za-z0-9._\- ]/) ? text : ""
     end
@@ -76,7 +57,8 @@ module TAC
 
     def _deep_dive_interactive_elements(element, list)
       element.children.each do |child|
-        if child.visible? && child.is_a?(CyberarmEngine::Element::EditLine) ||
+        if child.visible? && child.enabled? &&
+           child.is_a?(CyberarmEngine::Element::EditLine) ||
            child.is_a?(CyberarmEngine::Element::EditBox) ||
            child.is_a?(CyberarmEngine::Element::CheckBox) ||
            child.is_a?(CyberarmEngine::Element::ToggleButton) ||
@@ -90,24 +72,12 @@ module TAC
     end
 
     def draw
-      @previous_state.draw
+      previous_state&.draw
       Gosu.flush
 
       super
     end
 
-    def update
-      super
-
-      if window.width != @window_width or window.height != @window_height
-        request_recalculate
-
-        @window_width, @window_height = window.width, window.height
-      end
-
-      center_dialog
-    end
-
     def button_down(id)
       super
 
@@ -122,7 +92,7 @@ module TAC
     end
 
     def close
-      $window.pop_state
+      pop_state
     end
   end
 end

lib/dialogs/action_dialog.rb

@@ -7,7 +7,7 @@ module TAC
         label "Name", width: 1.0, text_align: :center
         @name_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
-        @name = edit_line @options[:action] ? @options[:action].name : "", filter: method(:name_filter), width: 1.0, autofocus: true
+        @name = edit_line @options[:action] ? @options[:action].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
         @name.subscribe(:changed) do |sender, value|
           valid?
         end

lib/dialogs/confirm_dialog.rb

@@ -22,6 +22,7 @@ module TAC
             try_commit(true)
           end
         end
+      end
 
       def try_commit(force = false)
         if !@dangerous
@@ -36,5 +37,4 @@ module TAC
       end
     end
   end
-  end
 end

lib/dialogs/name_prompt_dialog.rb

@@ -8,7 +8,7 @@ module TAC
         label "Name", width: 1.0, text_align: :center
         @name_error = label "", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
-        @name = edit_line @options[:renaming] ? @options[:renaming].name : "", filter: method(:name_filter), width: 1.0, autofocus: true
+        @name = edit_line @options[:renaming] ? @options[:renaming].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
 
         @name.subscribe(:changed) do |sender, value|
           valid?

lib/dialogs/tacnet_dialog.rb

@@ -8,7 +8,7 @@ module TAC
         background Gosu::Color::GRAY
         label @options[:message], width: 1.0
 
-        @sound = Gosu::Sample.new("#{TAC::ROOT_PATH}/media/error_alarm.ogg").play(1, 1, true)
+        @sound = Gosu::Sample.new("#{TAC::MEDIA_PATH}/error_alarm.ogg").play(1, 1, true)
 
         button "Close", width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do
           try_commit

lib/dialogs/tacnet_status_dialog.rb

@@ -3,14 +3,14 @@ module TAC
     class TACNETStatusDialog < Dialog
       def build
         background Gosu::Color::GRAY
-        @message_label = label $window.backend.tacnet.full_status
+        @message_label = label CyberarmEngine::Window.instance.backend.tacnet.full_status
 
         button "Close", width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do
           try_commit
         end
 
         @timer = CyberarmEngine::Timer.new(1000.0) do
-          @message_label.value = $window.backend.tacnet.full_status
+          @message_label.value = CyberarmEngine::Window.instance.backend.tacnet.full_status
         end
       end
 

lib/dialogs/variable_dialog.rb

@@ -9,7 +9,7 @@ module TAC
         label "Name", width: 1.0, text_align: :center
         @name_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
-        @name = edit_line @options[:variable] ? @options[:variable].name : "", filter: method(:name_filter), width: 1.0, autofocus: true
+        @name = edit_line @options[:variable] ? @options[:variable].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
         @name.subscribe(:changed) do |sender, value|
           valid?
         end
@@ -79,11 +79,22 @@ module TAC
 
       def valid?
         valid = true
+        name = @name.value.strip
 
-        if @name.value.strip.empty?
+        if name.empty?
           @name_error.value = "Error: Name cannot be blank or only whitespace."
           @name_error.show
           valid = false
+
+        ### Don't error if renaming variable to itself
+        elsif @options[:variable] && @options[:variable].name == name
+          @name_error.value = ""
+          @name_error.hide
+
+        elsif @options[:list].find { |variable| variable.name == name }
+          @name_error.value = "Error: Name is not unique!"
+          @name_error.show
+          valid = false
         end
 
         if not @type

lib/game_clock/clock.rb

@@ -8,7 +8,7 @@ module TAC
 
       def initialize
         @title = CyberarmEngine::Text.new("FIRST TECH CHALLENGE", size: TITLE_SIZE, text_shadow: true, y: 10, color: Gosu::Color::GRAY)
-        @title.x = $window.width / 2 - @title.width / 2
+        @title.x = CyberarmEngine::Window.instance.width / 2 - @title.width / 2
 
         @text = CyberarmEngine::Text.new(":1234567890", size: CLOCK_SIZE, text_border: true, border_size: 2, border_color: Gosu::Color::GRAY)
         @text.width # trigger font-eager loading
@@ -28,7 +28,7 @@ module TAC
       end
 
       def update
-        @title.x = $window.width / 2 - @title.width / 2
+        @title.x = CyberarmEngine::Window.instance.width / 2 - @title.width / 2
 
         if @controller
           @text.color = @controller.display_color
@@ -38,8 +38,8 @@ module TAC
           @text.text = "0:00"
         end
 
-        @text.x = $window.width / 2 - @text.textobject.text_width("0:00") / 2
+        @text.x = CyberarmEngine::Window.instance.width / 2 - @text.textobject.text_width("0:00") / 2
-        @text.y = $window.height / 2 - @text.height / 2
+        @text.y = CyberarmEngine::Window.instance.height / 2 - @text.height / 2
 
         @controller&.update
       end
@@ -57,13 +57,12 @@ 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 = format("%02d", time_left.ceil % 60)
-        seconds = "0#{seconds}" if seconds < 10
 
-        return "#{minutes}:#{seconds}" if time_left.round.even?
+        return "#{minutes}:#{seconds}" if time_left.ceil.even?
-        return "#{minutes}<c=999999>:</c>#{seconds}" if time_left.round.odd?
+        return "#{minutes}<c=999999>:</c>#{seconds}" if time_left.ceil.odd?
       end
     end
   end

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(:play_sound, 35.0, :teleop_pickup_controllers),
-        create_event(:change_color, 37.0, :red),
+        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

lib/game_clock/clock_proxy.rb

@@ -20,7 +20,7 @@ module TAC
       end
 
       def start_clock(mode)
-        return if @clock.active? || $window.current_state.is_a?(Randomizer)
+        return if @clock.active? || CyberarmEngine::Window.instance.current_state.is_a?(Randomizer)
 
         @clock.controller = case mode
         when :full_match
@@ -45,7 +45,7 @@ module TAC
 
       def set_clock_title(string)
         @clock.title.text = string.to_s
-        @clock.title.x = $window.width / 2 - @clock.title.width / 2
+        @clock.title.x = CyberarmEngine::Window.instance.width / 2 - @clock.title.width / 2
       end
 
       def get_clock_title(string)

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
 
@@ -56,26 +62,26 @@ module TAC
         path = nil
         case sound
         when :autonomous_countdown
-          path = "media/sounds/3-2-1.wav"
+          path = "sounds/3-2-1.wav"
         when :autonomous_start
-          path = "media/sounds/charge.wav"
+          path = "sounds/charge.wav"
         when :autonomous_ended
-          path = "media/sounds/endauto.wav"
+          path = "sounds/endauto.wav"
         when :teleop_pickup_controllers
-          path = "media/sounds/Pick_Up_Controllers.wav"
+          path = "sounds/Pick_Up_Controllers.wav"
         when :abort_match
-          path = "media/sounds/fogblast.wav"
+          path = "sounds/fogblast.wav"
         when :teleop_countdown
-          path = "media/sounds/3-2-1.wav"
+          path = "sounds/3-2-1.wav"
         when :teleop_started
-          path = "media/sounds/firebell.wav"
+          path = "sounds/firebell.wav"
         when :end_game
-          path = "media/sounds/factwhistle.wav"
+          path = "sounds/factwhistle.wav"
         when :end_match
-          path = "media/sounds/endmatch.wav"
+          path = "sounds/endmatch.wav"
         end
 
-        path = "#{ROOT_PATH}/#{path}"
+        path = "#{MEDIA_PATH}/#{path}"
 
         if path && File.exist?(path) && !File.directory?(path)
           Jukebox::SAMPLES[path] = Gosu::Sample.new(path) unless Jukebox::SAMPLES[path].is_a?(Gosu::Sample)

lib/game_clock/jukebox.rb

@@ -1,11 +1,11 @@
 module TAC
   class PracticeGameClock
     class Jukebox
-      MUSIC = Dir.glob(ROOT_PATH + "/media/music/*.*").freeze
+      MUSIC = Dir.glob(MEDIA_PATH + "/music/*.*").freeze
       SAMPLES = {}
 
-      if File.exist?(ROOT_PATH + "/media/sounds/skystone")
+      if File.exist?(MEDIA_PATH + "/sounds/skystone")
-        BEEPS_AND_BOOPS = Dir.glob(ROOT_PATH + "/media/sounds/skystone/*.*").freeze
+        BEEPS_AND_BOOPS = Dir.glob(MEDIA_PATH + "/sounds/skystone/*.*").freeze
       end
 
       attr_reader :volume, :now_playing

lib/game_clock/net/client.rb

@@ -129,7 +129,7 @@ module TAC
           end
 
 
-          return message.strip
+          return message.to_s.strip
         end
 
         def puts(message)

lib/game_clock/net/packet_handler.rb

@@ -225,7 +225,7 @@ module TAC
     def handle_shutdown(packet)
       unless @host_is_a_connection
         # RemoteControl.server.close
-        # $window.close
+        # CyberarmEngine::Window.instance.close
         Gosu::Song.current_song&.stop
         exit
       end

lib/game_clock/particle_emitter.rb

@@ -8,7 +8,7 @@ module TAC
         @z = -2
 
         @particles = []
-        @image_options = Dir.glob("#{ROOT_PATH}/media/particles/*.*")
+        @image_options = Dir.glob("#{MEDIA_PATH}/particles/*.*")
         @last_spawned = 0
         @clock_active = false
       end
@@ -18,7 +18,7 @@ module TAC
       end
 
       def update
-        @particles.each { |part| part.update($window.dt) }
+        @particles.each { |part| part.update(CyberarmEngine::Window.instance.dt) }
         @particles.delete_if { |part| part.die? }
 
         spawn_particles
@@ -27,28 +27,28 @@ module TAC
       def spawn_particles
         # !clock_active? &&
         if @particles.count < @max_particles && Gosu.milliseconds - @last_spawned >= @interval
-          screen_midpoint = CyberarmEngine::Vector.new($window.width / 2, $window.height / 2)
+          screen_midpoint = CyberarmEngine::Vector.new(CyberarmEngine::Window.instance.width / 2, CyberarmEngine::Window.instance.height / 2)
           scale = rand(0.25..1.0)
           image_name = @image_options.sample
 
           return unless image_name
 
-          image = $window.current_state.get_image(image_name)
+          image = CyberarmEngine::Window.instance.current_state.get_image(image_name)
           position = CyberarmEngine::Vector.new(0, 0)
 
           r = rand
           if r < 0.25 # LEFT
             position.x = -image.width * scale
-            position.y = rand(0..($window.height - image.height * scale))
+            position.y = rand(0..(CyberarmEngine::Window.instance.height - image.height * scale))
           elsif r < 0.5 # RIGHT
-            position.x = $window.width + (image.width * scale)
+            position.x = CyberarmEngine::Window.instance.width + (image.width * scale)
-            position.y = rand(0..($window.height - image.height * scale))
+            position.y = rand(0..(CyberarmEngine::Window.instance.height - image.height * scale))
           elsif r < 0.75 # TOP
-            position.x = rand(0..($window.width - image.width * scale))
+            position.x = rand(0..(CyberarmEngine::Window.instance.width - image.width * scale))
             position.y = -image.height * scale
           else #BOTTOM
-            position.x = rand(0..($window.width - image.width * scale))
+            position.x = rand(0..(CyberarmEngine::Window.instance.width - image.width * scale))
-            position.y = $window.height + image.height * scale
+            position.y = CyberarmEngine::Window.instance.height + image.height * scale
           end
 
           position.x ||= 0
@@ -71,6 +71,10 @@ module TAC
         end
       end
 
+      def particle_count
+        @particles.size
+      end
+
       def clock_active!
         @clock_active = true
         @particles.each(&:clock_active!)

lib/game_clock/randomizer.rb

@@ -15,27 +15,25 @@ module TAC
 
         case @roll
         when 1, 4
-          # Blue: Right
+          #Blue and Red: Left
-          # Red: Left
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 3, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :blue, slot: 1, speed: 1010, die_size: @size, label: "Left")
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 1, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :red, slot: 1, speed: 1010, die_size: @size, label: "Left")
         when 2, 5
           #Blue and Red: Center
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 2, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :blue, slot: 2, speed: 1010, die_size: @size, label: "Center")
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 2, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :red, slot: 2, speed: 1010, die_size: @size, label: "Center")
         when 3, 6
-          # Blue: Left
+          #Blue and Red: Right
-          # Red: Right
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 1, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :blue, slot: 3, speed: 1010, die_size: @size, label: "Right")
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 3, speed: 512, die_size: @size)
+          @ducks << Ducky.new(window: window, alliance: :red, slot: 3, speed: 1010, die_size: @size, label: "Right")
         end
       end
 
       def draw
-        window.previous_state.draw
+        previous_state.draw
 
         Gosu.flush
 
@@ -56,7 +54,7 @@ module TAC
       end
 
       def update
-        window.previous_state&.update_non_gui
+        previous_state&.update_non_gui
 
         @ducks.each { |o| o.update(@size) }
 
@@ -113,14 +111,17 @@ module TAC
         SIZE = 0.20
         HALF_SIZE = SIZE * 0.5
 
-        def initialize(window:, alliance:, slot:, speed:, die_size:)
+        def initialize(window:, alliance:, slot:, speed:, die_size:, label:)
           @window = window
           @alliance = alliance
           @slot = slot
           @speed = speed
+          @die_size = die_size
+          @label = label
 
-          @image = @window.get_image("#{ROOT_PATH}/media/openclipart_ducky.png")
+          @image = @window.get_image("#{MEDIA_PATH}/openclipart_ducky.png")
           @debug_text = Gosu::Font.new(28)
+          @label_text = CyberarmEngine::Text.new(@label, static: true, size: 28, alignment: :center)
 
           if @alliance == :blue
             @position = CyberarmEngine::Vector.new(@window.width, die_size)
@@ -138,6 +139,10 @@ module TAC
             duck_scale = (size * (SIZE + HALF_SIZE)) / @image.width
             duck_scale_x = @alliance == :blue ? -duck_scale : duck_scale
             @image.draw_rot(slot_position(size), size * SIZE + float_y(size), 1, 0, 0.5, 0.5, duck_scale_x, duck_scale)
+
+            @label_text.x = slot_position(size) + (@alliance == :blue ? -170 : 110)
+            @label_text.y = float_y(size) + 52
+            @label_text.draw
           end
         end
 

lib/game_clock/remote_control.rb

@@ -80,7 +80,10 @@ module TAC
 
           @jukebox_volume = 1.0
           @jukebox_sound_effects = true
+          @locked_buttons_randomizer_visible = []
+          @locked_buttons_clock_active  = []
           @randomizer_visible = false
+          @clock_updated_at = -1000
 
           RemoteControl.connection.proxy_object.register(:track_changed, method(:track_changed))
           RemoteControl.connection.proxy_object.register(:volume_changed, method(:volume_changed))
@@ -94,25 +97,25 @@ module TAC
           flow width: 1.0, height: 1.0 do
             stack width: 0.5 do
               title "Match", width: 1.0, text_align: :center
-              button "Start Match", width: 1.0, text_size: 48, margin_bottom: 50 do
+              @start_match_btn = button "Start Match", width: 1.0, text_size: 48, margin_bottom: 50 do
                 start_clock(:full_match)
               end
 
               title "Practice", width: 1.0, text_align: :center
-              button "Autonomous", width: 1.0 do
+              @autonomous_btn = button "Autonomous", width: 1.0 do
                 start_clock(:autonomous)
               end
-              button "TeleOp with Countdown", width: 1.0 do
+              @teleop_with_countdown_btn = button "TeleOp with Countdown", width: 1.0 do
                 start_clock(:full_teleop)
               end
-              button "TeleOp", width: 1.0 do
+              @teleop_btn = button "TeleOp", width: 1.0 do
                 start_clock(:teleop_only)
               end
-              button "TeleOp Endgame", width: 1.0, margin_bottom: 50 do
+              @teleop_endgame_btn = button "TeleOp Endgame", width: 1.0, margin_bottom: 50 do
                 start_clock(:endgame_only)
               end
 
-              button "Abort Match", width: 1.0 do
+              @abort_match_btn = button "Abort Match", width: 1.0 do
                 RemoteControl.connection.puts(ClockNet::PacketHandler.packet_abort_clock)
               end
 
@@ -146,48 +149,48 @@ module TAC
                 end
 
                 flow width: 1.0 do
-                  button get_image("#{ROOT_PATH}/media/icons/previous.png") do
+                  button get_image("#{MEDIA_PATH}/icons/previous.png") do
                     RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_previous_track)
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/right.png") do |button|
+                  button get_image("#{MEDIA_PATH}/icons/right.png") do |button|
                     if @jukebox_playing
                       RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_pause)
-                      button.value = get_image("#{ROOT_PATH}/media/icons/right.png")
+                      button.value = get_image("#{MEDIA_PATH}/icons/right.png")
                       @jukebox_playing = false
                     else
                       RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_play)
-                      button.value = get_image("#{ROOT_PATH}/media/icons/pause.png")
+                      button.value = get_image("#{MEDIA_PATH}/icons/pause.png")
                       @jukebox_playing = true
                     end
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/stop.png") do
+                  button get_image("#{MEDIA_PATH}/icons/stop.png") do
                     RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_stop)
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/next.png") do
+                  button get_image("#{MEDIA_PATH}/icons/next.png") do
                     RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_next_track)
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/minus.png"), margin_left: 20 do
+                  button get_image("#{MEDIA_PATH}/icons/minus.png"), margin_left: 20 do
                     @jukebox_volume -= 0.1
                     @jukebox_volume = 0.1 if @jukebox_volume < 0.1
                     RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_set_volume(@jukebox_volume))
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/plus.png") do
+                  button get_image("#{MEDIA_PATH}/icons/plus.png") do
                     @jukebox_volume += 0.1
                     @jukebox_volume = 1.0 if @jukebox_volume > 1.0
                     RemoteControl.connection.puts(ClockNet::PacketHandler.packet_jukebox_set_volume(@jukebox_volume))
                   end
 
-                  button get_image("#{ROOT_PATH}/media/icons/musicOn.png"), margin_left: 20, tip: "Toggle Sound Effects" do |button|
+                  button get_image("#{MEDIA_PATH}/icons/musicOn.png"), margin_left: 20, tip: "Toggle Sound Effects" do |button|
                     if @jukebox_sound_effects
-                      button.value = get_image("#{ROOT_PATH}/media/icons/musicOff.png")
+                      button.value = get_image("#{MEDIA_PATH}/icons/musicOff.png")
                       @jukebox_sound_effects = false
                     else
-                      button.value = get_image("#{ROOT_PATH}/media/icons/musicOn.png")
+                      button.value = get_image("#{MEDIA_PATH}/icons/musicOn.png")
                       @jukebox_sound_effects = true
                     end
 
@@ -196,12 +199,12 @@ module TAC
                 end
 
                 button "Open Music Library", width: 1.0 do
-                  path = "#{ROOT_PATH}/media/music"
+                  path = "#{MEDIA_PATH}/music"
 
                   if RUBY_PLATFORM.match(/ming|msys|cygwin/)
                     system("explorer \"#{path.gsub("/", "\\")}\"")
                   elsif RUBY_PLATFORM.match(/linux/)
-                    system("xdg-open \"#{ROOT_PATH}/media/music\"")
+                    system("xdg-open \"#{MEDIA_PATH}/music\"")
                   else
                     # TODO.
                   end
@@ -219,7 +222,7 @@ module TAC
                   @randomizer_label = title "Not Visible"
                 end
 
-                button "Randomizer", width: 1.0, **TAC::THEME_DANGER_BUTTON do
+                @randomizer_btn = button "Randomizer", width: 1.0, **TAC::THEME_DANGER_BUTTON do
                   @randomizer_visible = !@randomizer_visible
 
                   RemoteControl.connection.puts(ClockNet::PacketHandler.packet_randomizer_visible(@randomizer_visible))
@@ -227,6 +230,24 @@ module TAC
               end
             end
           end
+
+          @locked_buttons_clock_active.push(
+            @start_match_btn,
+            @autonomous_btn,
+            @teleop_with_countdown_btn,
+            @teleop_btn,
+            @teleop_endgame_btn,
+            @randomizer_btn
+          )
+
+          @locked_buttons_randomizer_visible.push(
+            @start_match_btn,
+            @autonomous_btn,
+            @teleop_with_countdown_btn,
+            @teleop_btn,
+            @teleop_endgame_btn,
+            @abort_match_btn
+          )
         end
 
         def update
@@ -236,6 +257,8 @@ module TAC
             o.call
           end
 
+          manage_button_enablement
+
           return if RemoteControl.connection.connected?
 
           # We've lost connection, unset window's connection object
@@ -258,6 +281,8 @@ module TAC
         end
 
         def clock_changed(string)
+          @clock_updated_at = Gosu.milliseconds if @clock_label.value != string
+
           @clock_label.value = string
         end
 
@@ -265,6 +290,22 @@ module TAC
           @randomizer_label.value = "Visible" if boolean
           @randomizer_label.value = "Not Visible" unless boolean
         end
+
+        def manage_button_enablement
+          if @randomizer_visible
+            @locked_buttons_randomizer_visible.each do |btn|
+              btn.enabled = false
+            end
+          elsif Gosu.milliseconds - @clock_updated_at <= 1_250
+            @locked_buttons_clock_active.each do |btn|
+              btn.enabled = false
+            end
+          else
+            (@locked_buttons_clock_active + @locked_buttons_randomizer_visible).uniq.each do |btn|
+              btn.enabled = true
+            end
+          end
+        end
       end
     end
   end

lib/game_clock/theme.rb

@@ -2,7 +2,7 @@ module TAC
   class PracticeGameClock
     THEME = {
       TextBlock: {
-        font: "Canterell",
+        font: "NotoSans-Bold",
         color: Gosu::Color.new(0xee_ffffff)
       },
       Button: {
@@ -23,7 +23,7 @@ module TAC
       },
       ToggleButton: {
         width: 18,
-        checkmark_image: "#{File.expand_path("..", __dir__)}/media/icons/checkmark.png",
+        checkmark_image: "#{MEDIA_PATH}/icons/checkmark.png",
       }
     }
   end

lib/game_clock/view.rb

@@ -9,14 +9,15 @@ module TAC
         window.show_cursor = !@remote_control_mode
         @escape_counter = 0
 
-        @background_image = get_image("#{ROOT_PATH}/media/background.png")
+        @background_image = get_image("#{MEDIA_PATH}/background.png")
-        # Preload duck image since Gosu and windows threads don't get along with OpenGL (image is blank if loaded in a threaded context)
+        # Preload duck image since Gosu and Windows threads don't get along with OpenGL (image is blank if loaded in a threaded context)
-        get_image("#{ROOT_PATH}/media/openclipart_ducky.png")
+        get_image("#{MEDIA_PATH}/openclipart_ducky.png")
         @menu_background = 0xaa004000
         @mouse = Mouse.new(window)
         @clock = Clock.new
         @clock.controller = nil
         @last_clock_display_value = @clock.value
+        @last_clock_title_value = @clock.title.text
 
         @particle_emitters = [
           PracticeGameClock::ParticleEmitter.new
@@ -24,6 +25,10 @@ module TAC
 
         @last_clock_state = @clock.active?
 
+        @locked_buttons_randomizer_visible = []
+        @locked_buttons_clock_active  = []
+        @randomizer_visible = false
+
         theme(THEME)
 
         @menu_container = flow width: 1.0 do
@@ -31,28 +36,45 @@ module TAC
             background @menu_background
 
             title "Match", width: 1.0, text_align: :center
-            button "Start Match", width: 1.0, margin_bottom: 50 do
+            @start_match_btn = button "Start Match", width: 1.0, margin_bottom: 50 do |btn|
+              @locked_buttons_clock_active << btn
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.start_clock(:full_match)
             end
 
             title "Practice", width: 1.0, text_align: :center
-            button "Autonomous", width: 1.0 do
+            @autonomous_btn = button "Autonomous", width: 1.0 do |btn|
+              @locked_buttons_clock_active << btn
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.start_clock(:autonomous)
             end
 
-            button "TeleOp with Countdown", width: 1.0 do
+            @teleop_with_countdown_btn = button "TeleOp with Countdown", width: 1.0 do |btn|
+              @locked_buttons_clock_active << btn
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.start_clock(:full_teleop)
             end
 
-            button "TeleOp", width: 1.0 do
+            @teleop_btn = button "TeleOp", width: 1.0 do |btn|
+              @locked_buttons_clock_active << btn
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.start_clock(:teleop_only)
             end
 
-            button "TeleOp Endgame", width: 1.0 do
+            @teleop_endgame_btn = button "TeleOp Endgame", width: 1.0 do |btn|
+              @locked_buttons_clock_active << btn
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.start_clock(:endgame_only)
             end
 
-            button "Abort Match", width: 1.0, margin_top: 50 do
+            @abort_match_btn = button "Abort Match", width: 1.0, margin_top: 50 do |btn|
+              @locked_buttons_randomizer_visible << btn
+
               @clock_proxy.abort_clock
             end
 
@@ -72,73 +94,73 @@ module TAC
           stack width: 0.4, padding_left: 50 do
             background @menu_background
 
-            flow do
+            flow(width: 1.0) do
               label "♫ Now playing:"
               @current_song_label = label "♫ ♫ ♫"
             end
 
-            flow do
+            flow(width: 1.0) do
               label "Volume:"
               @current_volume_label = label "100%"
             end
 
-            flow do
+            flow(width: 1.0) do
-              button get_image("#{ROOT_PATH}/media/icons/previous.png") do
+              button get_image("#{MEDIA_PATH}/icons/previous.png") do
                 @jukebox.previous_track
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/pause.png") do |button|
+              button get_image("#{MEDIA_PATH}/icons/pause.png") do |button|
                 if @jukebox.song && @jukebox.song.paused?
-                  button.value = get_image("#{ROOT_PATH}/media/icons/right.png")
+                  button.value = get_image("#{MEDIA_PATH}/icons/right.png")
                   @jukebox.play
                 elsif !@jukebox.song
-                  button.value = get_image("#{ROOT_PATH}/media/icons/right.png")
+                  button.value = get_image("#{MEDIA_PATH}/icons/right.png")
                   @jukebox.play
                 else
-                  button.value = get_image("#{ROOT_PATH}/media/icons/pause.png")
+                  button.value = get_image("#{MEDIA_PATH}/icons/pause.png")
                   @jukebox.pause
                 end
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/stop.png") do
+              button get_image("#{MEDIA_PATH}/icons/stop.png") do
                 @jukebox.stop
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/next.png") do
+              button get_image("#{MEDIA_PATH}/icons/next.png") do
                 @jukebox.next_track
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/minus.png"), margin_left: 20 do
+              button get_image("#{MEDIA_PATH}/icons/minus.png"), margin_left: 20 do
                 @jukebox.set_volume(@jukebox.volume - 0.1)
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/plus.png") do
+              button get_image("#{MEDIA_PATH}/icons/plus.png") do
                 @jukebox.set_volume(@jukebox.volume + 0.1)
               end
 
               button "Open Music Library", margin_left: 50 do
                 if RUBY_PLATFORM.match(/ming|msys|cygwin/)
-                  system("explorer #{ROOT_PATH}/media/music")
+                  system("explorer #{MEDIA_PATH}/music")
                 elsif RUBY_PLATFORM.match(/linux/)
-                  system("xdg-open #{ROOT_PATH}/media/music")
+                  system("xdg-open #{MEDIA_PATH}/music")
                 else
                   # TODO.
                 end
               end
 
-              button get_image("#{ROOT_PATH}/media/icons/musicOn.png"), margin_left: 50, tip: "Toggle Sound Effects" do |button|
+              button get_image("#{MEDIA_PATH}/icons/musicOn.png"), margin_left: 50, tip: "Toggle Sound Effects" do |button|
                 boolean = @jukebox.set_sfx(!@jukebox.play_sfx?)
 
                 if boolean
-                  button.value = get_image("#{ROOT_PATH}/media/icons/musicOn.png")
+                  button.value = get_image("#{MEDIA_PATH}/icons/musicOn.png")
                 else
-                  button.value = get_image("#{ROOT_PATH}/media/icons/musicOff.png")
+                  button.value = get_image("#{MEDIA_PATH}/icons/musicOff.png")
                 end
               end
             end
 
-            stack width: 1.0 do
+            stack(width: 1.0) do
-              button "Randomizer", width: 1.0, **TAC::THEME_DANGER_BUTTON do
+              @randomizer_btn = button "Randomizer", width: 1.0, **TAC::THEME_DANGER_BUTTON do |btn|
                 unless @clock.active?
                   push_state(Randomizer)
                 end
@@ -147,6 +169,24 @@ module TAC
           end
         end
 
+        @locked_buttons_clock_active.push(
+          @start_match_btn,
+          @autonomous_btn,
+          @teleop_with_countdown_btn,
+          @teleop_btn,
+          @teleop_endgame_btn,
+          @randomizer_btn
+        )
+
+        @locked_buttons_randomizer_visible.push(
+          @start_match_btn,
+          @autonomous_btn,
+          @teleop_with_countdown_btn,
+          @teleop_btn,
+          @teleop_endgame_btn,
+          @abort_match_btn
+        )
+
         @jukebox = Jukebox.new(@clock)
 
         @clock_proxy = ClockProxy.new(@clock, @jukebox)
@@ -190,16 +230,26 @@ module TAC
             @menu_container.hide if @menu_container.visible?
             window.show_cursor = false
           end
+
+          manage_button_enablement
         end
 
         if @clock.value != @last_clock_display_value
           @last_clock_display_value = @clock.value
 
+          request_repaint
+
           if @remote_control_mode && @server.active_client
             @server.active_client.puts(ClockNet::PacketHandler.packet_clock_time(@last_clock_display_value))
           end
         end
 
+        if @clock.title.text != @last_clock_title_value
+          @last_clock_title_value = @clock.title.text
+
+          request_repaint
+        end
+
         if @last_track_name != @jukebox.current_track
           track_changed(@jukebox.current_track)
         end
@@ -213,6 +263,14 @@ module TAC
         @last_clock_state = @clock.active?
       end
 
+      def needs_repaint?
+        if @particle_emitters && @particle_emitters.map(&:particle_count).sum.positive?
+          @needs_repaint = true
+        else
+          super
+        end
+      end
+
       def update_non_gui
         if @remote_control_mode
           while (o = RemoteControl.server.proxy_object.queue.shift)
@@ -224,6 +282,22 @@ module TAC
         @jukebox.update
       end
 
+      def manage_button_enablement
+        if @randomizer_visible
+          @locked_buttons_randomizer_visible.each do |btn|
+            btn.enabled = false
+          end
+        elsif @clock.active?
+          @locked_buttons_clock_active.each do |btn|
+            btn.enabled = false
+          end
+        else
+          (@locked_buttons_clock_active + @locked_buttons_randomizer_visible).uniq.each do |btn|
+            btn.enabled = true
+          end
+        end
+      end
+
       def button_down(id)
         super
 
@@ -257,6 +331,8 @@ module TAC
       end
 
       def randomizer_changed(boolean)
+        @randomizer_visible = boolean
+
         if boolean
           push_state(Randomizer) unless @clock.active?
         else

lib/pages/configurations.rb

@@ -5,7 +5,7 @@ module TAC
         header_bar("Manage Configurations")
 
         menu_bar.clear do
-          button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_height: 1.0, tip: "Add configuration" do
+          button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_height: 1.0, tip: "Add configuration" do
             push_state(Dialog::NamePromptDialog, title: "Config Name", callback_method: proc { |name|
               window.backend.write_new_config(name)
 
@@ -13,15 +13,27 @@ module TAC
               populate_configs
             })
           end
+
+          button "Open Folder", tip: "Open folder containing configurations", height: 1.0 do
+            if RUBY_PLATFORM =~ /mingw/
+              system("explorer \"#{TAC::CONFIGS_PATH.gsub("/", "\\")}\"")
+            elsif RUBY_PLATFORM =~ /darwin/
+              system("open \"#{TAC::CONFIGS_PATH}\"")
+            else
+              system("xdg-open \"#{TAC::CONFIGS_PATH}\"")
+            end
+          end
         end
 
         status_bar.clear do
+          flow(width: 1.0, max_width: 720, h_align: :center) do
             label "Current Configuration: "
             @config_label = label window.backend.settings.config
           end
+        end
 
         body.clear do
-          @configs_list = stack width: 1.0, height: 1.0, scroll: true do
+          @configs_list = stack width: 1.0, height: 1.0, margin_top: 36, max_width: 720, h_align: :center, scroll: true do
           end
         end
 
@@ -34,12 +46,13 @@ module TAC
 
         @configs_list.clear do
           @config_files.each_with_index do |config_file, i|
-            flow width: 1.0, **THEME_ITEM_CONTAINER_PADDING do
+            flow width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-
               name = File.basename(config_file, ".json")
 
-              button "#{name}", width: 0.94 do
+              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR unless name == window.backend.settings.config
+              background THEME_HIGHLIGHTED_COLOR if name == window.backend.settings.config
+
+              button "#{name}", fill: true, text_size: THEME_ICON_SIZE - 3 do
                 change_config(name)
 
                 if window.backend.tacnet.connected?
@@ -47,7 +60,7 @@ module TAC
                 end
               end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Rename configuration" do
+              button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Rename configuration" do
                 push_state(Dialog::NamePromptDialog, title: "Rename Config", renaming: @config_files_list.find { |c| c.name == name }, list: @config_files_list, accept_label: "Update", callback_method: proc { |old_name, new_name|
                   if not File.exist?("#{TAC::CONFIGS_PATH}/#{new_name}.json")
                     FileUtils.mv(
@@ -66,7 +79,7 @@ module TAC
                 })
               end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, **THEME_DANGER_BUTTON, tip: "Delete configuration" do
+              button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, **THEME_DANGER_BUTTON, tip: "Delete configuration" do
                 push_state(Dialog::ConfirmDialog, title: "Delete Config?", dangerous: true, callback_method: proc {
                   File.delete("#{TAC::CONFIGS_PATH}/#{name}.json")
 
@@ -92,6 +105,8 @@ module TAC
         window.backend.load_config(name)
 
         @config_label.value = name.to_s
+
+        populate_configs
       end
     end
   end

lib/pages/drive_team_rotation_generator.rb

@@ -7,22 +7,25 @@ module TAC
         header_bar("Drive Team Rotation Generator")
 
         @roster ||= [
-          "Alexander",
           "Aubrey",
           "Cayden",
+          "Connor",
+          "Ben",
+          "Dan",
           "Gabe",
           "Spencer",
-          "Olivia"
+          "Sodi"
         ]
 
         @roles ||= [
           "Coach",
           "Driver A",
-          "Driver B"
+          "Driver B",
+          "Human"
         ]
 
         menu_bar.clear do
-          button get_image("#{TAC::ROOT_PATH}/media/icons/save.png"), image_height: 1.0, tip: "Export rotation as Comma-Seperated Values" do
+          button get_image("#{TAC::MEDIA_PATH}/icons/save.png"), image_height: 1.0, tip: "Export rotation as Comma-Seperated Values" do
             export_rotation
 
             @status_bar.clear do
@@ -30,19 +33,19 @@ module TAC
             end
           end
 
-          button get_image("#{TAC::ROOT_PATH}/media/icons/target.png"), margin_right: 10, image_height: 1.0, tip: "Generate rotation" do
+          button "Generate", margin_right: 10, height: 1.0, tip: "Generate rotation" do
             populate_rotation
           end
         end
 
         body.clear do
           flow(margin_left: 20, width: 1.0, height: 1.0) do
-            stack(width: 0.25) do
+            stack(width: 0.25, height: 1.0) do
               title "Roles", width: 1.0, margin_bottom: 4, text_align: :center
 
-              flow(width: 1.0, margin_bottom: 20) do
+              flow(width: 1.0, height: 32, margin_bottom: 20) do
-                @role_name = edit_line "", placeholder: "Add role", width: 0.9
+                @role_name = edit_line "", placeholder: "Add role", fill: true, height: 1.0
-                button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_width: 0.1, tip: "Add role" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_height: 1.0, tip: "Add role" do
                   if @role_name.value.strip.length.positive?
                     @roles.push(@role_name.value.strip)
                     @role_name.value = ""
@@ -52,16 +55,16 @@ module TAC
                 end
               end
 
-              @roles_container = stack(width: 1.0, height: 0.835, scroll: true) do
+              @roles_container = stack(width: 1.0, fill: true, scroll: true) do
               end
             end
 
             stack(margin_left: 20, width: 0.25, height: 1.0) do
               title "Roster", width: 1.0, margin_bottom: 4, text_align: :center
 
-              flow(width: 1.0, margin_bottom: 20) do
+              flow(width: 1.0, height: 32, margin_bottom: 20) do
-                @roster_name = edit_line "", placeholder: "Add name", width: 0.9
+                @roster_name = edit_line "", placeholder: "Add name", height: 1.0, fill: true
-                button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_width: 0.1, tip: "Add name" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_height: 1.0, tip: "Add name" do
                   if @roster_name.value.strip.length.positive?
                     @roster.push(@roster_name.value.strip)
                     @roster_name.value = ""
@@ -71,14 +74,14 @@ module TAC
                 end
               end
 
-              @roster_container = stack(width: 1.0, height: 0.835, scroll: true) do
+              @roster_container = stack(width: 1.0, fill: true, scroll: true) do
               end
             end
 
-            stack(margin_left: 20, margin_right: 20, width: 0.5, height: 1.0) do
+            stack(margin_left: 20, margin_right: 20, fill: true, height: 1.0) do
               title "Rotation", width: 1.0, margin_bottom: 4, text_align: :center
 
-              @rotation_container = stack(width: 1.0, height: 0.835, scroll: true) do
+              @rotation_container = stack(width: 1.0, fill: true, scroll: true) do
               end
             end
           end
@@ -92,11 +95,11 @@ module TAC
       def populate_roles
         @roles_container.clear do
           @roles.each_with_index do |name, i|
-            flow(width: 1.0, padding: 2) do
+            flow(width: 1.0, height: 32, padding: 2) do
               background i.even? ? 0xff_007000 : 0xff_006000
 
-              tagline name, width: 0.9
+              tagline name, fill: true
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: 0.1, tip: "Remove role", **THEME_DANGER_BUTTON do
+              button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_height: 1.0, tip: "Remove role", **THEME_DANGER_BUTTON do
                 @roles.delete(name)
                 populate_roles
               end
@@ -108,11 +111,11 @@ module TAC
       def populate_roster
         @roster_container.clear do
           @roster.each_with_index do |name, i|
-            flow(width: 1.0, padding: 2) do
+            flow(width: 1.0, height: 32, padding: 2) do
               background i.even? ? 0xff_007000 : 0xff_006000
 
-              tagline name, width: 0.9
+              tagline name, fill: true
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: 0.1, tip: "Remove name", **THEME_DANGER_BUTTON do
+              button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_height: 1.0, tip: "Remove name", **THEME_DANGER_BUTTON do
                 @roster.delete(name)
                 populate_roster
               end
@@ -125,13 +128,11 @@ module TAC
         @rotation = Generator.new(roster: @roster, team_size: @roles.count)
 
         @rotation_container.clear do
-          fraction = (1.0 / @rotation.team_size) - 0.02
+          flow(width: 1.0, height: 32, padding: 2) do
-
-          flow(width: 1.0, padding: 2) do
             background Gosu::Color::BLACK
 
             @roles.each do |role|
-            tagline "<b>#{role}</b>", width: fraction
+            tagline "<b>#{role}</b>", fill: true
             end
           end
 
@@ -139,11 +140,11 @@ module TAC
           teams = @rotation.teams.shuffle if @shuffle_teams&.value
 
           teams.each_with_index do |team, i|
-            flow(width: 1.0, padding: 2) do
+            flow(width: 1.0, height: 32, padding: 2) do
               background i.even? ? 0xff_007000 : 0xff_006000
 
               team.each do |player|
-                tagline player, width: fraction
+                tagline player, fill: true
               end
             end
           end

lib/pages/editor.rb

@@ -6,6 +6,18 @@ module TAC
         @active_group = nil
         @active_action = nil
 
+        @scroll_into_view_list = []
+        @highlight_item_container = nil
+        @highlight_from_color = Gosu::Color.rgba(0, 0, 0, 0)
+        @highlight_to_color = Gosu::Color.rgba(THEME_HIGHLIGHTED_COLOR.red, THEME_HIGHLIGHTED_COLOR.green, THEME_HIGHLIGHTED_COLOR.blue, 200)
+
+        @highlight_animator = CyberarmEngine::Animator.new(
+          start_time: Gosu.milliseconds - 1,
+          duration: 0,
+          from: Gosu::Color.rgba(0, 0, 0, 0),
+          to: THEME_HIGHLIGHTED_COLOR
+        )
+
         menu_bar.clear do
           if @options[:group_is_preset]
             title "Editing group preset: #{@options[:group].name}"
@@ -30,34 +42,42 @@ module TAC
 
         body.clear do
           flow(width: 1.0, height: 1.0) do
-            stack width: 0.33333, height: 1.0, border_thickness_right: 1, border_color: [0, Gosu::Color::BLACK, 0, 0] do
+            stack fill: true, height: 1.0, padding_left: 2, padding_right: 2, border_thickness_right: 1, border_color: Gosu::Color::BLACK do
-              @groups_menu = flow(width: 1.0) do
+              @groups_menu = flow(width: 1.0, height: 36) do
-                label "Groups", text_size: THEME_SUBHEADING_TEXT_SIZE
+                label "Groups", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add group" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add group" do
                   push_state(TAC::Dialog::NamePromptDialog, title: "Create Group", list: window.backend.config.groups, callback_method: method(:create_group))
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/button2.png"), image_width: THEME_ICON_SIZE, tip: "Clone currently selected group" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/button2.png"), image_width: THEME_ICON_SIZE, tip: "Clone currently selected group" do
                   if @active_group
                     push_state(Dialog::NamePromptDialog, title: "Clone Group", renaming: @active_group, accept_label: "Clone", list: window.backend.config.groups, callback_method: proc { |group, name|
                       clone = TAC::Config::Group.from_json( JSON.parse( @active_group.to_json, symbolize_names: true ))
-                      clone.name = "#{name}"
+                      clone.name = name.to_s
+
                       window.backend.config.groups << clone
                       window.backend.config_changed!
 
-                      populate_groups_list
+                      @groups_list.append do
+                        add_group_container(clone)
+                      end
+
+                      update_list_children(@groups_list)
+
+                      scroll_into_view(clone)
                     })
                   else
                     push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to clone group, no group selected.")
                   end
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/save.png"), image_width: THEME_ICON_SIZE, tip: "Save group as preset" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/save.png"), image_width: THEME_ICON_SIZE, tip: "Save group as preset" do
                   if @active_group
                     push_state(Dialog::NamePromptDialog, title: "Save Group Preset", renaming: @active_group, accept_label: "Save", list: window.backend.config.presets.groups, callback_method: proc { |group, name|
                       clone = TAC::Config::Group.from_json( JSON.parse( @active_group.to_json, symbolize_names: true ))
-                      clone.name = "#{name}"
+                      clone.name = name.to_s
+
                       window.backend.config.presets.groups << clone
                       window.backend.config.presets.groups.sort_by! { |g| g.name.downcase }
                       window.backend.config_changed!
@@ -69,30 +89,37 @@ module TAC
                   end
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/import.png"), image_width: THEME_ICON_SIZE, tip: "Import group from preset" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/import.png"), image_width: THEME_ICON_SIZE, tip: "Import group from preset" do
                   push_state(Dialog::PickPresetDialog, title: "Pick Group Preset", limit: :groups, callback_method: proc { |preset|
                     push_state(Dialog::NamePromptDialog, title: "Name Group", renaming: preset, accept_label: "Add", list: window.backend.config.groups, callback_method: proc { |group, name|
                       clone = TAC::Config::Group.from_json( JSON.parse( group.to_json, symbolize_names: true ))
-                      clone.name = "#{name}"
+                      clone.name = name.to_s
+
                       window.backend.config.groups << clone
                       window.backend.config.groups.sort_by! { |g| g.name.downcase }
                       window.backend.config_changed!
 
-                      populate_groups_list
+                      @groups_list.append do
+                        add_group_container(clone)
+                      end
+
+                      update_list_children(@groups_list)
+
+                      scroll_into_view(clone)
                     })
                   })
                 end
               end
 
-              @groups_list = stack width: 1.0, scroll: true do
+              @groups_list = stack width: 1.0, fill: true, scroll: true do
               end
             end
 
-            stack width: 0.33333, height: 1.0, border_thickness_right: 1, border_color: [0, Gosu::Color::BLACK, 0, 0] do
+            stack fill: true, height: 1.0, padding_left: 2, padding_right: 2, border_thickness_right: 1, border_color: Gosu::Color::BLACK do
-              @actions_menu = flow(width: 1.0) do
+              @actions_menu = flow(width: 1.0, height: 36) do
-                label "Actions", text_size: THEME_SUBHEADING_TEXT_SIZE
+                label "Actions", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add action" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add action" do
                   if @active_group
                     push_state(TAC::Dialog::ActionDialog, title: "Create Action", list: @active_group.actions, callback_method: method(:create_action))
                   else
@@ -100,27 +127,35 @@ module TAC
                   end
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/button2.png"), image_width: THEME_ICON_SIZE, tip: "Clone currently selected action" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/button2.png"), image_width: THEME_ICON_SIZE, tip: "Clone currently selected action" do
                   if @active_group && @active_action
                     push_state(Dialog::ActionDialog, title: "Clone Action", action: @active_action, cloning: true, accept_label: "Clone", list: @active_group.actions, callback_method: proc { |action, name, comment|
                       clone = TAC::Config::Action.from_json( JSON.parse( @active_action.to_json, symbolize_names: true ))
                       clone.name    = name
                       clone.comment = comment
+
                       @active_group.actions << clone
                       window.backend.config_changed!
 
-                      populate_actions_list(@active_group)
+                      @actions_list.append do
+                        add_action_container(clone)
+                      end
+
+                      update_list_children(@actions_list)
+
+                      scroll_into_view(clone)
                     })
                   else
                     push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to clone action, no action selected.")
                   end
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/save.png"), image_width: THEME_ICON_SIZE, tip: "Save action as preset" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/save.png"), image_width: THEME_ICON_SIZE, tip: "Save action as preset" do
                   if @active_action
                     push_state(Dialog::NamePromptDialog, title: "Save Action Preset", renaming: @active_action, accept_label: "Save", list: window.backend.config.presets.actions, callback_method: proc { |action, name|
                       clone = TAC::Config::Action.from_json( JSON.parse( @active_action.to_json, symbolize_names: true ))
                       clone.name = "#{name}"
+
                       window.backend.config.presets.actions << clone
                       window.backend.config.presets.actions.sort_by! { |a| a.name.downcase }
                       window.backend.config_changed!
@@ -132,17 +167,26 @@ module TAC
                   end
                 end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/import.png"), image_width: THEME_ICON_SIZE, tip: "Import action from preset" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/import.png"), image_width: THEME_ICON_SIZE, tip: "Import action from preset" do
                   if @active_group
                     push_state(Dialog::PickPresetDialog, title: "Pick Action Preset", limit: :actions, callback_method: proc { |preset|
-                      push_state(Dialog::ActionDialog, title: "Name Action", action: preset, accept_label: "Add", list: @active_group.actions, callback_method: proc { |action, name|
+                      push_state(Dialog::ActionDialog, title: "Name Action", action: preset, accept_label: "Add", list: @active_group.actions, callback_method: proc { |action, name, comment|
                         clone = TAC::Config::Action.from_json( JSON.parse( action.to_json, symbolize_names: true ))
-                        clone.name = "#{name}"
+                        clone.name = name.to_s
+                        clone.comment = comment.to_s
+                        clone.enabled = true
+
                         @active_group.actions << clone
                         @active_group.actions.sort_by! { |a| a.name.downcase }
                         window.backend.config_changed!
 
-                        populate_actions_list(@active_group)
+                        @actions_list.append do
+                          add_action_container(clone)
+                        end
+
+                        update_list_children(@actions_list)
+
+                        scroll_into_view(clone)
                       })
                     })
                   else
@@ -151,91 +195,125 @@ module TAC
                 end
               end
 
-              @actions_list = stack width: 1.0, scroll: true do
+              @actions_list = stack width: 1.0, fill: true, scroll: true do
               end
             end
 
-            stack width: 0.331, height: 1.0 do
+            stack fill: true, height: 1.0, padding_left: 2, padding_right: 2 do
-              @variables_menu = flow(width: 1.0) do
+              @variables_menu = flow(width: 1.0, height: 36) do
-                label "Variables", text_size: THEME_SUBHEADING_TEXT_SIZE
+                label "Variables", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
-                button get_image("#{TAC::ROOT_PATH}/media/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add variable" do
+                button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add variable" do
                   if @active_action
-                    push_state(TAC::Dialog::VariableDialog, title: "Create Variable", callback_method: method(:create_variable))
+                    push_state(TAC::Dialog::VariableDialog, title: "Create Variable", list: @active_action.variables, callback_method: method(:create_variable))
                   else
                     push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to create variable, no action selected.")
                   end
                 end
               end
 
-              @variables_list = stack width: 1.0, scroll: true do
+              @variables_list = stack width: 1.0, fill: true, scroll: true do
               end
             end
           end
         end
 
+        populated_groups_list = false
+
+        if @options[:group_is_preset]
+          populated_groups_list = true
+
+          @active_group = @options[:group]
+          @active_group_label.value = @active_group.name
+
+          if @options[:action]
+            @active_action = @options[:action]
+            @active_action_label.value = @active_action.name
+          end
+
           populate_groups_list
-
-        if @options[:group_is_preset]
-          @active_group = @options[:group]
-          @active_group_label.value = @active_group.name
           populate_actions_list(@active_group)
+          populate_variables_list(@active_action) if @active_action
 
           @groups_menu.hide
 
+          scroll_into_view(@active_group)
+          scroll_into_view(@active_action) if @active_action
+          scroll_into_view(@options[:variable]) if @options[:variable]
+
         elsif @options[:action_is_preset]
           @active_action = @options[:action]
           @active_action_label.value = @active_action.name
 
-          populate_variables_list(@options[:action])
+          populate_variables_list(@active_action)
 
           @groups_menu.hide
           @actions_menu.hide
 
+          scroll_into_view(@active_action)
+          scroll_into_view(@options[:variable]) if @options[:variable]
+
         else
           if @options[:group]
+            populated_groups_list = true
+
             @active_group = @options[:group]
             @active_group_label.value = @active_group.name
 
-            populate_actions_list(@active_group)
+            populate_groups_list
+            populate_actions_list(@active_group) unless @options[:action]
+
+            scroll_into_view(@active_group)
 
             if @options[:action]
               @active_action = @options[:action]
               @active_action_label.value = @active_action.name
 
+              populate_actions_list(@active_group)
+
               populate_variables_list(@active_action)
 
-              if @options[:variable]
+              scroll_into_view(@active_action)
-                # Scroll into view?
+              scroll_into_view(@options[:variable]) if @options[:variable]
-              end
             end
           end
         end
 
-        body.root.subscribe(:window_size_changed) do
+        populate_groups_list unless populated_groups_list
-          set_list_heights
-        end
-      end
-
-      def set_list_heights
-        @groups_list.style.height = body.height - @groups_menu.height
-        @actions_list.style.height = body.height - @actions_menu.height
-        @variables_list.style.height = body.height - @variables_menu.height
       end
 
       def create_group(name)
-        window.backend.config.groups << TAC::Config::Group.new(name: name, actions: [])
+        group = TAC::Config::Group.new(name: name, actions: [])
+
+        window.backend.config.groups << group
         window.backend.config.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_groups_list
+        @groups_list.append do
+          add_group_container(group)
+        end
+
+        update_list_children(@groups_list)
+
+        scroll_into_view(group)
       end
 
       def update_group(group, name)
+        old_name = group.name
+
         group.name = name
         window.backend.config.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_groups_list
+        group_container = find_element_by_tag(@groups_list, old_name)
+        label = find_element_by_tag(group_container, "label")
+
+        label.value = name
+
+        group_container.style.tag = name
+
+        update_list_children(@groups_list)
+
+        scroll_into_view(group)
       end
 
       def delete_group(group)
@@ -244,29 +322,66 @@ module TAC
         window.backend.config_changed!
 
         @active_group = nil
+        @active_group_container = nil
         @active_group_label.value = ""
         @active_action = nil
+        @active_active_container = nil
         @active_action_label.value = ""
         @actions_list.clear
         @variables_list.clear
 
-        populate_groups_list
+        # Remove deleted action from list
+        container = find_element_by_tag(@groups_list, group.name)
+        @groups_list.remove(container)
+
+        update_list_children(@groups_list)
       end
 
       def create_action(name, comment)
-        @active_group.actions << TAC::Config::Action.new(name: name, comment: comment, enabled: true, variables: [])
+        action = TAC::Config::Action.new(name: name, comment: comment, enabled: true, variables: [])
+
+        @active_group.actions << action
         @active_group.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_actions_list(@active_group)
+        @actions_list.append do
+          add_action_container(action)
+        end
+
+        update_list_children(@actions_list)
+
+        scroll_into_view(action)
       end
 
       def update_action(action, name, comment)
+        old_name = action.name
+
         action.name = name
         action.comment = comment
+        @active_group.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_actions_list(@active_group)
+        action_container = find_element_by_tag(@actions_list, old_name)
+        label = find_element_by_tag(action_container, "label")
+        comment_container = find_element_by_tag(action_container, "comment_container")
+        comment_label = find_element_by_tag(action_container, "comment")
+
+        label.value = name
+        if comment.empty?
+          action_container.style.height = 36
+          comment_container.hide
+          comment_label.value = ""
+        else
+          action_container.style.height = 72
+          comment_container.show
+          comment_label.value = comment.to_s
+        end
+
+        action_container.style.tag = name
+
+        update_list_children(@actions_list)
+
+        scroll_into_view(action)
       end
 
       def delete_action(action)
@@ -278,18 +393,32 @@ module TAC
         @active_action_label.value = ""
         @variables_list.clear
 
-        populate_actions_list(@active_group)
+        # Remove deleted action from list
+        container = find_element_by_tag(@actions_list, action.name)
+        @actions_list.remove(container)
+
+        update_list_children(@actions_list)
       end
 
       def create_variable(name, type, value)
-        @active_action.variables << TAC::Config::Variable.new(name: name, type: type, value: value)
+        variable = TAC::Config::Variable.new(name: name, type: type, value: value)
+
+        @active_action.variables << variable
         @active_action.variables.sort_by! { |v| v.name.downcase }
         window.backend.config_changed!
 
-        populate_variables_list(@active_action)
+        @variables_list.append do
+          add_variable_container(variable)
+        end
+
+        update_list_children(@variables_list)
+
+        scroll_into_view(variable)
       end
 
       def update_variable(variable, name, type, value)
+        old_name = variable.name
+
         variable.name = name
         variable.type = type
         variable.value = value
@@ -298,7 +427,20 @@ module TAC
 
         window.backend.config_changed!
 
-        populate_variables_list(@active_action)
+        variable_container = find_element_by_tag(@variables_list, old_name)
+        label = find_element_by_tag(variable_container, "label")
+        type  = find_element_by_tag(variable_container, "type")
+        value = find_element_by_tag(variable_container, "value")
+
+        label.value = name
+        type.value = "Type: #{variable.type}"
+        value.value = "Value: #{variable.value}"
+
+        variable_container.style.tag = name
+
+        update_list_children(@variables_list)
+
+        scroll_into_view(variable)
       end
 
       def delete_variable(variable)
@@ -306,7 +448,48 @@ module TAC
         @active_action.variables.sort_by! { |v| v.name.downcase }
         window.backend.config_changed!
 
-        populate_variables_list(@active_action)
+        # Remove deleted variable from list
+        container = find_element_by_tag(@variables_list, variable.name)
+        @variables_list.remove(container)
+
+        update_list_children(@variables_list)
+      end
+
+      def update_list_children(list)
+        is_group = list == @groups_list
+        is_action = list == @actions_list
+        is_variable = list == @variables_list
+
+        list.children.sort_by! { |i| i.style.tag.downcase }
+
+        list.children.each_with_index do |child, i|
+          bg_color = i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+          bg_color = THEME_HIGHLIGHTED_COLOR if is_group && @active_group&.name == child.style.tag
+          bg_color = THEME_HIGHLIGHTED_COLOR if is_action && @active_action&.name == child.style.tag
+
+          child.style.default[:background] = bg_color
+
+          child.root.gui_state.request_recalculate
+        end
+      end
+
+      def scroll_into_view(item)
+        list_container = nil
+        item_container = nil
+
+        if item.is_a?(TAC::Config::Group)
+          list_container = @groups_list
+        elsif item.is_a?(TAC::Config::Action)
+          list_container = @actions_list
+        elsif item.is_a?(TAC::Config::Variable)
+          list_container = @variables_list
+        else
+          raise "Unsupported item type: #{item.class}"
+        end
+
+        item_container = find_element_by_tag(list_container, item.name)
+
+        @scroll_into_view_list << { list: list_container, item: item_container }
       end
 
       def populate_groups_list
@@ -319,32 +502,11 @@ module TAC
         end
 
         @groups_list.clear do
-          groups.each_with_index do |group, i|
+          groups.each do |group|
-            flow width: 1.0, **THEME_ITEM_CONTAINER_PADDING do
+            add_group_container(group)
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-
-              button group.name, width: 0.8 do
-                @active_group = group
-                @active_group_label.value = group.name
-                @active_action = nil
-                @active_action_label.value = ""
-
-                populate_actions_list(group)
-                @variables_list.clear
-              end
-
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group" do
-                push_state(Dialog::NamePromptDialog, title: "Rename Group", renaming: group, list: window.backend.config.groups, callback_method: method(:update_group))
-              end
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group", **THEME_DANGER_BUTTON do
-                push_state(Dialog::ConfirmDialog, dangerous: true, title: "Are you sure?", message: "Delete group and all of its actions and variables?", callback_method: proc { delete_group(group) })
           end
         end
       end
-        end
-
-        set_list_heights
-      end
 
       def populate_actions_list(group)
         @actions_list.scroll_top = 0
@@ -352,15 +514,69 @@ module TAC
         actions = group.actions
 
         @actions_list.clear do
-          actions.each_with_index do |action, i|
+          actions.each do |action|
-            stack width: 1.0, **THEME_ITEM_CONTAINER_PADDING do
+            add_action_container(action)
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+          end
+        end
+      end
 
-              flow width: 1.0 do
+      def populate_variables_list(action)
-                button action.name, width: 0.72 do
+        @variables_list.scroll_top = 0
+
+        variables = action.variables
+
+        @variables_list.clear do
+          variables.each do |variable|
+            add_variable_container(variable)
+          end
+        end
+      end
+
+      def add_group_container(group)
+        index = window.backend.config.groups.index(group)
+
+        flow width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING, tag: group.name do |container|
+          background group == @active_group ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_group_container = container if group == @active_group
+
+          button group.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
+            @active_group = group
+            @active_group_container = container
+            @active_group_label.value = group.name
+            @active_action = nil
+            @active_action_container = nil
+            @active_action_label.value = ""
+
+            update_list_children(@groups_list)
+
+            populate_actions_list(group)
+            @variables_list.clear
+          end
+
+          button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group" do
+            push_state(Dialog::NamePromptDialog, title: "Rename Group", renaming: group, list: window.backend.config.groups, callback_method: method(:update_group))
+          end
+          button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group", **THEME_DANGER_BUTTON do
+            push_state(Dialog::ConfirmDialog, dangerous: true, title: "Are you sure?", message: "Delete group and all of its actions and variables?", callback_method: proc { delete_group(group) })
+          end
+        end
+      end
+
+      def add_action_container(action)
+        index = @active_group.actions.index(action)
+
+        stack width: 1.0, height: action.comment.empty? ? 36 : 72, **THEME_ITEM_CONTAINER_PADDING, tag: action.name do |container|
+          background action == @active_action ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_action_container = container if action == @active_action
+
+          flow width: 1.0, height: 36 do
+            button action.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
               @active_action = action
+              @active_action_container = container
               @active_action_label.value = action.name
 
+              update_list_children(@actions_list)
+
               populate_variables_list(action)
             end
 
@@ -370,50 +586,131 @@ module TAC
               window.backend.config_changed!
             end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action" do
+            button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action" do
-                  push_state(Dialog::ActionDialog, title: "Rename Action", action: action, list: @active_group.actions, callback_method: method(:update_action))
+              push_state(Dialog::ActionDialog, title: "Edit Action", action: action, list: @active_group.actions, callback_method: method(:update_action))
             end
 
-                button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action", **THEME_DANGER_BUTTON do
+            button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action", **THEME_DANGER_BUTTON do
               push_state(Dialog::ConfirmDialog, dangerous: true, title: "Are you sure?", message: "Delete action and all of its variables?", callback_method: proc { delete_action(action) })
             end
           end
 
-              caption "#{action.comment}", width: 1.0, text_wrap: :word_wrap unless action.comment.empty?
+          stack(width: 1.0, fill: true, scroll: true, visible: !action.comment.empty?, tag: "comment_container") do
+            caption action.comment.to_s, width: 1.0, text_wrap: :word_wrap, text_border: true, text_border_size: 1, text_border_color: 0xaa_000000, tag: "comment"
           end
         end
       end
 
-        set_list_heights
+      def add_variable_container(variable)
+        index = @active_action.variables.index(variable)
+
+        stack width: 1.0, height: 96, **THEME_ITEM_CONTAINER_PADDING, tag: variable.name do
+          background index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+
+          flow(width: 1.0, fill: true) do
+            button variable.name, fill: true, text_size: THEME_ICON_SIZE - 3, tip: "Edit variable", tag: "label" do
+              push_state(Dialog::VariableDialog, title: "Edit Variable", variable: variable, list: @active_action.variables, callback_method: method(:update_variable))
             end
 
-      def populate_variables_list(action)
+            button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete variable", **THEME_DANGER_BUTTON do
-        @variables_list.scroll_top = 0
-
-        variables = action.variables
-
-        @variables_list.clear do
-          variables.each_with_index do |variable, i|
-            stack width: 1.0, **THEME_ITEM_CONTAINER_PADDING do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-
-              flow(width: 1.0) do
-                button "#{variable.name}", width: 0.89, tip: "Edit variable" do
-                  push_state(Dialog::VariableDialog, title: "Edit Variable", variable: variable, callback_method: method(:update_variable))
-                end
-
-                button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete variable", **THEME_DANGER_BUTTON do
               push_state(Dialog::ConfirmDialog, title: "Are you sure?", message: "Delete variable?", callback_method: proc { delete_variable(variable) })
             end
           end
 
-              caption "Type: #{variable.type}"
+          caption "Type: #{variable.type}", tag: "type", fill: true
-              caption "Value: #{variable.value}"
+          caption "Value: #{variable.value}", tag: "value", fill: true
-            end
         end
       end
 
-        set_list_heights
+      def draw
+        super
+
+        unless @highlight_animator.complete?
+          item = @highlight_item_container
+
+          Gosu.draw_rect(
+            item.x, item.y,
+            item.width, item.height,
+            @highlight_animator.color_transition,
+            item.z + 1
+          )
+        end
+      end
+
+      def update
+        super
+
+        current_state.request_repaint unless @highlight_animator.complete?
+
+        while (hash = @scroll_into_view_list.shift)
+          list_container = hash[:list]
+          item_container = hash[:item]
+
+          return unless list_container
+          return unless item_container
+
+          unless (item_container.y + item_container.height).between?(list_container.y, list_container.y + list_container.height)
+
+            list_container.scroll_top = (item_container.y + item_container.height) - (list_container.y + list_container.height)
+
+            list_container.recalculate
+          end
+
+          @highlight_item_container = item_container
+          @highlight_animator = CyberarmEngine::Animator.new(
+            start_time: Gosu.milliseconds,
+            duration: 750,
+            from: @highlight_from_color,
+            to: @highlight_to_color,
+            tween: :ease_in_out_back
+          )
+        end
+      end
+
+      def button_down(id)
+        super
+
+        return if control_down? || shift_down? || !alt_down?
+
+        case id
+        when Gosu::KB_G
+          push_state(
+            TAC::Dialog::NamePromptDialog,
+            title: "Create Group",
+            list: window.backend.config.groups,
+            callback_method: method(:create_group)
+          )
+        when Gosu::KB_A
+          if @active_group
+            push_state(
+              TAC::Dialog::ActionDialog,
+              title: "Create Action",
+              list: @active_group.actions,
+              callback_method: method(:create_action)
+            )
+          else
+            push_state(
+              TAC::Dialog::AlertDialog,
+              title: "Error",
+              message: "Unable to create action, no group selected."
+            )
+          end
+        when Gosu::KB_V
+          if @active_action
+            push_state(
+              TAC::Dialog::VariableDialog,
+              title: "Create Variable",
+              list: @active_action.variables,
+              callback_method: method(:create_variable)
+            )
+          else
+            push_state(
+              TAC::Dialog::AlertDialog,
+              title: "Error",
+              message: "Unable to create variable, no action selected."
+            )
+          end
+        end
       end
     end
   end

lib/pages/field_planner.rb

@@ -33,8 +33,15 @@ module TAC
 
             button "Reset", text_size: THEME_HEADING_TEXT_SIZE, **THEME_DANGER_BUTTON do
               @nodes.clear
+              measure_path
+
               refresh_panel
             end
+
+            list_box items: ["CENTERSTAGE", "Power Play", "Freight Frenzy", "Ultimate Goal", "Skystone"], width: 200, height: 1.0 do |item|
+              season = item.downcase.gsub(" ", "_").to_sym
+              @field = TAC::Simulator::Field.new(container: @field_container, season: season, simulation: nil)
+            end
           end
         end
 
@@ -43,7 +50,7 @@ module TAC
             tagline "Nodes:"
             @nodes_count_label = tagline "0"
 
-            tagline "Total Distance:"
+            tagline "Total Distance:", margin_left: 20
             @total_distance_label = tagline "0"
 
             @units_label = tagline "Inches"
@@ -61,7 +68,7 @@ module TAC
           end
         end
 
-        @field = TAC::Simulator::Field.new(container: @field_container, season: :freight_frenzy, simulation: nil)
+        @field = TAC::Simulator::Field.new(container: @field_container, season: :centerstage, simulation: nil)
         @nodes ||= []
         @unit = :inches
         @total_distance = 0
@@ -72,6 +79,9 @@ module TAC
         @node_radius = 6
         @segment_thickness = 2
 
+        @font = CyberarmEngine::Text.new(font: THEME_BOLD_FONT, size: 18, border: true, static: true)
+        @last_mouse_position = CyberarmEngine::Vector.new(window.mouse_x, window.mouse_y)
+
         measure_path
         refresh_panel
       end
@@ -82,11 +92,35 @@ module TAC
         @field.draw
 
         display_path
+
+        if @field_container.hit?(window.mouse_x, window.mouse_y)
+          x = (window.mouse_x - @field_container.x) / @field.scale - 72
+          y = (window.mouse_y - @field_container.y) / @field.scale - 72
+
+          @font.text = "X: #{inches_to_unit(x).round(2)} Y: #{inches_to_unit(y).round(2)} (#{@unit.to_s})"
+          @font.x = window.mouse_x + 6
+          @font.y = window.mouse_y - (@font.height / 2.0 + 24)
+          @font.z = 100_001
+
+          Gosu.draw_rect(
+            window.mouse_x,
+            @font.y - 6,
+            @font.width + 12,
+            @font.height + 12,
+            0xaa_000000,
+            100_000
+          )
+
+          @font.draw
+        end
       end
 
       def update
         super
 
+        current_state.request_repaint if window.mouse_x != @last_mouse_position.x || window.mouse_y != @last_mouse_position.y
+        @last_mouse_position = CyberarmEngine::Vector.new(window.mouse_x, window.mouse_y)
+
         @field.update
 
         measure_path
@@ -133,7 +167,7 @@ module TAC
           Gosu.draw_circle(
             current_node.x * @field.scale + @field_container.x,
             current_node.y * @field.scale + @field_container.y,
-            @node_radius, 7, mouse_near ? @node_hover_color : @node_color, 10
+            @node_radius, 7, mouse_near ? @node_hover_color : @node_color, @field_container.z + 1
           )
 
           next if i.zero?
@@ -153,7 +187,8 @@ module TAC
               (@field_container.y + last_node.y * @field.scale) - distance,
               @segment_thickness,
               distance,
-              @segment_color
+              @segment_color,
+              @field_container.z + 1
             )
           end
 
@@ -184,6 +219,10 @@ module TAC
         @total_distance_label.value = "#{inches_to_unit(@total_distance).round(2)}"
         @units_label.value = @unit.to_s.capitalize
 
+        status_bar.recalculate
+        status_bar.recalculate
+        status_bar.recalculate
+
         # @points_container.clear do
           # v1 = @nodes.first
           # break unless v1
@@ -214,11 +253,11 @@ module TAC
         when :feet
           inches / 12.0
         when :millimeters
-          inches / 0.254
+          inches * 25.4
         when :centimeters
-          inches / 2.54
+          inches * 2.54
         when :meters
-          inches / 25.4
+          inches * 0.0254
         end
       end
     end

lib/pages/game_clock.rb

@@ -24,7 +24,7 @@ module TAC
                   # Spawn game clock window
                   $clock_pid = Process.spawn(
                     RbConfig.ruby,
-                    "#{ROOT_PATH}/timecrafters_configuration_tool.rb",
+                    "#{MEDIA_PATH}/../timecrafters_configuration_tool.rb",
                     "--game-clock-remote-display"
                   )
 

lib/pages/home.rb

@@ -34,8 +34,42 @@ module TAC
               label "Total actions: #{actions.size}"
               label "Total variables: #{variables.size}"
             end
+
+            stack(width: 1.0, fill: true, scroll: true, margin_top: 32) do
+              heading, items = Gosu::LICENSES.split("\n\n")
+
+              title heading
+
+              items.split("\n").each do |item|
+                name, website, license, license_website = item.split(",").map(&:strip)
+                flow(width: 1.0, height: 28) do
+                  tagline "#{name} - "
+                  button "Website", height: 1.0, tip: website do
+                    open_url(website)
                   end
                 end
+
+                flow(width: 1.0, height: 22, margin_bottom: 20) do
+                  para "#{license} - "
+                  button "License Website", height: 1.0, text_size: 16, tip: license_website do
+                    open_url(license_website)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def open_url(url)
+        case RUBY_PLATFORM
+        when /mingw/ # windows
+          system("start #{url}")
+        when /linux/
+          system("xdg-open #{url}")
+        when /darwin/ # macos
+          system("open #{url}")
+        end
       end
     end
   end

lib/pages/presets.rb

@@ -11,29 +11,114 @@ module TAC
 
         body.clear do
           flow(width: 1.0, height: 1.0) do
-            @group_presets = stack(width: 0.49995, height: 1.0, scroll: true, border_thickness_right: 1, border_color: [0, Gosu::Color::BLACK, 0, 0]) do
+            @group_presets = stack(fill: true, height: 1.0, scroll: true, padding_left: 2, padding_top: 2, padding_right: 2, border_thickness_right: 1, border_color: Gosu::Color::BLACK) do
             end
 
-            @action_presets = stack(width: 0.49995, height: 1.0, scroll: true) do
+            @action_presets = stack(fill: true, height: 1.0, scroll: true, padding_left: 2, padding_top: 2, padding_right: 2) do
             end
           end
         end
 
+        @scroll_into_view_list = []
+        @highlight_item_container = nil
+        @highlight_from_color = Gosu::Color.rgba(0, 0, 0, 0)
+        @highlight_to_color = Gosu::Color.rgba(THEME_HIGHLIGHTED_COLOR.red, THEME_HIGHLIGHTED_COLOR.green, THEME_HIGHLIGHTED_COLOR.blue, 200)
+
+        @highlight_animator = CyberarmEngine::Animator.new(
+          start_time: Gosu.milliseconds - 1,
+          duration: 0,
+          from: Gosu::Color.rgba(0, 0, 0, 0),
+          to: THEME_HIGHLIGHTED_COLOR
+        )
+
         populate_group_presets
         populate_action_presets
       end
 
-      def populate_group_presets
+      def draw
-        @group_presets.clear do
+        super
-          window.backend.config.presets.groups.each_with_index do |group, i|
-            flow(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
 
-              button group.name, width: 0.895 do
+        unless @highlight_animator.complete?
-                page(TAC::Pages::Editor,{ group: group, group_is_preset: true })
+          item = @highlight_item_container
+
+          Gosu.draw_rect(
+            item.x, item.y,
+            item.width, item.height,
+            @highlight_animator.color_transition,
+            item.z + 1
+          )
+        end
       end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group preset" do
+      def update
+        super
+
+        current_state.request_repaint unless @highlight_animator.complete?
+
+        while (hash = @scroll_into_view_list.shift)
+          list_container = hash[:list]
+          item_container = hash[:item]
+
+          return unless list_container
+          return unless item_container
+
+          unless (item_container.y + item_container.height).between?(list_container.y, list_container.y + list_container.height)
+
+            list_container.scroll_top = (item_container.y + item_container.height) - (list_container.y + list_container.height)
+
+            list_container.recalculate
+          end
+
+          @highlight_item_container = item_container
+          @highlight_animator = CyberarmEngine::Animator.new(
+            start_time: Gosu.milliseconds,
+            duration: 750,
+            from: @highlight_from_color,
+            to: @highlight_to_color,
+            tween: :ease_in_out_back
+          )
+        end
+      end
+
+      def update_list_children(list)
+        list.children.sort_by! { |i| i.style.tag.downcase }
+
+        list.children.each_with_index do |child, i|
+          child.style.default[:background] = i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+
+          child.root.gui_state.request_recalculate
+        end
+      end
+
+      def scroll_into_view(item)
+        list_container = nil
+        item_container = nil
+
+        if item.is_a?(TAC::Config::Group)
+          list_container = @group_presets
+        elsif item.is_a?(TAC::Config::Action)
+          list_container = @action_presets
+        else
+          raise "Unsupported item type: #{item.class}"
+        end
+
+        item_container = find_element_by_tag(list_container, item.name)
+
+        @scroll_into_view_list << { list: list_container, item: item_container }
+      end
+
+      def add_group_container(group)
+        index = window.backend.config.presets.groups.index(group)
+
+        flow width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING, tag: group.name do |container|
+          background group == @active_group ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_group_container = container if group == @active_group
+
+          button group.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
+            page(TAC::Pages::Editor, { group: group, group_is_preset: true })
+          end
+
+          button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group" do
             push_state(
               Dialog::NamePromptDialog,
               title: "Rename Group Preset",
@@ -43,7 +128,7 @@ module TAC
             )
           end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group preset", **THEME_DANGER_BUTTON do
+          button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group", **THEME_DANGER_BUTTON do
             push_state(
               Dialog::ConfirmDialog,
               title: "Are you sure?",
@@ -53,30 +138,30 @@ module TAC
           end
         end
       end
-        end
+
+      def add_action_container(action)
+        index = window.backend.config.presets.actions.index(action)
+
+        stack width: 1.0, height: action.comment.empty? ? 36 : 72, **THEME_ITEM_CONTAINER_PADDING, tag: action.name do |container|
+          background action == @active_action ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_action_container = container if action == @active_action
+
+          flow width: 1.0, height: 36 do
+            button action.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
+              page(TAC::Pages::Editor, { action: action, action_is_preset: true })
             end
 
-      def populate_action_presets
+            button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action" do
-        @action_presets.clear do
-          window.backend.config.presets.actions.each_with_index do |action, i|
-            flow(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-
-              button action.name, width: 0.895 do
-                page(TAC::Pages::Editor,{ action: action, action_is_preset: true })
-              end
-
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action preset" do
               push_state(
-                  Dialog::NamePromptDialog,
+                Dialog::ActionDialog,
-                  title: "Rename Action Preset",
+                title: "Edit Action Preset",
-                  renaming: action,
+                action: action,
                 list: window.backend.config.presets.actions,
                 callback_method: method(:update_action_preset)
               )
             end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action preset", **THEME_DANGER_BUTTON do
+            button get_image("#{TAC::MEDIA_PATH}/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action", **THEME_DANGER_BUTTON do
               push_state(
                 Dialog::ConfirmDialog,
                 title: "Are you sure?",
@@ -85,16 +170,46 @@ module TAC
               )
             end
           end
+
+          stack(width: 1.0, fill: true, scroll: true, visible: !action.comment.empty?, tag: "comment_container") do
+            caption action.comment.to_s, width: 1.0, text_wrap: :word_wrap, text_border: true, text_border_size: 1, text_border_color: 0xaa_000000, tag: "comment"
+          end
+        end
+      end
+
+      def populate_group_presets
+        @group_presets.clear do
+          window.backend.config.presets.groups.each do |group|
+            add_group_container(group)
+          end
+        end
+      end
+
+      def populate_action_presets
+        @action_presets.clear do
+          window.backend.config.presets.actions.each do |action|
+            add_action_container(action)
           end
         end
       end
 
       def update_group_preset(group, name)
+        old_name = group.name
+
         group.name = name
         window.backend.config.presets.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_group_presets
+        group_container = find_element_by_tag(@group_presets, old_name)
+        label = find_element_by_tag(group_container, "label")
+
+        label.value = name
+
+        group_container.style.tag = name
+
+        update_list_children(@group_presets)
+
+        scroll_into_view(group)
       end
 
       def delete_group_preset(group)
@@ -102,15 +217,42 @@ module TAC
         window.backend.config.presets.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_group_presets
+        # Remove deleted action from list
+        container = find_element_by_tag(@group_presets, group.name)
+        @group_presets.remove(container)
+
+        update_list_children(@group_presets)
       end
 
-      def update_action_preset(action, name)
+      def update_action_preset(action, name, comment)
+        old_name = action.name
+
         action.name = name
+        action.comment = comment
         window.backend.config.presets.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_action_presets
+        action_container = find_element_by_tag(@action_presets, old_name)
+        label = find_element_by_tag(action_container, "label")
+        comment_container = find_element_by_tag(action_container, "comment_container")
+        comment_label = find_element_by_tag(action_container, "comment")
+
+        label.value = name
+        if comment.empty?
+          action_container.style.height = 36
+          comment_container.hide
+          comment_label.value = ""
+        else
+          action_container.style.height = 72
+          comment_container.show
+          comment_label.value = comment.to_s
+        end
+
+        action_container.style.tag = name
+
+        update_list_children(@action_presets)
+
+        scroll_into_view(action)
       end
 
       def delete_action_preset(action)
@@ -118,7 +260,11 @@ module TAC
         window.backend.config.presets.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_action_presets
+        # Remove deleted action from list
+        container = find_element_by_tag(@action_presets, action.name)
+        @action_presets.remove(container)
+
+        update_list_children(@action_presets)
       end
     end
   end

lib/pages/search.rb

@@ -5,10 +5,10 @@ module TAC
         header_bar("Search")
 
         menu_bar.clear do
-          search = edit_line "", width: 0.9, height: 1.0
+          search = edit_line "", fill: true, height: 1.0
-          button get_image("#{TAC::ROOT_PATH}/media/icons/zoom.png"), image_height: 1.0 do
+          button get_image("#{TAC::MEDIA_PATH}/icons/zoom.png"), image_height: 1.0 do
             unless search.value.strip.empty?
-              search_results = search_config(search.value.downcase.strip)
+              search_results = search_config(search.value.strip)
 
               status_bar.clear do
                 if search_results.results.size.zero?
@@ -22,7 +22,7 @@ module TAC
                 shared_index = 0
 
                 flow(width: 1.0, height: 1.0) do
-                  stack(width: 0.495, height: 1.0, scroll: true) do
+                  stack(fill: true, height: 1.0, scroll: true, padding: 20, padding_right: 10) do
                     if search_results.groups.size.positive?
                       title "Groups"
 
@@ -44,7 +44,9 @@ module TAC
                       search_results.actions.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button result.highlight(result.action.name), width: 1.0 do
+                          tip = "Group: #{result.group.name}"
+
+                          button result.highlight(result.action.name), width: 1.0, tip: tip do
                             page(TAC::Pages::Editor, { group: result.group, action: result.action, is_search: true })
                           end
 
@@ -63,7 +65,9 @@ module TAC
                       search_results.variables.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button "#{result.highlight(result.variable.name)} [#{result.highlight(result.variable.value)}]", width: 1.0 do
+                          tip = "Group: #{result.group.name}, Action: #{result.action.name}"
+
+                          button "#{result.highlight(result.variable.name)} [#{result.variable.type}: #{result.highlight(result.variable.value)}]", width: 1.0, tip: tip do
                             page(TAC::Pages::Editor, { group: result.group, action: result.action, variable: result.variable, is_search: true })
                           end
                         end
@@ -73,13 +77,14 @@ module TAC
                     end
                   end
 
-                  stack(width: 0.495, height: 1.0, scroll: true) do
+                  stack(fill: true, height: 1.0, scroll: true, padding: 20, padding_left: 10) do
                     if search_results.group_presets.size.positive?
                       title "Group Presets"
 
                       search_results.group_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+
                           button result.highlight(result.group.name), width: 1.0 do
                             page(TAC::Pages::Editor, { group: result.group, group_is_preset: true, is_search: true })
                           end
@@ -89,14 +94,15 @@ module TAC
                       end
                     end
 
-
                     if search_results.action_presets.size.positive?
                       title "Action Presets"
 
                       search_results.action_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button result.highlight(result.action.name), width: 1.0 do
+                          tip = result.group ? "Group: #{result.group.name}" : nil
+
+                          button result.highlight(result.action.name), width: 1.0, tip: tip do
                             if result.group.nil?
                               page(TAC::Pages::Editor, { action: result.action, action_is_preset: true, is_search: true })
                             else
@@ -119,7 +125,9 @@ module TAC
                       search_results.variables_from_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button "#{result.highlight(result.variable.name)} [#{result.highlight(result.variable.value)}]", width: 1.0 do
+                          tip = result.group ? "Group: #{result.group.name}, Action: #{result.action.name}" : "Action: #{result.action.name}"
+
+                          button "#{result.highlight(result.variable.name)} [#{result.variable.type}: #{result.highlight(result.variable.value)}]", width: 1.0, tip: tip do
                             if result.group.nil?
                               page(TAC::Pages::Editor, { action: result.action, variable: result.variable, action_is_preset: true, is_search: true })
                             else
@@ -152,7 +160,7 @@ module TAC
 
       def search_groups(query, search_results)
         window.backend.config.groups.each do |group|
-          if group.name.downcase.include?(query)
+          if group.name.downcase.include?(query.downcase)
             result = SearchResult.new(group: group, query: query, is_group: true, is_from_name: true)
             search_results.results << result
           end
@@ -162,12 +170,12 @@ module TAC
       def search_actions(query, search_results)
         window.backend.config.groups.each do |group|
           group.actions.each do |action|
-            if action.name.downcase.include?(query)
+            if action.name.downcase.include?(query.downcase)
               result = SearchResult.new(group: group, action: action, query: query, is_action: true, is_from_name: true)
               search_results.results << result
             end
 
-            if action.comment.downcase.include?(query)
+            if action.comment.downcase.include?(query.downcase)
               result = SearchResult.new(group: group, action: action, query: query, is_action: true, is_from_comment: true)
               search_results.results << result
             end
@@ -179,12 +187,12 @@ module TAC
         window.backend.config.groups.each do |group|
           group.actions.each do |action|
             action.variables.each do |variable|
-              if variable.name.downcase.include?(query)
+              if variable.name.downcase.include?(query.downcase)
                 result = SearchResult.new(group: group, action: action, variable: variable, is_variable: true, query: query, is_from_name: true)
                 search_results.results << result
               end
 
-              if variable.value.downcase.include?(query)
+              if variable.value.downcase.include?(query.downcase)
                 result = SearchResult.new(group: group, action: action, variable: variable, is_variable: true, query: query, is_from_value: true)
                 search_results.results << result
               end
@@ -195,29 +203,29 @@ module TAC
 
       def search_presets(query, search_results)
         window.backend.config.presets.groups.each do |group|
-          if group.name.downcase.include?(query)
+          if group.name.downcase.include?(query.downcase)
             result = SearchResult.new(group: group, query: query, is_group: true, is_from_name: true, is_preset: true)
             search_results.results << result
           end
 
           group.actions.each do |action|
-            if action.name.downcase.include?(query)
+            if action.name.downcase.include?(query.downcase)
               result = SearchResult.new(group: group, action: action, query: query, is_action: true, is_from_name: true, is_preset: true)
               search_results.results << result
             end
 
-            if action.comment.downcase.include?(query)
+            if action.comment.downcase.include?(query.downcase)
               result = SearchResult.new(group: group, action: action, query: query, is_action: true, is_from_comment: true, is_preset: true)
               search_results.results << result
             end
 
             action.variables.each do |variable|
-              if variable.name.downcase.include?(query)
+              if variable.name.downcase.include?(query.downcase)
                 result = SearchResult.new(group: group, action: action, variable: variable, is_variable: true, query: query, is_from_name: true, is_preset: true)
                 search_results.results << result
               end
 
-              if variable.value.downcase.include?(query)
+              if variable.value.downcase.include?(query.downcase)
                 result = SearchResult.new(group: group, action: action, variable: variable, is_variable: true, query: query, is_from_value: true, is_preset: true)
                 search_results.results << result
               end
@@ -226,23 +234,23 @@ module TAC
         end
 
         window.backend.config.presets.actions.each do |action|
-            if action.name.downcase.include?(query)
+          if action.name.downcase.include?(query.downcase)
             result = SearchResult.new(group: nil, action: action, query: query, is_action: true, is_from_name: true, is_preset: true)
             search_results.results << result
           end
 
-            if action.comment.downcase.include?(query)
+          if action.comment.downcase.include?(query.downcase)
             result = SearchResult.new(group: nil, action: action, query: query, is_action: true, is_from_comment: true, is_preset: true)
             search_results.results << result
           end
 
           action.variables.each do |variable|
-              if variable.name.downcase.include?(query)
+            if variable.name.downcase.include?(query.downcase)
               result = SearchResult.new(group: nil, action: action, variable: variable, is_variable: true, query: query, is_from_name: true, is_preset: true)
               search_results.results << result
             end
 
-              if variable.value.downcase.include?(query)
+            if variable.value.downcase.include?(query.downcase)
               result = SearchResult.new(group: nil, action: action, variable: variable, is_variable: true, query: query, is_from_value: true, is_preset: true)
               search_results.results << result
             end
@@ -332,7 +340,8 @@ module TAC
         end
 
         def highlight(string)
-          string.gsub(/#{@query}/i, "<b><c=ff00ff>#{@query}</c></b>")
+          match = string.match(/#{@query}/i)
+          string.gsub(/#{@query}/i, "<b><c=ff00ff>#{match}</c></b>")
         end
       end
     end

lib/pages/simulator.rb

@@ -6,24 +6,24 @@ module TAC
         header_bar("Simulator")
 
         menu_bar.clear do
-          button get_image("#{TAC::ROOT_PATH}/media/icons/right.png"), tip: "Run Simulation", image_height: 1.0 do
+          button get_image("#{TAC::MEDIA_PATH}/icons/right.png"), tip: "Run Simulation", image_height: 1.0 do
             save_source
 
             begin
               @simulation = TAC::Simulator::Simulation.new(source_code: @source_code.value, field_container: @field_container)
               @simulation.start
-            rescue SyntaxError, NameError, NoMethodError, TypeError, ArgumentError => e
+            rescue SyntaxError, NameError, NoMethodError, TypeError, ArgumentError, StandardError => e
               puts e.backtrace.reverse.join("\n")
               puts e
               push_state(Dialog::AlertDialog, title: "#{e.class}", message: e)
             end
           end
 
-          button get_image("#{TAC::ROOT_PATH}/media/icons/stop.png"), tip: "Stop Simulation", image_height: 1.0 do
+          button get_image("#{TAC::MEDIA_PATH}/icons/stop.png"), tip: "Stop Simulation", image_height: 1.0 do
             @simulation.robots.each { |robot| robot.queue.clear } if @simulation
           end
 
-          button get_image("#{TAC::ROOT_PATH}/media/icons/save.png"), tip: "Save", image_height: 1.0 do
+          button get_image("#{TAC::MEDIA_PATH}/icons/save.png"), tip: "Save", image_height: 1.0 do
             save_source
           end
         end
@@ -49,7 +49,7 @@ robot.forward 100
 robot.turn -90
 robot.forward 100"
 
-              source_code = File.read(SOURCE_FILE_PATH) if File.exists?(SOURCE_FILE_PATH)
+              source_code = File.read(SOURCE_FILE_PATH) if File.exist?(SOURCE_FILE_PATH)
 
               @source_code = edit_box source_code, width: 1.0, height: 1.0
             end
@@ -77,6 +77,7 @@ robot.forward 100"
         @simulation.update
 
         unless @simulation.robots.all? { |robot| robot.queue.empty? } # Only update clock if simulation is running
+          current_state.request_repaint
           @simulation_status.value = "Time: #{(@simulation.simulation_time).round(1)} seconds"
         end
       end

lib/pages/tacnet.rb

@@ -30,7 +30,7 @@ module TAC
         end
 
         status_bar.clear do
-          @tacnet_icon = image "#{TAC::ROOT_PATH}/media/icons/signal3.png", height: 26
+          @tacnet_icon = image "#{TAC::MEDIA_PATH}/icons/signal3.png", height: 26
           @status_label = label "TACNET: Not Connected", text_size: 26
         end
 

lib/simulator/field.rb

@@ -12,14 +12,14 @@ module TAC
         @scale = 1
         @size = 0
         @field_size = 144 # inches [1 pixel = 1 inch]
+        @z = @container.z + 1
 
         @blue = Gosu::Color.new(0xff_004080)
         @red = Gosu::Color.new(0xff_800000)
+        @soft_orange = Gosu::Color.rgb(255, 175, 0)
       end
 
       def draw
-        Gosu.flush
-
         Gosu.clip_to(@position.x, @position.y, @size, @size) do
           Gosu.translate(@position.x, @position.y) do
             draw_field
@@ -34,37 +34,38 @@ module TAC
       end
 
       def draw_field
-        Gosu.draw_rect(0, 0, @field_size * @scale, @field_size * @scale, Gosu::Color::GRAY)
+        Gosu.draw_rect(0, 0, @field_size * @scale, @field_size * @scale, Gosu::Color::GRAY, @z)
         6.times do |i| # Tile lines across
           next if i == 0
-          Gosu.draw_rect((@field_size * @scale) / 6 * i, 0, 1, @field_size * @scale, Gosu::Color::BLACK)
+          Gosu.draw_rect((@field_size * @scale) / 6 * i, 0, 1, @field_size * @scale, Gosu::Color::BLACK, @z)
         end
         6.times do |i| # Tile lines down
           next if i == 0
-          Gosu.draw_rect(0, (@field_size * @scale) / 6 * i, @field_size * @scale, 1, Gosu::Color::BLACK)
+          Gosu.draw_rect(0, (@field_size * @scale) / 6 * i, @field_size * @scale, 1, Gosu::Color::BLACK, @z)
         end
       end
 
       def draw_field_skystone
         # blue bridge
-        Gosu.draw_rect(0, @field_size / 2 - 2, 48, 1, @blue)
+        Gosu.draw_rect(0, @field_size / 2 - 2, 48, 1, @blue, @z)
-        Gosu.draw_rect(0, @field_size / 2 + 1, 48, 1, @blue)
+        Gosu.draw_rect(0, @field_size / 2 + 1, 48, 1, @blue, @z)
 
         # mid bridge
-        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 - 9.25, 48, 18.5, Gosu::Color.new(0xff_222222))
+        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 - 9.25, 48, 18.5, Gosu::Color.new(0xff_222222), @z)
-        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 - 2, 48, 1, Gosu::Color::YELLOW)
+        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 - 2, 48, 1, @soft_orange, @z)
-        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 + 1, 48, 1, Gosu::Color::YELLOW)
+        Gosu.draw_rect(@field_size / 2 - 24, @field_size / 2 + 1, 48, 1, @soft_orange, @z)
 
         # blue bridge
-        Gosu.draw_rect(@field_size - 48, @field_size / 2 - 2, 48, 1, @red)
+        Gosu.draw_rect(@field_size - 48, @field_size / 2 - 2, 48, 1, @red, @z)
-        Gosu.draw_rect(@field_size - 48, @field_size / 2 + 1, 48, 1, @red)
+        Gosu.draw_rect(@field_size - 48, @field_size / 2 + 1, 48, 1, @red, @z)
 
         # blue build site
         Gosu.draw_quad(
           24 - 2, 0,      @blue,
           24,     0,      @blue,
           0,      24 - 2, @blue,
-          0,      24,     @blue
+          0,      24,     @blue,
+          @z
         )
 
         # red build site
@@ -72,50 +73,51 @@ module TAC
           @field_size - (24 - 2), 0,        @red,
           @field_size - (24 - 0), 0,        @red,
           @field_size,            24 - 2,   @red,
-          @field_size,            24,       @red
+          @field_size,            24,       @red,
+          @z
         )
 
         # blue depot
-        Gosu.draw_rect(@field_size - 24, @field_size - 24, 24, 2, @blue)
+        Gosu.draw_rect(@field_size - 24, @field_size - 24, 24, 2, @blue, @z)
-        Gosu.draw_rect(@field_size - 24, @field_size - 24, 2, 24, @blue)
+        Gosu.draw_rect(@field_size - 24, @field_size - 24, 2, 24, @blue, @z)
 
         # red depot
-        Gosu.draw_rect(-1,  @field_size - 24, 24, 2, @red)
+        Gosu.draw_rect(-1,  @field_size - 24, 24, 2, @red, @z)
-        Gosu.draw_rect(22, @field_size - 24, 2, 24, @red)
+        Gosu.draw_rect(22, @field_size - 24, 2, 24, @red, @z)
 
         # blue foundation
-        Gosu.draw_rect(48, 4, 18.5, 34.5, @blue)
+        Gosu.draw_rect(48, 4, 18.5, 34.5, @blue, @z)
 
         # red foundation
-        Gosu.draw_rect(@field_size - (48 + 18.5), 4, 18.5, 34.5, @red)
+        Gosu.draw_rect(@field_size - (48 + 18.5), 4, 18.5, 34.5, @red, @z)
 
         # stones
         6.times do |i|
-          Gosu.draw_rect(48, @field_size - 8 * i - 8, 4, 8, Gosu::Color::YELLOW)
+          Gosu.draw_rect(48, @field_size - 8 * i - 8, 4, 8, @soft_orange, @z)
         end
         6.times do |i|
-          Gosu.draw_rect(@field_size - (48 + 4), @field_size - 8 * i - 8, 4, 8, Gosu::Color::YELLOW)
+          Gosu.draw_rect(@field_size - (48 + 4), @field_size - 8 * i - 8, 4, 8, @soft_orange, @z)
         end
       end
 
       def draw_field_ultimate_goal
         # middle line
-        Gosu.draw_rect(0, @field_size / 2 - 13, @field_size, 2, Gosu::Color::WHITE)
+        Gosu.draw_rect(0, @field_size / 2 - 13, @field_size, 2, Gosu::Color::WHITE, @z)
 
         # phantom center line to indict half field for remote season field
-        Gosu.draw_rect(@field_size / 2 - (0.5 + 24), 0, 1, @field_size, 0x88_448844)
+        Gosu.draw_rect(@field_size / 2 - (0.5 + 24), 0, 1, @field_size, 0x88_448844, @z)
 
 
         # blue starting lines
-        Gosu.draw_rect(24 - 1, @field_size - 24, 2, 24, @blue)
+        Gosu.draw_rect(24 - 1, @field_size - 24, 2, 24, @blue, @z)
-        Gosu.draw_rect(48 - 1, @field_size - 24, 2, 24, @blue)
+        Gosu.draw_rect(48 - 1, @field_size - 24, 2, 24, @blue, @z)
 
         # blue wobbly wobs
-        Gosu.draw_circle(24, @field_size - 24, 4, 32, @blue)
+        Gosu.draw_circle(24, @field_size - 24, 4, 32, @blue, @z)
-        Gosu.draw_circle(48, @field_size - 24, 4, 32, @blue)
+        Gosu.draw_circle(48, @field_size - 24, 4, 32, @blue, @z)
 
         # blue starter stack
-        Gosu.draw_rect(36 - 1, @field_size - 50, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, @field_size - 50, 2, 2, @blue, @z)
 
         # blue target zones
         # A
@@ -132,15 +134,15 @@ module TAC
         end
 
         # red starting lines
-        Gosu.draw_rect(@field_size - 24 - 1, @field_size - 24, 2, 24, @red)
+        Gosu.draw_rect(@field_size - 24 - 1, @field_size - 24, 2, 24, @red, @z)
-        Gosu.draw_rect(@field_size - 48 - 1, @field_size - 24, 2, 24, @red)
+        Gosu.draw_rect(@field_size - 48 - 1, @field_size - 24, 2, 24, @red, @z)
 
         # red wobbly wobs
-        Gosu.draw_circle(@field_size - 24, @field_size - 24, 4, 32, @red)
+        Gosu.draw_circle(@field_size - 24, @field_size - 24, 4, 32, @red, @z)
-        Gosu.draw_circle(@field_size - 48, @field_size - 24, 4, 32, @red)
+        Gosu.draw_circle(@field_size - 48, @field_size - 24, 4, 32, @red, @z)
 
         # red starter stack
-        Gosu.draw_rect(@field_size - 37, @field_size - 50, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 37, @field_size - 50, 2, 2, @red, @z)
 
         # red target zones
         # A
@@ -161,91 +163,88 @@ module TAC
 
       def draw_field_freight_frenzy
         # blue ZONE
-        Gosu.draw_rect(24, @field_size - 24, 2, 24, @blue)
+        Gosu.draw_rect(24, @field_size - 24, 2, 24, @blue, @z)
-        Gosu.draw_rect(24, @field_size - 24, 24, 2, @blue)
+        Gosu.draw_rect(24, @field_size - 24, 24, 2, @blue, @z)
-        Gosu.draw_rect(48 - 2, @field_size - 24, 2, 24, @blue)
+        Gosu.draw_rect(48 - 2, @field_size - 24, 2, 24, @blue, @z)
 
         # blue barcode 1
-        Gosu.draw_rect(36 - 1, @field_size - 24 - 4, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, @field_size - 24 - 4, 2, 2, @blue, @z)
-        Gosu.draw_rect(36 - 1, @field_size - 36 - 1, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, @field_size - 36 - 1, 2, 2, @blue, @z)
-        Gosu.draw_rect(36 - 1, @field_size - 48 + 2, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, @field_size - 48 + 2, 2, 2, @blue, @z)
 
         # blue barcode 2
-        Gosu.draw_rect(36 - 1, 48 + 2, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, 48 + 2, 2, 2, @blue, @z)
-        Gosu.draw_rect(36 - 1, 60 - 1, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, 60 - 1, 2, 2, @blue, @z)
-        Gosu.draw_rect(36 - 1, 72 - 4, 2, 2, @blue)
+        Gosu.draw_rect(36 - 1, 72 - 4, 2, 2, @blue, @z)
 
         # blue wobble goal
-        Gosu.draw_circle(48, 84, 9, 32, @blue)
+        Gosu.draw_circle(48, 84, 9, 32, @blue, @z)
 
         # blue shared wobble goal
-        Gosu.draw_circle(@field_size / 2, 24, 9, 32, @blue)
+        Gosu.draw_circle(@field_size / 2, 24, 9, 32, @blue, @z)
 
         # red ZONE
-        Gosu.draw_rect(@field_size - 24 - 2, @field_size - 24, 2, 24, @red)
+        Gosu.draw_rect(@field_size - 24 - 2, @field_size - 24, 2, 24, @red, @z)
-        Gosu.draw_rect(@field_size - 48, @field_size - 24, 24, 2, @red)
+        Gosu.draw_rect(@field_size - 48, @field_size - 24, 24, 2, @red, @z)
-        Gosu.draw_rect(@field_size - 48, @field_size - 24, 2, 24, @red)
+        Gosu.draw_rect(@field_size - 48, @field_size - 24, 2, 24, @red, @z)
 
         # red barcode 1
-        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 24 - 4, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 24 - 4, 2, 2, @red, @z)
-        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 36 - 1, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 36 - 1, 2, 2, @red, @z)
-        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 48 + 2, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, @field_size - 48 + 2, 2, 2, @red, @z)
 
         # red barcode 2
-        Gosu.draw_rect(@field_size - 36 - 1, 48 + 2, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, 48 + 2, 2, 2, @red, @z)
-        Gosu.draw_rect(@field_size - 36 - 1, 60 - 1, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, 60 - 1, 2, 2, @red, @z)
-        Gosu.draw_rect(@field_size - 36 - 1, 72 - 4, 2, 2, @red)
+        Gosu.draw_rect(@field_size - 36 - 1, 72 - 4, 2, 2, @red, @z)
 
         # red wobble goal
-        Gosu.draw_circle(@field_size - 48, 84, 9, 32, @red)
+        Gosu.draw_circle(@field_size - 48, 84, 9, 32, @red, @z)
 
         # red shared wobble goal
-        Gosu.clip_to(@field_size / 2, 0, 10, 48) do
+        # Gosu.clip_to(@field_size / 2, 0, 10, 48) do
-          Gosu.draw_circle(@field_size / 2, 24, 9, 32, @red)
+          Gosu.draw_circle(@field_size / 2, 24, 9, 32, @red, @z)
-        end
+        # end
 
         # white corner left
         faint_white = Gosu::Color.rgb(240, 240, 240)
 
-        Gosu.draw_rect(0, 46 - 2, 46, 2, faint_white)
+        Gosu.draw_rect(0, 46 - 2, 46, 2, faint_white, @z)
-        Gosu.draw_rect(46 - 2, 0, 2, 46, faint_white)
+        Gosu.draw_rect(46 - 2, 0, 2, 46, faint_white, @z)
         # white corner right
-        Gosu.draw_rect(@field_size - 46, 46 - 2, 46, 2, faint_white)
+        Gosu.draw_rect(@field_size - 46, 46 - 2, 46, 2, faint_white, @z)
-        Gosu.draw_rect(@field_size - 46, 0, 2, 46, faint_white)
+        Gosu.draw_rect(@field_size - 46, 0, 2, 46, faint_white, @z)
 
         # cross bars
         bar_gray = Gosu::Color.rgb(50, 50, 50)
         #   MAIN
-        Gosu.draw_rect(13.75, 48 - 2, @field_size - 13.75 * 2, 1, bar_gray)
+        Gosu.draw_rect(13.75, 48 - 2, @field_size - 13.75 * 2, 1, bar_gray, @z)
-        Gosu.draw_rect(13.75, 48 + 1, @field_size - 13.75 * 2, 1, bar_gray)
+        Gosu.draw_rect(13.75, 48 + 1, @field_size - 13.75 * 2, 1, bar_gray, @z)
-        Gosu.draw_rect(13.75, 48 - 2, 1, 4, Gosu::Color::BLACK)
+        Gosu.draw_rect(13.75, 48 - 2, 1, 4, Gosu::Color::BLACK, @z)
-        Gosu.draw_rect(@field_size - 13.75 - 1, 48 - 2, 1, 4, Gosu::Color::BLACK)
+        Gosu.draw_rect(@field_size - 13.75 - 1, 48 - 2, 1, 4, Gosu::Color::BLACK, @z)
 
         #   BLUE
-        Gosu.draw_rect(48 - 2, 13.75, 1, 48 - 13.75 - 2, bar_gray)
+        Gosu.draw_rect(48 - 2, 13.75, 1, 48 - 13.75 - 2, bar_gray, @z)
-        Gosu.draw_rect(48 + 1, 13.75, 1, 48 - 13.75 - 2, bar_gray)
+        Gosu.draw_rect(48 + 1, 13.75, 1, 48 - 13.75 - 2, bar_gray, @z)
-        Gosu.draw_rect(48 - 2, 13.75, 4, 1, Gosu::Color::BLACK)
+        Gosu.draw_rect(48 - 2, 13.75, 4, 1, Gosu::Color::BLACK, @z)
-        Gosu.draw_rect(48 - 2, 48 - 3, 4, 1, Gosu::Color::BLACK)
+        Gosu.draw_rect(48 - 2, 48 - 3, 4, 1, Gosu::Color::BLACK, @z)
 
         #   RED
-        Gosu.draw_rect(@field_size - 48 - 2, 13.75, 1, 48 - 13.75 - 2, bar_gray)
+        Gosu.draw_rect(@field_size - 48 - 2, 13.75, 1, 48 - 13.75 - 2, bar_gray, @z)
-        Gosu.draw_rect(@field_size - 48 + 1, 13.75, 1, 48 - 13.75 - 2, bar_gray)
+        Gosu.draw_rect(@field_size - 48 + 1, 13.75, 1, 48 - 13.75 - 2, bar_gray, @z)
-        Gosu.draw_rect(@field_size - 48 - 2, 13.75, 4, 1, Gosu::Color::BLACK)
+        Gosu.draw_rect(@field_size - 48 - 2, 13.75, 4, 1, Gosu::Color::BLACK, @z)
-        Gosu.draw_rect(@field_size - 48 - 2, 48 - 3, 4, 1, Gosu::Color::BLACK)
+        Gosu.draw_rect(@field_size - 48 - 2, 48 - 3, 4, 1, Gosu::Color::BLACK, @z)
 
         # Duck Delivery
         Gosu.draw_circle(2, @field_size - 2, 9, 16, Gosu::Color.rgb(75, 75, 75))
         Gosu.draw_circle(@field_size - 2, @field_size - 2, 9, 16, Gosu::Color.rgb(75, 75, 75))
 
-        # packages
-        soft_orange = Gosu::Color.rgb(255, 175, 0)
-
         7.times do |y|
           7.times do |x|
             if x.even?
-              Gosu.draw_rect(x * 3 + 1, y * 3 + 1, 2, 2, soft_orange)
+              Gosu.draw_rect(x * 3 + 1, y * 3 + 1, 2, 2, @soft_orange, @z)
             else
-              Gosu.draw_circle(x * 3 + 2, y * 3 + 2, 1, 16, faint_white)
+              Gosu.draw_circle(x * 3 + 2, y * 3 + 2, 1, 16, faint_white, @z)
             end
           end
         end
@@ -253,24 +252,200 @@ module TAC
         7.times do |y|
           7.times do |x|
             if x.even?
-              Gosu.draw_rect((@field_size - 4) - x * 3 + 1, y * 3 + 1, 2, 2, soft_orange)
+              Gosu.draw_rect((@field_size - 4) - x * 3 + 1, y * 3 + 1, 2, 2, @soft_orange, @z)
             else
-              Gosu.draw_circle((@field_size - 4) - x * 3 + 2, y * 3 + 2, 1, 16, faint_white)
+              Gosu.draw_circle((@field_size - 4) - x * 3 + 2, y * 3 + 2, 1, 16, faint_white, @z)
             end
           end
         end
 
-        Gosu.draw_rect(0, 60 - 1, 2, 2, soft_orange)
+        Gosu.draw_rect(0, 60 - 1, 2, 2, @soft_orange, @z)
-        Gosu.draw_rect(0, 108 - 1, 2, 2, soft_orange)
+        Gosu.draw_rect(0, 108 - 1, 2, 2, @soft_orange, @z)
-        Gosu.draw_rect(@field_size - 2, 60 - 1, 2, 2, soft_orange)
+        Gosu.draw_rect(@field_size - 2, 60 - 1, 2, 2, @soft_orange, @z)
-        Gosu.draw_rect(@field_size - 2, 108 - 1, 2, 2, soft_orange)
+        Gosu.draw_rect(@field_size - 2, 108 - 1, 2, 2, @soft_orange, @z)
+      end
+
+      def draw_field_power_play
+        # pole junctions (Drawn before ground junctions to be lazy- ground junctions will cover non-existant poles)
+        5.times do |y|
+          5.times do |x|
+            Gosu.draw_circle(24 + (x * 24), 24 + (y * 24), 0.5, 16, @soft_orange, @z)
+          end
+        end
+
+        # ground junction
+        3.times do |y|
+          3.times do |x|
+            Gosu.draw_circle(24 + (x * 48), 24 + (y * 48), 3, 16, Gosu::Color::BLACK, @z)
+          end
+        end
+
+        # Field cones
+        2.times do |y|
+          2.times do |x|
+            Gosu.draw_circle(36 + (x * 72), 36 + (y * 72), 2, 16, x.zero? ? @blue : @red, @z)
+          end
+        end
+
+        # alliance LINEs
+        2.times do |y|
+          2.times do |x|
+            Gosu.draw_rect(59 + (x * 24), y * (144 - 23.5), 2, 23.5, x.zero? ? @blue : @red, @z)
+          end
+        end
+
+        # alliance LINE cones
+        2.times do |y|
+          2.times do |x|
+            Gosu.draw_circle(60 + (x * 24), y * (144 - 4) + 2, 2, 16, x.zero? ? @blue : @red, @z)
+          end
+        end
+
+        # Corner TAPE
+        4.times do |i|
+          Gosu.rotate(i * 90.0, 72, 72) do
+            Gosu.draw_quad(
+              24 - 2, 0,      i.even? ? @red : @blue,
+              24,     0,      i.even? ? @red : @blue,
+              0,      24 - 2, i.even? ? @red : @blue,
+              0,      24,     i.even? ? @red : @blue,
+              @z
+            )
+          end
+        end
+
+        # Triangle TAPE
+        2.times do |i|
+          Gosu.rotate(i * 180.0, 72, 72) do
+            Gosu.draw_quad(
+              0,    72 - 10.5, i.odd? ? @red : @blue,
+              10.5, 72,        i.odd? ? @red : @blue,
+              8.5,  72,        i.odd? ? @red : @blue,
+              0,    72 - 8.5,  i.odd? ? @red : @blue,
+              @z
+            )
+
+            Gosu.draw_quad(
+              0,    72 + 10.5, i.odd? ? @red : @blue,
+              10.5, 72,        i.odd? ? @red : @blue,
+              8.5,  72,        i.odd? ? @red : @blue,
+              0,    72 + 8.5,  i.odd? ? @red : @blue,
+              @z
+            )
+          end
+        end
+      end
+
+      ###########################
+      ### --- CENTERSTAGE --- ###
+      ###########################
+      def draw_field_centerstage
+        # Corner TAPE
+        2.times do |i|
+          Gosu.rotate((i + 2) * 90.0, 72, 72) do
+            Gosu.draw_quad(
+              24 - 2, 0,      i.odd? ? @red : @blue,
+              24,     0,      i.odd? ? @red : @blue,
+              0,      24 - 2, i.odd? ? @red : @blue,
+              0,      24,     i.odd? ? @red : @blue,
+              @z
+            )
+          end
+        end
+
+        # Backstage TAPE
+        # BLUE
+        Gosu.draw_rect(0, 22, 58.5, 2, @blue, @z)
+        Gosu.draw_quad(
+          72 - 2, 0,      @blue,
+          72,     0,      @blue,
+          58.5 - 2,  24,  @blue,
+          58.5,      24,  @blue,
+          @z
+        )
+        # RED
+        Gosu.draw_rect(@field_size, 22, -58.5, 2, @red, @z)
+        Gosu.draw_quad(
+          @field_size - (72 - 2), 0,      @red,
+          @field_size - 72,     0,      @red,
+          @field_size - (58.5 - 2),  24,  @red,
+          @field_size - 58.5,      24,  @red,
+          @z
+        )
+
+        # Backstage BACKDROP
+        Gosu.draw_rect(24, 0, 24, 11.25, 0xff_252525, @z)
+        Gosu.draw_rect(@field_size - 48, 0, 24, 11.25, 0xff_252525, @z)
+
+        # Pixel TAPE
+        7.times do |i|
+          next if i == 3 # skip 4th iteration; empty slot
+
+          # TAPE
+          Gosu.draw_rect(24 + 11.5 + (12 * i), @field_size - 6, 1, 6, 0xff_dddddd, @z)
+          # Pixel
+          Gosu.rotate(30, 24 + 12 + (12 * i), @field_size - 1.75) do
+            Gosu.draw_circle(24 + 12 + (12 * i), @field_size - 1.75, 2.25, 6, 0xff_ffffff, @z)
+          end
+        end
+
+        # Spike marks TAPE
+        # BLUE
+        2.times do |r|
+          2.times do |i|
+            Gosu.rotate(r * 180, @field_size / 2, @field_size / 2 + 12) do
+              c = r.even? ? @blue : @red
+              Gosu.translate(0, i * 48) do
+                Gosu.draw_rect(35.5, @field_size / 2 - 1.5, 12, 1, c, @z)
+                Gosu.draw_rect(47.5 - 1, @field_size / 2 - 18, 1, 12, c, @z)
+                Gosu.draw_rect(35.5, @field_size / 2 - 23.5, 12, 1, c, @z)
+                # --- mark
+                Gosu.draw_rect(35.5 + 6, @field_size / 2 - 1.5, 0.125, 1, 0xff_000000, @z)
+                Gosu.draw_rect(47.5 - 1, @field_size / 2 - 18 + 6, 1, 0.125, 0xff_000000, @z)
+                Gosu.draw_rect(35.5 + 6, @field_size / 2 - 23.5, 0.125, 1, 0xff_000000, @z)
+              end
+            end
+          end
+        end
+
+        # Trusses
+        Gosu.draw_rect(0, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+        Gosu.draw_rect(23, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+        Gosu.draw_rect(47, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+        Gosu.draw_rect(@field_size / 2 + 24 + -1, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+        Gosu.draw_rect(@field_size / 2 + 24 + 23, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+        Gosu.draw_rect(@field_size / 2 + 24 + 46, @field_size / 2 - 2, 2, 28, 0xff_656565, @z)
+
+        # Crossbeams
+        # BLUE
+        Gosu.draw_rect(0, @field_size / 2 + 12 + 2, 26, 2, @blue, @z)
+        Gosu.draw_rect(24, @field_size / 2 + 12 - 1, 24, 2, @blue, @z)
+        # YELLOW
+        # --- Blue
+        Gosu.draw_rect(0, @field_size / 2 + 2, 25, 1, @soft_orange, @z)
+        Gosu.draw_rect(23, @field_size / 2 + 21, 26, 1, @soft_orange, @z)
+        # --- Middle
+        Gosu.draw_rect(24 + 24, @field_size / 2 + 2, 48, 1, @soft_orange, @z)
+        Gosu.draw_rect(24 + 24, @field_size / 2 + 12 - 0.5, 48, 1, @soft_orange, @z)
+        Gosu.draw_rect(24 + 24, @field_size / 2 + 12 - 0.5, 48, 1, @soft_orange, @z)
+        # --- --- parallel beams
+        Gosu.draw_rect(24 + 28, @field_size / 2 + 2, 1, 10, @soft_orange, @z)
+        Gosu.draw_rect(@field_size / 2, @field_size / 2 + 2, 1, 10, @soft_orange, @z)
+        Gosu.draw_rect(24 + 72 - 4, @field_size / 2 + 2, 1, 10, @soft_orange, @z)
+        # --- Red
+        Gosu.draw_rect(47 + 72, @field_size / 2 + 2, 25, 1, @soft_orange, @z)
+        Gosu.draw_rect(23 + 72, @field_size / 2 + 21, 26, 1, @soft_orange, @z)
+        # RED
+        Gosu.draw_rect(24 + 72, @field_size / 2 + 12 - 1, 24, 2, @red, @z)
+        Gosu.draw_rect(46 + 72, @field_size / 2 + 12 + 2, 26, 2, @red, @z)
+
       end
 
       def draw_tile_box(color)
-        Gosu.draw_rect(0,  0, 24, 2, color)
+        Gosu.draw_rect(0,  0, 24, 2, color, @z)
-        Gosu.draw_rect(22, 2, 2, 22, color)
+        Gosu.draw_rect(22, 2, 2, 22, color, @z)
-        Gosu.draw_rect(0, 22, 22, 2, color)
+        Gosu.draw_rect(0, 22, 22, 2, color, @z)
-        Gosu.draw_rect(0,  2, 2, 22, color)
+        Gosu.draw_rect(0,  2, 2, 22, color, @z)
       end
 
       def update

lib/simulator/robot.rb

@@ -1,44 +1,54 @@
 module TAC
   class Simulator
     class Robot
-      attr_accessor :position, :angle
+      FONT = Gosu::Font.new(11)
-      attr_reader :alliance, :width, :depth
+
-      def initialize(alliance:, width:, depth:)
+      attr_accessor :position, :angle, :comment
+      attr_reader :alliance, :width, :depth, :z
+      def initialize(alliance:, width:, depth:, container:)
         @alliance = alliance
-        @width, @depth = width, depth
+        @width = width
+        @depth = depth
+        @container = container
 
         @position = CyberarmEngine::Vector.new
         @angle = 0
+        @z = @container.z + 1
 
         @queue = []
 
         @unit = :ticks
         @ticks_per_revolution = 240
         @gear_ratio = 1
+
+        @comment = ""
       end
 
       def draw
         Gosu.translate(@width / 2, @depth / 2) do
           Gosu.rotate(@angle, @position.x, @position.y) do
-            Gosu.draw_rect(@position.x - @width / 2, @position.y - @depth / 2, @width, @depth, Gosu::Color::BLACK)
+            Gosu.draw_rect(@position.x - @width / 2, @position.y - @depth / 2, @width, @depth, Gosu::Color::BLACK, @z)
-            Gosu.draw_rect(@position.x - @width / 2 + 1, @position.y - @depth / 2 + 1, @width - 2, @depth - 2, Gosu::Color.new(0xff_808022))
+            Gosu.draw_rect(@position.x - @width / 2 + 1, @position.y - @depth / 2 + 1, @width - 2, @depth - 2, Gosu::Color.new(0xff_808022), @z)
 
             if @alliance == :blue
-              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, TAC::Palette::BLUE_ALLIANCE)
+              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, TAC::Palette::BLUE_ALLIANCE, @z)
             elsif @alliance == :red
-              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, TAC::Palette::RED_ALLIANCE)
+              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, TAC::Palette::RED_ALLIANCE, @z)
             else
-              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, @alliance)
+              Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, @alliance, @z)
             end
-            Gosu.draw_circle(@position.x, @position.y - @depth * 0.25, 2, 3, TAC::Palette::TIMECRAFTERS_TERTIARY)
+            Gosu.draw_circle(@position.x, @position.y - @depth * 0.25, 2, 3, TAC::Palette::TIMECRAFTERS_TERTIARY, @z)
           end
+
+          FONT.draw_text(@comment, 2.2, 2.2, @z, 1, 1, Gosu::Color::BLACK)
+          FONT.draw_text(@comment, 2, 2, @z)
         end
       end
 
       def update(dt)
         @angle %= 360.0
 
-        if state = @queue.first
+        if (state = @queue.first)
           state.update(dt)
 
           if state.complete?
@@ -87,6 +97,14 @@ module TAC
         @queue << Turn.new(robot: self, relative_angle: relative_angle, power: power)
       end
 
+      def delay(time_in_seconds)
+        @queue << Delay.new(robot: self, time_in_seconds: time_in_seconds)
+      end
+
+      def comment(comment)
+        @queue << Comment.new(robot: self, comment: comment)
+      end
+
       def speed
         @ticks_per_revolution / @gear_ratio
       end
@@ -95,7 +113,7 @@ module TAC
         @queue
       end
 
-class State
+      class State
         def start
         end
 
@@ -130,9 +148,10 @@ class State
         def draw
           Gosu.draw_line(
             @robot.position.x + @robot.width / 2, @robot.position.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY,
-            @goal.x + @robot.width / 2, @goal.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY
+            @goal.x + @robot.width / 2, @goal.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY,
+            @robot.z
           )
-          Gosu.draw_rect(@goal.x + (@robot.width / 2 - 1), @goal.y + (@robot.depth / 2 - 1), 2, 2, Gosu::Color::RED)
+          Gosu.draw_rect(@goal.x + (@robot.width / 2 - 1), @goal.y + (@robot.depth / 2 - 1), 2, 2, Gosu::Color::RED, @robot.z)
         end
 
         def update(dt)
@@ -176,9 +195,10 @@ class State
         def draw
           Gosu.draw_line(
             @robot.position.x + @robot.width / 2, @robot.position.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY,
-            @goal.x + @robot.width / 2, @goal.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY
+            @goal.x + @robot.width / 2, @goal.y + @robot.depth / 2, TAC::Palette::TIMECRAFTERS_TERTIARY,
+            @robot.z
           )
-          Gosu.draw_rect(@goal.x + (@robot.width / 2 - 1), @goal.y + (@robot.depth / 2 - 1), 2, 2, Gosu::Color::RED)
+          Gosu.draw_rect(@goal.x + (@robot.width / 2 - 1), @goal.y + (@robot.depth / 2 - 1), 2, 2, Gosu::Color::RED, @robot.z)
         end
 
         def update(dt)
@@ -230,7 +250,8 @@ class State
               fraction,
               360,
               1,
-              TAC::Palette::TIMECRAFTERS_TERTIARY
+              TAC::Palette::TIMECRAFTERS_TERTIARY,
+              @robot.z
             )
           end
 
@@ -239,7 +260,8 @@ class State
             @robot.position.y + @robot.depth / 2 + Gosu.offset_y(@target_angle, @robot.width > @robot.depth ? @robot.width : @robot.depth),
             1,
             9,
-            Gosu::Color::RED
+            Gosu::Color::RED,
+            @robot.z
           )
           # Gosu.draw_arc(@position.x, @position.y, 6, 1.0, 32, 2, @alliance)
         end
@@ -259,6 +281,58 @@ class State
           @last_angle = @robot.angle
         end
       end
+
+      class Delay < State
+        def initialize(robot:, time_in_seconds:)
+          @robot = robot
+          @time_in_seconds = time_in_seconds
+
+          @accumulator = 0.0
+        end
+
+        def start
+          @complete = false
+        end
+
+        def draw
+          fraction = @accumulator / @time_in_seconds.to_f
+
+          Gosu.draw_arc(
+            @robot.position.x + @robot.width / 2,
+            @robot.position.y + @robot.depth / 2,
+            @robot.width > @robot.depth ? @robot.width : @robot.depth,
+            1 - fraction,
+            360,
+            1,
+            TAC::Palette::TIMECRAFTERS_TERTIARY,
+            @robot.z
+          )
+
+          @complete = fraction >= 1
+        end
+
+        def update(dt)
+          @accumulator += dt
+        end
+      end
+
+      class Comment < State
+        def initialize(robot:, comment:)
+          @robot = robot
+          @comment = comment
+        end
+
+        def start
+          @robot.comment = @comment
+          @complete = true
+        end
+
+        def draw
+        end
+
+        def update(dt)
+        end
+      end
     end
   end
 end

lib/simulator/simulation.rb

@@ -8,7 +8,7 @@ module TAC
         @field_container = field_container
 
         @robots = []
-        @field = Field.new(simulation: self, season: :freight_frenzy, container: @field_container)
+        @field = Field.new(simulation: self, season: :centerstage, container: @field_container)
         @show_paths = false
 
         @last_milliseconds = Gosu.milliseconds
@@ -29,7 +29,7 @@ module TAC
       def update
         @accumulator += (Gosu.milliseconds - @last_milliseconds) / 1000.0
 
-        while(@accumulator > @simulation_step)
+        while @accumulator > @simulation_step
           @field.update
           @robots.each { |robot| robot.update(@simulation_step) }
 
@@ -41,7 +41,7 @@ module TAC
       end
 
       def create_robot(alliance:, width:, depth:)
-        robot = Simulator::Robot.new(alliance: alliance, width: width, depth: depth)
+        robot = Simulator::Robot.new(alliance: alliance, width: width, depth: depth, container: @field_container)
         @robots << robot
 
         return robot

lib/states/boot.rb

@@ -8,12 +8,12 @@ module TAC
           background [TAC::Palette::TIMECRAFTERS_PRIMARY, TAC::Palette::TIMECRAFTERS_SECONDARY, TAC::Palette::TIMECRAFTERS_TERTIARY, TAC::Palette::TIMECRAFTERS_PRIMARY]
         end
 
-        @title_font = CyberarmEngine::Text.new(TAC::NAME, z: 100, size: 72, border: true, border_size: 3, font: THEME[:Label][:font])
+        @title_font = CyberarmEngine::Text.new(TAC::NAME, z: 100, size: 72, border: true, border_size: 2, border_color: 0xff_000000, font: THEME[:TextBlock][:font], static:  true)
-        @logo = Gosu::Image.new("#{TAC::ROOT_PATH}/media/logo.png")
+        @logo = Gosu::Image.new("#{TAC::MEDIA_PATH}/logo.png")
 
-        @title_animator = CyberarmEngine::Animator.new(start_time: 0, duration: 750, from: 0.0, to: 1.0, tween: :swing_from_to)
+        @title_animator = CyberarmEngine::Animator.new(start_time: Gosu.milliseconds + 0, duration: 750, from: 0.0, to: 1.0, tween: :swing_from_to)
-        @logo_animator = CyberarmEngine::Animator.new(start_time: 750, duration: 1_000, from: 0.0, to: 1.0, tween: :swing_to)
+        @logo_animator = CyberarmEngine::Animator.new(start_time: Gosu.milliseconds + 750, duration: 1_000, from: 0.0, to: 1.0, tween: :swing_to)
-        @transition_animator = CyberarmEngine::Animator.new(start_time: 2_250, duration: 750, from: 0, to: 255, tween: :ease_out)
+        @transition_animator = CyberarmEngine::Animator.new(start_time: Gosu.milliseconds + 2_250, duration: 750, from: 0, to: 255, tween: :ease_out)
         @transition_color = Gosu::Color.new(0x00_111111)
 
         @next_state = Editor
@@ -30,17 +30,23 @@ module TAC
       def update
         super
 
+        request_repaint
+
         @title_font.x = window.width / 2 - @title_font.width / 2
         @title_font.y = (window.height / 2 - (@logo.height / 2 + @title_font.height)) * @title_animator.transition
 
         @transition_color.alpha = @transition_animator.transition
 
-        push_state(@next_state) if @transition_color.alpha >= 255
+        if @transition_color.alpha >= 255
+          pop_state
+          push_state(@next_state)
+        end
       end
 
-      def button_up(id)
+      def button_down(id)
         super
 
+        pop_state
         push_state(@next_state)
       end
     end

lib/states/editor.rb

@@ -8,6 +8,8 @@ class Editor < CyberarmEngine::GuiState
     @window_width = 0
     @window_height = 0
 
+    @last_tacnet_status = nil
+
     @pages = {}
     @page = nil
 
@@ -34,18 +36,18 @@ class Editor < CyberarmEngine::GuiState
     @header_bar = flow(width: 1.0, height: 36) do
       background 0xff_006000
 
-      @header_bar_label = label TAC::NAME, width: 1.0, text_align: :center, text_size: 32
+      @header_bar_label = label TAC::NAME, fill: true, text_align: :center, text_size: 32, font: TAC::THEME_BOLD_FONT, margin_left: BORDERLESS ? 36 * 3 : 0
 
-      @window_controls = flow(x: window.width - 36 * 2, y: 0, height: 1.0) do
+      @window_controls = flow(width: 36 * 3, height: 1.0) do
-        button get_image("#{TAC::ROOT_PATH}/media/icons/minus.png"), tip: "Minimize", image_height: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/minus.png"), tip: "Minimize", image_height: 1.0 do
           window.minimize if window.respond_to?(:minimize)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/larger.png"), tip: "Maximize", image_height: 1.0 do |btn|
+        button get_image("#{TAC::MEDIA_PATH}/icons/larger.png"), tip: "Maximize", image_height: 1.0 do |btn|
           window.maximize if window.respond_to?(:maximize)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/cross.png"), tip: "Exit", image_height: 1.0, **TAC::THEME_DANGER_BUTTON do
+        button get_image("#{TAC::MEDIA_PATH}/icons/cross.png"), tip: "Exit", image_height: 1.0, **TAC::THEME_DANGER_BUTTON do
           window.close
         end
       end
@@ -55,27 +57,27 @@ class Editor < CyberarmEngine::GuiState
       @navigation = stack(width: 64, height: 1.0, scroll: true) do
         background 0xff_333333
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/home.png"), margin: 4, tip: "Home", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/home.png"), margin: 4, tip: "Home", image_width: 1.0 do
           page(TAC::Pages::Home)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/menuList.png"), margin: 4, tip: "Editor", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/menuList.png"), margin: 4, tip: "Editor", image_width: 1.0 do
           page(TAC::Pages::Editor)
         end
 
-        @tacnet_button = button get_image("#{TAC::ROOT_PATH}/media/icons/signal3.png"), margin: 4, tip: "TACNET", image_width: 1.0 do
+        @tacnet_button = button get_image("#{TAC::MEDIA_PATH}/icons/signal3.png"), margin: 4, tip: "TACNET", image_width: 1.0 do
           page(TAC::Pages::TACNET)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), margin: 4, tip: "Configurations", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/gear.png"), margin: 4, tip: "Configurations", image_width: 1.0 do
           page(TAC::Pages::Configurations)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/menuGrid.png"), margin: 4, tip: "Presets", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/menuGrid.png"), margin: 4, tip: "Presets", image_width: 1.0 do
           page(TAC::Pages::Presets)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/zoom.png"), margin: 4, tip: "Search", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/zoom.png"), margin: 4, tip: "Search", image_width: 1.0 do
           page(TAC::Pages::Search)
         end
 
@@ -84,23 +86,23 @@ class Editor < CyberarmEngine::GuiState
           para "Tools", width: 1.0, text_align: :center
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/right.png"), margin: 4, tip: "Simulator", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/right.png"), margin: 4, tip: "Simulator", image_width: 1.0 do
           page(TAC::Pages::Simulator)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/joystickLeft.png"), margin: 4, tip: "Field Planner", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/joystickLeft.png"), margin: 4, tip: "Field Planner", image_width: 1.0 do
           page(TAC::Pages::FieldPlanner)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/massiveMultiplayer.png"), margin: 4, tip: "Drive Team Rotation Generator", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/massiveMultiplayer.png"), margin: 4, tip: "Drive Team Rotation Generator", image_width: 1.0 do
           page(TAC::Pages::DriveTeamRotationGenerator)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/custom_stopWatch.png"), margin: 4, tip: "Game Clock", image_width: 1.0 do
+        button get_image("#{TAC::MEDIA_PATH}/icons/custom_stopWatch.png"), margin: 4, tip: "Game Clock", image_width: 1.0 do
           page(TAC::Pages::GameClock)
         end
 
-        button get_image("#{TAC::ROOT_PATH}/media/icons/power.png"), margin: 4, tip: "Exit", image_width: 1.0, **TAC::THEME_DANGER_BUTTON do
+        button get_image("#{TAC::MEDIA_PATH}/icons/power.png"), margin: 4, tip: "Exit", image_width: 1.0, **TAC::THEME_DANGER_BUTTON do
           window.close
         end
       end
@@ -128,9 +130,9 @@ class Editor < CyberarmEngine::GuiState
   end
 
   def draw
-    super
+    @page&.draw
 
-    @page.draw if @page
+    super
   end
 
   def update
@@ -138,15 +140,35 @@ class Editor < CyberarmEngine::GuiState
 
     @page.update if @page
 
+    if @last_tacnet_status != window.backend.tacnet.status
+      @last_tacnet_status = window.backend.tacnet.status
+
       case window.backend.tacnet.status
       when :not_connected
         @tacnet_button.style.color = Gosu::Color::WHITE
+        @header_bar.style.background = 0xff_006000
+      when :connected
+        @tacnet_button.style.color = Gosu::Color::WHITE
+        @header_bar.style.background = TAC::Palette::TACNET_PRIMARY
       when :connecting
         @tacnet_button.style.color = TAC::Palette::TACNET_CONNECTING
-    when :connected
+        @header_bar.style.background = TAC::Palette::TACNET_CONNECTING
-      @tacnet_button.style.color = TAC::Palette::TACNET_CONNECTED
       when :connection_error
         @tacnet_button.style.color = TAC::Palette::TACNET_CONNECTION_ERROR
+        @header_bar.style.background = TAC::Palette::TACNET_CONNECTION_ERROR
+
+        unless @page.is_a?(TAC::Pages::TACNET)
+          push_state(TAC::Dialog::TACNETDialog, title: "TACNET Connection Error", message: window.backend.tacnet.full_status)
+        end
+      end
+
+      @tacnet_button.style.default[:color] = @tacnet_button.style.color
+      @header_bar.style.default[:background] = @header_bar.style.background
+
+      @tacnet_button.recalculate
+      @header_bar.recalculate
+
+      request_repaint
     end
 
     window.width = Gosu.available_width / 2 if window.width < Gosu.available_width / 2

lib/tac.rb

@@ -1,7 +1,13 @@
 module TAC
+  if ARGV.join.include?("--dev")
     ROOT_PATH = File.expand_path("../..", __FILE__)
+  else
+    ROOT_PATH = "#{Dir.home}/TimeCrafters_Configuration_Tool"
+  end
   CONFIGS_PATH = "#{ROOT_PATH}/data/configs"
   SETTINGS_PATH = "#{ROOT_PATH}/data/settings.json"
 
+  MEDIA_PATH = "#{File.expand_path("../..", __FILE__)}/media"
+
   CONFIG_SPEC_VERSION = 2
 end

lib/tacnet.rb

@@ -1,6 +1,6 @@
 module TAC
   class TACNET
-    DEFAULT_HOSTNAME = "192.168.49.1"
+    DEFAULT_HOSTNAME = "192.168.49.1".freeze
     DEFAULT_PORT = 8962
 
     SYNC_INTERVAL = 250 # ms
@@ -30,7 +30,7 @@ module TAC
     end
 
     def full_status
-      _status = status.to_s.split("_").map { |c| c.capitalize }.join(" ")
+      _status = status.to_s.split("_").map(&:capitalize).join(" ")
 
       if connected?
         net_stats = ""
@@ -42,7 +42,7 @@ module TAC
 
         "<b>Status:</b> #{_status}\n\n#{net_stats}"
       elsif @connection&.client && @connection.client.socket_error?
-        "<b>Status:</b> #{_status}\n\n#{@connection.client.last_socket_error.to_s}"
+        "<b>Status:</b> #{_status}\n\n#{@connection.client.last_socket_error}"
       else
         "<b>Status:</b> #{_status}"
       end
@@ -53,11 +53,11 @@ module TAC
     end
 
     def close
-      if connected?
+      return unless connected?
+
       @connection.close
       @connection = nil
     end
-    end
 
     def client
       @connection.client

lib/tacnet/client.rb

@@ -8,7 +8,9 @@ module TAC
       attr_reader :uuid, :read_queue, :write_queue, :socket,
                   :packets_sent, :packets_received,
                   :data_sent, :data_received
+
       attr_accessor :sync_interval, :last_socket_error, :socket_error
+
       def initialize
         @uuid = SecureRandom.uuid
         @read_queue = []
@@ -20,8 +22,11 @@ module TAC
         @socket_error = false
         @bound = false
 
-        @packets_sent, @packets_received = 0, 0
+        @packets_sent = 0
-        @data_sent, @data_received = 0, 0
+        @packets_received = 0
+
+        @data_sent = 0
+        @data_received = 0
       end
 
       def uuid=(id)
@@ -39,18 +44,16 @@ module TAC
         Thread.new do
           while connected?
             # Read from socket
-            while message_in = read
+            while (message_in = read)
-              if message_in.empty?
+              break if message_in.empty?
-                break
+
-              else
+              log.i(TAG, "Read: #{message_in}")
-                log.i(TAG, "Read: " + message_in)
 
               @read_queue << message_in
 
               @packets_received += 1
               @data_received += message_in.length
             end
-            end
 
             sleep @sync_interval / 1000.0
           end
@@ -59,12 +62,12 @@ module TAC
         Thread.new do
           while connected?
             # Write to socket
-            while message_out = @write_queue.shift
+            while (message_out = @write_queue.shift)
               write(message_out)
 
               @packets_sent += 1
               @data_sent += message_out.to_s.length
-              log.i(TAG, "Write: " + message_out.to_s)
+              log.i(TAG, "Write: #{message_out}")
             end
 
             sleep @sync_interval / 1000.0
@@ -82,7 +85,7 @@ module TAC
         while message
           puts(message)
 
-          log.i(TAG, "Writing to Queue: " + message)
+          log.i(TAG, "Writing to Queue: #{message}")
 
           message = gets
         end
@@ -101,32 +104,29 @@ module TAC
       end
 
       def closed?
-        @socket.closed? if @socket
+        @socket&.closed?
       end
 
       def write(message)
-        begin
+        @socket.puts("#{message}#{PACKET_TAIL}") if connected?
-          @socket.puts("#{message}#{PACKET_TAIL}")
       rescue => error
         @last_socket_error = error
         @socket_error = true
+
         log.e(TAG, error.message)
+
         close
       end
-      end
 
       def read
-        begin
+        @socket&.gets&.strip if connected?
-          message = @socket.gets
       rescue => error
         @last_socket_error = error
         @socket_error = true
 
-          message = ""
+        log.e(TAG, error.message)
-        end
 
-
+        close
-        return message.strip
       end
 
       def puts(message)
@@ -138,11 +138,11 @@ module TAC
       end
 
       def encode(message)
-        return message
+        message
       end
 
       def decode(blob)
-        return blob
+        blob
       end
 
       def flush
@@ -151,7 +151,8 @@ module TAC
 
       def close(reason = nil)
         write(reason) if reason
-        @socket.close if @socket
+
+        @socket&.close
       end
     end
   end

lib/tacnet/packet_handler.rb

@@ -47,7 +47,7 @@ module TAC
 
       def handle_handshake(packet)
         if @host_is_a_connection
-          $window.backend.tacnet.client.uuid = packet.body
+          CyberarmEngine::Window.instance.backend.tacnet.client.uuid = packet.body
         end
       end
 
@@ -59,7 +59,7 @@ module TAC
       def handle_error(packet)
         if @host_is_a_connection
           title, message = packet.body.split(Packet::PROTOCOL_SEPERATOR, 2)
-          $window.push_state(TAC::Dialog::TACNETDialog, title: title, message: message)
+          CyberarmEngine::Window.instance.push_state(TAC::Dialog::TACNETDialog, title: title, message: message)
         else
           log.e(TAG, "Remote error: #{title}: #{message}")
         end
@@ -73,11 +73,11 @@ module TAC
           if data.is_a?(Hash) && data.dig(:config, :spec_version) == TAC::CONFIG_SPEC_VERSION
             File.open("#{TAC::CONFIGS_PATH}/#{config_name}.json", "w") { |f| f.write json }
 
-            if $window.backend.config&.name == config_name
+            if CyberarmEngine::Window.instance.backend.config&.name == config_name
-              $window.backend.load_config(config_name)
+              CyberarmEngine::Window.instance.backend.load_config(config_name)
             end
           else
-            $window.push_state(TAC::Dialog::AlertDialog, title: "Invalid Config", message: "Supported config spec: v#{TAC::CONFIG_SPEC_VERSION} got v#{data.dig(:config, :spec_version)}")
+            CyberarmEngine::Window.instance.push_state(TAC::Dialog::AlertDialog, title: "Invalid Config", message: "Supported config spec: v#{TAC::CONFIG_SPEC_VERSION} got v#{data.dig(:config, :spec_version)}")
           end
 
         rescue JSON::ParserError => e
@@ -97,7 +97,7 @@ module TAC
         end
 
         if @host_is_a_connection
-          $window.backend.tacnet.puts(pkt)
+          CyberarmEngine::Window.instance.backend.tacnet.puts(pkt)
         else
           $server.active_client.puts(pkt)
         end
@@ -119,20 +119,20 @@ module TAC
               config = Config.new(name)
 
               if config.configuration.revision < revision
-                $window.backend.tacnet.puts( PacketHandler.packet_download_config(name) )
+                CyberarmEngine::Window.instance.backend.tacnet.puts( PacketHandler.packet_download_config(name) )
               elsif config.configuration.revision > revision
-                $window.backend.tacnet.puts( PacketHandler.packet_upload_config(name, JSON.dump( config )) )
+                CyberarmEngine::Window.instance.backend.tacnet.puts( PacketHandler.packet_upload_config(name, JSON.dump( config )) )
               end
 
             else
-              $window.backend.tacnet.puts( PacketHandler.packet_download_config(name) )
+              CyberarmEngine::Window.instance.backend.tacnet.puts( PacketHandler.packet_download_config(name) )
             end
           end
 
           _diff.each do |name|
             config = Config.new(name)
 
-            $window.backend.tacnet.puts( PacketHandler.packet_upload_config(name, JSON.dump( config )) )
+            CyberarmEngine::Window.instance.backend.tacnet.puts( PacketHandler.packet_upload_config(name, JSON.dump( config )) )
           end
         else
           if $server.active_client && $server.active_client.connected?
@@ -144,43 +144,43 @@ module TAC
       def handle_select_config(packet)
         config_name = packet.body
 
-        $window.backend.settings.config = config_name
+        CyberarmEngine::Window.instance.backend.settings.config = config_name
-        $window.backend.save_settings
+        CyberarmEngine::Window.instance.backend.save_settings
-        $window.backend.load_config(config_name)
+        CyberarmEngine::Window.instance.backend.load_config(config_name)
       end
 
       def handle_add_config(packet)
         config_name = packet.body
 
-        if $window.backend.configs_list.include?(config_name)
+        if CyberarmEngine::Window.instance.backend.configs_list.include?(config_name)
           unless @host_is_a_connection
             if $server.active_client&.connected?
               $server.active_client.puts(PacketHandler.packet_error("Config already exists!", "A config with the name #{config_name} already exists over here."))
             end
           end
         else
-          $window.backend.write_new_config(config_name)
+          CyberarmEngine::Window.instance.backend.write_new_config(config_name)
         end
       end
 
       def handle_update_config(packet)
         old_config_name, new_config_name  = packet.body.split(PROTOCOL_SEPERATOR, 2)
 
-        if $window.backend.configs_list.include?(config_name)
+        if CyberarmEngine::Window.instance.backend.configs_list.include?(config_name)
           unless @host_is_a_connection
             if $server.active_client&.connected?
               $server.active_client.puts(PacketHandler.packet_error("Config already exists!", "A config with the name #{config_name} already exists over here."))
             end
           end
         else
-          $window.backend.move_config(old_config_name, new_config_name)
+          CyberarmEngine::Window.instance.backend.move_config(old_config_name, new_config_name)
         end
       end
 
       def handle_delete_config(packet)
         config_name = packet.body
 
-        $window.backend.delete_config(config_name)
+        CyberarmEngine::Window.instance.backend.delete_config(config_name)
       end
 
       def self.packet_handshake(client_uuid)

lib/theme.rb

@@ -1,12 +1,15 @@
 module TAC
-  THEME_FONT = "#{TAC::ROOT_PATH}/media/fonts/DejaVuSansCondensed.ttf"
+  THEME_FONT = "#{TAC::MEDIA_PATH}/fonts/NotoSans-Bold.ttf"
+  THEME_BOLD_FONT = "#{TAC::MEDIA_PATH}/fonts/NotoSans-Black.ttf"
   THEME = {
-    Label: {
+    TextBlock: {
+      text_static: true,
       font: THEME_FONT,
       text_size: 22,
       color: Gosu::Color.new(0xee_ffffff),
     },
     Button: {
+      font: THEME_BOLD_FONT,
       text_size: 22,
       background: TAC::Palette::TIMECRAFTERS_PRIMARY,
       border_thickness: 1,
@@ -20,10 +23,11 @@ module TAC
     },
     EditLine: {
       caret_color: Gosu::Color.new(0xff_88ef90),
+      font: THEME_FONT
     },
     ToggleButton: {
       width: 18,
-      checkmark_image: "#{TAC::ROOT_PATH}/media/icons/checkmark.png",
+      checkmark_image: "#{TAC::MEDIA_PATH}/icons/checkmark.png",
     },
   }
 
@@ -31,10 +35,10 @@ module TAC
     color: Gosu::Color.new(0xff_ffffff),
     background: Gosu::Color.new(0xff_800000),
     hover: {
-      background: Gosu::Color.new(0xff_600000),
+      background: Gosu::Color.new(0xff_c00000),
     },
     active: {
-      background: Gosu::Color.new(0xff_c00000),
+      background: Gosu::Color.new(0xff_600000),
     }
   }
 
@@ -49,6 +53,7 @@ module TAC
     padding_top: THEME_ITEM_PADDING,
     padding_bottom: THEME_ITEM_PADDING
   }
+  THEME_HIGHLIGHTED_COLOR = Gosu::Color.rgb(255, 175, 0) # Gosu::Color.new(0xff_f080f0)
   THEME_EVEN_COLOR = Gosu::Color.new(0xff_202020)
   THEME_ODD_COLOR = Gosu::Color.new(0xff_606060)
   THEME_CONTENT_BACKGROUND = Gosu::Color.new(0x88_007f3f)

lib/version.rb

@@ -1,5 +1,5 @@
 module TAC
   NAME = "TimeCrafters Configuration Tool"
-  VERSION = "0.5.1"
+  VERSION = "0.7.2"
   RELEASE_NAME = "Beta"
 end

lib/window.rb

@@ -7,10 +7,12 @@ 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)
+      elsif ARGV.join.include?("--intro")
+        push_state(CyberarmEngine::IntroState, forward: TAC::States::Boot)
       else
         push_state(TAC::States::Boot)
       end
@@ -24,14 +26,18 @@ module TAC
     end
 
     def update
-      super
-
       @notification_manager.update
+
+      super
+    end
+
+    def needs_redraw?
+      states.any?(&:needs_repaint?) || @notification_manager.instance_variable_get(:@drivers).size.positive?
     end
 
     def toast(title, message = nil)
       @notification_manager.create_notification(
-        priority: GosuNotifications::Notification::PRIORITY_HIGH,
+        priority: CyberarmEngine::Notification::PRIORITY_HIGH,
         title: title,
 
         tagline: message ? message : "",

media/fonts/DejaVuSans-LICENSE.txt

@@ -1,187 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org.
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-TeX Gyre DJV Math
------------------
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-
-Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski
-(on behalf of TeX users groups) are in public domain.
-
-Letters imported from Euler Fraktur from AMSfonts are (c) American
-Mathematical Society (see below).
-Bitstream Vera Fonts Copyright
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera
-is a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license (“Fonts”) and associated
-documentation
-files (the “Font Software”), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute,
-and/or sell copies of the Font Software, and to permit persons  to whom
-the Font Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional
-glyphs or characters may be added to the Fonts, only if the fonts are
-renamed
-to names not containing either the words “Bitstream” or the word “Vera”.
-
-This License becomes null and void to the extent applicable to Fonts or
-Font Software
-that has been modified and is distributed under the “Bitstream Vera”
-names.
-
-The Font Software may be sold as part of a larger software package but
-no copy
-of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
-SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE
-THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-Except as contained in this notice, the names of GNOME, the GNOME
-Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the GNOME Foundation or Bitstream Inc., respectively.
-For further information, contact: fonts at gnome dot org.
-
-AMSFonts (v. 2.2) copyright
-
-The PostScript Type 1 implementation of the AMSFonts produced by and
-previously distributed by Blue Sky Research and Y&Y, Inc. are now freely
-available for general use. This has been accomplished through the
-cooperation
-of a consortium of scientific publishers with Blue Sky Research and Y&Y.
-Members of this consortium include:
-
-Elsevier Science IBM Corporation Society for Industrial and Applied
-Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS)
-
-In order to assure the authenticity of these fonts, copyright will be
-held by
-the American Mathematical Society. This is not meant to restrict in any way
-the legitimate use of the fonts, such as (but not limited to) electronic
-distribution of documents containing these fonts, inclusion of these fonts
-into other public domain or commercial font collections or computer
-applications, use of the outline data to create derivative fonts and/or
-faces, etc. However, the AMS does require that the AMS copyright notice be
-removed from any derivative versions of the fonts which have been altered in
-any way. In addition, to ensure the fidelity of TeX documents using Computer
-Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
-has requested that any alterations which yield different font metrics be
-given a different name.
-
-$Id$

media/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

timecrafters_configuration_tool.rb

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