empi 0.16.6 → 0.17

data/lib/army.rb

@@ -15,4 +15,8 @@ class Army < Unit
   def can_ride?
     true
   end
+
+  def can_capture?
+    true
+  end
 end

data/lib/cursor.rb

@@ -85,12 +85,16 @@ class Cursor
     @freeroam = !@freeroam
   end
 
-  # Find some info about unit in current tile
+  # Find some info about units on the current tile
   def info
     uu = @map.get_unit(@x, @y)
     if uu
       @infopane.text = uu.info
       puts uu.info
+
+      if uu.is_transporting?
+        uu.cargo.each { |uu| puts '- cargo: ' + uu.info }
+      end
     else
       @infopane.text = ''
       puts 'nothing here'

data/lib/docu/info.txt

@@ -5,6 +5,67 @@
 Empi: Ruby Edition
 ====================
 
+v17 dev
+=========
+- selected map: m02
+- terrain stuff separated to Tile class
+! units are still stored via Map class instead of Tile one
+! units are still accessed via Window class instead of Cursor one
+- removed debug printout from Unit class
+- moving transports don't leave their cargo behind
+- capturing done only by armies
+  fixed: all units can capture towns (armies visiting towns are left allowed for now)
+- only towns can be captured, other units do battle
+  fixed: battling units capture instead of damaging
+! capturing town with units leaves those enemy units inside
+! damaged units are destroyed
+- printouts tweaked
+  fixed: transported units show only info of their transport instead when selected
+! transported units show in infopane info of their transport instead when selected
+! destroyed transport ships don't give points for their lost cargo
+
+file changes
+--------------
+empi.rb
+  cursor prints out info() even for not moved units
+  (say, when friend unit without avaiable cargo capacity was on the destination tile)
+  added PROMPT to responding printouts
+
+cursor.rb
+  info() shows info of transported units too
+
+map.rb
+  TILE constants moved to tile.rb
+  initialize() sets tile and leaves processing of loaded symbol to it
+  tile() returns object of tile instead directly its terrain type
+  +all_tiles - Return all tiles
+  draw_tiles
+
+unit.rb
+  removed debug printout used for checking of units leaving towns
+  added PROMPT to responding printouts
+  check_movement() makes sure cargo is moved too
+  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
+  fixed comparing of functions in set_function()
+  +can_capture?
+  +can_be_captured?
+  can_move() renamed to can_move?()
+  reset_moves() renamed to reset_moves!()
+
+army.rb
+  can capture
+
+town.rb
+  can be captured
+   
+save/m02.esf
+  +two ships, one for each faction
+
+tile.rb
+
 
 v16 dev
 =========
@@ -12,24 +73,25 @@ v16 dev
 - neutral units can't have functions
 - links to media and save files use full path
 - towns build armies
+  fixed: no building of units
 ! hardcoded unit type to be built
 - units can transport other units
 - newly built units are stored in town instead of map
   fixes: new units are saved in map instead of the towns that built them
 ! transported units are not drawn
-! transported units show info of their transport instead when selected
+! transported units show only info of their transport instead when selected
 ! all units can capture and visit towns
 
 file changes
 --------------
-map
+map.rb
   initialize() uses full paths to files
   all_units renamed to all_map_units() - Return only units directly on map
   +all_transported_units() - Return only units transported by other units
   +all_units() - Return both map units and transported units
   draw_units() draws only map units
 
-unit
+unit.rb
   +@cargo, @cargo_max
   +can_transport?() - Unit is able to both transport other units and currently has some space left
   set_function() checks for @faction == 0
@@ -37,25 +99,26 @@ unit
   +check_movement() - Processes move of unit and takes care of its (un)loading or attack
   capture() makes newly captured towns start building
 
-town
+town.rb
   initialize() uses full path to file
   +parts_built
   +@cargo_max set to 10
 
-army
+army.rb
   initialize() uses full path to file
 
-ship
+ship.rb
   initialize() uses full path to file
   +@cargo_max set to 3
 
-unitFunction
+unitFunction.rb
   +FUNCBUILD case in func!()
   FUNCSENTRY case in func!() sets "ret" even when unit keeps sentrying 
 
 
 v15 dev
 =========
