empi 0.24 → 0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63caec222a8c3c293532aabadbebc30a9acb2f8a664b4327ba95dae6e5222955
-  data.tar.gz: '09b1c7b2f163e042ee4e9ecb17547b585c5d8b80480c099f8a253a2c917449e2'
+  metadata.gz: abe9081612cf59f547e94e98d5ee4373fab6ded9298bfb20366bc3d67725c0cc
+  data.tar.gz: 7f7683c7a94d512965feed1617fc3cb700851e5444862a28069b8c2ddb76cecc
 SHA512:
-  metadata.gz: 1662dd058a2e1d8d5e4a8f4cdf48cb7f3b8a45bcc2500c11dd458af7c0d0aff5c9718ce79d5378f47ef6d9d0b9650a1a0a8604b791368371515f68390264e02e
-  data.tar.gz: abcac90abcfa4d0c72561ddac4c8a074e558d906f82530a7ac7d554f8784d769998b778ed8e5cb3f71c2217f807d6ddcf505217f589a1bfdf2f887c1b3577a0b
+  metadata.gz: feac436c82e490b978bac742c546816879fa7c32ef3e14410023078d83b1e8d5366d3ffa7ef051442cf84d5cef728f8c7ee2f2577ddce84c7f3ef16c2661def1
+  data.tar.gz: 73ade95b93a6b84b509ecb88ea545aaa80babbd007586bc4d5db52dee03a79eec15c9fd18f7a4422db265398921e1ab33701bd2c2230f9a7592fdc64cae64277

data/lib/empi.rb

@@ -19,7 +19,11 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.24'
+
+    # Set version name
+    version = '0.25'
+    self.caption = "Empi: Ruby Edition #{version}"
+    WelcomeState.instance.version = version
 
     # Activate first state
     $window = self
@@ -46,7 +50,6 @@ class GameWindow < Gosu::Window
 
   # Draw according to current state
   def draw
-
     @button = BUTTON_PROCESSED # draw just once after each button release
     unless $window.state.nil?
       @state.draw

data/lib/lib/game_states/build_state.rb

@@ -6,7 +6,7 @@ require_relative './play_state'
 require_relative './../units/army'
 require_relative './../units/ship'
 
-# Game state of closing the game window
+# Game state of selection of the build project
 class BuildState < GameState
   include Singleton
 
@@ -20,7 +20,7 @@ class BuildState < GameState
   #def before_end
   #end
 
-  # Process given button to cursor
+  # Process given button
   def update(button)
     newly_selected = nil
 

data/lib/lib/game_states/play_state.rb

@@ -2,12 +2,12 @@ require 'singleton'
 
 require_relative './game_state'
 require_relative './welcome_state'
+require_relative './win_state'
 
 require_relative './../user_interface/cursor'
 require_relative './../user_interface/infopane'
 require_relative './../user_interface/map'
 
-
 XTEXT = 5
 YTEXT = 5
 ZTILE = 0
@@ -32,6 +32,7 @@ class PlayState < GameState
   # Load new scenario or resume game
   def after_start
     if @desired_new_map
+      WinState.instance.unset_victory!
       load_new_map!
       help # show help after each loading of a new map
       @desired_new_map = nil
@@ -65,7 +66,11 @@ class PlayState < GameState
   def update(button)
     case(button)
     when Gosu::KbEscape then
-      GameState.switch!(WelcomeState.instance)
+      unless WinState.instance.faction
+        GameState.switch!(WelcomeState.instance)
+      else
+        GameState.switch!(WinState.instance)
+      end
     when Gosu::KbPeriod then
       next_faction_turn!
     when Gosu::KbH then
@@ -120,6 +125,14 @@ class PlayState < GameState
     }
     all_faction_units.each { |uu| uu.reset_moves!}
 
+    # Win check: current faction has lost all units
+    if !WinState.instance.faction and all_faction_units.empty?
+      WinState.instance.set_victory!(
+        3 - @infopane.faction, # TODO more factions?
+        'Annihilation', @infopane.turn, @infopane.score
+      )
+    end
+
     # Lock the cursor to the first waiting unit
     @cursor.reset!
   end
@@ -127,9 +140,10 @@ class PlayState < GameState
   # 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" \
