empi 0.20 → 0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44b7fcbf8da0bfeb456b1aa7515b343466669b84ce1bbb758da28c08c18bd47
-  data.tar.gz: 0d9da419f8352641e1a42829c38302b2306481a5c7015b7ed656c020980999e8
+  metadata.gz: c2a8c4d275198c690e2abe8ccaa6cc4fa6d636fa48a7aa5ddcf4cfd5e67a4e1b
+  data.tar.gz: 92d1bed4b5219e8ed122fa0abf5bb2065db2df87c6ac27698cc4c9c27750a935
 SHA512:
-  metadata.gz: 905bf655272b2cb5b38fcd615b895a599b05376524cd5f904ee95fc4607f7d4a5f1edb4403bdade52dfb57bd8223a632f712de31b19cca38f0c06325edde65fa
-  data.tar.gz: 4674d0c6c7ba49ec9fb559ccf8ff808ced32beb91863cdca1d0bbf26de9766d6257c150e3a69c0a3bf1d28fc9c84e803d6dd120b3d64b7a08fa3e4ddd175e61d
+  metadata.gz: 4c925aebb1925ccecbef7fa18e9bd1b18ec65d0066bfcd2b1ebc3e0f3476877c3f7b3dcd48f6d926057a85756591b70ec38d783134ba65e03b4436f9daf512dd
+  data.tar.gz: ab0dde3dd38a74a7639104601d6b972a824095f2b242acf81a5d8dc69b55e0be4eae0f3125f804b9106576c3cea185353b16ec0db1200d4c49ecf15c1dc67e80

data/lib/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')
 
-    @name = 'army'
-    @value = 5
     @armor_left = @armor_max = 3
     @moves_max = 5
   end

data/lib/build_state.rb