+- selected map: m03
 - units referenced only from map
   fixed: no destruction of units
 - loading of units from file
@@ -127,6 +190,7 @@ old wishlist
 !x no destruction of units
 !x no building of units
 ! no victory conditions
+!x battling units capture instead of damaging
 ! attacker always wins
 ! player playing both factions at once
 !x hardcoded starting scenario
@@ -143,7 +207,13 @@ new problems
 ! hardcoded map size
 ! hardcoded unit type to be built
 ! transported units are not drawn
-! transported units show info of their transport instead when selected
-! all units can capture and visit towns
+!x transported units show only info of their transport instead when selected
+!x all units can capture and visit towns
+! units are still stored via Map class instead of Tile one
+! units are still accessed via Window class instead of Cursor one
+! 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
 
 (! thing to fix, !x fixed thing)
+

data/lib/empi.rb

@@ -5,6 +5,7 @@ require_relative './army'
 require_relative './cursor'
 require_relative './infopane'
 require_relative './map'
+require_relative './tile'
 require_relative './ship'
 require_relative './town'
 
@@ -27,13 +28,15 @@ FUNCNONE = 'none'
 FUNCSENTRY = 'sentry'
 FUNCBUILD = 'build'
 
+PROMPT = '> '
+
 # Main class
 class GameWindow < Gosu::Window
   def initialize(width = (MAPX + 1) * TILESIZE, \
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.16 dev'
+    self.caption = 'Empi: Ruby Edition 0.17 dev'
 
     @infopane = Infopane.new
     @map = Map.new(@infopane)
@@ -62,23 +65,23 @@ class GameWindow < Gosu::Window
   def update
     if @button == -1 then return end
 
-    movable_units = @map.all_units.select { |uu| uu.can_move && uu.function == FUNCNONE}
+    movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
     # If there are any movable units without functions select one of them with the cursor
     if @cursor.freeroam == false && movable_units.size > 0
       unit_to_move = movable_units[0]
       unit_to_move.update(@button)
 
       # Can it still move?
-      if unit_to_move.can_move && unit_to_move.function == FUNCNONE
+      if unit_to_move.can_move? && unit_to_move.function == FUNCNONE
        # Move the cursor to it unless it is already there
         if (@cursor.x != unit_to_move.x \
             || @cursor.y != unit_to_move.y)
           @cursor.warp(unit_to_move.x, unit_to_move.y)
-          @cursor.info
         end
+        @cursor.info
       else
         # Was that the last currently avaiable non-function move?
-        movable_units = @map.all_units.select { |uu| uu.can_move && uu.function == FUNCNONE}
+        movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
         if movable_units.size == 0
           puts 'all movable units without functions moved'
           @cursor.switch_freeroam
@@ -125,7 +128,7 @@ class GameWindow < Gosu::Window
     functionable_units = @map.all_units.select { |uu| uu.function != FUNCNONE}
     functionable_units.each { |uu| uu.function! }
 
-    @map.all_units.each { |uu| uu.reset_moves}
+    @map.all_units.each { |uu| uu.reset_moves!}
     @infopane.next_turn
   end
 

data/lib/map.rb

@@ -1,8 +1,3 @@
-TILE_SEA = 0
-TILE_GROUND = 1
-
-SYMBOL_SEA = '.'
-SYMBOL_GROUND = '#'
 SYMBOL_TOWN = 'T'
 SYMBOL_ARMY = 'A'
 SYMBOL_SHIP = 'S'
@@ -15,9 +10,7 @@ class Map
     dir_path = File.dirname(__FILE__)
 
     @infopane = infopane
-    @sea_image = Gosu::Image.new(dir_path + '/media/sea.png')
-    @ground_image = Gosu::Image.new(dir_path + '/media/ground.png')
-    load_map(dir_path + '/save/m03.esf')
+    load_map(dir_path + '/save/m02.esf')
   end
 
   # Load map from file
@@ -33,14 +26,7 @@ class Map
       @units[rr] = []
       map_row = input.gets
       0.upto(@mapx - 1) { |cc|
-        case(map_row[cc])
-        when SYMBOL_SEA then
-          @tiles[rr][cc] = TILE_SEA
-        when SYMBOL_GROUND then
-          @tiles[rr][cc] = TILE_GROUND
-        else
-          abort("map.load_map(): Unknown terrain symbol (#{map_row[cc]})")
-        end
+        @tiles[rr][cc] = Tile.new(cc, rr, map_row[cc], @infopane)
       }
     }
 
