cyberarm_engine 0.25.0 → 0.30.0

data/lib/cyberarm_engine/common.rb

@@ -1,131 +1,133 @@
-module CyberarmEngine
-  module Common
-    ImageBlob = Data.define(:to_blob, :columns, :rows)
-
-    def push_state(klass, options = {})
-      window.push_state(klass, options)
-    end
-
-    def current_state
-      window.current_state
-    end
-
-    def previous_state(state = nil)
-      raise "Only available for CyberarmEngine::GameState and subclasses" unless is_a?(CyberarmEngine::GameState) || state.is_a?(CyberarmEngine::GameState)
-
-      i = window.states.index(state || self)
-      window.states[i - 1] unless (i - 1).negative?
-    end
-
-    def pop_state
-      window.pop_state
-    end
-
-    def shift_state
-      window.shift_state
-    end
-
-    def show_cursor
-      window.show_cursor
-    end
-
-    def show_cursor=(boolean)
-      window.show_cursor = boolean
-    end
-
-    def find_element_by_tag(container, tag, list = [])
-      return unless container
-
-      container.children.each do |child|
-        list << child if child.style.tag == tag
-
-        find_element_by_tag(child, tag, list) if child.is_a?(CyberarmEngine::Element::Container)
-      end
-
-      list.first
-    end
-
-    def draw_rect(x, y, width, height, color, z = 0, mode = :default)
-      Gosu.draw_rect(x, y, width, height, color, z, mode)
-    end
-
-    def fill(color, z = 0)
-      draw_rect(0, 0, window.width, window.height, color, z)
-    end
-
-    def lighten(color, amount = 25)
-      if color.respond_to?(:alpha)
-        Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha)
-      else
-        Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount)
-      end
-    end
-
-    def darken(color, amount = 25)
-      if color.respond_to?(:alpha)
-        Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha)
-      else
-        Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount)
-      end
-    end
-
-    def opacity(color, ratio = 1.0)
-      alpha = 255 * ratio
-
-      Gosu::Color.rgba(color.red, color.green, color.blue, alpha)
-    end
-
-    def get_asset(path, hash, klass, retro = false, tileable = false)
-      asset = nil
-      hash.detect do |_asset, instance|
-        if _asset == path
-          asset = instance
-          true
-        end
-      end
-
-      unless asset
-        instance = nil
-        instance = if klass == Gosu::Image
-                     path_or_blob = path.is_a?(String) ? path : ImageBlob.new(path.to_blob, path.width, path.height)
-                     klass.new(path_or_blob, retro: retro, tileable: tileable)
-                   else
-                     klass.new(path)
-                   end
-
-        hash[path] = instance
-        asset = instance
-      end
-
-      asset
-    end
-
-    def get_image(path, retro: false, tileable: false)
-      get_asset(path, Window::IMAGES, Gosu::Image, retro, tileable)
-    end
-
-    def get_sample(path)
-      get_asset(path, Window::SAMPLES, Gosu::Sample)
-    end
-
-    def get_song(path)
-      get_asset(path, Window::SONGS, Gosu::Song)
-    end
-
-    def window
-      CyberarmEngine::Window.instance
-    end
-
-    def control_down?
-      Gosu.button_down?(Gosu::KB_LEFT_CONTROL) || Gosu.button_down?(Gosu::KB_RIGHT_CONTROL)
-    end
-
-    def shift_down?
-      Gosu.button_down?(Gosu::KB_LEFT_SHIFT) || Gosu.button_down?(Gosu::KB_RIGHT_SHIFT)
-    end
-
-    def alt_down?
-      Gosu.button_down?(Gosu::KB_LEFT_ALT) || Gosu.button_down?(Gosu::KB_RIGHT_ALT)
-    end
-  end
-end
+module CyberarmEngine
+  GUI_DEBUG = false
+
+  module Common
+    ImageBlob = Data.define(:to_blob, :columns, :rows)
+
+    def push_state(klass, options = {})
+      window.push_state(klass, options)
+    end
+
+    def current_state
+      window.current_state
+    end
+
+    def previous_state(state = nil)
+      raise "Only available for CyberarmEngine::GameState and subclasses" unless is_a?(CyberarmEngine::GameState) || state.is_a?(CyberarmEngine::GameState)
+
+      i = window.states.index(state || self)
+      window.states[i - 1] unless (i - 1).negative?
+    end
+
+    def pop_state
+      window.pop_state
+    end
+
+    def shift_state
+      window.shift_state
+    end
+
+    def show_cursor
+      window.show_cursor
+    end
+
+    def show_cursor=(boolean)
+      window.show_cursor = boolean
+    end
+
+    def find_element_by_tag(container, tag, list = [])
+      return unless container
+
+      container.children.each do |child|
+        list << child if child.style.tag == tag
+
+        find_element_by_tag(child, tag, list) if child.is_a?(CyberarmEngine::Element::Container)
+      end
+
+      list.first
+    end
+
+    def draw_rect(x, y, width, height, color, z = 0, mode = :default)
+      Gosu.draw_rect(x, y, width, height, color, z, mode)
+    end
+
+    def fill(color, z = 0)
+      draw_rect(0, 0, window.width, window.height, color, z)
+    end
+
+    def lighten(color, amount = 25)
+      if color.respond_to?(:alpha)
+        Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha)
+      else
+        Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount)
+      end
+    end
+
+    def darken(color, amount = 25)
+      if color.respond_to?(:alpha)
+        Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha)
+      else
+        Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount)
+      end
+    end
+
+    def opacity(color, ratio = 1.0)
+      alpha = 255 * ratio
+
+      Gosu::Color.rgba(color.red, color.green, color.blue, alpha)
+    end
+
+    def get_asset(path, hash, klass, retro = false, tileable = false)
+      asset = nil
+      hash.detect do |_asset, instance|
+        if _asset == path
+          asset = instance
+          true
+        end
+      end
+
+      unless asset
+        instance = nil
+        instance = if klass == Gosu::Image
+                     path_or_blob = path.is_a?(String) ? path : ImageBlob.new(path.to_blob, path.width, path.height)
+                     klass.new(path_or_blob, retro: retro, tileable: tileable)
+                   else
+                     klass.new(path)
+                   end
+
+        hash[path] = instance
+        asset = instance
+      end
+
+      asset
+    end
+
+    def get_image(path, retro: false, tileable: false)
+      get_asset(path, Window::IMAGES, Gosu::Image, retro, tileable)
+    end
+
+    def get_sample(path)
+      get_asset(path, Window::SAMPLES, Gosu::Sample)
+    end
+
+    def get_song(path)
+      get_asset(path, Window::SONGS, Gosu::Song)
+    end
+
+    def window
+      CyberarmEngine::Window.instance
+    end
+
+    def control_down?
+      Gosu.button_down?(Gosu::KB_LEFT_CONTROL) || Gosu.button_down?(Gosu::KB_RIGHT_CONTROL)
+    end
+
+    def shift_down?
+      Gosu.button_down?(Gosu::KB_LEFT_SHIFT) || Gosu.button_down?(Gosu::KB_RIGHT_SHIFT)
+    end
+
+    def alt_down?
+      Gosu.button_down?(Gosu::KB_LEFT_ALT) || Gosu.button_down?(Gosu::KB_RIGHT_ALT)
+    end
+  end
+end