+         "H: help, Esc: menu, Enter: info, " \
+         ".: end your turn, J: switch freeroam\n" \
+         "QWEADZXC or arrow keys: movement, K: previous unit, L: next unit\n" \
+         "functions: S sentry, B build, N none\n" \
          "-----------\n"
   end
 end

data/lib/lib/game_states/quit_state.rb

@@ -15,7 +15,7 @@ class QuitState < GameState
   #def before_end
   #end
 
-  # Process given button to cursor
+  # Process given button
   def update(button)
     case(button)
     when Gosu::KbY then

data/lib/lib/game_states/set_state.rb

@@ -0,0 +1,75 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './welcome_state'
+
+# Game state of settings screen
+class SetState < GameState
+  include Singleton
+
+  # TODO move out?
+  attr_reader :settings
+
+  # 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 initialize
+    super
+    @settings = { # TODO move out?
+      'axis_top'    => true,
+      'axis_bottom' => false,
+      'axis_left'   => true,
+      'axis_right'  => false
+    }
+  end
+
+  # Process given button
+  def update(button)
+    case(button)
+    when Gosu::Kb1, Gosu::Kb2, Gosu::Kb3, Gosu::Kb4 then
+      change_setting!(button)
+    when Gosu::KbEscape then
+      GameState.switch!(WelcomeState.instance)
+    end
+  end
+
+  def draw
+    header_text = '
+        /--  ///  /-/  -/-
+        /--  |||  /-/   |
+        /--  |||  |    -/-'
+    options_text = "
+        1 – show top axis: #{@settings['axis_top']}
+        2 – show bottom axis: #{@settings['axis_bottom']}
+        3 – show left axis: #{@settings['axis_left']}
+        4 – show right axis: #{@settings['axis_right']}\n
+        Esc – return to menu"
+    warning_text = '
+        Warning: settings are not saved
+        when Empi is closed'
+
+    menu = Gosu::Image.from_text(
+      header_text + "\n\n\n\n\n" + options_text + "\n\n\n" + warning_text, 20)
+
+    menu.draw((3*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+
+  def change_setting!(button)
+    changed_setting = {
+      Gosu::Kb1 => 'axis_top',
+      Gosu::Kb2 => 'axis_bottom',
+      Gosu::Kb3 => 'axis_left',
+      Gosu::Kb4 => 'axis_right'
+    }[button]
+
+    old_value = @settings[changed_setting]
+    @settings[changed_setting] = !@settings[changed_setting] # TODO other than boolean types?
+    puts "setting #{changed_setting} changed from #{old_value} " \
+         "to #{@settings[changed_setting]}"
+  end
+end

data/lib/lib/game_states/welcome_state.rb

@@ -3,11 +3,15 @@ require 'singleton'
 require_relative './game_state'
 require_relative './play_state'
 require_relative './quit_state'
+require_relative './set_state'
+require_relative './win_state'
 
-# Game state of closing the game window
+# Game state of main menu
 class WelcomeState < GameState
   include Singleton
 
+  attr_accessor :version
+
   # What to do just after state gets activated
   #def after_start
   #end
@@ -16,14 +20,17 @@ class WelcomeState < GameState
   #def before_end
   #end
 
-  # Process given button to cursor
+  # Process given button
   def update(button)
     case(button)
-    when Gosu::Kb0, Gosu::KbQ then
-      GameState.switch!(QuitState.instance)
     when Gosu::KbEscape then
+      # If there is active map go either to it or to its win screen
       if PlayState.instance.map
-        GameState.switch!(PlayState.instance)
+        unless WinState.instance.faction
+          GameState.switch!(PlayState.instance)
+        else
+          GameState.switch!(WinState.instance)
+        end
       end
     when Gosu::Kb1, Gosu::Kb2, Gosu::Kb3 then
       PlayState.instance.desired_new_map = {
@@ -32,6 +39,10 @@ class WelcomeState < GameState
          Gosu::Kb3 => 'm03'
       }[button]
       GameState.switch!(PlayState.instance)
+    when Gosu::Kb9, Gosu::KbS then
+      GameState.switch!(SetState.instance)
+    when Gosu::Kb0, Gosu::KbQ then
+      GameState.switch!(QuitState.instance)
     end
   end
 
@@ -41,24 +52,34 @@ class WelcomeState < GameState
         /--  |||  /-/   |
         /--  |||  |    -/-'
 
-    if PlayState.instance.map # some map is loaded
-      space_text = "\n\n\n"
-      options_text = "
-        Esc – Resume"
+    # Is there active map? Is it won?
+    if PlayState.instance.map
+      unless WinState.instance.faction
+        resume_text = "
+        Esc – resume"
+      else
+        resume_text = "
+        Esc – return to victory screen"
+      end
     else
-      space_text = "\n\n\n\n"
-      options_text = ""
+      resume_text = "\n"
     end
 
-    options_text += "
-        1 – Start New: Map 01
-        2 – Start New: Map 02
-        3 – Start New: Map 03\n
-        0, Q – Quit"
+    options_text = "
+        1 – start new: Map 01
+        2 – start new: Map 02
+        3 – start new: Map 03\n
+        9, S – settings
+        0, Q – quit"
 
-    menu = Gosu::Image.from_text(
-      header_text + space_text + options_text, 20)
+    version_text = "
+        version #{self.version}"
 
+    menu = Gosu::Image.from_text(
+      header_text + "\n\n\n" +
+      resume_text + "\n" +
+      options_text + "\n\n\n\n\n\n\n\n" +
+      version_text, 20)
     menu.draw((3*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
   end
 end

data/lib/lib/game_states/win_state.rb

@@ -0,0 +1,61 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+require_relative './welcome_state'
+
+# Game state of summary of won game
+class WinState < GameState
+  include Singleton
+
+  attr_reader :faction
+
+  # 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
+  def update(button)
+    case(button)
+    when Gosu::KbEscape then
+      GameState.switch!(WelcomeState.instance)
+    when Gosu::KbReturn then
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  def draw
+    winner_text = "VICTORY FOR FACTION #{@faction}"
+    summary_text = "Summary:
+        victory type: #{@type}
+        won on turn: #{@turn}
+        ending score: #{@score}"
+    options_text = 'Do you want to continue playing?
+        Enter – resume
+        Esc – return to menu'
+
+    win_summary = Gosu::Image.from_text(
+      winner_text + "\n\n\n" + summary_text + "\n\n" + options_text, 20)
+    win_summary.draw((2*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+
+  def set_victory!(faction, type, turn, score)
+    @faction = faction
+    @type = type
+    @turn = turn
+    @score = score.clone # separate object is neeeded
+
+    GameState.switch!(WinState.instance)
+  end
+
+   def unset_victory!()
+    @faction = nil
+    @type = nil
+    @turn = nil
+    @score = nil
+  end
+end

data/lib/lib/units/town.rb

@@ -76,7 +76,7 @@ class Town < Unit
   # Set desired project
   def set_project!(desired_project)
     unless price_list.key?(desired_project)
-      abort("town.set_project!(): Unknown project (#{desired_project})")
+      abort("Town.set_project!(): Unknown project (#{desired_project})")
     end
     @parts_needed = price_list[desired_project]
 

data/lib/lib/units/unit.rb

@@ -1,4 +1,4 @@
-require_relative './unitFunction'
+require_relative './unit_function'
 
 # Both capturable and movable game pieces
 class Unit
@@ -35,8 +35,8 @@ class Unit
 
   # Process engagement targeted at this unit
   def engage!(by_whom)
-    if by_whom == @faction
-      abort("unit.engage!(): Engaging unit is of the same faction as this one (#{@faction})")
+    if by_whom.faction == @faction
+      abort("Unit.engage!(): Engaging unit is of the same faction as this one (#{@faction})")
     end
 
     # Can it be captured and is it without defenders?
@@ -46,7 +46,7 @@ class Unit
       else # then capture it if you can
         if by_whom.can_capture?
           puts PROMPT + by_whom.to_s + ' is capturing ' + to_s
-          capture!(by_whom.faction)
+          capture!(by_whom)
         else
           puts PROMPT + by_whom.to_s + ' can\'t capture other units'
         end
@@ -65,16 +65,16 @@ class Unit
   # Process capture targeted at this unit
   def capture!(by_whom)
     unless can_be_captured?
-      abort("unit.capture!(): This unit can\'t be captured")
+      abort("Unit.capture!(): This unit can\'t be captured")
     end
 
-    if by_whom == @faction
-      abort("unit.capture!(): This unit already belongs to faction #{@faction}")
+    if by_whom.faction == @faction
+      abort("Unit.capture!(): This unit already belongs to faction #{@faction}")
     end
 
     # Add <value> to the capturing faction
-    @infopane.add_score(by_whom - 1, self.class.value)
-    @faction = by_whom
+    @infopane.add_score(by_whom.faction - 1, self.class.value)
+    @faction = by_whom.faction
   end
 
   # Add <value> to the other faction and remove links to given unit
@@ -98,7 +98,7 @@ class Unit
   def check_movement(old_x, old_y)
     if @x != old_x || @y != old_y # only if it moved
       if @moves_left <= 0
-        abort("unit.check_movement(): Moving unit does not have enough move points (#{@moves_left} moves)")
+        abort("Unit.check_movement(): Moving unit does not have enough move points (#{@moves_left} moves)")
       end
 
       oldcoords_unit = @map.get_unit(old_x, old_y)
@@ -121,17 +121,18 @@ class Unit
         # Get to new coordinates
         if !newcoords_unit
           @map.set_unit(@x, @y, self)
-          @cargo.each { |uu|
-            uu.x = @x
-            uu.y = @y
-          }
-
         else # if you are going to be transported
           newcoords_unit.cargo.insert(-1, self) # -1 = to the end
           puts PROMPT + to_s + ' got loaded into '+ newcoords_unit.to_s
           @moves_left = 1 unless newcoords_unit.can_build? # use all your left moves unless you are getting loaded into a town
         end
 
+        # Update position of your cargo
+        @cargo.each { |uu|
+          uu.x = @x
+          uu.y = @y
+        }
+
       else # if there already is somebody that can't transport you (enemy or full friend)
         # Stay on your original tile
         @x = old_x

data/lib/lib/units/{unitFunction.rb → unit_function.rb}

@@ -13,7 +13,7 @@ class UnitFunction
       "no function"
     when FUNCBUILD
       unless @unit.project
-        abort("unitFunction.info(): No project set (" + @unit.to_s + ")")
+        abort("UnitFunction.info(): No project set (" + @unit.to_s + ")")
       end
       "building #{@unit.project.name} (#{@unit.build_info})"
     when FUNCSENTRY
@@ -26,7 +26,7 @@ class UnitFunction
     # Build given unit
     when FUNCBUILD
       unless @unit.project
-        abort("unitFunction.func!(): No project set (" + @unit.to_s + ")")
+        abort("UnitFunction.func!(): No project set (" + @unit.to_s + ")")
       end
 
       @unit.parts_built += 1
@@ -39,9 +39,9 @@ class UnitFunction
         @unit.project.new(@unit.x, @unit.y, @unit.faction, map, infopane)
       end
 
-    # Wake when enemies are nearby
+    # Wake when enemies are nearby (checking just map units is enough)
     when FUNCSENTRY
-      units_around = map.all_units.select { |uu|
+      units_around = map.all_units(0,0).select { |uu|
         (uu.x - @unit.x).abs <= 1 &&
         (uu.y - @unit.y).abs <= 1 &&
         uu.faction != @unit.faction
@@ -55,7 +55,7 @@ class UnitFunction
     end
 
     unless ret
-      abort("unitFunction.func!(): Functionable unit didn't function (" + @unit.to_s + ")")
+      abort("UnitFunction.func!(): Functionable unit didn't function (" + @unit.to_s + ")")
     end
 
     ret

data/lib/lib/user_interface/cursor.rb

@@ -15,7 +15,7 @@ class Cursor
 
     # Give to Infopane link to yourself (for freeroam marker)
     if !@infopane
-      abort("Cursor.initialize!(): Infopane is not set")
+      abort("Cursor.initialize(): Infopane is not set")
     end
     @infopane.cursor = self
   end
@@ -53,6 +53,10 @@ class Cursor
     # The rest
     when Gosu::KbJ, Gosu::KB_NUMPAD_0 then
       switch_freeroam!
+    when Gosu::KbK, Gosu::KB_NUMPAD_MINUS then
+      select_other_unit!(false)
+    when Gosu::KbL, Gosu::KB_NUMPAD_PLUS then
+      select_other_unit!(true)
     when Gosu::KbReturn, Gosu::KB_NUMPAD_5 then
       info
     end
@@ -65,11 +69,11 @@ class Cursor
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZCURSOR)
   end
 
-  # Move to coordinates of unit the cursor is locked to
+  # Move to coordinates of map unit the cursor is locked to
   def warp_to_locked!()
-    @x = @locked_to.x
-    @y = @locked_to.y
-    @local_unit = @locked_to
+    @x = @locked_unit.x
+    @y = @locked_unit.y
+    @selected_unit = @locked_unit
   end
 
   # Move by given change of coordinates
@@ -77,39 +81,39 @@ class Cursor
     if freeroam
       @x += xx
       @y += yy
-      @local_unit = @map.get_unit(@x, @y)
+      @selected_unit = @map.get_unit(@x, @y)
       # TODO show some basic tile info in infopane
     else
       check_unit
 
       # Move the unit first
-      @locked_to.x += xx
-      @locked_to.y += yy
-      @locked_to.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
+      @locked_unit.x += xx
+      @locked_unit.y += yy
+      @locked_unit.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
 
       # Is the unit still alive?
-      if @locked_to.armour_left > 0
+      if @locked_unit.armour_left > 0
         warp_to_locked! # whether it moved or not
       else
         # It got destroyed so clear last links then so that (object of)
         # given unit can be truly destroyed
-        @local_unit = nil
-        @locked_to = nil
+        @selected_unit = nil
+        @locked_unit = nil
       end
     end
   end
 
-  # Tries to set function <func> to local unit
+  # Tries to set function <func> to selected unit
   def set_function_to_unit(func)
     check_unit
 
-    if @local_unit
-      @local_unit.set_function!(func, @infopane.faction)
+    if @selected_unit
+      @selected_unit.set_function!(func, @infopane.faction)
 
       # Update infopane with the new (possibly changed) state
       # (visible only in freeroam mode as in locked one the infopane is
       # overwritten as cursor either jumps away or switches to freeroam mode)
-      @infopane.text = @local_unit.info
+      @infopane.text = @selected_unit.info
     else
       puts "no unit to set that function to (at #{@x}-#{@y})"
     end
@@ -119,19 +123,19 @@ class Cursor
   def reset!
     @freeroam = true
     switch_freeroam!
-    @local_unit = nil
-    @locked_to = nil
+    @selected_unit = nil
+    @locked_unit = nil
     to_next_unit!
   end
 
   # Find next unit which is still waiting for commands and lock to it
-  # (local -> last locked to -> next waiting) or switch (back) to freeroaming
+  # (selected -> last locked to -> next waiting) or switch (back) to freeroaming
   def to_next_unit!
-    if @local_unit and @local_unit.is_waiting_for_commands?
+    if @selected_unit and @selected_unit.is_waiting_for_commands?
       # Lock to such unit (though it may have already been locked)
-      @locked_to = @local_unit
+      @locked_unit = @selected_unit
     else
-      unless @locked_to and @locked_to.is_waiting_for_commands?
+      unless @locked_unit and @locked_unit.is_waiting_for_commands?
         waiting = @map.all_units.select { |uu| uu.is_waiting_for_commands? }
 
         # Are there still some units of active faction waiting for commands?
@@ -141,7 +145,8 @@ class Cursor
           return
         end
 
-        @locked_to = waiting[0] # newly selected one
+        # Pick the first waiting unit (leftmost of topmosts)
+        @locked_unit = waiting[0]
       end
     end
 
@@ -149,11 +154,68 @@ class Cursor
     info unless @info_stopped # due to switching out of the play game state
   end
 
-  # When cursor is in locked mode there needs to be a local unit it is locked to
-  # When cursor is in freeroam mode the local unit should still be loaded
+  # Skip or cycle units, depending on cursor mode
+  def select_other_unit!(search_forward)
+    unless @freeroam
+      skip_to_other_unit!(search_forward)
+    else
+      cycle_to_other_unit!(search_forward)
+    end
+  end
+
+  # Skip from selected unit waiting for commands to the next/previous waiting one
+  def skip_to_other_unit!(search_forward = true)
+    if @freeroam
+      abort("Cursor.skip_to_other_unit!(): " \
+            "skipping to #{ search_forward ? 'next' : 'previous'} " \
+            "unit works only in locked mode, not in freeroam one")
+    end
+
+    waiting = @map.all_units.select { |uu| uu.is_waiting_for_commands? }
+
+    # Pick the previous/next waiting unit, relative to the current one
+    # (picking the previous of the first results in index -1 which is the last
+    # so there it is fine but taking the next of the last would go out of range)
+    current_index = waiting.index(@selected_unit)
+    other_index = search_forward ? current_index + 1 : current_index - 1
+    other_index = 0 if other_index >= waiting.size # == would be enough
+
+    @locked_unit = waiting[other_index]
+    warp_to_locked! # so that to_next_unit!() doesn't stay at @selected_unit
+  end
+
+  # Cycle from selected unit to the next/previous local one
+  def cycle_to_other_unit!(search_forward = true)
+    unless @freeroam
+      abort("Cursor.cycle_to_other_unit!():" \
+            "cycling to #{ search_forward ? 'next' : 'previous'} " \
+            "unit works only in freeroam mode, not in locked one")
+    end
+
+    unless @selected_unit
+      @infopane.text = ''
+      puts "no units to cycle through (at #{@x}-#{@y})"
+      return
+    end
+
+    local_pile = @map.all_units_from_tile(@x, @y)
+
+    # Pick the previous/next local unit, relative to the current one
+    # (picking the previous of the first results in index -1 which is the last
+    # so there it is fine but taking the next of the last would go out of range)
+    current_index = local_pile.index(@selected_unit)
+    other_index = search_forward ? current_index + 1 : current_index - 1
+    other_index = 0 if other_index >= local_pile.size # == would be enough
+
+    @selected_unit = local_pile[other_index]
+    info
+  end
+
+  # When cursor is in locked mode there needs to be unit it is locked to
+  # When cursor is in freeroam mode the locked unit should be kept
   def check_unit
-    if !@freeroam and !@local_unit
-      abort("cursor.set_function_to_unit(): Cursor is in locked mode " \
+    if !@freeroam and !@locked_unit
+      abort("Cursor.check_unit(): Cursor is in locked mode " \
             "but there is no unit it is locked to (at #{@x}-#{@y})")
     end
   end
@@ -175,12 +237,12 @@ class Cursor
   def info
     check_unit
 
-    if @local_unit
-      @infopane.text = @local_unit.info
-      puts @local_unit.info
+    if @selected_unit
+      @infopane.text = @selected_unit.info
+      puts @selected_unit.info
 
-      if @local_unit.is_transporting?
-        @local_unit.cargo.each { |uu| puts '- cargo: ' + uu.info }
+      if @selected_unit.is_transporting?
+        @selected_unit.cargo.each { |uu| puts '- cargo: ' + uu.info }
       end
     else
       @infopane.text = ''

data/lib/lib/user_interface/infopane.rb

@@ -2,7 +2,7 @@ LINE_HEIGHT = 20
 
 # Score, turn and event texts
 class Infopane
-  attr_reader :faction
+  attr_reader :faction, :turn, :score
   attr_writer :cursor, :text
 
   def initialize

data/lib/lib/user_interface/map.rb

@@ -4,6 +4,8 @@ require_relative './../units/army'
 require_relative './../units/ship'
 require_relative './../units/town'
 
+MAX_CARGO_LEVEL = 10
+
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
 
@@ -73,13 +75,13 @@ class Map
     coords_y = coords[1].to_i
     if (coords_x < 0 || coords_x >= @mapx ||
         coords_y < 0 || coords_y >= @mapy)
-      abort("map.load_unit!(): Unit out of map borders (#{coords_x}-#{coords_y})")
+      abort("Map.load_unit!(): Unit out of map borders (#{coords_x}-#{coords_y})")
     end
 
     # Check faction
     fac = unit[1].to_i
     if(fac < 0 || fac > FACTIONS)
-      abort("map.load_unit!(): Bad faction id (#{fac})")
+      abort("Map.load_unit!(): Bad faction id (#{fac})")
     end
 
     # Create unit
@@ -87,7 +89,7 @@ class Map
     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_type})")
+      abort("Map.load_unit!(): Unknown unit type symbol (#{unit_type})")
     end
   end
 
@@ -105,7 +107,7 @@ class Map
   def all_tiles
     ret = []
     ii = 0
-    0.upto(MAPX) { |rr|
+    0.upto(MAPY) { |rr|
       0.upto(MAPX) { |cc|
         ret[ii] = @tiles[rr][cc]
         ii += 1
@@ -124,34 +126,64 @@ class Map
     @tiles[rr][cc].unit = uu
   end
 
-  # Return both map units and transported units
-  def all_units
-    all_map_units + all_transported_units
-  end
-
-  # Return only units directly on map
-  def all_map_units
+  # Return all units with cargo level in given range
+  # CL0 = map units, CL1 = units in map units, CL2 = units in CL1 units...
+  # all_units() -> all units, all_units(0, 0) -> only map units
+  def all_units(min_cargo_level = 0, max_cargo_level = MAX_CARGO_LEVEL)
     ret = []
-    ii = 0
-    0.upto(MAPX) { |rr|
+
+    unless min_cargo_level.between?(0, MAX_CARGO_LEVEL) and
+           max_cargo_level.between?(0, MAX_CARGO_LEVEL)
+      abort("Map.all_units(): Desired cargo levels need to be " \
+            "from 0 to #{MAX_CARGO_LEVEL}")
+    end
+    unless min_cargo_level <= max_cargo_level
+      abort("Map.all_units(): Min cargo level (#{min_cargo_level}) is higher " \
+            "than max cargo level (#{max_cargo_level})")
+    end
+
+    0.upto(MAPY) { |rr|
       0.upto(MAPX) { |cc|
-        if get_unit(cc, rr)
-          ret[ii] = get_unit(cc, rr)
-          ii += 1
-        end
+        ret += all_units_from_tile(cc, rr)
       }
     }
+
     ret
   end
 
-  # Return only units transported by other units
-  def all_transported_units
+  # Return all units from given tile with cargo level in given range
+  def all_units_from_tile(cc, rr,
+                          min_cargo_level = 0,
+                          max_cargo_level = MAX_CARGO_LEVEL)
     ret = []
-    all_map_units.each { |uu|
-      if uu.is_transporting?
-        ret += uu.cargo
-      end
-    }
+
+    uu = get_unit(cc, rr)
+    if uu
+      ret += add_unit_to_list(uu, 0, min_cargo_level, max_cargo_level)
+    end
+
+    ret
+  end
+
+  # Recursively add units to the list
+  def add_unit_to_list(unit, cargo_level = 0,
+                       min_cargo_level = 0,
+                       max_cargo_level = MAX_CARGO_LEVEL)
+    ret = []
+
+    # This unit
+    if cargo_level >= min_cargo_level
+      ret.append(unit)
+    end
+
+    # Transported units
+    cargo_level += 1
+    if cargo_level <= max_cargo_level
+      unit.cargo.each { |uu|
+        ret += add_unit_to_list(uu, cargo_level, min_cargo_level, max_cargo_level)
+      }
+    end
+
     ret
   end
 end

data/lib/lib/user_interface/tile.rb

@@ -1,3 +1,5 @@
+require_relative './../game_states/set_state'
+
 TILE_SEA = 0
 TILE_GROUND = 1
 
@@ -22,7 +24,7 @@ class Tile
       @terrain = TILE_GROUND
       @image = Gosu::Image.new(dir_path + '/../../media/ground.png')
     else
-      abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
+      abort("Tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
     end
   end
 
@@ -36,8 +38,10 @@ class Tile
     end
 
     # 3) axes
-    draw_axis_tick(@x, @y, 0) # TODO 0 -> viewport.y
-    draw_axis_tick(@y, @x, 0) # TODO 0 -> viewport.x
+    draw_axis_tick(@x, @y, 0) if SetState.instance.settings['axis_top'] # TODO 0 -> viewport.y
+    draw_axis_tick(@x, @y, MAPY) if SetState.instance.settings['axis_bottom']
+    draw_axis_tick(@y, @x, 0) if SetState.instance.settings['axis_left'] # TODO 0 -> viewport.x
+    draw_axis_tick(@y, @x, MAPX) if SetState.instance.settings['axis_right']
   end
 
   # Draw one tick of axis for appropriate tiles

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.24'
+  version: '0.25'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -52,12 +52,14 @@ files:
 - lib/lib/game_states/game_state.rb
 - lib/lib/game_states/play_state.rb
 - lib/lib/game_states/quit_state.rb
+- lib/lib/game_states/set_state.rb
 - lib/lib/game_states/welcome_state.rb
+- lib/lib/game_states/win_state.rb
 - lib/lib/units/army.rb
 - lib/lib/units/ship.rb
 - lib/lib/units/town.rb
 - lib/lib/units/unit.rb
-- lib/lib/units/unitFunction.rb
+- lib/lib/units/unit_function.rb
 - lib/lib/user_interface/cursor.rb
 - lib/lib/user_interface/infopane.rb
 - lib/lib/user_interface/map.rb