smash_and_grab 0.0.5alpha → 0.0.6alpha

data/lib/smash_and_grab/gui/entity_summary.rb

@@ -16,26 +16,34 @@ class EntitySummary < Fidgit::Vertical
 
     @name = label "", font_height: 15
 
-    horizontal padding: 0, spacing: 4 do
-      @portrait = image_frame nil, padding: 0, background_color: Color::GRAY,
+    @box = horizontal padding: 0, spacing: 4 do
+      @portrait = image_frame nil, background_color: Color::GRAY,
                               border_thickness: 1, border_color: Color::BLACK
 
-      vertical padding: 0, spacing: 0 do
-        @health = label "", font_height: 15
-        @action_points = label "", font_height: 15
-        @movement_points = label "", font_height: 15
-      end
+      # Just to get a position to place the stats box.
+      @stats_position = vertical padding: 0
     end
 
-     self.entity = entity
+    self.entity = entity
+  end
+
+  def draw
+    super
+    @entity.draw_stat_bars x: @stats_position.x, y: @stats_position.y + 1, zorder: z, factor_x: 6, factor_y: 6
+
+    if @entity.contents
+      # TODO: Measure the sprite properly.
+      @entity.contents.image.draw x + width - 10, y - 12, z
+    end
   end
 
   public
   def update_details(entity)
-    @health.text = "HP: #{entity.health}"
-    @movement_points.text = "MP: #{entity.mp}"
-    @action_points.text = "AP: #{entity.ap}"
+    self.tip = "HP: #{entity.hp} / #{entity.max_hp}; MP: #{entity.mp} / #{entity.max_mp}; AP: #{entity.ap} / #{entity.max_ap}"
+
     @portrait.image = entity.portrait
+    @name.color = entity.alive? ? Color::WHITE : Color::GRAY
+    @portrait.enabled = entity.alive?
   end
 
   public

data/lib/smash_and_grab/gui/game_log.rb

@@ -4,6 +4,7 @@ module SmashAndGrab
       include Log
 
       MAX_ITEMS = 100
+      HEADING_COLOR = Color.rgb(200, 200, 230)
 
       def initialize(state, options = {})
         options = {
@@ -16,18 +17,21 @@ module SmashAndGrab
 
         @scroll_window = scroll_window width: 420, height: 72, padding: 0 do
           # TODO: Text-area "editable(?)" seem broken. They don't prevent editing while also allowing copy/pasting.
-          @text = text_area width: 400, font_height: 14, enabled: false
+          @text = text_area width: 400, font_height: 14, editable: false
         end
 
         @scroll_window.background_color = @text.background_color
 
         state.subscribe :game_info do |_, text|
           append text
+          text = text.gsub /<[^>]*>/, ''
           log.info { "game_info: #{text}" }
         end
 
         state.subscribe :game_heading do |_, text|
-          append "<c=AAAADD> { #{text} }</c>"
+
+          append HEADING_COLOR.colorize("{ #{text} }")
+          text = text.gsub /<[^>]*>/, ''
           log.info { "game_heading: #{text}" }
         end
       end

data/lib/smash_and_grab/gui/info_panel.rb

@@ -15,17 +15,20 @@ module SmashAndGrab
         }.merge! options
         super options
 
-        @object = nil
         @show_info = false
-        @scenario_panel = ScenarioPanel.new state
+
         @frame = vertical padding: 4, background_color: Color.rgb(0, 0, 150), width: 440, height: 112
 
+        @scenario_panel = ScenarioPanel.new state
+        self.object = nil
+
         self.x, self.y = ($window.width - width) / 2, $window.height - height
       end
 
       def object=(object)
-        return if @object == object
-        @scenario_panel.parent = nil
+        return if defined? @object and object == @object
+
+        @frame.each(&:finalize)
 
         @frame.clear
         case object

data/lib/smash_and_grab/gui/object_panel.rb

@@ -16,7 +16,7 @@ module SmashAndGrab
           @portrait = image_frame @object.image, padding: 0, background_color: Color::GRAY,
                                   factor: (@object.is_a?(Objects::Vehicle) ? 0.25 : 1)
 
