empi 0.17 → 0.22.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6ad13787b5a8797ab609b5b7a907cf5c496eaeb1e6dd6f6cca7d639eeb8ea806
+  data.tar.gz: 260e7ffb1be2609e55edef0e37fe1d74409a107f15b269472154514ada633f36
+SHA512:
+  metadata.gz: 138cf192068da984a0a415346d9210ef81e20c968bf86f4c0a37dd71201ec233eb224e1aa400a5199143badbf649e2c45a1dd7fafa33aecc2afcbc8e58a27a19
+  data.tar.gz: 971e0ec6b97089ede1598648cb114cecdcd88a6fceb49a90fd9da162539afc50896569ae08bc394676dda6c5a833db6dedab9216173d4ed6100dc3759daeec00

data/lib/empi.rb

@@ -1,146 +1,60 @@
 require 'rubygems'
 require 'gosu'
 
-require_relative './army'
-require_relative './cursor'
-require_relative './infopane'
-require_relative './map'
-require_relative './tile'
-require_relative './ship'
-require_relative './town'
+require_relative './lib/game_states/game_state'
+require_relative './lib/game_states/play_state'
 
 TILESIZE = 50
 MAPX = 10
 MAPY = 10
 
-XTEXT = 5
-YTEXT = 5
-
-ZTILE = 0
-ZUNIT = 1
-ZTEXT = 2
-ZCURSOR = 3
-
-FACTIONS = 2
-COLOUR = [0xff_ffffff, 0xff_ff3300, 0xff_ffcc00]
-
-FUNCNONE = 'none'
-FUNCSENTRY = 'sentry'
-FUNCBUILD = 'build'
-
 PROMPT = '> '
+BUTTON_PROCESSED = -1
 
 # Main class
 class GameWindow < Gosu::Window
