smash_and_grab 0.0.3alpha → 0.0.5alpha

data/lib/smash_and_grab/gui/entity_panel.rb

@@ -0,0 +1,110 @@
+module SmashAndGrab
+  module Gui
+    class EntityPanel < Fidgit::Horizontal
+      event :info_toggled
+
+      def initialize(entity, info_shown, options = {})
+        options = {
+            padding: 0,
+            spacing: 8,
+        }.merge! options
+
+        super options
+
+        @entity = entity
+        @info_shown = info_shown
+
+        vertical padding: 0 do
+          # TODO: Clicking on portrait should center.
+          @portrait = image_frame @entity.image, padding: 0, background_color: Color::GRAY
+          @info_toggle = toggle_button "Bio", value: @info_shown, tip: "Show/hide biography",
+                                       font_height: 14, align_h: :center do |_, value|
+            @info_shown = value
+            publish :info_toggled, value
+            switch_sub_panel
+          end
+        end
+
+        vertical padding: 0, spacing: 4 do
+          @name = label @entity.name
+          @sub_panel_container = vertical spacing: 0, padding: 0
+        end
+
+        create_details_sub_panel
+        create_info_sub_panel
+        switch_sub_panel
+
+        update_details @entity
+
+        @entity.subscribe :changed, method(:update_details)
+      end
+
+      def switch_sub_panel
+        @sub_panel_container.clear
+        @sub_panel_container.add @info_shown ? @info_sub_panel : @details_sub_panel
+      end
+
+      def create_info_sub_panel
+        @info_sub_panel = Fidgit::Vertical.new padding: 0, spacing: 0 do
+          text = nil
+          scroll = scroll_window width: 350, height: 72 do
+            text = text_area text: "#{@entity.name} once ate a pomegranate, but it took all day and all night... " * 5,
+                                  width: 330, font_height: 14, enabled: false
+          end
+          scroll.background_color = text.background_color
+        end
+      end
+
+      def create_details_sub_panel
+        @details_sub_panel = Fidgit::Horizontal.new padding: 0, spacing: 0 do
+          vertical padding: 0, spacing: 1, width: 160 do
+            @health = label "", font_height: 20
+            @movement_points = label "", font_height: 20
+            @action_points = label "", font_height: 20
+          end
+
+          grid num_columns: 4, spacing: 4, padding: 0 do
+            button_options = { font_height: 20, width: 28, height: 28, padding: 0, padding_left: 8 }
+
+            @ability_buttons = {}
+
+            label_options = button_options.merge border_thickness: 2, border_color: Color.rgba(255, 255, 255, 100)
+
+            [:melee, :ranged, :sprint].each do |ability_name|
+              if @entity.has_ability? ability_name
+                ability = @entity.ability ability_name
+                @ability_buttons[ability_name] = button("#{ability_name.to_s[0].upcase}#{ability.skill}",
+                                                        button_options.merge(tip: ability.tip)) do
+
+                  @entity.use_ability :sprint if ability_name == :sprint
+                end
+              else
+                label "", label_options
+              end
+            end
+
+            5.times do |i|
+               label "", label_options
+            end
+          end
+        end
+      end
+
+      def update_details(entity)
+        @health.text = "HP: #{entity.health} / #{entity.max_health}"
+        @movement_points.text = "MP: #{entity.mp} / #{entity.max_mp}"
+        @action_points.text = "AP: #{entity.ap} / #{entity.max_ap}"
+
+        if entity.has_ability? :sprint
+          @movement_points.text += " + #{entity.ability(:sprint).movement_bonus}"
+        end
+
+        @ability_buttons.each do |ability, button|
+          button.enabled = (entity.active? and (entity.has_ability?(ability) and entity.action_points >= entity.ability(ability).action_cost))
+        end
+
+        @portrait.image = entity.image
+      end
+    end
+  end
+end

data/lib/smash_and_grab/gui/entity_summary.rb

@@ -22,8 +22,8 @@ class EntitySummary < Fidgit::Vertical
 
       vertical padding: 0, spacing: 0 do
         @health = label "", font_height: 15
-        @movement_points = label "", font_height: 15
         @action_points = label "", font_height: 15
+        @movement_points = label "", font_height: 15
       end
     end
 
