line-em-up 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355d80eddd51bba34630ada558a16331979bb1ce
-  data.tar.gz: e8005d22fdf8599ddc3c36525c1bad61a9995387
+  metadata.gz: 36230f97fa8a9410ec6aaa037ccf96927225a228
+  data.tar.gz: 848b5b2c38e62b4adf4abbcc5b94d6c14f444c74
 SHA512:
-  metadata.gz: 68ddd19bc70a4665892dae349b58bdf101c2698440662214ac8fc57144725861ce97cdc7d420e7d27b71099a3a8d08284392d48a36f29819ac9a6dccff57c9e1
-  data.tar.gz: 4514d5bfff105922305f2460571f7d64152020c5af47077a9a09136efceb4c90be79f6507781eae6c6efc355584ddc491031164d1d40a4ba35b1f16c7053bad2
+  metadata.gz: 3a32a7c25a62c46a5c58729012ed8c8bd80ce440e1c2322e56363da3eb7c4e9df17a27ee8a5970b8541f2e022927ba8fdb97b91556e8dca45f1071a544d1c321
+  data.tar.gz: e1a811212aa923a2a878cc91b4e2870d09e7665983fcae74cfbd83ed5c70df7398820ff058bee8d16de3ada9fb79abc66ec4ebbe2c514dfd9908e9bf9082b6b6

data/bin/line-em-up.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 SCRIPT_DIRECTORY = File.expand_path('../../', __FILE__)
+CONFIG_FILE = File.expand_path('../../', __FILE__) + '/config.txt'
 require "#{SCRIPT_DIRECTORY}/menu_launcher.rb"
-Main.new.show
+Main.new(CONFIG_FILE).show

data/line-em-up/game_window.rb

@@ -79,6 +79,7 @@ class GameWindow < Gosu::Window
     @config_path = self.class::CONFIG_FILE
     @window = self
     @open_gl_executer = ExecuteOpenGl.new
+    # GET difficulty from config file.!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     @difficulty = options[:difficulty]
     @block_all_controls = !options[:block_controls_until_button_up].nil? && options[:block_controls_until_button_up] == true ? true : false
     @debug = options[:debug]

data/line-em-up/lib/config_setting.rb

@@ -35,6 +35,7 @@ module ConfigSetting
   end
 
   def self.get_setting file_location, setting_name, default_value = nil