data/lib/cyberarm_engine/config_file.rb

@@ -1,46 +1,46 @@
-module CyberarmEngine
-  class ConfigFile
-    def initialize(file:)
-      @file = file
-
-      if File.exist?(@file)
-        deserialize
-      else
-        @data = {}
-      end
-    end
-
-    def []=(*keys, value)
-      last_key = keys.last
-
-      if keys.size == 1
-        hash = @data
-      else
-        keys.pop
-        hash = @data[keys.shift] ||= {}
-
-        keys.each do |key|
-          hash = hash[key] ||= {}
-        end
-      end
-
-      hash[last_key] = value
-    end
-
-    def get(*keys)
-      @data.dig(*keys)
-    end
-
-    def serialize
-      JSON.dump(@data)
-    end
-
-    def deserialize
-      @data = JSON.parse(File.read(@file), symbolize_names: true)
-    end
-
-    def save!
-      File.open(@file, "w") { |f| f.write(serialize) }
-    end
-  end
-end
+module CyberarmEngine
+  class ConfigFile
+    def initialize(file:)
+      @file = file
+
+      if File.exist?(@file)
+        deserialize
+      else
+        @data = {}
+      end
+    end
+
+    def []=(*keys, value)
+      last_key = keys.last
+
+      if keys.size == 1
+        hash = @data
+      else
+        keys.pop
+        hash = @data[keys.shift] ||= {}
+
+        keys.each do |key|
+          hash = hash[key] ||= {}
+        end
+      end
+
+      hash[last_key] = value
+    end
+
+    def get(*keys)
+      @data.dig(*keys)
+    end
+
+    def serialize
+      JSON.dump(@data)
+    end
+
+    def deserialize
+      @data = JSON.parse(File.read(@file), symbolize_names: true)
+    end
+
+    def save!
+      File.open(@file, "w") { |f| f.write(serialize) }
+    end
+  end
+end