-          @object.subscribe :changed do
+          @changed_event = @object.subscribe :changed do
             @portrait.image = @object.image
           end
         end
@@ -27,11 +27,15 @@ module SmashAndGrab
           Fidgit::Vertical.new padding: 0, spacing: 0 do
             scroll_window width: 350, height: 72 do
               text_area text: "#{@object.name} once was a pomegranate, but it got better... " * 10,
-                        background_color: Color::NONE, width: 330, font_height: 14
+                        background_color: Color::NONE, width: 330, font_height: 14, editable: false
             end
           end
         end
       end
+
+      def finalize
+        @changed_event.unsubscribe
+      end
     end
   end
 end

data/lib/smash_and_grab/gui/scenario_panel.rb

@@ -16,6 +16,10 @@ module SmashAndGrab
           @game_log = GameLog.new(state, parent: self)
         end
       end
+
+      def finalize
+        # Don't need to clean up.
+      end
     end
   end
 end

data/lib/smash_and_grab/history/action_history.rb

@@ -6,7 +6,7 @@ class ActionHistory < Fidgit::History
 
   def_delegators :@actions, :empty?
 
-  def completed_turns; @actions.count {|a| a.is_a? GameAction::EndTurn }; end
+  def completed_turns; @actions.count {|a| a.is_a? GameActions::EndTurn }; end
 
   # Perform a History::Action, adding it to the history.
   # If there are currently any actions that have been undone, they will be permanently lost and cannot be redone.

data/lib/smash_and_grab/main.rb

@@ -39,11 +39,15 @@ require 'syck' # Required for unknown reason, when ocraed!
 require 'gosu'
 require_folder('gosu_ext', %w[font])
 
+require 'r18n-desktop'
+R18n.from_env File.join(EXTRACT_PATH, 'config/lang'), Gosu.language
+
 require 'chingu'
+require_folder("chingu_ext", %w[basic_game_object])
 
 require 'fidgit'
 Fidgit::Element.schema.merge_schema! YAML.load(File.read(File.expand_path('config/gui/schema.yml', EXTRACT_PATH)))
-require_folder("fidgit_ext", %w[event element container cursor])
+require_folder("fidgit_ext", %w[element container cursor])
 
 require 'texplay'
 require_folder('texplay_ext', %w[color image window])
@@ -72,7 +76,7 @@ require_folder("map", %w[tile wall map])
 require_folder("objects", %w[static entity vehicle])
 require_folder("gui", %w[minimap editor_selector entity_summary info_panel])
 require_folder("states", %w[edit_level play_level main_menu])
-require_folder("players", %w[player])
+require_folder("players", %w[ai human remote])
 require_folder("history", %w[editor_action_history game_action_history])
 
 SmashAndGrab::Log.log.debug { "Scripts loaded in #{"%.3f" % (Time.now - t)} s" }
@@ -80,7 +84,7 @@ SmashAndGrab::Log.log.debug { "Scripts loaded in #{"%.3f" % (Time.now - t)} s" }
 t = Time.now
 SmashAndGrab::GameWindow.new
 SmashAndGrab::Log.log.debug { "Window created in #{"%.3f" % (Time.now - t)} s" }
-
+SmashAndGrab::  FONT_NAME = "UnmaskedBB.ttf"
 unless defined? Ocra or defined? Bacon
   SmashAndGrab::Log.log.info { "Game window opened" }
   $window.show

data/lib/smash_and_grab/map/faction.rb

@@ -1,6 +1,6 @@
 module SmashAndGrab
 module Factions
-  class Faction
+  class Faction < BasicGameObject
     include Fidgit::Event
     extend Forwardable
     include Log
@@ -15,18 +15,26 @@ module Factions
 
     def friend?(faction); faction.is_a? self.class; end
     def enemy?(faction); not friend?(faction); end
-    def to_s; Inflector.demodulize self.class.name; end
-    def minimap_color; self.class::COLOR; end
+    def to_s; name; end
+    def minimap_color; self.class::MINIMAP_COLOR; end
     def active?; @active; end
     def inactive?; !@active; end
+    def colorized_name; self.class::TEXT_COLOR.colorize name; end
+    def name; Inflector.demodulize self.class.name; end
 
