smash_and_grab 0.0.5alpha → 0.0.6alpha

data/lib/smash_and_grab/states/edit_level.rb

@@ -4,6 +4,7 @@ module SmashAndGrab
 module States
 class EditLevel < World
   PLACEMENT_COLOR = Color.rgba(255, 255, 255, 190)
+  FACTIONS = [:baddies, :goodies, :bystanders]
 
   def initialize(file)
     super()
@@ -13,13 +14,23 @@ class EditLevel < World
 
     @selected_wall = nil
 
-    load_game file
+    factions = FACTIONS.map do |f|
+      Factions.const_get(f.capitalize).new
+    end
+
+    load_game file, factions
 
     on_input :right_mouse_button do
       @selector.pick_up(@hover_tile, @hover_wall)
     end
   end
 
+  def assign_entities_to_factions
+    map.world_objects.grep(Objects::Entity).each do |o|
+      o.faction = map.factions[FACTIONS.index o.default_faction_type]
+    end
+  end
+
   def create_gui
     @container = Fidgit::Container.new do |container|
       @minimap = Gui::Minimap.new parent: container
@@ -58,8 +69,8 @@ class EditLevel < World
     load_game @editing_file
   end
 
-  def load_game(file)
-    super
+  def load_game(file, factions)
+    super file, factions, start: false
     @editing_file = file
     @actions = EditorActionHistory.new
   end
@@ -194,4 +205,4 @@ class EditLevel < World
   end
 end
 end
-end
+end

data/lib/smash_and_grab/states/main_menu.rb

@@ -11,7 +11,7 @@ class MainMenu < Fidgit::GuiState
 
     @container.background_color = Color.rgb(0, 0, 25)
 
-    vertical align: :center do
+    vertical align: :center, padding: 0, spacing: 0 do
       horizontal align: :center do
         image_frame Objects::Static.sprites[1, 0], factor: 3
 
@@ -28,9 +28,21 @@ class MainMenu < Fidgit::GuiState
         image_frame Objects::Entity.sprites[3, 1], factor: 4
 
         vertical align: :center do
-          options = { width: 120, justify: :center }
-          button "Play", options do
-            push_game_state States::PlayLevel.new(GAME_FILE)
+          options = { width: 200, justify: :center }
+          button "Single Player", options do
+            push_game_state States::PlayLevel.new(GAME_FILE, Players::Human.new, Players::AI.new)
+          end
+
+          button "Co-op", options do
+            push_game_state States::PlayLevel.new(GAME_FILE, [Players::Human.new, Players::Human.new], Players::AI.new)
+          end
+
+          button "Hot-seat", options do
+            push_game_state States::PlayLevel.new(GAME_FILE, Players::Human.new, Players::Human.new)
+          end
+
+          button "AI vs AI", options do
+            push_game_state States::PlayLevel.new(GAME_FILE, Players::AI.new, Players::AI.new)
           end
 
           button "Edit", options do

data/lib/smash_and_grab/states/play_level.rb

@@ -5,63 +5,116 @@ module States
 class PlayLevel < World
   include Fidgit::Event
 
-  attr_reader :info_panel
+  attr_reader :info_panel, :cursor_world_x, :cursor_world_y
 
   event :game_info
   event :game_heading
 
-  def initialize(file)
+  # Players is villains
+  def initialize(file, baddies_players, goodies_players)
     super()
 
     add_inputs(space: :end_turn)
 
-    @players = [Players::Human.new, Players::AI.new, Players::AI.new]
+    @players = {
+      baddies: Array(baddies_players),
+      goodies: Array(goodies_players),
+      bystanders: [Players::AI.new],
+    }
 
     @quicksaved = false
+    @cursor_world_x = @cursor_world_x = nil
 
-    load_game file
+    factions = []
 
-    @players.each.with_index do |player, i|
-      map.factions[i].player = player
-      player.faction = map.factions[i]
-      player.faction.subscribe :turn_started do
-        publish :game_heading, "=== Turn #{map.turn + 1} ===" if player == @players.first
-        publish :game_info, ""
-        publish :game_heading, "#{player.faction}' turn (#{Inflector.demodulize player.class})"
-        publish :game_info, ""
+    @players.each_pair do |faction_name, players|
+      players.each do |player|
+        new_faction = Factions.const_get(faction_name.capitalize).new
+        factions << new_faction
+        player.faction = new_faction
       end
     end
 