@@ -31,10 +31,11 @@ class EntitySummary < Fidgit::Vertical
   end
 
   public
-  def update
-    @health.text = "HP: #{@entity.health}"
-    @movement_points.text = "MP: #{@entity.mp}"
-    @action_points.text = "AP: #{@entity.ap}"
+  def update_details(entity)
+    @health.text = "HP: #{entity.health}"
+    @movement_points.text = "MP: #{entity.mp}"
+    @action_points.text = "AP: #{entity.ap}"
+    @portrait.image = entity.portrait
   end
 
   public
@@ -46,10 +47,10 @@ class EntitySummary < Fidgit::Vertical
   def entity=(entity)
     @entity = entity
 
-    @name.text = " " + entity.name[0...13]
-    @portrait.image = entity.portrait
+    @name.text = " " + @entity.name[0...13]
+    @entity.subscribe :changed, &method(:update_details)
 
-    update
+    update_details @entity
 
     entity
   end

data/lib/smash_and_grab/gui/game_log.rb

@@ -0,0 +1,44 @@
+module SmashAndGrab
+  module Gui
+    class GameLog < Fidgit::Composite
+      include Log
+
+      MAX_ITEMS = 100
+
+      def initialize(state, options = {})
+        options = {
+            padding: 0,
+        }.merge! options
+
+        super options
+
+        @items = []
+
+        @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
+        end
+
+        @scroll_window.background_color = @text.background_color
+
+        state.subscribe :game_info do |_, text|
+          append text
+          log.info { "game_info: #{text}" }
+        end
+
+        state.subscribe :game_heading do |_, text|
+          append "<c=AAAADD> { #{text} }</c>"
+          log.info { "game_heading: #{text}" }
+        end
+      end
+
+      def append(text)
+        @items.shift until @items.size < MAX_ITEMS
+        @items << text
+        @text.text = @items.join "\n"
+
+        @scroll_window.offset_y = Float::INFINITY # Scroll to bottom.
+      end
+    end
+  end
+end

data/lib/smash_and_grab/gui/info_panel.rb

@@ -1,105 +1,49 @@
-module SmashAndGrab
-module Gui
-class InfoPanel < Fidgit::Vertical
-  def initialize(options = {})
-    options = {
-        padding: 4,
-        background_color: Color::BLACK,
-    }.merge! options
-    super options
-
-    @frame = horizontal padding: 4, spacing: 8, background_color: Color.rgb(0, 0, 150), width: 440, height: 112 do
-      @portrait = image_frame Objects::Entity.sprites[0, 0], padding: 0, background_color: Color::GRAY
+require_relative "entity_panel"
+require_relative "object_panel"
+require_relative "scenario_panel"
 
-      vertical padding: 0, spacing: 4 do
-        @name = label " "
-
-        horizontal padding: 0, spacing: 0 do
-          vertical padding: 0, spacing: 1, width: 160 do
-            @health = label "", font_height: 20
-            @movement_points = label "", font_height: 20
-            @action_points = label "", font_height: 20
-          end
+module SmashAndGrab
+  module Gui
+    # The info panel contains scenario/entity/object panels based what is selected.
+    class InfoPanel < Fidgit::Vertical
+      attr_reader :object
+
+      def initialize(state, options = {})
+        options = {
+            padding: 4,
+            background_color: Color::BLACK,
+        }.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
+
+        self.x, self.y = ($window.width - width) / 2, $window.height - height
+      end
 
-          grid num_columns: 4, spacing: 4, padding: 0 do
-            button_options = { font_height: 20, width: 28, height: 28, padding: 0, padding_left: 8 }
+      def object=(object)
+        return if @object == object
+        @scenario_panel.parent = nil
 
-            @ability_buttons = {}
-            @ability_buttons[:melee] = button "Me", button_options
-            @ability_buttons[:ranged] = button "Ra", button_options
-            @ability_buttons[:sprint] = button "Sp", button_options do
-              @entity.map.actions.do :ability, @entity.ability(:sprint).action_data
+        @frame.clear
+        case object
+          when Objects::Entity
+            panel = EntityPanel.new(object, @show_info, parent: @frame)
+            panel.subscribe :info_toggled do |_, shown|
+              @show_info = shown
             end