@@ -104,19 +90,7 @@ class Map
 
   # Draw all tiles
   def draw_tiles
-    # TODO combine with draw_units()
-
-    0.upto(MAPX) { |rr|
-      0.upto(MAPX) { |cc|
-        if @tiles[rr][cc] == TILE_SEA
-          # TODO tiles (z1) and units (z2) together
-          im = @sea_image
-        else
-          im = @ground_image
-        end
-        im.draw(cc * TILESIZE, (rr + 1) * TILESIZE, ZTILE)
-      }
-    }
+    all_tiles.each { |tt| tt.draw}     # TODO combine with draw_units() ?
   end
 
   # Draw all map units
@@ -124,11 +98,24 @@ class Map
     all_map_units.each { |uu| uu.draw} # TODO do not draw transported units? only draw them on selection (with their tile)?
   end
 
-  # Getter for tile type in given coordinates
+  # Getter for tile in given coordinates
   def tile(cc, rr)
     @tiles[rr][cc]
   end
 
+  # Return all tiles
+  def all_tiles
+    ret = []
+    ii = 0
+    0.upto(MAPX) { |rr|
+      0.upto(MAPX) { |cc|
+        ret[ii] = @tiles[rr][cc]
+        ii += 1
+      }
+    }
+    ret
+  end
+
   # Getter for unit in given coordinates
   def get_unit(cc, rr)
     @units[rr][cc]

data/lib/save/m02.esf

@@ -1,4 +1,4 @@
-mission02 11x11 10
+mission02 11x11 12
 ###########
 #..###..###
 #....#...##
@@ -17,6 +17,8 @@ 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

data/lib/tile.rb

@@ -0,0 +1,33 @@
+TILE_SEA = 0
+TILE_GROUND = 1
+
+SYMBOL_SEA = '.'
+SYMBOL_GROUND = '#'
+
+class Tile
+  attr_accessor :terrain, :infopane
+
+  # Fill tile map and prepare 
+  def initialize(x, y, loaded_symbol, infopane)
+    dir_path = File.dirname(__FILE__)
+
+    @x = x
+    @y = y
+    @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})")
+    end
+  end
+
+  def draw
+    @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTILE)
+  end
+end

data/lib/town.rb

@@ -21,4 +21,8 @@ class Town < Unit
   def can_build?
     true
   end
+
+  def can_be_captured?
+    true
+  end
 end

data/lib/unit.rb

@@ -102,45 +102,71 @@ class Unit
   # Processes move of unit and takes care of its (un)loading or attack
   def check_movement(old_x, old_y)
     if @x != old_x || @y != old_y
+      if @moves_left <= 0
+        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)
       newcoords_unit = @map.get_unit(@x, @y)
 
       # If there is nobody or is there friendly unit with some cargo space
       if !newcoords_unit || \
-        (newcoords_unit.faction == @faction && newcoords_unit.can_transport?)
+        (newcoords_unit.faction == @faction && \
+         newcoords_unit.can_transport? && \
+         !newcoords_unit.is_full?)
 
         # Leave old coordinates
         if oldcoords_unit == self 
           @map.set_unit(old_x, old_y, nil)
         else # if you have been transported
-puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
           oldcoords_unit.cargo.delete(self)
-puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
         end
 
         # Get to new coordinates
         if newcoords_unit == nil
           @map.set_unit(@x, @y, self)
-        else # if you are going to be transported
+          @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
         end
 
-      else # if there already is somebody
+      else # if there already is somebody that can't transport you (enemy or full friend)
           # Stay on your original tile
           @x = old_x
           @y = old_y
 