+  attr_accessor :state
+
   def initialize(width = (MAPX + 1) * TILESIZE, \
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.17 dev'
+    self.caption = 'Empi: Ruby Edition 0.22 dev'
 
-    @infopane = Infopane.new
-    @map = Map.new(@infopane)
-    @cursor = Cursor.new(5, 5, @map, @infopane)
-
-    new_turn
+    # Activate first state
+    $window = self
+    GameState.switch!(PlayState.instance)
   end
 
+  # Catch the released button
   def button_up(key)
     @button = key
-
-    case(key)
-    when Gosu::KbEscape then
-      close
-    when Gosu::KbPeriod then
-      new_turn
-    when Gosu::KbH then
-      help
-    when Gosu::KbJ then
-      unit_to_move = 0
-      @cursor.switch_freeroam
-    end
   end
 
-  # Process given button to cursor
+  # Process given button according to current state
   def update
-    if @button == -1 then return end
-
-    movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
-    # If there are any movable units without functions select one of them with the cursor
-    if @cursor.freeroam == false && movable_units.size > 0
-      unit_to_move = movable_units[0]
-      unit_to_move.update(@button)
-
-      # Can it still move?
-      if unit_to_move.can_move? && unit_to_move.function == FUNCNONE
-       # Move the cursor to it unless it is already there
-        if (@cursor.x != unit_to_move.x \
-            || @cursor.y != unit_to_move.y)
-          @cursor.warp(unit_to_move.x, unit_to_move.y)
-        end
-        @cursor.info
-      else
-        # Was that the last currently avaiable non-function move?
-        movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
-        if movable_units.size == 0
-          puts 'all movable units without functions moved'
-          @cursor.switch_freeroam
-        else
-          # Move cursor to next avaiable unit
-          unit_to_move = movable_units[0]
-          @cursor.warp(unit_to_move.x, unit_to_move.y)
-          @cursor.info
-        end
-      end
-
-    else
-      # Cursor in freeroam mode
-      @cursor.update(@button) 
+    # No (new) keys
+    unless @button == BUTTON_PROCESSED || @button.nil?
+      @state.update(@button)
     end
   end
 
   # Draw only after some button was released and in the start
   def needs_redraw?
-    @button != -1
+    @button != BUTTON_PROCESSED
   end
 
+  # Draw according to current state
   def draw
-    @button = -1 # use each button just once
-
-    # Draw map tiles and units
-    @map.draw_tiles
-    @map.draw_units
-# DEBUG    @map.all_units.each { |uu| puts uu.info}
-
-    @cursor.draw
-    @infopane.draw
-
-    # @message = Gosu::Image.from_text(
-    # self, "Empire", Gosu.default_font_name, 20)
-    # @message.draw(10, 10, 2)
-  end
 
-  # End current turn and start next one
-  def new_turn
-    @cursor.freeroam = true
-    @cursor.switch_freeroam # so freeroam = false, with messages
-
-    functionable_units = @map.all_units.select { |uu| uu.function != FUNCNONE}
-    functionable_units.each { |uu| uu.function! }
-
-    @map.all_units.each { |uu| uu.reset_moves!}
-    @infopane.next_turn
-  end
-
-  def help
-    puts "----------\n" \
-         "QWEADZXC movement, h help, Enter info, j switch freeroam\n" \
-         "functions: s sentry, n none\n" \
-         "----------\n"
+    @button = BUTTON_PROCESSED # draw just once after each button release
+    unless $window.state.nil?
+      @state.draw
+    end
   end
 end
 
 # ---------------------------------------------------------------
 
-window = GameWindow.new
-window.show
+$window = GameWindow.new
+$window.show

data/lib/lib/game_states/build_state.rb

@@ -0,0 +1,82 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+
+require_relative './../units/army'
+require_relative './../units/ship'
+
+# Game state of closing the game window
+class BuildState < GameState
+  include Singleton
+
+  attr_accessor :unit
+
+  # What to do just after state gets activated
+  #def after_start
+  #end
+
+  # What to do just before state gets deactivated
+  #def before_end
+  #  TODO hide question?
+  #end
+
+  # Process given button to cursor
+  def update(button)
+    project = nil
+
+    case(button)
+    when Gosu::KbEscape then
+      # If there was no project selected before then behave same as "none" option
+      unless @unit.project
+        reset_function!()
+      else
+        puts PROMPT + @unit.to_s + ": cancelling, nothing changed"
+        GameState.switch!(PlayState.instance)
+      end
+    when Gosu::Kb0, Gosu::KbN then
+      reset_function!()
+    when Gosu::Kb1, Gosu::KbA then
+      project = Army
+    when Gosu::Kb2, Gosu::KbS then
+      project = Ship
+    end
+
+    # Did we get any proper answer?
+    if project
+      @unit.set_project!(project)
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  # If "none" project was selected reset also the function
+  def reset_function!()
+    puts PROMPT + @unit.to_s + ": no project selected, resetting function"
+    @unit.set_function!(FUNCNONE)
+    GameState.switch!(PlayState.instance)
+  end
+
+  def draw
+    # Combine parts according to if there already is some project set
+    unit_text = "Built so far in " + @unit.to_s + ":"
+    if @unit.project
+      project_text = "
+        #{@unit.parts_built} " +
+        "part#{ 's' unless @unit.parts_built == 1 } of " +
+        @unit.project.name + " (" + @unit.build_info + ")"
+    else
+      project_text = "
+        no project selected"
+    end
+
+    options_text = "Select the project:\n
+        1, A – Army (#{ @unit.price_list[Army] } turns)
+        2, S – Ship (#{ @unit.price_list[Ship] } turns)\n
+        0, N – none
+        Esc – cancel project #{ @unit.project ? 'change' : 'setup'}"
+
+    build_project = Gosu::Image.from_text(
+      unit_text + "\n" + project_text + "\n\n" + options_text, 20)
+    build_project.draw((2*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+end

data/lib/lib/game_states/escape_state.rb

@@ -0,0 +1,34 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+
+# Game state of closing the game window
+class EscapeState < GameState
+  include Singleton
+
+  # What to do just after state gets activated
+  #def after_start
+  #end
+
+  # What to do just before state gets deactivated
+  #def before_end
+  #  TODO hide question?
+  #end
+
+  # Process given button to cursor
+  def update(button)
+    case(button)
+    when Gosu::KbY then
+      $window.close
+    when Gosu::KbN, Gosu::KbEscape then
+      GameState.switch!(PlayState.instance) # TODO return to state that called you
+    end
+  end
+
+  def draw
+     confirmation = Gosu::Image.from_text(
+       "Are you sure you want to quit? Y/N", 20)
+     confirmation.draw((3*TILESIZE) + XTEXT, (4*TILESIZE) + YTEXT, ZTEXT)
+  end
+end

data/lib/lib/game_states/game_state.rb

@@ -0,0 +1,27 @@
+# Managing of active game states
+class GameState
+  # Switch active state to next one
+  def self.switch!(next_state)
+    #puts 'DEBUG: switching to state ' + next_state.to_s
+
+    unless $window.state.nil?
+      $window.state.before_end
+    end
+    $window.state = next_state
+    $window.state.after_start
+  end
+
+  # What to do just after state gets activated
+  def after_start
+  end
+
+  # What to do just before state gets deactivated
+  def before_end
+  end
+
+  def update(button)
+  end
+
+  def draw
+  end
+end

data/lib/lib/game_states/play_state.rb

@@ -0,0 +1,100 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './escape_state'
+
+require_relative './../user_interface/cursor'
+require_relative './../user_interface/infopane'
+require_relative './../user_interface/map'
+
+
+XTEXT = 5
+YTEXT = 5
+ZTILE = 0
+ZUNIT = 1
+ZTEXT = 2
+ZCURSOR = 3
+
+FACTIONS = 2
+COLOUR = [0xff_ffffff, 0xff_ff3300, 0xff_ffcc00]
+
+FUNCNONE = 'none'
+FUNCSENTRY = 'sentry'
+FUNCBUILD = 'build'
+
+# Game state of main gameplay
+class PlayState < GameState
+  include Singleton
+
+  # Load new scenario or resume game
+  def after_start
+    unless @infopane and @map and @cursor # is everything set up yet?
+      @infopane = Infopane.new
+      @map = Map.new(@infopane)
+      @cursor = Cursor.new(0, 0, @map, @infopane)
+      help # show help after loading of map
+      new_turn
+    else
+      @cursor.info_stopped = false
+
+      # Remind player the current status
+      if @cursor.freeroam
+        @infopane.text = 'freeroam is enabled'
+        puts 'freeroam is enabled'
+      else
+        @cursor.info
+      end
+    end
+  end
+
+  # What to do just before state gets deactivated
+  def before_end
+    @cursor.info_stopped = true
+  end
+
+  # Process given button or send it to cursor
+  def update(button)
+    case(button)
+    when Gosu::KbEscape then
+      GameState.switch!(EscapeState.instance)
+    when Gosu::KbPeriod then
+      new_turn
+    when Gosu::KbH then
+      help
+    else
+      @cursor.update(button)
+    end
+  end
+
+  # Draw all parts of main window
+  def draw
+    @map.draw_tiles
+    @cursor.draw
+    @infopane.draw
+  end
+
+  # End current turn and start the next one
+  def new_turn
+    puts "=============\n" \
+         "End of turn\n" \
+         "=============\n"
+
+    functionable_units = @map.all_units.select { |uu| uu.function != FUNCNONE}
+    functionable_units.each { |uu| uu.function! }
+
+    @map.all_units.each { |uu| uu.reset_moves!}
+    @infopane.next_turn
+
+    @cursor.freeroam = true
+    @cursor.switch_freeroam! # so freeroam = false, with messages
+  end
+
+  # Printout the controls
+  def help
+    puts "-----------\n" \
+         "h: help, Esc: end game, Enter: info, j: switch freeroam\n" \
+         "QWEADZXC or arrow keys: movement, .: end turn\n" \
+         "functions: s sentry, b build, n none\n" \
+         "-----------\n"
+  end
+end

data/lib/{army.rb → lib/units/army.rb}

@@ -1,13 +1,16 @@
 require_relative './unit'
 
 class Army < Unit
+  @name = 'army'
+  @map_symbol = 'A'
+  @price = 3
+  @value = 5
+
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/army.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/army.png')
 
-    @name = 'army'
-    @value = 5
     @armor_left = @armor_max = 3
     @moves_max = 5
   end

data/lib/{ship.rb → lib/units/ship.rb}

@@ -1,13 +1,16 @@
 require_relative './unit'
 
 class Ship < Unit
+  @name = 'ship'
+  @map_symbol = 'S'
+  @price = 5
+  @value = 10
+
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/ship.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/ship.png')
 
-    @name = 'ship'
-    @value = 10
     @armor_left = @armor_max = 1
     @moves_max = 2
     @cargo_max = 3