-
-            @ability_buttons[:a] = button "??", button_options.merge(tip: "???")
-
-            @ability_buttons[:b] = button "P1", button_options.merge(tip: "power1")
-            @ability_buttons[:c] = button "P2", button_options.merge(tip: "power2")
-            @ability_buttons[:d] = button "P3", button_options.merge(tip: "power3")
-            @ability_buttons[:e] = button "P4", button_options.merge(tip: "power4")
-          end
+          when Objects::Static, Objects::Vehicle
+            ObjectPanel.new(object, parent: @frame)
+          when nil
+            @frame.add @scenario_panel
+          else
+            raise object.inspect
         end
-      end
-    end
-
-    recalc
-
-    self.x, self.y = ($window.width - width) / 2, $window.height - height
-  end
-
-  public
-  def update
-    return unless @entity
-
-    @health.text = "HP: #{@entity.health} / #{@entity.max_health}"
-    @movement_points.text = "MP: #{@entity.mp} / #{@entity.max_mp}"
-    @action_points.text = "AP: #{@entity.ap} / #{@entity.max_ap}"
-
-    if @entity.has_ability? :sprint
-      @movement_points.text += " +#{@entity.ability(:sprint).movement_bonus}"
-    end
-
-    @ability_buttons.each do |ability, button|
-      button.enabled = (@entity.has_ability?(ability) and @entity.action_points >= @entity.ability(ability).action_cost)
-    end
-  end
 
-  public
-  def entity=(entity)
-    @entity = entity
-
-    @frame.shown = (not entity.nil?)
-
-    if entity
-      @portrait.image = @entity.image
-      @name.text = @entity.name
-
-      if @entity.has_ability? :melee
-        melee = @entity.ability(:melee)
-        @ability_buttons[:melee].tip = "Melee[#{melee.skill}] - attack in hand-to-hand combat"
-      else
-        @ability_buttons[:melee].tip = "Melee[n/a]"
+        @object = object
       end
-
-      if @entity.has_ability? :ranged
-        ranged = @entity.ability(:ranged)
-        @ability_buttons[:ranged].tip = "Ranged[#{ranged.skill}] - attack in ranged combat"
-      else
-        @ability_buttons[:ranged].tip = "Ranged[n/a]"
-      end
-
-      if @entity.has_ability? :sprint
-        sprint = @entity.ability(:sprint)
-        @ability_buttons[:sprint].tip = "Sprint[#{sprint.skill}] - gain #{sprint.movement_bonus} movement points"
-      else
-        @ability_buttons[:sprint].tip = "Sprint[n/a]"
-      end
-
-      update
     end
-
-    entity
   end
 end
-end
-end

data/lib/smash_and_grab/gui/object_panel.rb

@@ -0,0 +1,37 @@
+module SmashAndGrab
+  module Gui
+    class ObjectPanel < Fidgit::Horizontal
+      def initialize(object, options = {})
+        options = {
+            padding: 0,
+            spacing: 8,
+        }.merge! options
+
+        super options
+
+        @object = object
+
+        vertical padding: 0 do
+          # TODO: Clicking on portrait should center.
+          @portrait = image_frame @object.image, padding: 0, background_color: Color::GRAY,
+                                  factor: (@object.is_a?(Objects::Vehicle) ? 0.25 : 1)
+
+          @object.subscribe :changed do
+            @portrait.image = @object.image
+          end
+        end
+
+        vertical padding: 0, spacing: 4 do
+          @name = label @object.name
+
+          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
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smash_and_grab/gui/scenario_panel.rb

@@ -0,0 +1,21 @@
+require_relative "game_log"
+
+module SmashAndGrab
+  module Gui
+    class ScenarioPanel < Fidgit::Vertical
+      def initialize(state, options = {})
+        options = {
+            padding: 0,
+            spacing: 8,
+        }.merge! options
+        super options
+
+        label "Scenario: Bank raid"
+
+        horizontal padding_h: 4, padding_v: 0 do
+          @game_log = GameLog.new(state, parent: self)
+        end
+      end
+    end
+  end
+end

data/lib/smash_and_grab/history/editor_actions/place_object.rb

