empi 0.23 → 0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a7e44ce8aebd925aac9b87c2344c2ddfb75dc7e12b2d2d61d584c6c4ca2477
-  data.tar.gz: edc23d080b7c85249fd869b4571c6c42eff315a2a5ddee93720b5f7c9aa09004
+  metadata.gz: 63caec222a8c3c293532aabadbebc30a9acb2f8a664b4327ba95dae6e5222955
+  data.tar.gz: '09b1c7b2f163e042ee4e9ecb17547b585c5d8b80480c099f8a253a2c917449e2'
 SHA512:
-  metadata.gz: 22293eedf9f530feafdc018936a37399c2c4ac975c65e00f4b32ffa4c27a79e912d1e2c5e3d0189d464b348b8f0aebc9b5c2955f7b616daadd813afc9f6e5a11
-  data.tar.gz: 4701285d5bb8aa354afd9d766e4b2012489822aaa0e3c59cc3c6b9ae6f9cb3a7c61ab521d142e425bfb582c6fa2c6ef86dc10a5fdb1a785a03ecf2de4a97c4f9
+  metadata.gz: 1662dd058a2e1d8d5e4a8f4cdf48cb7f3b8a45bcc2500c11dd458af7c0d0aff5c9718ce79d5378f47ef6d9d0b9650a1a0a8604b791368371515f68390264e02e
+  data.tar.gz: abcac90abcfa4d0c72561ddac4c8a074e558d906f82530a7ac7d554f8784d769998b778ed8e5cb3f71c2217f807d6ddcf505217f589a1bfdf2f887c1b3577a0b

data/lib/empi.rb

@@ -19,7 +19,7 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.23'
+    self.caption = 'Empi: Ruby Edition 0.24'
 
     # Activate first state
     $window = self

data/lib/lib/game_states/build_state.rb

@@ -18,62 +18,48 @@ class BuildState < GameState
 
   # 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
+    newly_selected = nil
 
     case(button)
+    # Cancelled change of project = return
     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
+      puts PROMPT + @unit.to_s + ": cancelling, nothing changed"
+      GameState.switch!(PlayState.instance)
+    # Paused production = reset function and return
     when Gosu::Kb0, Gosu::KbN then
-      reset_function!()
+      puts PROMPT + @unit.to_s + ": production paused, resetting function"
+      @unit.set_function!(FUNCNONE, @unit.faction)
+      GameState.switch!(PlayState.instance)
+    # Selected new project = set it and return
     when Gosu::Kb1, Gosu::KbA then
-      project = Army
+      newly_selected = Army
     when Gosu::Kb2, Gosu::KbS then
-      project = Ship
+      newly_selected = Ship
     end
 
     # Did we get any proper answer?
-    if project
-      @unit.set_project!(project)
+    if newly_selected
+      @unit.set_project!(newly_selected)
       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 = "
+    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'}"
+        0, N – pause production
+        Esc – cancel change of project"
 
     build_project = Gosu::Image.from_text(
       unit_text + "\n" + project_text + "\n\n" + options_text, 20)

data/lib/lib/units/army.rb

@@ -11,7 +11,7 @@ class Army < Unit
     dir_path = File.dirname(__FILE__)
     @image = Gosu::Image.new(dir_path + '/../../media/army.png')
 
-    @armor_left = @armor_max = 3
+    @armour_left = @armour_max = 3
     @moves_max = 5
   end
 

data/lib/lib/units/ship.rb

@@ -11,7 +11,7 @@ class Ship < Unit
     dir_path = File.dirname(__FILE__)
     @image = Gosu::Image.new(dir_path + '/../../media/ship.png')
 
-    @armor_left = @armor_max = 1
+    @armour_left = @armour_max = 1
     @moves_max = 2
     @cargo_max = 3
   end

data/lib/lib/units/town.rb

@@ -17,11 +17,12 @@ class Town < Unit
     dir_path = File.dirname(__FILE__)
     @image = Gosu::Image.new(dir_path + '/../../media/town.png')
 
-    @armor_left = @armor_max = 1
+    @armour_left = @armour_max = 1
     @moves_max = 0
     @cargo_max = 10
 
-    @starting_project = Army unless @faction == 0
+    @starting_project = Army unless @faction == 0 # used once at the game start
+    @default_project = Army # used after capture
     @project = nil
     @parts_built = 0
     @parts_needed = 0
@@ -47,10 +48,12 @@ class Town < Unit
     super
 
     # Reset build process
+    # 1) remove old project so that it is not disclosed
+    # 2) set default project so that there is always some set (remove old parts)
+    # 3) offer change of the project to the new owner
     @function.func = FUNCNONE
     @project = nil