@@ -0,0 +1,54 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+
+require_relative './army'
+require_relative './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::KbN, Gosu::KbEscape then
+      puts PROMPT + @unit.to_s + ": no project selected, resetting function"
+      @unit.set_function!(FUNCNONE)
+      GameState.switch!(PlayState.instance)
+    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
+
+  def draw
+     build_project = Gosu::Image.from_text(
+       "Select the project for " + @unit.to_s + ":\n
+        1, A – Army (3 turns)\n
+        2, S – Ship (5 turns)\n\n
+        N, Esc – none\n", 20)
+     build_project.draw((2*TILESIZE) + XTEXT, (3*TILESIZE) + YTEXT, ZTEXT)
+  end
+end

data/lib/cursor.rb

@@ -11,12 +11,10 @@ class Cursor
 
     @image = Gosu::Image.new(dir_path + '/media/cursor.png')
     @freeroam = false
-
- #   to_next_unit! # get to the first one
   end
 
-  def update(key)
-    case key
+  def update(button)
+    case button
     # Cardinal directions
     when Gosu::KbLeft, Gosu::KbA, Gosu::KB_NUMPAD_4 then
       move!(-1, 0) unless @x <= 0
@@ -45,6 +43,9 @@ class Cursor
      when Gosu::KbN then
       set_function_to_unit(FUNCNONE)
 
+    # The rest
+    when Gosu::KbJ, Gosu::KB_NUMPAD_0 then
+      switch_freeroam!
     when Gosu::KbReturn, Gosu::KB_NUMPAD_5 then
       info
     end

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 './ship'
-require_relative './tile'
-require_relative './town'
+require_relative './game_state'
+require_relative './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.20 dev'
+    self.caption = 'Empi: Ruby Edition 0.21 dev'
 
-    @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!(PlayState.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, nil then # no keys pressed (yet)
-      return
-    when Gosu::KbEscape then
-      close
-    when Gosu::KbPeriod then
-      new_turn
-    when Gosu::KbH then
-      help
-    when Gosu::KbJ, Gosu::KB_NUMPAD_0 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, b build, 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/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/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/map.rb

@@ -1,6 +1,7 @@
-SYMBOL_TOWN = 'T'
-SYMBOL_ARMY = 'A'
-SYMBOL_SHIP = 'S'
+require_relative './army'
+require_relative './ship'
+require_relative './tile'
+require_relative './town'
 
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
@@ -9,6 +10,11 @@ class Map
     dir_path = File.dirname(__FILE__)
 
     @infopane = infopane
+    @known_unit_types = Hash[
+      [Army, Ship, Town].collect { |ii| [ii.map_symbol, ii] }
+    ]
+
+    # TODO selectable starting scenario
     load_map(dir_path + '/save/m02.esf')
   end
 
@@ -73,24 +79,20 @@ class Map
     end
 
     # Create unit
-    case(unit[0])
-    when SYMBOL_TOWN then
-      Town.new(coords_x, coords_y, fac, self, @infopane)
-    when SYMBOL_ARMY then
-      Army.new(coords_x, coords_y, fac, self, @infopane)
-    when SYMBOL_SHIP then
-      Ship.new(coords_x, coords_y, fac, self, @infopane)
+    unit_type = unit[0]
+    if @known_unit_types.include?(unit_type)
+      @known_unit_types[unit_type].new(coords_x, coords_y, fac, self, @infopane)
     else
-      abort("map.load_unit(): Unknown unit type symbol (#{unit[0]})")
+      abort("map.load_unit(): Unknown unit type symbol (#{unit_type})")
     end
   end
 
   # Draw all tiles
   def draw_tiles
-    all_tiles.each { |tt| tt.draw}     # TODO combine with draw_units() ?
+    all_tiles.each { |tt| tt.draw}
   end
 
-  # Getter for tile in given coordinates
+  # Getter for tile at given coordinates
   def tile(cc, rr)
     @tiles[rr][cc]
   end
@@ -108,12 +110,12 @@ class Map
     ret
   end
 
-  # Getter for unit in given coordinates
+  # Getter for unit at given coordinates
   def get_unit(cc, rr)
     @tiles[rr][cc].unit
   end
 
-  # Setter for unit in given coordinates
+  # Setter for unit at given coordinates
   def set_unit(cc, rr, uu)
     @tiles[rr][cc].unit = uu
   end

data/lib/play_state.rb

@@ -0,0 +1,98 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './escape_state'
+
+require_relative './cursor'
+require_relative './infopane'
+require_relative './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
+      # 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
+  #  TODO undraw all parts?
+  #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/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')
 
-    @name = 'ship'
-    @value = 10
     @armor_left = @armor_max = 1
     @moves_max = 2
     @cargo_max = 3

data/lib/town.rb

@@ -1,6 +1,15 @@
+require_relative './game_state'
+require_relative './build_state'
+
+require_relative './army'
+require_relative './ship'
 require_relative './unit'
 
 class Town < Unit
+  @name = 'town'
+  @map_symbol = 'T'
+  @value = 20
+
   attr_accessor :project, :parts_built, :parts_needed
 
   def initialize(x, y, faction, map, infopane)
@@ -8,12 +17,11 @@ class Town < Unit
     dir_path = File.dirname(__FILE__)
     @image = Gosu::Image.new(dir_path + '/media/town.png')
 
-    @name = 'town'
-    @value = 20
     @armor_left = @armor_max = 1
     @moves_max = 0
     @cargo_max = 10
 
+    @starting_project = Army unless @faction == 0
     @project = nil
     @parts_built = 0
     @parts_needed = 0
@@ -48,29 +56,44 @@ class Town < Unit
   def set_function!(func)
     super
 
-    if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects either
-       set_project!
+    if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects
+      # Set once starting project or ask player about next project
+      if @starting_project
+         set_project!(@starting_project)
+         @starting_project = nil
+      else
+        GameState.switch!(BuildState.instance)
+        BuildState.instance.unit = self
+      end
     end
   end
 
   # Set desired project
-  def set_project!
-    @desired_project = "army" # TODO ask for input on what to build
-    @parts_needed = 3 # TODO load from given project class
+  def set_project!(desired_project)
+    # Figure out the price
+    prices = Hash[
+      [Army, Ship].collect { |ii| [ii, ii.price] } # TODO all subclasses of Unit which can_be_built?
+    ]
+
+    unless prices.key?(desired_project)
+      abort("town.set_project!(): Unknown project (#{desired_project})")
+    end
+    @parts_needed = prices[desired_project]
 
-    if @desired_project == @project
-      puts PROMPT + to_s + ": project has already been set to #{@project} (#{build_info} done)"
+    # Compare new setting with the old one
+    if desired_project == @project
+      puts PROMPT + to_s + ": project has already been set to #{@project.name} (#{build_info} done)"
     else
       previous_project = @project
-      @project = @desired_project
+      @project = desired_project
       lost_parts = @parts_built
       @parts_built = 0
 
-      new_project_set_text = PROMPT + to_s + ": project set to #{@project} (#{build_info} done)"
+      new_project_set_text = PROMPT + to_s + ": project set to #{@project.name} (#{build_info} done)"
       unless lost_parts > 0
         puts new_project_set_text
       else
-        puts new_project_set_text + ", losing #{lost_parts} parts of #{previous_project} "
+        puts new_project_set_text + ", losing #{lost_parts} parts of #{previous_project.name} "
       end
     end
   end

data/lib/unit.rb

@@ -1,9 +1,11 @@
 require_relative './unitFunction'
 
-PARTS_TO_BE_BUILT = 0
-
 # Both capturable and movable game pieces
 class Unit
+  class << self
+    attr_reader :name, :map_symbol, :price, :value
+  end
+
   attr_accessor :x, :y, :faction, :function, :cargo
 
   def initialize(x, y, faction, map, infopane)
@@ -13,8 +15,6 @@ class Unit
     @map = map
     @infopane = infopane
 
-    @name = 'unit'
-    @value = 1
     @armor_max = 1
     @armor_left = @armor_max
     @moves_max = 1
@@ -72,7 +72,7 @@ class Unit
     end
 
     # Add <value> to the capturing faction
-    @infopane.add_score(by_whom - 1, @value)
+    @infopane.add_score(by_whom - 1, self.class.value)
     @faction = by_whom
   end
 
@@ -81,7 +81,7 @@ class Unit
     # If you are transporting somebody, destroy them first
     @cargo.each { |uu| uu.destroy! }
 
-    @infopane.add_score(3 - @faction - 1, @value) # TODO more factions?
+    @infopane.add_score(3 - @faction - 1, self.class.value) # TODO more factions?
 
     if is_transported?
       coords_unit = @map.get_unit(@x, @y)
@@ -182,7 +182,7 @@ class Unit
   end
 
   def can_be_built?
-    PARTS_TO_BE_BUILT > 0
+    self.class.price > 0
   end
 
   def can_transport?
@@ -250,7 +250,7 @@ class Unit
 
   # Set short info string: type, faction, coordinates
   def to_s
-    "#{@name} (FAC#{@faction} #{@x}-#{@y})"
+    "#{self.class.name} (FAC#{@faction} #{@x}-#{@y})"
   end
 
   # Set long info string: short info string, armor, moves, function, cargo

data/lib/unitFunction.rb

@@ -12,7 +12,7 @@ class UnitFunction
     when FUNCNONE
       "no function"
     when FUNCBUILD
-      "building #{@unit.project} (#{@unit.build_info})"
+      "building #{@unit.project.name} (#{@unit.build_info})"
     when FUNCSENTRY
       "sentrying"
     end
@@ -27,11 +27,11 @@ class UnitFunction
       @unit.parts_built += 1
 
       unless @unit.parts_built >= @unit.parts_needed # just == should be enough
-        ret = " built next part of #{@unit.project} (#{@unit.build_info} done)"
+        ret = " built next part of #{@unit.project.name} (#{@unit.build_info} done)"
       else
-        ret = " completed building of #{@unit.project}"
+        ret = " completed building of #{@unit.project.name}"
         @unit.parts_built = 0
-        Army.new(@unit.x, @unit.y, @unit.faction, map, infopane)
+        @unit.project.new(@unit.x, @unit.y, @unit.faction, map, infopane)
       end
 
     # Wake when enemies are nearby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: '0.21'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -47,8 +47,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/army.rb
+- lib/build_state.rb
 - lib/cursor.rb
 - lib/empi.rb
+- lib/escape_state.rb
+- lib/game_state.rb
 - lib/infopane.rb
 - lib/map.rb
 - lib/media/Empi v18.png
@@ -58,6 +61,7 @@ files:
 - lib/media/sea.png
 - lib/media/ship.png
 - lib/media/town.png
+- lib/play_state.rb
 - lib/save/m01.esf
 - lib/save/m02-err.esf
 - lib/save/m02.esf