empi 0.18 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a373e0fd7e1d69b026eb9e03e6ae1b74d9001d528fcdd2dc144693749cd534
-  data.tar.gz: 83104dc8fce378e990efac52715be41659e874dbe4ecf8ec8553ceffc5e3cb55
+  metadata.gz: d7a7e44ce8aebd925aac9b87c2344c2ddfb75dc7e12b2d2d61d584c6c4ca2477
+  data.tar.gz: edc23d080b7c85249fd869b4571c6c42eff315a2a5ddee93720b5f7c9aa09004
 SHA512:
-  metadata.gz: bd6791f595a7aa71d7e063a9d0e2d7eac6931db0d54c323a464d4967069c4fcb11274067b79e0a5cec05551b0e41e0e6c8dcf5255e08273718da1540ca39eae4
-  data.tar.gz: 7b5406ef092968567a0f503ae3b4bfb532ffb50219a335a8c2b47abd6b7da1a2600bf20529287e66181d201b10a9b675d043f542b8fbc2c2175b7150caac22a0
+  metadata.gz: 22293eedf9f530feafdc018936a37399c2c4ac975c65e00f4b32ffa4c27a79e912d1e2c5e3d0189d464b348b8f0aebc9b5c2955f7b616daadd813afc9f6e5a11
+  data.tar.gz: 4701285d5bb8aa354afd9d766e4b2012489822aaa0e3c59cc3c6b9ae6f9cb3a7c61ab521d142e425bfb582c6fa2c6ef86dc10a5fdb1a785a03ecf2de4a97c4f9

data/lib/empi.rb

@@ -1,113 +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/welcome_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.18 dev'
+    self.caption = 'Empi: Ruby Edition 0.23'
 
-    @infopane = Infopane.new
-    @map = Map.new(@infopane)
-    @cursor = Cursor.new(0, 0, @map, @infopane)
-    help # show help after loading of map
-    new_turn
+    # Activate first state
+    $window = self
+    GameState.switch!(WelcomeState.instance)
   end
 
+  # Catch the released button
   def button_up(key)
     @button = key
   end
 
-  # Process given button to cursor
+  # Process given button according to current state
   def update
-    case(@button)
-    when -1 then # no keys pressed
-      return
-    when Gosu::KbEscape then
-      close
-    when Gosu::KbPeriod then
-      new_turn
-    when Gosu::KbH then
-      help
-    when Gosu::KbJ then
-      @cursor.switch_freeroam!
-    else
-      @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 # draw just once after each button press
-
-    @map.draw_tiles
-    @cursor.draw
-    @infopane.draw
-
-# DEBUG    @map.all_units.each { |uu| puts uu.info}
-  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
-
-  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, 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, @unit.faction)
+    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/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,135 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './welcome_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
+
+  attr_reader :map
+  attr_writer :desired_new_map
+
+  # Load new scenario or resume game
+  def after_start
+    if @desired_new_map
+      load_new_map!
+      help # show help after each loading of a new map
+      @desired_new_map = nil
+
+      next_faction_turn! # so FAC1 will be the first active faction, with announcement
+    else
+      # Make sure everything is set up
+      unless @infopane and @map and @cursor
+        abort("PlayState.after_start(): Map parts are not properly loaded
+          (#{@infopane}, #{@map}, #{@cursor})")
+      end
+
+      @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!(WelcomeState.instance)
+    when Gosu::KbPeriod then
+      next_faction_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
+
+  # Load the desired map
+  def load_new_map!
+    puts("=============\n" \
+         "=============\n" \
+         "Loading save: #{@desired_new_map}")
+    @infopane = Infopane.new
+    @map = Map.new(@desired_new_map, @infopane)
+    @cursor = Cursor.new(0, 0, @map, @infopane)
+  end
+
+  # End turn of the active faction
+  def next_faction_turn!
+    @infopane.next_faction!
+
+    # Have all factions played this turn so we are now back at the first one?
+    if @infopane.faction == 1
+      puts "=============\n" \
+           "End of turn\n" \
+           "=============\n"
+      @infopane.next_turn!
+    end
+
+    # Announce game state at the start of turn of the next faction
+    # TODO add change-of-active-faction screen
+    puts "-----------\n" + @infopane.turnscore
+
+    # Activate functions and reset moves for units of the next faction
+    functionable_faction_units = @map.all_units.select { |uu|
+      uu.faction == @infopane.faction and
+      uu.function != FUNCNONE
+    }
+    functionable_faction_units.each { |uu| uu.function! }
+
+    all_faction_units = @map.all_units.select { |uu|
+      uu.faction == @infopane.faction
+    }
+    all_faction_units.each { |uu| uu.reset_moves!}
+
+    # Lock the cursor to the first waiting unit
+    @cursor.reset!
+  end
+
+  # Printout the controls
+  def help
+    puts "-----------\n" \
+         "h: help, Esc: menu, Enter: info, j: switch freeroam\n" \
+         "QWEADZXC or arrow keys: movement, .: end your turn\n" \
+         "functions: s sentry, b build, n none\n" \
+         "-----------\n"
+  end
+end

data/lib/lib/game_states/quit_state.rb

@@ -0,0 +1,33 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './welcome_state'
+
+# Game state of closing the game window
+class QuitState < 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
+  #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!(WelcomeState.instance)
+    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/welcome_state.rb

@@ -0,0 +1,64 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+require_relative './quit_state'
+
+# Game state of closing the game window
+class WelcomeState < 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
+  #end
+
+  # Process given button to cursor
+  def update(button)
+    case(button)
+    when Gosu::Kb0, Gosu::KbQ then
+      GameState.switch!(QuitState.instance)
+    when Gosu::KbEscape then
+      if PlayState.instance.map
+        GameState.switch!(PlayState.instance)
+      end
+    when Gosu::Kb1, Gosu::Kb2, Gosu::Kb3 then
+      PlayState.instance.desired_new_map = {
+         Gosu::Kb1 => 'm01',
+         Gosu::Kb2 => 'm02',
+         Gosu::Kb3 => 'm03'
+      }[button]
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  def draw
+    header_text = '
+        /--  ///  /-/  -/-
+        /--  |||  /-/   |
+        /--  |||  |    -/-'
+
+    if PlayState.instance.map # some map is loaded
+      space_text = "\n\n\n"
+      options_text = "
+        Esc – Resume"
+    else
+      space_text = "\n\n\n\n"
+      options_text = ""
+    end
+
+    options_text += "
+        1 – Start New: Map 01
+        2 – Start New: Map 02
+        3 – Start New: Map 03\n
+        0, Q – Quit"
+
+    menu = Gosu::Image.from_text(
+      header_text + space_text + options_text, 20)
+
+    menu.draw((3*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+end