-    @parts_built = 0
-
+    set_project!(@default_project)
     set_function!(FUNCBUILD, @faction)
   end
 
@@ -87,12 +90,11 @@ class Town < Unit
       @parts_built = 0
 
       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
+      if previous_project and lost_parts > 0 # parts were lost but not due to capture
         puts new_project_set_text + ", losing #{lost_parts} " +
           "part#{ 's' unless lost_parts == 1 } of #{previous_project.name}"
-
+      else
+        puts new_project_set_text
       end
     end
   end

data/lib/lib/units/unit.rb

@@ -6,7 +6,7 @@ class Unit
     attr_reader :name, :map_symbol, :price, :value
   end
 
-  attr_reader :armor_left
+  attr_reader :armour_left
   attr_accessor :x, :y, :faction, :function, :cargo, :cargo_max
 
   def initialize(x, y, faction, map, infopane)
@@ -16,8 +16,8 @@ class Unit
     @map = map
     @infopane = infopane
 
-    @armor_max = 1
-    @armor_left = @armor_max
+    @armour_max = 1
+    @armour_left = @armour_max
     @moves_max = 1
     @moves_left = @moves_max
     @cargo = [] # transported units
@@ -79,7 +79,7 @@ class Unit
 
   # Add <value> to the other faction and remove links to given unit
   def destroy!
-    @armor_left = 0 # for non-attack damage
+    @armour_left = 0 # for non-attack damage
 
     # If you are transporting somebody, destroy them first
     @cargo.each { |uu| uu.destroy! }
@@ -278,9 +278,9 @@ class Unit
     "#{self.class.name} (FAC#{@faction} #{@x}-#{@y})"
   end
 
-  # Set long info string: short info string, armor, moves, function, cargo
+  # Set long info string: short info string, armour, moves, function, cargo
   def info
-    ret = to_s + ": armor #{@armor_left}/#{@armor_max}"
+    ret = to_s + ": armour #{@armour_left}/#{@armour_max}"
 
     if @moves_max > 0
       ret = ret + ", moves #{@moves_left}/#{@moves_max}"

data/lib/lib/user_interface/cursor.rb

@@ -78,6 +78,7 @@ class Cursor
       @x += xx
       @y += yy
       @local_unit = @map.get_unit(@x, @y)
+      # TODO show some basic tile info in infopane
     else
       check_unit
 
@@ -87,7 +88,7 @@ class Cursor
       @locked_to.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
 
       # Is the unit still alive?
-      if @locked_to.armor_left > 0
+      if @locked_to.armour_left > 0
         warp_to_locked! # whether it moved or not
       else
         # It got destroyed so clear last links then so that (object of)
@@ -104,6 +105,11 @@ class Cursor
 
     if @local_unit
       @local_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
     else
       puts "no unit to set that function to (at #{@x}-#{@y})"
     end
@@ -169,7 +175,7 @@ class Cursor
   def info
     check_unit
 
-    unless !@local_unit
+    if @local_unit
       @infopane.text = @local_unit.info
       puts @local_unit.info
 
@@ -178,7 +184,7 @@ class Cursor
       end
     else
       @infopane.text = ''
-      puts 'nothing here'
+      puts "no unit to show info of (at #{@x}-#{@y})"
     end
   end
 end

data/lib/lib/user_interface/tile.rb

@@ -27,10 +27,26 @@ class Tile
   end
 
   def draw
+    # 1) terrain
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTILE)
 
+    # 2) unit
     if @unit
       @unit.draw
     end
+
+    # 3) axes
+    draw_axis_tick(@x, @y, 0) # TODO 0 -> viewport.y
+    draw_axis_tick(@y, @x, 0) # TODO 0 -> viewport.x
+  end
+
+  # Draw one tick of axis for appropriate tiles
+  def draw_axis_tick(draw_coord, test_coord, test_against)
+    # TODO appropriatness can be changed (show axes: no/top/left/bottom/right)
+    if test_coord == test_against
+      tick = Gosu::Image.from_text(draw_coord, 20)
+      tick.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTEXT)
+      # ^^ TODO substract test_against of viewport from @x and @y here?
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.23'
+  version: '0.24'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -38,9 +38,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 'Empi: Ruby Edition is a turn based wargame, currently deep in development.
-  While learning Ruby I have found there are hardly any strategic games avaiable.
-  So this should be Ruby version of Classic Empire, wargame from old times.'
+description: |-
+  Empi: Ruby Edition is a turn-based wargame with hotseat
+    multiplayer, currently in alpha development state. The game is inspired by
+    Classic Empire, originally from 1977.
 email: rasunadon@seznam.cz
 executables: []
 extensions: []
@@ -100,5 +101,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Turn-based wargame
+summary: A turn-based wargame
 test_files: []