From a0f792d8feadf919290b8349dbc0eac143545927 Mon Sep 17 00:00:00 2001
From: _Tradam <github@tradam.dev>
Date: Mon, 3 Jan 2022 08:26:24 -0500
Subject: Major 4.0 Update (#16)

See Changelog
---
 deprecated/helpers/00_tileset.rb   |  28 ++++----
 deprecated/helpers/01_component.rb | 131 ++++++++++++++++++-------------------
 2 files changed, 77 insertions(+), 82 deletions(-)

(limited to 'deprecated/helpers')

diff --git a/deprecated/helpers/00_tileset.rb b/deprecated/helpers/00_tileset.rb
index c4293cb..9d727f9 100644
--- a/deprecated/helpers/00_tileset.rb
+++ b/deprecated/helpers/00_tileset.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Coverage Ignored because the functionality of this
 # code will not be used for the core of FelFlame.
 # It will most likely be released as a seperate package
@@ -9,39 +11,39 @@ class Helper
   # If any are missing then it will load them from files
 
   @json_data = {}
-  class <<self
+  class << self
     attr_accessor :json_data
 
     def get_json_tiles(json_name, hitbox: false)
-      unless hitbox
-        return nil if json_name == 'hitbox' && !Components::DebugSingleton.data
-      end
+      return nil if !hitbox && (json_name == 'hitbox' && !Components::DebugSingleton.data)
 
-      if self.json_data[json_name].nil?
-        self.json_data[json_name] = $gtk.parse_json_file "assets/json/#{json_name}.json"
-        raise Exception.new "#{json_name} is null and not loaded. Cannot get json tile" if self.json_data[json_name].nil?
+      if json_data[json_name].nil?
+        json_data[json_name] = $gtk.parse_json_file "assets/json/#{json_name}.json"
+        raise StandardError, "#{json_name} is null and not loaded. Cannot get json tile" if json_data[json_name].nil?
 
-        if self.json_data[json_name]['type'] == 'map' #json_name.split("_").first == 'map'
-          self.json_data[json_name]['tilesets'].each do |tileset|
+        if json_data[json_name]['type'] == 'map' # json_name.split("_").first == 'map'
+          json_data[json_name]['tilesets'].each do |tileset|
             tileset = Helper.get_json_tiles(tileset['source'].split('/').last.delete_suffix('.tsx'))
             # download tileset here
             # $gtk.args.gtk.http_get 'https://mysite.net/#{tileset['name']}.png'
           end
         end
       end
-      self.json_data[json_name]
+      json_data[json_name]
     end
 
     def get_tile(json_name:, tile_index:)
       if json_name == 'hitbox' && !Components::DebugSingleton.data
         return tile_index - 1 if tile_index > 1
+
         return {}
       end
 
-      json_tiles = self.get_json_tiles(json_name)
-      raise Exception.new "Error, json file not a tileset" unless json_tiles['type'] == 'tileset'
+      json_tiles = get_json_tiles(json_name)
+      raise StandardError, 'Error, json file not a tileset' unless json_tiles['type'] == 'tileset'
       return tile_index - json_tiles['tilecount'] if tile_index > json_tiles['tilecount']
-      source_height_tiles = (tile_index.to_i / json_tiles['columns'].to_i).to_i# * json_tiles['tileheight']
+
+      source_height_tiles = (tile_index.to_i / json_tiles['columns'].to_i).to_i # * json_tiles['tileheight']
       { w: json_tiles['tilewidth'],
         h: json_tiles['tileheight'],
         path: json_tiles['image'].split('mygame/').last.delete('\\'),
diff --git a/deprecated/helpers/01_component.rb b/deprecated/helpers/01_component.rb
index 2065d0c..12cce09 100644
--- a/deprecated/helpers/01_component.rb
+++ b/deprecated/helpers/01_component.rb
@@ -1,74 +1,67 @@
+# frozen_string_literal: true
+
 class FelFlame
   class Helper
+    #  # Unused:
+    #     class Level < FelFlame::Helper::ComponentManager
+    #       class <<self
+    #         def data
+    #           @data ||= { add: [], remove: [], grid: FelFlame::Helper::Array2D.new }
+    #         end
+    #
+    #         def add(entity_id)
+    #           super
+    #           data[:add].push entity_id
+    #         end
+    #
+    #         def remove(entity_id)
+    #           data[:remove].push entity_id
+    #           super
+    #         end
+    #       end
+    #     end
+    #     class Array2D < Array
+    #       def [](val)
+    #         unless val.nil?
+    #           return self[val] = [] if super.nil?
+    #         end
+    #         super
+    #       end
+    #     end
+    #     class ArrayOfHashes < Array
+    #       def [](val)
+    #         unless val.nil?
+    #           return self[val] = {} if super.nil?
+    #         end
+    #         super
+    #       end
+    #     end
 
-=begin
- # Unused:
-    class Level < FelFlame::Helper::ComponentManager
-      class <<self
-        def data
-          @data ||= { add: [], remove: [], grid: FelFlame::Helper::Array2D.new }
-        end
-
-        def add(entity_id)
-          super
-          data[:add].push entity_id
-        end
-
-        def remove(entity_id)
-          data[:remove].push entity_id
-          super
-        end
-      end
-    end
-=end
-=begin
-    class Array2D < Array
-      def [](val)
-        unless val.nil?
-          return self[val] = [] if super.nil?
-        end
-        super
-      end
-    end
-=end
-=begin
-    class ArrayOfHashes < Array
-      def [](val)
-        unless val.nil?
-          return self[val] = {} if super.nil?
-        end
-        super
-      end
-    end
-=end
-
-=begin
-    module ComponentHelper
-      class <<self
-        def up? char
-          char == char.upcase
-        end
-
-        def down? char
-          char == char.downcase
-        end
-
-        def underscore(input)
-          output = input[0].downcase
-          (1...(input.length - 1)).each do |iter|
-            if down?(input[iter]) && up?(input[iter + 1])
-              output += "#{input[iter].downcase}_"
-            elsif up?(input[iter - 1]) && up?(input[iter]) && down?(input[iter + 1])
-              output += "_#{input[iter].downcase}"
-            else
-              output += input[iter].downcase
-            end
-          end
-          output += input[-1].downcase unless input.length == 1
-          output
-        end
-      end
-    end
-=end
+    #     module ComponentHelper
+    #       class <<self
+    #         def up? char
+    #           char == char.upcase
+    #         end
+    #
+    #         def down? char
+    #           char == char.downcase
+    #         end
+    #
+    #         def underscore(input)
+    #           output = input[0].downcase
+    #           (1...(input.length - 1)).each do |iter|
+    #             if down?(input[iter]) && up?(input[iter + 1])
+    #               output += "#{input[iter].downcase}_"
+    #             elsif up?(input[iter - 1]) && up?(input[iter]) && down?(input[iter + 1])
+    #               output += "_#{input[iter].downcase}"
+    #             else
+    #               output += input[iter].downcase
+    #             end
+    #           end
+    #           output += input[-1].downcase unless input.length == 1
+    #           output
+    #         end
+    #       end
+    #     end
   end
 end
-- 
cgit v1.2.3