+    raise "NO FILE LOCATION PATH" if file_location.nil?
     create_file_if_non_existent(file_location)
     test = File.readlines(file_location).select { |line| line =~ /^#{setting_name}: ([^;]*);$/ }
     if test && test.first
@@ -53,6 +54,7 @@ module ConfigSetting
   end
 
   def self.set_mapped_setting file_location, setting_names, setting_value
+    raise "NO FILE LOCATION PATH" if file_location.nil?
     puts "set_mapped_setting".upcase
     puts setting_names
     puts setting_value
@@ -149,6 +151,7 @@ module ConfigSetting
   end
 
   def self.get_mapped_setting file_location, setting_names = [], default_value = nil
+    raise "NO FILE LOCATION PATH" if file_location.nil?
     create_file_if_non_existent(file_location)
     setting_name = setting_names.shift
     text = (File.readlines(file_location).select { |line| line =~ /^#{setting_name}: ([^;]*);$/ }).first
@@ -168,7 +171,11 @@ module ConfigSetting
         indexer = indexer.to_s if indexer
       end
       puts "FOUND DATA: #{data}"
-      return data
+      if data
+        return data
+      else
+        return default_value
+      end
     else
       return default_value
     end

data/line-em-up/lib/ship_loadout_setting.rb

@@ -127,7 +127,32 @@ class ShipLoadoutSetting < Setting
         key = "matrix_#{x}_#{y}"
         click_area = LUIT::ClickArea.new(@window, key, current_x, current_y, @cell_width, @cell_height)
         # click_area = LUIT::Button.new(@window, click_key, current_x, current_y, '', @cell_width, @cell_height)
-        klass_name = ConfigSetting.get_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s])
+        # Kludge here to populate inventory on first load, without committing the config file.
+        # puts "X AND Y START : #{x} - #{y}"
+        # if y == 0
+        #   klass_name = ConfigSetting.get_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'DumbMissileLauncher')
+        #   if klass_name == 'DumbMissileLauncher'
+        #     puts "SETTING X AND Y: #{x} - #{y} - with DumbMissileLauncher"
+        #     ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'DumbMissileLauncher')
+        #   end
+        # elsif y == 1
+        #   klass_name = ConfigSetting.get_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'LaserLauncher')
+        #   puts "Y HERE was 1: AND GOT ORIGINAL KLASS HERE #{klass_name}"
+        #   if klass_name == 'LaserLauncher'
+        #     puts "SETTING X AND Y: #{x} - #{y} - with LaserLauncher"
+        #     ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'LaserLauncher')
+        #   end
+        # elsif y == 2
+        #   klass_name = ConfigSetting.get_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'BulletLauncher')
+        #   if klass_name == 'BulletLauncher'
+        #     puts "SETTING X AND Y: #{x} - #{y} - with BulletLauncher"
+        #     ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s], 'BulletLauncher')
+        #   end
+        # else
+          klass_name = ConfigSetting.get_mapped_setting(@config_file_path, ['Inventory', x.to_s, y.to_s])
+        # end
+        puts "X and Y WAS : #{x} - #{y}"
+        puts "CLASS WAS: #{klass_name}"
         item = nil
         if klass_name
           klass = eval(klass_name)

data/line-em-up/loadout_window.rb

@@ -37,6 +37,7 @@ class LoadoutWindow < Gosu::Window
   attr_accessor :width, :height, :block_all_controls, :game_window
   # attr_accessor :mouse_x, :mouse_y
   def initialize width = nil, height = nil, fullscreen = false, options = {}
+    @block_all_controls = !options[:block_controls_until_button_up].nil? && options[:block_controls_until_button_up] == true ? true : false
     puts "INCOMING WIDHT AND HEIGHT: #{width} and #{height}"
     @config_file_path = self.class::CONFIG_FILE
     @cursor_object = nil
@@ -194,6 +195,10 @@ class LoadoutWindow < Gosu::Window
     end
   end
 
+  def button_up id
+    @block_all_controls = false
+  end
+
   def increase_center_font_ui_y amount
     @center_ui_y += amount 
   end
@@ -215,6 +220,7 @@ class LoadoutWindow < Gosu::Window
     {
       # back: lambda { |window, id| window.close; Main.new.show }
       back: lambda { |window, id|
+        puts "RIGHT HERE IS THE ISSUE!!!!!!!!!!!!!!!!"
         # puts "SElocal_windowLF? #{local_window.class.name}"
         # can't get it to bring the game window back
         # self.close
@@ -225,9 +231,9 @@ class LoadoutWindow < Gosu::Window
         # puts "!!!!!!GAME wINDOW: #{window.game_window}"
         if window.game_window
         #   window.game_window.show
-          GameWindow.new.show
+          GameWindow.new(nil, nil, nil, {block_controls_until_button_up: true}).show
         else
-          Main.new.show
+          Main.new(@config_file_path, {block_controls_until_button_up: true}).show
         end
       }
     }

data/line-em-up/models/main.rb

@@ -5,13 +5,18 @@ class Main < Gosu::Window
   require "#{CURRENT_DIRECTORY}/../game_window.rb"
   require "#{CURRENT_DIRECTORY}/../loadout_window.rb"
 
-
-  def initialize config_path = nil
-    config_path = CONFIG_FILE if config_path.nil?
+  # block_controls_until_button_up: true
+  attr_accessor :block_all_controls, :config_path
+  def initialize config_path = nil, options = {}
+    @block_all_controls = !options[:block_controls_until_button_up].nil? && options[:block_controls_until_button_up] == true ? true : false
+    puts "MAIN HERE: block? #{@block_all_controls}"
+    @config_file_path = config_path
+    @config_file_path = CONFIG_FILE if config_path.nil?
+    puts "MAIN CONFIG INITL: #{@config_file_path} - #{config_path} - #{CONFIG_FILE}"
 
 
     # @width, @height = ResolutionSetting::SELECTION[0].split('x').collect{|s| s.to_i}
-    value = ConfigSetting.get_setting(config_path, 'resolution', ResolutionSetting::SELECTION[0])
+    value = ConfigSetting.get_setting(@config_file_path, 'resolution', ResolutionSetting::SELECTION[0])
     raise "DID NOT GET A RESOLUTION FROM CONFIG" if value.nil?
     width, height = value.split('x')
     @width, @height = [width.to_i, height.to_i]
@@ -58,10 +63,10 @@ class Main < Gosu::Window
 
     window_height = Gosu.screen_height
     @window = self
-    @resolution_menu = ResolutionSetting.new(@window, window_height, @width, @height, get_center_font_ui_y, config_path)
+    @resolution_menu = ResolutionSetting.new(@window, window_height, @width, @height, get_center_font_ui_y, @config_file_path)
 
     @difficulty = nil
-    @difficulty_menu = DifficultySetting.new(@window, window_height, @width, @height, get_center_font_ui_y, config_path)
+    @difficulty_menu = DifficultySetting.new(@window, window_height, @width, @height, get_center_font_ui_y, @config_file_path)
     @menu = Menu.new(self, @width / 2, get_center_font_ui_y, ZOrder::UI, @scale)
     # Just move everything else above the menu
     # increase_center_font_ui_y(@menu.current_height)
@@ -75,7 +80,11 @@ class Main < Gosu::Window
       LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Start", 0, 1),
       0,
       0,
-      lambda {|window, id| self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, difficulty: @difficulty}) },
+      lambda {|window, id|
+        if !@block_all_controls
+          self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, difficulty: @difficulty})
+        end
+      },
       # lambda {|window, id| self.close },
       nil,
       {is_button: true, key: button_key}