-    def initialize(map)
-      @map = map
+    def initialize
+      super
+
+      @map = nil
       @entities = []
       @active = false
       @player = nil
     end
 
+    def map=(map)
+      @map = map
+    end
+
     def <<(entity)
       @entities << entity
     end
@@ -37,15 +45,22 @@ module Factions
 
     # Start of first turn of the game.
     def start_game
+      raise unless @map
       start_turn
     end
 
     # Restart from a loaded position.
     def resume_game
+      raise unless @map
       @active = true
     end
 
     def start_turn
+      parent.publish :game_heading, "=== Turn #{map.turn + 1} ==="
+      parent.publish :game_info, ""
+      parent.publish :game_heading, self.class::TEXT_COLOR.colorize("#{name}' turn (#{Inflector.demodulize player.class})")
+      parent.publish :game_info, ""
+
       log.info "#{self} started turn #{@map.turn + 1}"
       @active = true
       @entities.each(&:start_turn)
@@ -65,18 +80,21 @@ module Factions
 
   # Super-villains
   class Baddies < Faction
-    COLOR = Color.rgb(255, 50, 50)
+    TEXT_COLOR = Color.rgb(255, 0, 0)
+    MINIMAP_COLOR = Color.rgb(255, 50, 50)
   end
 
   # Superheroes, police, g-men, etc.
   class Goodies < Faction
-    COLOR = Color.rgb(100, 100, 255)
+    TEXT_COLOR = Color.rgb(100, 100, 255)
+    MINIMAP_COLOR = Color.rgb(100, 100, 255)
     def friend?(faction); (faction.is_a? Bystanders) or super; end
   end
 
   # Everyone else (NPCS).
   class Bystanders < Faction
-    COLOR = Color.rgb(255, 255, 0)
+    TEXT_COLOR = Color.rgb(200, 200, 0)
+    MINIMAP_COLOR = Color.rgb(255, 255, 0)
 
     def friend?(faction); (faction.is_a? Goodies) or super; end
   end

data/lib/smash_and_grab/map/map.rb

@@ -36,7 +36,7 @@ class Map
   event :wall_type_changed # The actual type itself changed.
 
   attr_reader :grid_width, :grid_height, :actions
-  attr_reader :goodies, :baddies, :bystanders, :active_faction, :turn, :factions
+  attr_reader :active_faction, :turn, :factions, :world_objects
     
   def to_rect; Rect.new(0, 0, @grid_width * Tile::WIDTH, @grid_height * Tile::HEIGHT); end
 
@@ -45,9 +45,17 @@ class Map
   def busy?; factions.any? {|f| f.entities.any?(&:busy?) }; end
 
   # tile_classes: Nested arrays of Tile class names (Tile::Grass is represented as "Grass")
-  def initialize(data)
+  def initialize(data, factions, options = {})
+    options = {
+        start: true,
+    }.merge! options
+
     t = Time.now
 
+    raise unless factions.inspect unless factions.size >= 3
+    @factions = factions
+    @factions.each {|f| f.map = self }
+
     @effects = []
     @world_objects = []
     @drawable_objects = []
@@ -79,12 +87,6 @@ class Map
       Wall.new self, wall_data
     end
 
-    @goodies = Factions::Goodies.new self
-    @baddies = Factions::Baddies.new self
-    @bystanders = Factions::Bystanders.new self
-
-    @factions = [@baddies, @goodies, @bystanders] # And order of play.
-
     data[:objects].each do |object_data|
       case object_data[:class]
         when Objects::Entity::CLASS
@@ -109,10 +111,12 @@ class Map
 
     record
 
-    if @actions.empty?
-      start_game
-    else
-      resume_game
+    if options[:start]
+      if @actions.empty?
+        start_game
+      else
+        resume_game
+      end
     end
 
     # Ensure that if any tiles are changed, that the map is redrawn.
@@ -135,6 +139,11 @@ class Map
   end
 
   def start_game
+    # Ensure that everyone is at max health when scenario helps (not more or less).
+    @factions.each do |faction|
+       faction.entities.each {|e| e.start_game }
+    end
+
     @active_faction.start_game
   end
 

data/lib/smash_and_grab/map/tile.rb

