Migrate to Ocran, update release date

Gemfile

@@ -1,9 +1,8 @@
 source "https://rubygems.org"
 
 gem "cyberarm_engine"
-gem "gosu_notifications"
 
 group :packaging do
-  gem "ocra"
+  gem "ocran"
-  gem "releasy", github: "gosu/releasy"
+  # gem "releasy", path: "../releasy"
 end

Gemfile.lock

@@ -1,38 +1,21 @@
-GIT
-  remote: https://github.com/gosu/releasy.git
-  revision: e8a24c079c4930c6ddbab17fc444027ba41491ca
-  specs:
-    releasy (0.2.3)
-      bundler (>= 1.2.1)
-      cri (~> 2.1.0)
-      ocra (~> 1.3.0)
-      rake (>= 0.9.2.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    cri (2.1.0)
+    cyberarm_engine (0.24.1)
-    cyberarm_engine (0.24.0)
       excon (~> 0.88)
       gosu (~> 1.1)
       gosu_more_drawables (~> 0.3)
-    excon (0.105.0)
+    excon (0.109.0)
     gosu (1.4.6)
     gosu_more_drawables (0.3.1)
-    gosu_notifications (0.1.0)
+    ocran (1.3.15)
-    ocra (1.3.11)
-    rake (13.1.0)
 
 PLATFORMS
   x64-mingw-ucrt
-  x64-mingw32
-  x86_64-linux
 
 DEPENDENCIES
   cyberarm_engine
-  gosu_notifications
+  ocran
-  ocra
-  releasy!
 
 BUNDLED WITH
-   2.4.3
+   2.5.3

lib/pages/editor.rb

@@ -119,14 +119,19 @@ module TAC
               @actions_menu = flow(width: 1.0, height: 36) do
                 label "Actions", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
 
-                button get_image("#{TAC::MEDIA_PATH}/icons/up.png"), image_width: THEME_ICON_SIZE, tip: "Move selected action up (and its children, if applicable)" do
+                # TODO: Implement this
+                # button get_image("#{TAC::MEDIA_PATH}/icons/barsHorizontal.png"), image_width: THEME_ICON_SIZE, tip: "Auto renumber engine actions", margin_right: 16, enabled: false do
+                # end
+
+                button get_image("#{TAC::MEDIA_PATH}/icons/up.png"), image_width: THEME_ICON_SIZE, tip: "Move selected action up (and its children, if holding SHIFT)" do
                   if @active_group && @active_action
                     shift_action(@active_action, :up)
                   else
                     push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action, no action selected.")
                   end
                 end
-                button get_image("#{TAC::MEDIA_PATH}/icons/down.png"), image_width: THEME_ICON_SIZE, tip: "Move selected action down (and its children, if applicable)" do
+
+                button get_image("#{TAC::MEDIA_PATH}/icons/down.png"), image_width: THEME_ICON_SIZE, tip: "Move selected action down (and its children, if holding SHIFT)" do
                   if @active_group && @active_action
                     shift_action(@active_action, :down)
                   else
@@ -392,6 +397,12 @@ module TAC
           comment_label.value = comment.to_s
         end
 
+        if action_is_child?(action)
+          action_container.style.default[:margin_left] = 72
+        else
+          action_container.style.default[:margin_left] = 0
+        end
+
         action_container.style.tag = name
 
         update_list_children(@actions_list)
@@ -581,20 +592,7 @@ module TAC
         index = @active_group.actions.index(action)
 
         # Determine whether we should intent this action's container element because it is for a child state (i.e. 00-01)
-        indent = false
+        indent = action_is_child?(action)
-        base, subbase = action.name.split("-", 2)
-        subbase_int = -1
-
-        if subbase
-          begin
-            Integer(base) # Convert to integer to verify that it is in fact, an integer.
-            subbase_int = Integer(subbase)
-          rescue ArgumentError
-            subbase_int = -1
-          end
-
-          indent = subbase_int > 0
-        end
 
         stack width: 1.0, height: action.comment.empty? ? 36 : 72, **THEME_ITEM_CONTAINER_PADDING, margin_left: indent ? 72 : 0, tag: action.name do |container|
           background action == @active_action ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
@@ -655,48 +653,23 @@ module TAC
 
       def shift_action(action, direction)
         # Determine whether this action is named as required for this operation
-        valid_name = false
+        valid_name = valid_engine_action_name?(action)
-        am_child = false
+        am_child = action_is_child?(action)
-        base, subbase = action.name.split("-", 2)
+        index = @active_group.actions.index(action)
-        base_int = -1
+        move_children = shift_down? # require that a SHIFT key is down when moving childen with their current parent to prevent undesired relocations.
-        subbase_int = -1
-
-        if subbase
-          begin
-            base_int = Integer(base)
-            subbase_int = Integer(subbase)
-          rescue ArgumentError
-            base_int = -1
-            subbase_int = -1
-          end
-
-          valid_name = base_int >= 0
-          am_child = subbase_int > 0 # 00-00 is a 'base' action where as 00-01 is a 'subbase' action.
-
-          # Debug prints
-          # pp [base, subbase, base_int, subbase_int, valid_name, am_child]
-        end
 
         unless valid_name
-          push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action, incorrectly formated name.")
+          push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action, incorrectly formated name.\nExpected: name to be like '00-00' not '#{action.name}'")
 
           return
         end
 
-        if am_child
+        base_int = valid_name[0]
-          push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action, cannot yet shift child actions.")
+        subbase_int = valid_name[1]
 
-          return
+        return if direction == :up && index.zero?
-        end
 
-        if direction == :up && base_int.zero?
+        index_before = index - 1 >= 0 ? index - 1 : nil
-          push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action up, already first action.")
-
-          return
-        end
-
-        index = @active_group.actions.index(action)
-        index_before = index - 1 > 0 ? index - 1 : nil
         index_next = index + 1 < @active_group.actions.size ? index + 1 : nil
 
         mutated = false
@@ -704,53 +677,47 @@ module TAC
         case direction
         when :up
           if index_before
-            a_before = @active_group.actions[index_before]
+            other = @active_group.actions[index_before]
+            other_is_child = action_is_child?(other)
 
-            old_name = action.name
+            i = index
-            new_name = a_before.name
 
-            action.name = a_before.name
+            while(other && ((!am_child && other_is_child) || (am_child && !other_is_child)))
-            a_before.name = old_name
+              i -= 1
+              index_before = i - 1 >= 0 ? i - 1 : nil
 
-            action_container = find_element_by_tag(@actions_list, old_name)
+              return unless index_before
-            action_label = find_element_by_tag(action_container, "label")
+              return if am_child && valid_engine_action_name?(other).to_a[0].to_i != base_int
 
-            a_before_container = find_element_by_tag(@actions_list, new_name)
+              other = @active_group.actions[index_before]
-            a_before_label = find_element_by_tag(a_before_container, "label")
+              other_is_child = action_is_child?(other)
-
+            end
-            action_container.style.tag = action.name
-            a_before_container.style.tag = a_before.name
-            action_label.value = action.name
-            a_before_label.value = a_before.name
 
+            move_child_actions(other, action) if move_children
+            swap_action(action, other)
             mutated = true
-          else
-            push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action up, already last action.")
           end
         when :down
           if index_next
-            a_next = @active_group.actions[index_next]
+            other = @active_group.actions[index_next]
+            other_is_child = action_is_child?(other)
 
-            old_name = action.name
+            i = index
-            new_name = a_next.name
 
-            action.name = a_next.name
+            while(other && ((!am_child && other_is_child) || (am_child && !other_is_child)))
-            a_next.name = old_name
+              i += 1
+              index_next = i + 1 < @active_group.actions.size ? i + 1 : nil
 
-            action_container = find_element_by_tag(@actions_list, old_name)
+              return unless index_next
-            action_label = find_element_by_tag(action_container, "label")
+              return if am_child && valid_engine_action_name?(other).to_a[0].to_i != base_int
 
-            a_next_container = find_element_by_tag(@actions_list, new_name)
+              other = @active_group.actions[index_next]
-            a_next_label = find_element_by_tag(a_next_container, "label")
+              other_is_child = action_is_child?(other)
-
+            end
-            action_container.style.tag = action.name
-            a_next_container.style.tag = a_next.name
-            action_label.value = action.name
-            a_next_label.value = a_next.name
 
+            move_child_actions(action, other) if move_children
+            swap_action(action, other)
             mutated = true
-          else
-            push_state(TAC::Dialog::AlertDialog, title: "Error", message: "Unable to shift action down, already last action.")
           end
         end
 
@@ -767,6 +734,93 @@ module TAC
         scroll_into_view(action)
       end
 
+      def swap_action(action, other)
+        old_name = action.name
+        new_name = other.name
+
+        action.name = other.name
+        other.name = old_name
+
+        action_container = find_element_by_tag(@actions_list, old_name)
+        action_label = find_element_by_tag(action_container, "label")
+
+        other_container = find_element_by_tag(@actions_list, new_name)
+        other_label = find_element_by_tag(other_container, "label")
+
+        action_container.style.tag = action.name
+        other_container.style.tag = other.name
+        action_label.value = action.name
+        other_label.value = other.name
+      end
+
+      def move_child_actions(action, other)
+        # Ordered: OTHER, ACTION
+        children = [select_child_actions(other), select_child_actions(action)]
+
+        [action, other].each_with_index do |a, i|
+          new_base_int, _new_subbase_int = valid_engine_action_name?(a)
+
+          children[i].each do |child|
+            child_base_int, child_subbase_int = valid_engine_action_name?(child)
+
+            # puts format("MOVING CHILD: #{child.name} (#{child.comment}) from %02d-00 to %02d-00", child_base_int, new_base_int)
+            new_name = format("%02d-%02d", new_base_int, child_subbase_int)
+
+            action_container = find_element_by_tag(@actions_list, child.name)
+            action_label = find_element_by_tag(action_container, "label")
+
+            action_container.style.tag = new_name
+            action_label.value = new_name
+
+            child.name = new_name
+          end
+        end
+      end
+
+      def select_child_actions(action)
+        valid_name = valid_engine_action_name?(action)
+
+        @active_group.actions.select do |a|
+          child_base_int, _child_subbase_int = valid_engine_action_name?(a)
+
+          next unless child_base_int
+
+          child_base_int == valid_name[0] && action_is_child?(a)
+        end
+      end
+
+      def valid_engine_action_name?(action)
+        base, subbase = action.name.split("-", 2)
+        base_int = -1
+        subbase_int = -1
+
+        return false unless base && subbase
+
+        return false unless base.length == 2 && subbase.length == 2
+
+        # Work around bug in Ruby's `Integer("08")` parser
+        base = base[0] == "0" ? base[1] : base
+        subbase = subbase[0] == "0" ? subbase[1] : subbase
+
+        begin
+          base_int = Integer(base)
+          subbase_int = Integer(subbase)
+        rescue ArgumentError
+          base_int = -1
+          subbase_int = -1
+        end
+
+        return [base_int, subbase_int] if base_int >= 0 && subbase_int >= 0
+
+        return false
+      end
+
+      def action_is_child?(action)
+        _base_int, subbase_int = valid_engine_action_name?(action)
+
+        return (subbase_int && subbase_int > 0) ? true : false
+      end
+
       def draw
         super
 
@@ -774,7 +828,7 @@ module TAC
           item = @highlight_item_container
 
           Gosu.draw_rect(
-            item.x, item.y,
+            item.x, item.y + (item&.parent&.scroll_top || 0),
             item.width, item.height,
             @highlight_animator.color_transition,
             item.z + 1

lib/version.rb

@@ -1,5 +1,6 @@
 module TAC
   NAME = "TimeCrafters Configuration Tool"
-  VERSION = "0.7.2"
+  RELEASE_DATE = "2024-01-19" # ISO 8601 Date of version release
-  RELEASE_NAME = "Beta"
+  VERSION = "0.8.0"
+  RELEASE_NAME = "BETA"
 end

lib/window.rb

@@ -5,7 +5,7 @@ module TAC
     def initialize(**args)
       super(**args)
 
-      self.caption = "#{TAC::NAME} v#{TAC::VERSION} (#{TAC::RELEASE_NAME})"
+      self.caption = "#{TAC::NAME} v#{TAC::VERSION} (#{TAC::RELEASE_NAME}) [#{TAC::RELEASE_DATE}]"
       @backend = Backend.new
       @notification_manager = CyberarmEngine::NotificationManager.new(window: self, edge: :bottom)
 

timecrafters_configuration_tool.rb

@@ -1,5 +1,5 @@
 begin
-  raise LoadError if defined?(Ocra)
+  raise LoadError if defined?(Ocra) || defined?(Ocran)
   require_relative "../cyberarm_engine/lib/cyberarm_engine"
 rescue LoadError
   require "cyberarm_engine"
@@ -73,7 +73,7 @@ require_relative "lib/game_clock/net/packet"
 USE_REDESIGN = ARGV.include?("--redesign")
 BORDERLESS = ARGV.include?("--borderless")
 
-if not defined?(Ocra)
+unless defined?(Ocra) || defined?(Ocran)
   TAC::Window.new(width: (Gosu.screen_width * 0.8).round, height: (Gosu.screen_height * 0.8).round, resizable: true, borderless: BORDERLESS).show
 end