@@ -91,7 +100,11 @@ class Main < Gosu::Window
       LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Loadout", 0, 1),
       0,
       0,
-      lambda {|window, id| self.close; LoadoutWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true}) },
+      lambda {|window, id|
+        if !@block_all_controls
+          self.close; LoadoutWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true})
+        end
+      },
       nil,
       {is_button: true, key: button_key}
     )
@@ -99,21 +112,54 @@ class Main < Gosu::Window
     # debug_start_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/debug_start.png")
     # @menu.add_item(debug_start_image, (@width / 2) - (debug_start_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty}) }, debug_start_image)
 
-    button_key = :debug_start
+    # button_key = :debug_start
+    # @menu.add_item(
+    #   LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Debug Start", 0, 1),
+    #   0,
+    #   0,
+    #   lambda {|window, id|
+    #     if !@block_all_controls
+    #       self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty})
+    #     end
+    #   },
+    #   nil,
+    #   {is_button: true, key: button_key}
+    # )
+    button_key = :debug_start # too lazy to rename
     @menu.add_item(
-      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Debug Start", 0, 1),
+      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Populate Inventory", 0, 1),
       0,
       0,
-      lambda {|window, id| self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty}) },
+      lambda {|window, id|
+        if !@block_all_controls
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '0'.to_s, '0'.to_s], 'DumbMissileLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '1'.to_s, '0'.to_s], 'DumbMissileLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '2'.to_s, '0'.to_s], 'DumbMissileLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '0'.to_s, '1'.to_s], 'LaserLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '1'.to_s, '1'.to_s], 'LaserLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '2'.to_s, '1'.to_s], 'LaserLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '0'.to_s, '2'.to_s], 'BulletLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '1'.to_s, '2'.to_s], 'BulletLauncher')
+          ConfigSetting.set_mapped_setting(@config_file_path, ['Inventory', '2'.to_s, '2'.to_s], 'BulletLauncher')
+        end
+      },
       nil,
       {is_button: true, key: button_key}
     )
+
     button_key = :exit
     @menu.add_item(
       LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Exit", 0, 1),
       0,
       0,
-      lambda {|window, id| self.close },
+      lambda {|window, id|
+        puts "WINDOW: #{window.class}"
+        puts "SELF blcok?: #{self.block_all_controls}"
+        puts "EXIT BUTTON: @block_all_controls: #{@block_all_controls}"
+        if !@block_all_controls
+          self.close
+        end
+      },
       nil,
       {is_button: true, key: button_key}
     )
@@ -161,6 +207,10 @@ class Main < Gosu::Window
     end
   end
 
+  def button_up id
+    @block_all_controls = false
+  end
+
   def increase_center_font_ui_y amount
     @center_ui_y += amount 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-em-up
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ben Dana