Updated gems

Gemfile.lock

@@ -6,12 +6,12 @@ GEM
       excon (~> 0.88)
       gosu (~> 1.1)
       gosu_more_drawables (~> 0.3)
-    excon (0.98.0)
-    gosu (1.4.5)
+    excon (0.104.0)
+    gosu (1.4.6)
     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)

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/randomizer.rb

@@ -15,30 +15,20 @@ module TAC
 
         case @roll
         when 1, 4
-          # Blue: Right
-          # Red: Left
+          #Blue and Red: Left
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 3, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 1, 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: 1010, die_size: @size, label: "Left")
         when 2, 5
           #Blue and Red: Center
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 1, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 3, speed: 512, die_size: @size)
-
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 3, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 1, 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: 1010, die_size: @size, label: "Center")
         when 3, 6
-          # Blue: Left
-          # Red: Right
+          #Blue and Red: Right
 
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 1, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 2, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :blue, slot: 3, speed: 512, die_size: @size)
-
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 3, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :red, slot: 2, speed: 512, die_size: @size)
-          @ducks << Ducky.new(window: window, alliance: :red, 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: 1010, die_size: @size, label: "Right")
         end
       end
 
@@ -121,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")
           @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)
@@ -146,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
 
@@ -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/view.rb

@@ -10,7 +10,7 @@ module TAC
         @escape_counter = 0
 
         @background_image = get_image("#{ROOT_PATH}/media/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")
         @menu_background = 0xaa004000
         @mouse = Mouse.new(window)
@@ -25,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
@@ -32,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
 
@@ -139,7 +160,7 @@ module TAC
             end
 
             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
@@ -148,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)
@@ -191,6 +230,8 @@ 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
@@ -222,9 +263,9 @@ module TAC
         @last_clock_state = @clock.active?
       end
 
-      def request_repaint
+      def needs_repaint?
         if @particle_emitters && @particle_emitters.map(&:particle_count).sum.positive?
-          true
+          @needs_repaint = true
         else
           super
         end
@@ -241,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
 
@@ -274,6 +331,8 @@ module TAC
       end
 
       def randomizer_changed(boolean)
+        @randomizer_visible = boolean
+
         if boolean
           push_state(Randomizer) unless @clock.active?
         else

lib/pages/field_planner.rb

@@ -38,7 +38,7 @@ module TAC
               refresh_panel
             end
 
-            list_box items: ["Power Play", "Freight Frenzy", "Ultimate Goal", "Skystone"], width: 200, height: 1.0 do |item|
+            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
@@ -68,7 +68,7 @@ module TAC
           end
         end
 
-        @field = TAC::Simulator::Field.new(container: @field_container, season: :power_play, simulation: nil)
+        @field = TAC::Simulator::Field.new(container: @field_container, season: :centerstage, simulation: nil)
         @nodes ||= []
         @unit = :inches
         @total_distance = 0
@@ -80,12 +80,15 @@ module TAC
         @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
 
       def draw
+        super
+
         @field.draw
 
         display_path
@@ -105,15 +108,19 @@ module TAC
             @font.width + 12,
             @font.height + 12,
             0xaa_000000,
-            100_000)
-
-            @font.draw
+            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

lib/simulator/field.rb

@@ -336,6 +336,10 @@ module TAC
         end
       end
 
+      def draw_field_centerstage
+
+      end
+
       def draw_tile_box(color)
         Gosu.draw_rect(0,  0, 24, 2, color, @z)
         Gosu.draw_rect(22, 2, 2, 22, color, @z)

lib/simulator/simulation.rb

@@ -8,7 +8,7 @@ module TAC
         @field_container = field_container
 
         @robots = []
-        @field = Field.new(simulation: self, season: :power_play, container: @field_container)
+        @field = Field.new(simulation: self, season: :centerstage, container: @field_container)
         @show_paths = false
 
         @last_milliseconds = Gosu.milliseconds

lib/version.rb

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