+    load_game file, factions
+
+    # If loading a level, start the first turn, otherwise just keep going.
+    name = File.basename(file).chomp(File.extname(file))
+    if File.extname(file) == ".sgl"
+      publish :game_heading, "=== Started #{name} ==="
+      publish :game_info, ""
+      map.factions.first.start_turn
+    else
+      faction = map.active_faction
+      publish :game_heading, "=== Resuming #{name} in turn #{map.turn + 1} ==="
+      publish :game_info, ""
+      publish :game_heading,faction.class::TEXT_COLOR.colorize("#{faction.name}' turn (#{Inflector.demodulize faction.player.class})")
+      publish :game_info, ""
+    end
+
     save_game_as AUTOSAVE_FILE
 
     @mouse_selection = MouseSelection.new @map
   end
 
+  def assign_entities_to_factions
+    factions_by_type = map.factions.group_by {|f| Inflector.demodulize(f.class.name).downcase.to_sym }
+    factions_by_type.each_pair do |faction_name, factions|
+      entities = map.world_objects.grep(Objects::Entity).find_all {|o| o.default_faction_type == faction_name }
+      # Split them up as evenly as possible if more than one player is controlling them.
+      entities_per_faction = entities.size.fdiv(factions.size).ceil
+      entities.each_slice(entities_per_faction).with_index do |entities, i|
+        entities.each {|e| e.faction = factions[i] }
+      end
+    end
+  end
+
   def create_gui
     @container = Fidgit::Container.new do |container|
       @minimap = Gui::Minimap.new parent: container
 
-      # Unit roster.
-      @summary_bar = vertical parent: container, padding: 4, spacing: 4, background_color: Color::BLACK do |packer|
-        [@map.baddies.size, 8].min.times do |i|
-          baddy = @map.baddies[i]
-          summary = Gui::EntitySummary.new baddy, parent: packer
-          summary.subscribe :left_mouse_button do
-            @mouse_selection.selected = baddy if baddy.alive?
-            @info_panel.object = baddy
+      # Unit roster for each human-controlled faction.
+      @summaries_lists = {}
+
+      # Create a summary list for each human-controlled faction.
+      @map.factions.each do |faction|
+        if faction.player.is_a? Players::Human
+          @summaries_lists[faction] = Fidgit::Vertical.new padding: 4, spacing: 4 do |packer|
+            # Put each entity into the list.
+            faction.entities.each do |entity|
+              summary = Gui::EntitySummary.new entity, parent: packer
+              summary.subscribe :left_mouse_button do
+                @mouse_selection.selected = entity if entity.alive?
+                @info_panel.object = entity
+              end
+            end
           end
+
+          # At the start of the turn, change in our summary list.
+          # Means the last human player's list will be shown during the AI turns.
+          faction.subscribe :turn_started do
+            @summary_bar.clear
+            @summary_bar.add @summaries_lists[faction]
+          end
+
+          # TODO: Add and remove entities to the lists as unit list changes.
+          #faction.subscribe :entity_added do
+          #end
+          #faction.subscribe :entity_removed do
+          #end
         end
       end
 
+      # Will contain the summary lists.
+      @summary_bar = vertical parent: container, padding: 0, spacing: 0, background_color: Color::BLACK
+
       # Info panel.
       @info_panel = Gui::InfoPanel.new self, parent: container
-      @info_panel.object = @map.baddies[0]
 
       # Button box.
       @button_box = vertical parent: container, padding: 4, spacing: 8, width: 150, background_color: Color::BLACK do
         @turn_label = label " ", font_height: 14
 
-        button "End turn" do
+        @end_turn_button = button "End turn" do
           end_turn
         end
 
@@ -96,7 +149,7 @@ class PlayLevel < World
     selection = @mouse_selection.selected
     @mouse_selection.selected = nil
     @map.actions.redo if @map.actions.can_redo?
-    @mouse_selection.selected =sd selection if selection
+    @mouse_selection.selected = selection if selection
   end
 
   def map=(map)
@@ -125,9 +178,13 @@ class PlayLevel < World
                                 $window.mouse_y >= 0 and $window.mouse_y < $window.height and
                                 @container.each.none? {|e| e.hit? $window.mouse_x, $window.mouse_y }
 