@@ -4,6 +4,18 @@ class Tile < GameObject
 
   WIDTH, HEIGHT = 32, 16
 
+  #   X
+  #  / \
+  # X T X  <- this tile
+  #  \ /   <- covered by any wall here
+  #   X
+  #  / \   <- covered by wall height 1+ here
+  # X   X
+  #  \ /   <- covered by wall height 1+ here
+  #   X
+  #   X
+  #  / \   <- covered by wall height 2+ here
+  #
   # x, y, direction to cause occlusion.
   WALL_OCCLUSION_POSITIONS = [
       [[ 0,  0], :left],
@@ -31,7 +43,7 @@ class Tile < GameObject
   class << self
     def blank; @sprites[0]; end
     def config; @config ||= YAML.load_file(File.expand_path("config/map/tiles.yml", EXTRACT_PATH)); end
-    def sprites; @sprites ||= SpriteSheet.new("floor_tiles.png", WIDTH, HEIGHT, 4); end
+    def sprites; @sprites ||= SpriteSheet["floor_tiles.png", WIDTH, HEIGHT, 4]; end
   end
 
   attr_reader :entities_exerting_zoc
@@ -52,6 +64,14 @@ class Tile < GameObject
     @entities_exerting_zoc = Set.new
   end
 
+  def overwatched?(faction_targeted)
+    return false unless empty?
+
+    map.factions.any? do |faction|
+      faction.enemy?(faction_targeted) and faction.entities.any? {|e| e.overwatch? self }
+    end
+  end
+
   def entities_exerting_zoc(faction)
     @entities_exerting_zoc.select {|e| e.action? and e.faction.enemy? faction }
   end
@@ -165,16 +185,23 @@ class Tile < GameObject
     @walls[direction] = wall
   end
 
+  # Returns wall in this direction.
   def wall(direction)
     @walls[direction]
   end
 
+  # @return [Wall, nil] wall between this and other tile.
+  def wall_to(tile)
+    @walls[direction_to(tile)]
+  end
+
+  # @return [Symbol, nil] Direction to another tile
   def direction_to(tile)
     @walls.each_pair do |direction, wall|
       return direction if wall.destination(self) == tile
     end
 
-    return nil
+    nil
   end
 
   def to_json(*a)

data/lib/smash_and_grab/map/wall.rb

@@ -34,7 +34,7 @@ class Wall < GameObject
 
   class << self
     def config; @config ||= YAML.load_file(File.expand_path("config/map/walls.yml", EXTRACT_PATH)); end
-    def sprites; @sprites ||= SpriteSheet.new("walls.png", SPRITE_WIDTH, SPRITE_HEIGHT, 8); end
+    def sprites; @sprites ||= SpriteSheet["walls.png", SPRITE_WIDTH, SPRITE_HEIGHT, 8]; end
   end
 
   def initialize(map, data)
@@ -124,7 +124,7 @@ class Wall < GameObject
   end
 
   def destination(from)
-    blocks_movement? ? nil : @destinations[from]
+    @destinations[from]
   end
 
   def draw

data/lib/smash_and_grab/mixins/has_contents.rb

@@ -0,0 +1,38 @@
+module SmashAndGrab
+  module Mixins
+    module HasContents
+      attr_reader :contents
+
+      def setup_contents
+        # @tmp_contents_id was just a holder until we could do this; can't get it to work unless
+        # all objects have been loaded.
+        @contents = @tmp_contents_id ? map.object_by_id(@tmp_contents_id) : nil
+        log.debug { "#{self} started carrying #{@contents}"} if @contents
+        @tmp_contents_id = nil
+      end
+
+      def pick_up?(object)
+        @contents.nil? and object.pick_up?(self)
+      end
+
+      def pick_up(object)
+        raise if @contents
+        object.tile = nil
+        @contents = object
+        parent.publish :game_info, "#{colorized_name} picked up #{object.colorized_name}"
+        publish :changed
+        nil
+      end
+
+      def drop(tile)
+        raise unless @contents
+        object = @contents
+        @contents = nil
+        parent.publish :game_info, "#{colorized_name} dropped #{object.colorized_name}"
+        object.tile = tile
+        publish :changed
+        nil
+      end
+    end
+  end
+end