data/lib/cyberarm_engine/console/command.rb

@@ -1,158 +1,158 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class Console
-    module Style
-      def self.error(string)
-        "<c=ff5555>#{string}</c>"
-      end
-
-      def self.warn(string)
-        "<c=ff7700>#{string}</c>"
-      end
-
-      def self.notice(string)
-        "<c=55ff55>#{string}</c>"
-      end
-
-      def self.highlight(string, color = "5555ff")
-        "<c=#{color}>#{string}</c>"
-      end
-    end
-
-    class Command
-      def self.inherited(subclass)
-        @list ||= []
-        @commands ||= []
-        @list << subclass
-      end
-
-      def self.setup
-        @list ||= []
-        @commands = []
-        @list.each do |subclass|
-          cmd = subclass.new
-          if @commands.detect { |c| c.command == cmd.command }
-            raise "Command '#{cmd.command}' from '#{cmd.class}' already exists!"
-          end
-
-          @commands << cmd
-        end
-      end
-
-      def self.use(command, arguments, console)
-        found_command = @commands.detect { |cmd| cmd.command == command.to_sym }
-
-        if found_command
-          found_command.handle(arguments, console)
-        else
-          console.stdin("Command #{Style.error(command)} not found.")
-        end
-      end
-
-      def self.find(command)
-        @commands.detect { |cmd| cmd.command == command.to_sym }
-      end
-
-      def self.list_commands
-        @commands
-      end
-
-      def initialize
-        @store = {}
-        @subcommands = []
-
-        setup
-      end
-
-      def setup
-      end
-
-      def subcommand(command, type)
-        if @subcommands.detect { |subcmd| subcmd.command == command.to_sym }
-          raise "Subcommand '#{command}' for '#{self.command}' already exists!"
-        end
-
-        @subcommands << SubCommand.new(self, command, type)
-      end
-
-      def get(key)
-        @store[key]
-      end
-
-      def set(key, value)
-        @store[key] = value
-      end
-
-      def group
-        raise NotImplementedError
-      end
-
-      def command
-        raise NotImplementedError
-      end
-
-      def handle(arguments, console)
-        raise NotImplementedError
-      end
-
-      def autocomplete(console)
-        split = console.text_input.text.split(" ")
-
-        if @subcommands.size.positive?
-          if !console.text_input.text.end_with?(" ") && split.size == 2
-            list = console.abbrev_search(@subcommands.map { |cmd| cmd.command.to_s }, split.last)
-
-            if list.size == 1
-              console.text_input.text = "#{split.first} #{list.first} "
-            else
-              return unless list.size.positive?
-
-              console.stdin(list.map { |cmd| Console::Style.highlight(cmd) }.join(", ").to_s)
-            end
-
-          # List available options on subcommand
-          elsif (console.text_input.text.end_with?(" ") && split.size == 2) || !console.text_input.text.end_with?(" ") && split.size == 3
-            subcommand = @subcommands.detect { |cmd| cmd.command.to_s == (split[1]) }
-
-            if subcommand
-              if split.size == 2
-                console.stdin("Available options: #{subcommand.values.map { |value| Console::Style.highlight(value) }.join(',')}")
-              else
-                list = console.abbrev_search(subcommand.values, split.last)
-                if list.size == 1
-                  console.text_input.text = "#{split.first} #{split[1]} #{list.first} "
-                elsif list.size.positive?
-                  console.stdin("Available options: #{list.map { |value| Console::Style.highlight(value) }.join(',')}")
-                end
-              end
-            end
-
-          # List available subcommands if command was entered and has only a space after it
-          elsif console.text_input.text.end_with?(" ") && split.size == 1
-            console.stdin("Available subcommands: #{@subcommands.map { |cmd| Console::Style.highlight(cmd.command) }.join(', ')}")
-          end
-        end
-      end
-
-      def handle_subcommand(arguments, console)
-        if arguments.size.zero?
-          console.stdin(usage)
-          return
-        end
-        subcommand = arguments.delete_at(0)
-
-        found_command = @subcommands.detect { |cmd| cmd.command == subcommand.to_sym }
-        if found_command
-          found_command.handle(arguments, console)
-        else
-          console.stdin("Unknown subcommand #{Style.error(subcommand)} for #{Style.highlight(command)}")
-        end
-      end
-
-      def usage
-        raise NotImplementedError
-      end
-    end
-  end
+# frozen_string_literal: true
+
+module CyberarmEngine
+  class Console
+    module Style
+      def self.error(string)
+        "<c=ff5555>#{string}</c>"
+      end
+
+      def self.warn(string)
+        "<c=ff7700>#{string}</c>"
+      end
+
+      def self.notice(string)
+        "<c=55ff55>#{string}</c>"
+      end
+
+      def self.highlight(string, color = "5555ff")
+        "<c=#{color}>#{string}</c>"
+      end
+    end
+
+    class Command
+      def self.inherited(subclass)
+        @list ||= []
+        @commands ||= []
+        @list << subclass
+      end
+
+      def self.setup
+        @list ||= []
+        @commands = []
+        @list.each do |subclass|
+          cmd = subclass.new
+          if @commands.detect { |c| c.command == cmd.command }
+            raise "Command '#{cmd.command}' from '#{cmd.class}' already exists!"
+          end
+
+          @commands << cmd
+        end
+      end
+
+      def self.use(command, arguments, console)
+        found_command = @commands.detect { |cmd| cmd.command == command.to_sym }
+
+        if found_command
+          found_command.handle(arguments, console)
+        else
+          console.stdin("Command #{Style.error(command)} not found.")
+        end
+      end
+
+      def self.find(command)
+        @commands.detect { |cmd| cmd.command == command.to_sym }
+      end
+
+      def self.list_commands
+        @commands
+      end
+
+      def initialize
+        @store = {}
+        @subcommands = []
+
+        setup
+      end
+
+      def setup
+      end
+
+      def subcommand(command, type)
+        if @subcommands.detect { |subcmd| subcmd.command == command.to_sym }
+          raise "Subcommand '#{command}' for '#{self.command}' already exists!"
+        end
+
+        @subcommands << SubCommand.new(self, command, type)
+      end
+
+      def get(key)
+        @store[key]
+      end
+
+      def set(key, value)
+        @store[key] = value
+      end
+
+      def group
+        raise NotImplementedError
+      end
+
+      def command
+        raise NotImplementedError
+      end
+
+      def handle(arguments, console)
+        raise NotImplementedError
+      end
+
+      def autocomplete(console)
+        split = console.text_input.text.split(" ")
+
+        if @subcommands.size.positive?
+          if !console.text_input.text.end_with?(" ") && split.size == 2
+            list = console.abbrev_search(@subcommands.map { |cmd| cmd.command.to_s }, split.last)
+
+            if list.size == 1
+              console.text_input.text = "#{split.first} #{list.first} "
+            else
+              return unless list.size.positive?
+
+              console.stdin(list.map { |cmd| Console::Style.highlight(cmd) }.join(", ").to_s)
+            end
+
+          # List available options on subcommand
+          elsif (console.text_input.text.end_with?(" ") && split.size == 2) || !console.text_input.text.end_with?(" ") && split.size == 3
+            subcommand = @subcommands.detect { |cmd| cmd.command.to_s == (split[1]) }
+
+            if subcommand
+              if split.size == 2
+                console.stdin("Available options: #{subcommand.values.map { |value| Console::Style.highlight(value) }.join(',')}")
+              else
+                list = console.abbrev_search(subcommand.values, split.last)
+                if list.size == 1
+                  console.text_input.text = "#{split.first} #{split[1]} #{list.first} "
+                elsif list.size.positive?
+                  console.stdin("Available options: #{list.map { |value| Console::Style.highlight(value) }.join(',')}")
+                end
+              end
+            end
+
+          # List available subcommands if command was entered and has only a space after it
+          elsif console.text_input.text.end_with?(" ") && split.size == 1
+            console.stdin("Available subcommands: #{@subcommands.map { |cmd| Console::Style.highlight(cmd.command) }.join(', ')}")
+          end
+        end
+      end
+
+      def handle_subcommand(arguments, console)
+        if arguments.size.zero?
+          console.stdin(usage)
+          return
+        end
+        subcommand = arguments.delete_at(0)
+
+        found_command = @subcommands.detect { |cmd| cmd.command == subcommand.to_sym }
+        if found_command
+          found_command.handle(arguments, console)
+        else
+          console.stdin("Unknown subcommand #{Style.error(subcommand)} for #{Style.highlight(command)}")
+        end
+      end
+
+      def usage
+        raise NotImplementedError
+      end
+    end
+  end
 end