@@ -17,7 +17,7 @@ class PlaceObject < EditorAction
     @new_object = @object_class.new @tile.map,
                                  type: @type,
                                  tile: @tile.grid_position,
-                                 facing: :left
+                                 facing: :right
   end
 
   def undo

data/lib/smash_and_grab/main.rb

@@ -11,13 +11,7 @@ def require_folder(path, files)
 end
 
 module SmashAndGrab
-  USER_PATH = if ENV['APPDATA']
-                File.join(ENV['APPDATA'].gsub("\\", "/"), "Smash And Grab")
-              else
-                File.expand_path("~/.smash_and_grab")
-              end
-
-  SAVE_PATH = File.join(USER_PATH, "saves")
+  SAVE_PATH = File.join(USER_DATA_PATH, "saves")
 end
 
 require_relative "log"
@@ -26,13 +20,11 @@ SmashAndGrab::Log.log.info { "Smash and Grab loading; please wait.." }
 t = Time.now
 
 begin
-  require 'rubygems' unless defined? OSX_EXECUTABLE
-rescue LoadError
-end
-
-
-begin
-  require 'bundler/setup' unless defined?(OSX_EXECUTABLE) or ENV['OCRA_EXECUTABLE']
+  # Running as an executable makes bundler irrelevant; from a gem means someone else decides about whether to use Bundler.
+  unless RUNNING_FROM_EXECUTABLE or Gem.loaded_specs.has_key? APP_NAME
+    require 'bundler'
+    Bundler.setup :default
+  end
 
 rescue LoadError
   $stderr.puts "Bundler gem not installed. To install:\n  gem install bundler"
@@ -51,7 +43,7 @@ require 'chingu'
 
 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[element container cursor])
+require_folder("fidgit_ext", %w[event element container cursor])
 
 require 'texplay'
 require_folder('texplay_ext', %w[color image window])
@@ -76,9 +68,9 @@ require_folder "std_ext", %w[array hash]
 
 # Include other files.
 require_folder("", %w[version sprite_sheet z_order z_order_recorder game_window mouse_selection])
-require_folder("gui", %w[minimap editor_selector entity_summary info_panel])
 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("history", %w[editor_action_history game_action_history])
@@ -90,5 +82,8 @@ SmashAndGrab::GameWindow.new
 SmashAndGrab::Log.log.debug { "Window created in #{"%.3f" % (Time.now - t)} s" }
 
 unless defined? Ocra or defined? Bacon
+  SmashAndGrab::Log.log.info { "Game window opened" }
   $window.show
+
+  SmashAndGrab::Log.log.info { "Game window closed" }
 end

data/lib/smash_and_grab/map/map.rb

@@ -42,6 +42,7 @@ class Map
 
   def add_effect(effect); @effects << effect; end
   def remove_effect(effect); @effects.delete effect; end
+  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)

data/lib/smash_and_grab/map/tile.rb

@@ -25,11 +25,14 @@ class Tile < GameObject
   def position; [@x, @y]; end
   def needs_to_be_seen?; (@temp_occlusions > 0) or @object; end # Causes walls to become transparent.
   def blocks_sight?; @type == 'none' or (@object and @object.blocks_sight?); end
+  def zoc?(faction); entities_exerting_zoc(faction).any?; end
 
   # Blank white tile, useful for colourising tiles.
-  def self.blank; @@sprites[0]; end
-  def self.config; @@config ||= YAML.load_file(File.expand_path("config/map/tiles.yml", EXTRACT_PATH)); end
-  def self.sprites; @@sprites ||= SpriteSheet.new("floor_tiles.png", WIDTH, HEIGHT, 4); end
+  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
+  end
 
   attr_reader :entities_exerting_zoc
 

data/lib/smash_and_grab/map/wall.rb

@@ -32,8 +32,10 @@ class Wall < GameObject
 
   def blocks_sight?; @blocks_sight; end
 
-  def self.config; @@config ||= YAML.load_file(File.expand_path("config/map/walls.yml", EXTRACT_PATH)); end
-  def self.sprites; @@sprites ||= SpriteSheet.new("walls.png", SPRITE_WIDTH, SPRITE_HEIGHT, 8); end
+  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
+  end
 
   def initialize(map, data)
     options = {