-      @map.tile_at_position((@camera_offset_x + $window.mouse_x) / @zoom,
-         (@camera_offset_y + $window.mouse_y) / @zoom)
+      @cursor_world_x = (@camera_offset_x + $window.mouse_x) / @zoom
+      @cursor_world_y = (@camera_offset_y + $window.mouse_y) / @zoom
+
+      @map.tile_at_position @cursor_world_x, @cursor_world_y
     else
+      @cursor_world_x = @cursor_world_y = nil
+
       nil
     end
 
@@ -139,17 +196,20 @@ class PlayLevel < World
 
     @turn_label.text = "Turn: #{@map.turn + 1} (#{@map.active_faction})"
 
-    @undo_button.enabled = @map.actions.can_undo?
-    @redo_button.enabled = @map.actions.can_redo?
+    usable = @map.active_faction.player.human? && !@map.busy?
+    @end_turn_button.enabled = usable
+    @undo_button.enabled = usable && @map.actions.can_undo?
+    @redo_button.enabled = usable && @map.actions.can_redo?
   end
 
   def quickload
     if @quicksaved
-      switch_game_state self.class.new(QUICKSAVE_FILE)
+      switch_game_state self.class.new(QUICKSAVE_FILE, @players[:baddies], @players[:goodies])
     end
   end
 
   def quicksave
+    publish :game_heading, "<<< Quick-saved >>>"
     save_game_as QUICKSAVE_FILE
     @quicksaved = true
   end

data/lib/smash_and_grab/states/world.rb

@@ -18,14 +18,9 @@ class World < Fidgit::GuiState
   QUICKSAVE_FILE = File.expand_path("quicksave.sgs", SAVE_PATH)
   AUTOSAVE_FILE = File.expand_path("autosave.sgs", SAVE_PATH)
 
-  def map=(map)
-    @map = map
-    @map.record_grid GRID_COLOR
-
-    @camera_offset_x, @camera_offset_y = [0, -@map.to_rect.center_y]
-
-    create_gui
+  def create_gui; raise NotImplementedError; end
 
+  def create_minimap
     @minimap.map = @map
 
     @map.subscribe :tile_contents_changed do |map, tile|
@@ -94,7 +89,7 @@ class World < Fidgit::GuiState
     File.open("#{file}.json", "w") {|f| f.write json } # DEBUG ONLY!
   end
 
-  def load_game(file)
+  def load_game(file, factions, options = {})
     t = Time.now
 
     json = Zlib::GzipReader.open(file) do |gz|
@@ -103,11 +98,24 @@ class World < Fidgit::GuiState
 
     data = JSON.parse(json).symbolize
 
-    self.map = Map.new data
+    @map =  Map.new data, factions, options
+    @map.record_grid GRID_COLOR
+
+    @camera_offset_x, @camera_offset_y = [0, -@map.to_rect.center_y]
+
+    assign_entities_to_factions
+
+    # Make sure that every entity has picked up the object they had before.
+    map.factions.each {|f| f.entities.each {|e| e.setup_contents } }
+
+    create_gui
+    create_minimap
 
     log.info { "Loaded game from #{file} [#{File.size(file)} bytes] in #{"%.3f" % (Time.now - t) }s" }
   end
 
+  def assign_entities_to_factions; raise NotImplementedError; end
+
   def autosave
     save_game_as AUTOSAVE_FILE
   end

data/lib/smash_and_grab/version.rb

@@ -1,3 +1,3 @@
 module SmashAndGrab
-  VERSION = "0.0.5alpha"
+  VERSION = "0.0.6alpha"
 end

data/lib/smash_and_grab/z_order.rb

@@ -1,12 +1,13 @@
 module SmashAndGrab
 class ZOrder
   BACKGROUND = -Float::INFINITY
-  TILES = -99999
-  SHADOWS = -99998
-  TILE_SELECTION = -99997
-  PATH = -99996
-  # Objects -1000 .. +1000
+  TILES = -99_999
+  SHADOWS = -99_998
+  TILE_SELECTION = -99_997
+  PATH = -99_996
+  # Objects -1_000 .. +1_000
 
+  BEHIND_GUI = 1_000_000
   GUI = Float::INFINITY
 end
 end

data/smash_and_grab.gemspec

@@ -25,9 +25,9 @@ END
 
   s.add_runtime_dependency "gosu", "~> 0.7.41"
   s.add_runtime_dependency "chingu", "~> 0.9rc7"