-          # Don't capture allies
-          if newcoords_unit.faction != @faction
-            puts to_s + ' is capturing ' + newcoords_unit.to_s # TODO capture only towns, do combat otherwise
-            newcoords_unit.capture(@faction)
+          # If it was a friend unit
+          if newcoords_unit.faction == @faction
+            if !newcoords_unit.can_transport?
+              puts PROMPT + newcoords_unit.to_s + ' can\'t transport other units'
+            else # newcoords_unit.can_full?; has to be full then
+              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      
       end
       @moves_left -= 1
 
-      # Check if unit is on invalid type of tile
-      if tile_check == false
-        puts to_s + " found itself in a bad place"
+      # Check if you are on an invalid type of terrain (unless transported)
+      unless tile_check == true
+        puts PROMPT + to_s + " found itself in a bad place"
         destroy
       end
     end
@@ -152,7 +178,7 @@ puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
                 scale_x = 1, scale_y = 1, color = COLOUR[@faction])
   end
 
-  def can_move
+  def can_move?
     (can_fly? || can_sail? || can_ride?) && @moves_left > 0
   end
 
@@ -172,21 +198,39 @@ puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
     false
   end
 
-  # Unit is able to both transport other units and currently has some space left
   def can_transport?
-    @cargo_max > 0 && @cargo.size < @cargo_max
+    @cargo_max > 0
+  end
+
+  def is_full?
+     @cargo.size >= @cargo_max # just == should be enough
   end
 
   def is_transporting?
     @cargo.size > 0
   end
 
+  def is_transported?
+    @map.get_unit(@x, @y) != self
+  end
+
+  def can_capture?
+    false
+  end
+
+  def can_be_captured?
+    false
+  end
+
+  # Checks if unit is on the right type of terrain (not for transported units)
   def tile_check
-    case @map.tile(@x, @y)
-    when TILE_SEA
-      return can_fly? || can_sail?
-    when TILE_GROUND
-      return can_fly? || can_ride?
+    unless is_transported?
+      case @map.tile(@x, @y).terrain
+      when TILE_SEA
+        return can_fly? || can_sail?
+      when TILE_GROUND
+        return can_fly? || can_ride?
+      end
     end
     true
   end
@@ -198,19 +242,18 @@ puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
   def set_function(func)
     unless @faction == 0 # neutral faction doesn't need functions
       if (func == FUNCBUILD && !can_build?)
-        puts to_s + ": this unit can't build other units"
+        puts PROMPT + to_s + ": this unit can't build other units"
       end
 
-      if @function == func
-        puts to_s + ": function already set to #{@function.func}"
+      if @function.func == func
+        puts PROMPT + to_s + ": function has already been set to #{@function.func}"
       else
         @function.func = func
-        puts to_s + ": function set to #{@function.func}"
+        puts PROMPT + to_s + ": function set to #{@function.func}"
       end
     end
   end
 
-
   def function!
     ret = @function.func!(@x, @y, @map, @infopane)
     puts to_s + ret
@@ -225,20 +268,20 @@ puts "oldcoords_unit.cargo = \"#{oldcoords_unit.cargo}\""
   def info
     ret = to_s + ": armor #{@armor_left}/#{@armor_max}"
      
-    if can_move
+    if can_move?
       ret = ret + ", moves #{@moves_left}/#{@moves_max}"
     end
 
     ret = ret + ", func #{@function.func}"
 
     if @cargo.size > 0
-      ret = ret + ", transports #{@cargo.size} units"
+      ret = ret + ", transports #{@cargo.size}/#{@cargo_max} units"
     end
 
     ret
   end
 
-  def reset_moves
+  def reset_moves!
     @moves_left = @moves_max
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: '0.17'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -63,6 +63,7 @@ files:
 - lib/save/m01.esf
 - lib/save/m03.esf
 - lib/ship.rb
+- lib/tile.rb
 - lib/unit.rb
 - lib/unitFunction.rb
 - lib/town.rb
@@ -71,7 +72,7 @@ files:
 - lib/cursor.rb
 - lib/infopane.rb
 - lib/empi.rb
-homepage: http://www.bay12forums.com/smf/index.php?topic=157538.0
+homepage: http://www.bay12forums.com/smf/index.php?topic=157538
 licenses:
 - CC-BY-SA 3.0
 post_install_message: