empi 0.18 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a373e0fd7e1d69b026eb9e03e6ae1b74d9001d528fcdd2dc144693749cd534
-  data.tar.gz: 83104dc8fce378e990efac52715be41659e874dbe4ecf8ec8553ceffc5e3cb55
+  metadata.gz: 2d95cf3fd4165a2f088ce364e4a5e1a1511ee395a2f0f9a697528a8860d1b69d
+  data.tar.gz: b1e56a884ed3f3db2909379e73ddd9d5079ecab4c7e80e92524d543e0ef0800b
 SHA512:
-  metadata.gz: bd6791f595a7aa71d7e063a9d0e2d7eac6931db0d54c323a464d4967069c4fcb11274067b79e0a5cec05551b0e41e0e6c8dcf5255e08273718da1540ca39eae4
-  data.tar.gz: 7b5406ef092968567a0f503ae3b4bfb532ffb50219a335a8c2b47abd6b7da1a2600bf20529287e66181d201b10a9b675d043f542b8fbc2c2175b7150caac22a0
+  metadata.gz: bfb3d1398928e814bba042ac3017fb051df0073cead2fa24119f7c53406d3767a20c39e44de8631b3c17ebd53e0a9b7ea5ec7c9382a974b30fa2e27b16720755
+  data.tar.gz: e4a85873b8bd9127b051ea262aadca0c251e3cfabbbea3a09bc211f067b8590fefb241b1236e6ab59855223fef4f44a8c7dfc094cb105b70c845ccc8d23de42f

data/lib/cursor.rb

@@ -8,7 +8,7 @@ class Cursor
     @y = y
     @map = map
     @infopane = infopane
-  
+
     @image = Gosu::Image.new(dir_path + '/media/cursor.png')
     @freeroam = false
 
@@ -95,35 +95,19 @@ class Cursor
   def set_function_to_unit(func)
       if freeroam
         uu = @map.get_unit(@x, @y)
-      else
-        # If in locked mode
+      else # in locked mode
         if !@unit
           abort("cursor.set_function_to_unit(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
         end
         uu = @unit
       end
-      
-      uu.set_function(func) unless !uu
+
+      uu.set_function!(func) unless !uu
   end
 
   # Find next unit to target with cursor
   def to_next_unit!
-    if @unit
-      puts 'current unit is there'
-    else
-      puts 'nothing hereeee'
-    end
-
-    if @unit && @unit.can_move?
-      puts 'current unit can move'
-    end
-
-    if @unit && @unit.function == FUNCNONE
-      puts 'current unit has no function set'
-    end
-
     unless @unit && @unit.can_move? && @unit.function == FUNCNONE # unless the current one is still movable
-puts 'searching'
       movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
 
       # If there are no more movable units without function, switch to freeroam mode
@@ -136,8 +120,7 @@ puts 'searching'
 
       @unit = movable_units[0] # newly selected one
     end
-puts 'ready'
-    
+
     warp_to!(@unit) # stay at old or go to new
     info
   end

data/lib/docu/info.txt

@@ -6,9 +6,87 @@ Empi: Ruby Edition
 ====================
 CC-BY-SA 3.0, Detros
 http://www.bay12forums.com/smf/index.php?topic=157538
+https://rubygems.org/gems/empi
 rasunadon@seznam.cz
 
 
+v19 dev
+=========
+- units which can't build will not only protest against such function but also not set it
+  fixed: units which can't build can still have function set to build
+- added link to the gem page to the header of this Info file
+- defenders of capturable units need to be dealt with before it can be captured
+  fixed: capturing town with units leaves those enemy units inside
+- destroyed transporters first destroy their cargo
+  fixed: destroyed transport ships don't give points for their lost cargo
+- apparently fixed in v0.18 with storing of last unit in cursor
+  fixed: transported units show in infopane info of their transport instead when selected
+- cargo part of info shown even for empty transporters
+- UnitFunction stores its unit
+  fixed: transported units don't function properly, their transports secretly function instead of them
+- preliminary work done on setting build projects
+- towns say what their project and its progress are
+- parts are first build and then checked so building process takes one less turn now
+- captured towns have their build process reset
+- reworded function parts of unit info
+
+newly found issues
+--------------------
+! passing a Window to Image.from_text has been deprecated since Gosu 0.9
+! Fontconfig error: failed reading config file
+! no way to list cargo in loaded maps
+! units loaded from tile can spawn on unsuitable terrain
+
+file changes
+--------------
+army.rb
+  PARTS_TO_BE_BUILT
+
+cursor.rb
+  removed debug printouts from to_next_unit!()
+
+empi.rb
+  added Build function to help
+
+ship
+  PARTS_TO_BE_BUILT
+
+unit.rb
+  set_function(func) properly returns if it tries to set build function for unit which can't build
+  capture(by_whom) renamed to capture!(by_whom)
+  destroy(by_whom) renamed to destroy!(by_whom)
+  tile_check() renamed to is_terrain_suitable?()
+  +engage!(by_whom) - Process engagement targeted at this unit
+  +attack!(by_whom) - Process attack targeted at this unit
+  capture!(by_whom) checks if unit can be captured and if capturing faction is different from current one
+  destroy!(by_whom) removes from cargo of its transporter when transported
+  cargo part shortened in info()
+  positive cargo_max used instead of cargo size to show cargo part of info
+  simplified calling of UnitFunction in function!
+  set_function(func) renamed to set_function!(func)
+  PARTS_TO_BE_BUILT
+  moved build part of capture! to Town
+  moved build part of set_function! to Town
+  +can_be_built?
+
+unitFunction.rb
+  removed PARTS_NEEDED
+  @unit
+  states project and its state when building in func!()
+  loading needed unit parameters from its stored unit in func!()
+  +info() - Set function part of long info string of unit
+
+town.rb
+  @parts_needed
+  @project
+  +build_info - Tell the state of current build project
+  +capture!(by_whom) - Process capture targeted at this town and reset build process
+  +set_function(func) - Set desired function and possibly also project
+  +set_project! - Set desired project
+
+save/m02-err.esf
+  copy of m02 with two extra units on unsuitable terrain
+
 v18 dev
 =========
 - help is now listing all keys
@@ -26,14 +104,19 @@ v18 dev
 - function setting of units separated to its own method
 - autodisabling of freeroam mode on each end of turn moved to the start of next turn
 
+newly found issues
+--------------------
 ! help should be shown after each load of new map
 ! transported units can't get commands from freeroaming cursor
 ! transported units don't function properly, their transports secretly function instead of them
 ! unit info shown twice at the start of the first turn
 ! units which can't build can still have function set to build (though they do protest)
 
+file changes
+--------------
 empi.rb
   help shown at the start of game
+  added End turn and End game keys to help()
   "End of turn" marker
   removed calling of @map.draw_units
   removed search for next movable unit
@@ -61,6 +144,8 @@ tile.rb
 infopane.rb
   removed one space from score output
 
+docu/Empi v18.png
+docu/Empi v18 - printouts.png
 
 v17 dev
 =========
@@ -105,7 +190,7 @@ unit.rb
   check_movement() checks if moved unit has enough move points
   check_movement() print outs are more detailed
   tile_check() doesn't check terrain type for transported units
-  info() print outs also max cargo capacity
+  info() prints out also max cargo capacity
   fixed comparing of functions in set_function()
   +can_capture?
   +can_be_captured?
@@ -266,17 +351,22 @@ new problems
 ! hardcoded unit type to be built
 ! transported units are never drawn
 !x transported units show only info of their transport instead when selected
-!x all units can capture and visit towns
+!x all units can capture towns
+!x all units can visit towns
 !x units are still stored via Map class instead of Tile one
 !x units are still accessed via Window class instead of Cursor one
+!x capturing town with units leaves those enemy units inside
 ! damaged units are destroyed
-! transported units show in infopane info of their transport instead when selected
-! capturing town with units leaves those enemy units inside
+!x transported units show in infopane info of their transport instead when selected
+!x destroyed transport ships don't give points for their lost cargo
 ! help should be shown after each load of new map
 ! transported units can't get commands from freeroaming cursor
-! transported units don't function properly, their transports secretly function instead of them
+!x transported units don't function properly, their transports secretly function instead of them
 ! unit info shown twice at the start of the first turn
-! units which can't build can still have function set to build (though they do protest)
+!x units which can't build can still have function set to build
+! passing a Window to Image.from_text has been deprecated since Gosu 0.9
+! Fontconfig error: failed reading config file
+! no way to list cargo in loaded maps
+! units loaded from tile can spawn on unsuitable terrain
 
 (! thing to fix, !x fixed thing)
-

data/lib/empi.rb

@@ -36,7 +36,7 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.18 dev'
+    self.caption = 'Empi: Ruby Edition 0.19 dev'
 
     @infopane = Infopane.new
     @map = Map.new(@infopane)
@@ -102,7 +102,7 @@ class GameWindow < Gosu::Window
     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" \
+         "functions: s sentry, b build, n none\n" \
          "-----------\n"
   end
 end

data/lib/infopane.rb

@@ -22,9 +22,9 @@ class Infopane
   end
 
   def next_faction
-    
+    # TODO active faction switching
   end
-  
+
   def next_turn
     @turn += 1
     puts "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}"

data/lib/map.rb

@@ -141,7 +141,7 @@ class Map
   # Return only units transported by other units
   def all_transported_units
     ret = []
-    all_map_units.each { |uu| 
+    all_map_units.each { |uu|
       if uu.is_transporting?
         ret += uu.cargo
       end

data/lib/save/m02-err.esf

@@ -0,0 +1,26 @@
+mission02 11x11 14
+###########
+#..###..###
+#....#...##
+##...#....#
+##....#...#
+####...####
+#...#....##
+#....#....#
+##...#....#
+###..##..##
+###########
+T 0 1-3
+T 0 3-1
+T 0 6-9
+T 0 9-6
+T 1 8-1
+T 1 9-2
+A 1 10-0
+S 1 8-2
+T 2 1-8
+T 2 2-9
+A 2 0-10
+S 2 2-8
+S 2 0-0
+A 2 1-1

data/lib/tile.rb

@@ -15,14 +15,14 @@ class Tile
     @infopane = infopane
 
     case(loaded_symbol)
-    when SYMBOL_SEA then
-      @terrain = TILE_SEA
-      @image = Gosu::Image.new(dir_path + '/media/sea.png')
-    when SYMBOL_GROUND then
-      @terrain = TILE_GROUND
-      @image = Gosu::Image.new(dir_path + '/media/ground.png')
-    else
-      abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
+      when SYMBOL_SEA then
+        @terrain = TILE_SEA
+        @image = Gosu::Image.new(dir_path + '/media/sea.png')
+      when SYMBOL_GROUND then
+        @terrain = TILE_GROUND
+        @image = Gosu::Image.new(dir_path + '/media/ground.png')
+      else
+        abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
     end
   end
 

data/lib/town.rb

@@ -1,7 +1,7 @@
 require_relative './unit'
 
 class Town < Unit
-  attr_accessor :parts_built
+  attr_accessor :project, :parts_built, :parts_needed
 
   def initialize(x, y, faction, map, infopane)
     super
@@ -12,10 +12,13 @@ class Town < Unit
     @value = 20
     @armor_left = @armor_max = 1
     @moves_max = 0
+    @cargo_max = 10
 
     @parts_built = 0
-    @cargo_max = 10
-    set_function(FUNCBUILD)
+    @parts_needed = 0
+    @project = nil
+
+    set_function!(FUNCBUILD)
   end
 
   def can_build?
@@ -25,4 +28,50 @@ class Town < Unit
   def can_be_captured?
     true
   end
+
+  # Tell the state of current build project
+  def build_info
+    "#{@parts_built}/#{@parts_needed}"
+  end
+
+  # Process capture targeted at this town and reset build process
+  def capture!(by_whom)
+    super
+
+    # Reset build process
+    @project = nil
+    @parts_built = 0
+    set_function!(FUNCBUILD)
+  end
+
+  # Set desired function and possibly also project
+  def set_function!(func)
+    super
+
+    if @faction != 0 and func == FUNCBUILD # neutral towns dom't need projects either
+       set_project!
+    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
+
+    if @desired_project == @project
+      puts PROMPT + to_s + ": project has already been set to #{@project} (#{build_info} done)"
+    else
+      previous_project = @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)"
+      unless lost_parts > 0
+        puts new_project_set_text
+      else
+        puts new_project_set_text + ", losing #{lost_parts} parts of #{previous_project} "
+      end
+    end
+  end
 end

data/lib/unit.rb

@@ -1,10 +1,11 @@
 require_relative './unitFunction'
 
-# All capturable game pieces
+PARTS_TO_BE_BUILT = 0
+
+# Both capturable and movable game pieces
 class Unit
   attr_accessor :x, :y, :faction, :function, :cargo
 
-
   def initialize(x, y, faction, map, infopane)
     @x = x
     @y = y
@@ -20,7 +21,7 @@ class Unit
     @moves_left = @moves_max
     @cargo = [] # transported units
     @cargo_max = 0
-    @function = UnitFunction.new(FUNCNONE)
+    @function = UnitFunction.new(FUNCNONE, self)
 
     # Store yourself
     coords_unit = @map.get_unit(@x, @y)
@@ -31,25 +32,66 @@ class Unit
     end
   end
 
-  # Add <value> to the other faction and remove links to given unit
-  def destroy
-    @infopane.add_score(3 - @faction - 1, @value) # TODO more factions?
-    # TODO is this deleted enough?
-    @map.set_unit(@x, @y, nil)
+  # 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})")
+    end
+
+    # Can it be captured and is it without defenders?
+    if can_be_captured?
+      if is_transporting?
+        cargo[0].attack!(by_whom)
+      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)
+        else
+          puts PROMPT + by_whom.to_s + ' can\'t capture other units'
+        end
+      end
+    else
+      attack!(by_whom) # uncapturable transporters can't get help from their cargo
+    end
   end
 
-  def capture(by_whom)
-    # add <value> to the capturing faction
+  # Process attack targeted at this unit
+  def attack!(by_whom)
+    puts PROMPT + by_whom.to_s + ' is attacking ' + to_s
+    destroy! # TODO proper combat
+  end
+
+  # Process capture targeted at this unit
+  def capture!(by_whom)
+    unless can_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}")
+    end
+
+    # Add <value> to the capturing faction
     @infopane.add_score(by_whom - 1, @value)
     @faction = by_whom
+  end
+
+  # Add <value> to the other faction and remove links to given unit
+  def destroy!
+    # If you are transporting somebody, destroy them first
+    @cargo.each { |uu| uu.destroy! }
 
-    # if you are a town, start building units
-    if can_build?
-      set_function(FUNCBUILD)
+    @infopane.add_score(3 - @faction - 1, @value) # TODO more factions?
+
+    if is_transported?
+      coords_unit = @map.get_unit(@x, @y)
+      coords_unit.cargo -= [self]
+    else
+      @map.set_unit(@x, @y, nil)
     end
   end
 
-  # Processes move of unit and takes care of its (un)loading or attack
+  # Process move of unit and take care of its (un)loading or start of engagement
   def check_movement(old_x, old_y)
     if @x != old_x || @y != old_y # only if it moved
       if @moves_left <= 0
@@ -66,7 +108,7 @@ class Unit
          !newcoords_unit.is_full?)
 
         # Leave old coordinates
-        if oldcoords_unit == self 
+        if oldcoords_unit == self
           @map.set_unit(old_x, old_y, nil)
         else # if you have been transported
           oldcoords_unit.cargo.delete(self)
@@ -99,26 +141,16 @@ class Unit
               puts PROMPT + newcoords_unit.to_s + ' is already full'
             end
           else
-            # Can it be captured?
-            if newcoords_unit.can_be_captured?
-              if can_capture? # then capture it if you can
-                puts PROMPT + to_s + ' is capturing ' + newcoords_unit.to_s
-                newcoords_unit.capture(@faction)
-              else
-                puts PROMPT + to_s + ' can\'t capture other units'
-              end 
-            else # then battle it
-              puts PROMPT + to_s + ' is battling ' + newcoords_unit.to_s
-              newcoords_unit.destroy # TODO randomized combat
-            end
-          end      
+            # Enemy!
+            newcoords_unit.engage!(self)
+          end
       end
       @moves_left -= 1
 
       # Check if you are on an invalid type of terrain (unless transported)
-      unless tile_check == true
+      unless is_terrain_suitable?
         puts PROMPT + to_s + " found itself in a bad place"
-        destroy
+        destroy!
       end
     end
   end
@@ -149,6 +181,10 @@ class Unit
     false
   end
 
+  def can_be_built?
+    PARTS_TO_BE_BUILT > 0
+  end
+
   def can_transport?
     @cargo_max > 0
   end
@@ -174,7 +210,7 @@ class Unit
   end
 
   # Checks if unit is on the right type of terrain (not for transported units)
-  def tile_check
+  def is_terrain_suitable?
     unless is_transported?
       case @map.tile(@x, @y).terrain
       when TILE_SEA
@@ -190,14 +226,16 @@ class Unit
     @function.func
   end
 
-  def set_function(func)
-    unless @faction == 0 # neutral faction doesn't need functions
-      if (func == FUNCBUILD && !can_build?)
+  # Set desired function
+  def set_function!(func)
+    unless @faction == 0 # neutral towns dom't need functions
+      if func == FUNCBUILD and !can_build?
         puts PROMPT + to_s + ": this unit can't build other units"
+        return
       end
 
       if @function.func == func
-        puts PROMPT + to_s + ": function has already been set to #{@function.func}"
+        puts PROMPT + to_s + ": function is already set to #{@function.func}"
       else
         @function.func = func
         puts PROMPT + to_s + ": function set to #{@function.func}"
@@ -206,7 +244,7 @@ class Unit
   end
 
   def function!
-    ret = @function.func!(@x, @y, @map, @infopane)
+    ret = @function.func!(@map, @infopane)
     puts to_s + ret
   end
 
@@ -218,15 +256,15 @@ class Unit
   # Set long info string: short info string, armor, moves, function, cargo
   def info
     ret = to_s + ": armor #{@armor_left}/#{@armor_max}"
-     
+
     if @moves_max > 0
       ret = ret + ", moves #{@moves_left}/#{@moves_max}"
     end
 
-    ret = ret + ", func #{@function.func}"
+    ret = ret + ", #{@function.info}"
 
-    if @cargo.size > 0
-      ret = ret + ", transports #{@cargo.size}/#{@cargo_max} units"
+    if @cargo_max > 0
+      ret = ret + ", cargo #{@cargo.size}/#{@cargo_max}"
     end
 
     ret

data/lib/unitFunction.rb

@@ -1,38 +1,45 @@
-PARTS = 3
-
 class UnitFunction
   attr_accessor :func
 
-  def initialize(function = FUNCNONE)
+  def initialize(function = FUNCNONE, unit)
     @func = function
+    @unit = unit
   end
 
-  def func!(xx, yy, map, infopane)
-    ret = " didn't actually do anything (ERROR)"
-
-    unit = map.get_unit(xx, yy)
-    if !unit
-      abort("unitFunction.func!(): Functioning unit not found at given coordinates (#{xx}-#{yy})")
+  # Set function part of long info string of unit
+  def info
+    case @func
+    when FUNCNONE
+      "no function"
+    when FUNCBUILD
+      "building #{@unit.project} (#{@unit.build_info})"
+    when FUNCSENTRY
+      "sentrying"
     end
+  end
+
+  def func!(map, infopane)
+    ret = " didn't actually do anything (ERROR)"
 
     case @func
     # Build given unit
     when FUNCBUILD
-      if(unit.parts_built >= PARTS) # just == should be enough
-        ret = " completed building of army"
-        unit.parts_built = 0
-        Army.new(unit.x, unit.y, unit.faction, map, infopane) # TODO allow setting what to build
+      @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)"
       else
-        ret = " built next part of army"
-        unit.parts_built = unit.parts_built + 1
+        ret = " completed building of #{@unit.project}"
+        @unit.parts_built = 0
+        Army.new(@unit.x, @unit.y, @unit.faction, map, infopane)
       end
-    
-    # Wake up when enemies are nearby
+
+    # Wake when enemies are nearby
     when FUNCSENTRY
       units_around = map.all_units.select { |uu|
-        (uu.x - xx).abs <= 1 &&
-        (uu.y - yy).abs <= 1 &&
-        uu.faction != unit.faction
+        (uu.x - @unit.x).abs <= 1 &&
+        (uu.y - @unit.y).abs <= 1 &&
+        uu.faction != @unit.faction
       }
       if units_around.size > 0
         ret = " woke up"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.19'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -48,8 +48,6 @@ extra_rdoc_files: []
 files:
 - lib/army.rb
 - lib/cursor.rb
-- lib/docu/Empi v14.png
-- lib/docu/Empi v18 - printouts.png
 - lib/docu/Empi v18.png
 - lib/docu/info.txt
 - lib/empi.rb
@@ -62,6 +60,7 @@ files:
 - lib/media/ship.png
 - lib/media/town.png
 - lib/save/m01.esf
+- lib/save/m02-err.esf
 - lib/save/m02.esf
 - lib/save/m03.esf
 - lib/ship.rb