-  s.add_runtime_dependency "fidgit", "~> 0.1.10"
+  s.add_runtime_dependency "fidgit", "~> 0.2.1"
   s.add_runtime_dependency "texplay", "~> 0.3"
-  #s.add_runtime_dependency "r18n-desktop", "~> 0.4.9"
+  s.add_runtime_dependency "r18n-desktop", "~> 0.4.14"
 
   s.add_development_dependency "releasy", "~> 0.2.2"
   s.add_development_dependency "rake", "~> 0.9.2.2"

data/tasks/create_portraits.rb

@@ -0,0 +1,39 @@
+PORTRAIT_IMAGES = [
+  # in, out, in-size, columns, out-rect.
+  ["entities.png", "entity_portraits.png", [66, 66], 8, [14, 10, 36, 36]],
+]
+
+desc "Process images (cut out a portrait of each character)"
+task create_portraits: :outline_images do
+  require 'texplay'
+  require_relative '../lib/texplay_ext/color'
+  require_relative '../lib/texplay_ext/image'
+  require_relative '../lib/texplay_ext/window'
+
+  puts "=== Creating portraits ===\n\n"
+
+  $window = Gosu::Window.new(100, 100, false)
+
+  PORTRAIT_IMAGES.each do |image_in_name, image_out_name, (width, height), num_columns, (rect_x, rect_y, rect_width, rect_height)|
+    puts "Making portraits from #{image_in_name}"
+
+    sprites = Gosu::Image.load_tiles($window, File.expand_path(image_in_name, MODIFIED_IMAGE_PATH), width, height, false)
+    sprites.each(&:refresh_cache)
+
+    new_image = Gosu::Image.create rect_width * num_columns,
+                                   rect_height * (sprites.size / num_columns)
+    new_image.refresh_cache
+
+    print "\n  Splicing:   "
+    sprites.each.with_index do |sprite, i|
+      row, column = i.divmod num_columns
+      new_image.splice sprite, column * rect_width, row * rect_height,
+                       crop: [rect_x, rect_y, rect_x + rect_width, rect_y + rect_height]
+      print '.'
+    end
+
+    puts "\n\n"
+
+    new_image.save(File.expand_path(image_out_name, MODIFIED_IMAGE_PATH))
+  end
+end

data/tasks/outline_images.rb

@@ -0,0 +1,56 @@
+ORIGINAL_IMAGE_PATH = File.expand_path("../../raw_media/images", __FILE__)
+MODIFIED_IMAGE_PATH = File.expand_path("../../media/images", __FILE__)
+
+IMAGES = [
+    ["entities.png", [32, 32], 8],
+    ["objects.png",    [32, 32], 8],
+    ["vehicles.png",   [128, 128], 3],
+]
+
+desc "Process images (double in size and add an outline)"
+task :outline_images do
+  require 'texplay'
+  require_relative '../lib/texplay_ext/color'
+  require_relative '../lib/texplay_ext/image'
+  require_relative '../lib/texplay_ext/window'
+
+  puts "=== Processing images ===\n\n"
+
+  $window = Gosu::Window.new(100, 100, false)
+
+  IMAGES.each do |image_name, (width, height), num_columns|
+    puts "Processing #{image_name}"
+
+    sprites = Gosu::Image.load_tiles($window, File.expand_path(image_name, ORIGINAL_IMAGE_PATH), width, height, false)
+    sprites.each(&:refresh_cache)
+
+    print "  Enlarging: "
+    large_sprites = sprites.map do |sprite|
+      print '.'
+      sprite.enlarge 2
+    end
+
+    print "\n  Outlining: "
+    large_outlined = large_sprites.map do |sprite|
+      print '.'
+      sprite.outline
+    end
+
+    new_image = Gosu::Image.create large_outlined.first.width * num_columns,
+                                   large_outlined.first.height * large_outlined.size / num_columns
+    new_image.refresh_cache
+
+    print "\n  Splicing:   "
+    large_outlined.each.with_index do |sprite, i|
+      sprite.clear(dest_ignore: :alpha, color: Gosu::Color.rgb(50, 50, 50))
+      sprite.splice large_sprites[i], 1, 1, alpha_blend: true
+      row, column = i.divmod num_columns
+      new_image.splice sprite, column * sprite.width, row * sprite.height
+      print '.'
+    end
+
+    puts "\n\n"
+
+    new_image.save(File.expand_path(image_name, MODIFIED_IMAGE_PATH))
+  end
+end