empi 0.17 → 0.22.3

data/lib/lib/user_interface/cursor.rb

@@ -0,0 +1,168 @@
+class Cursor
+  attr_accessor :x, :y, :freeroam, :info_stopped, :unit
+
+  def initialize(x, y, map, infopane)
+    dir_path = File.dirname(__FILE__)
+
+    @x = x
+    @y = y
+    @map = map
+    @infopane = infopane
+
+    @image = Gosu::Image.new(dir_path + '/../../media/cursor.png')
+    @freeroam = false
+    @info_stopped = false
+  end
+
+  def update(button)
+    case button
+    # Cardinal directions
+    when Gosu::KbLeft, Gosu::KbA, Gosu::KB_NUMPAD_4 then
+      move!(-1, 0) unless @x <= 0
+    when Gosu::KbRight, Gosu::KbD, Gosu::KB_NUMPAD_6 then
+      move!(1, 0) unless @x >= MAPX
+    when Gosu::KbUp, Gosu::KbW, Gosu::KB_NUMPAD_8 then
+      move!(0, -1) unless @y <= 0
+    when Gosu::KbDown, Gosu::KbX, Gosu::KB_NUMPAD_2 then
+      move!(0, 1) unless @y >= MAPY
+
+    # Intercardinal directions
+    when Gosu::KbQ, Gosu::KB_NUMPAD_7 then
+      move!(-1, -1) unless @x <= 0 || @y <= 0
+    when Gosu::KbE, Gosu::KB_NUMPAD_9 then
+      move!(1, -1) unless @x >= MAPX || @y <= 0
+    when Gosu::KbZ, Gosu::KB_NUMPAD_1 then
+      move!(-1, 1) unless @x <= 0 || @y >= MAPY
+    when Gosu::KbC, Gosu::KB_NUMPAD_3 then
+      move!(1, 1) unless @x >= MAPX || @y >= MAPY
+
+    # Functions
+    when Gosu::KbS then
+      set_function_to_unit(FUNCSENTRY)
+    when Gosu::KbB then
+      set_function_to_unit(FUNCBUILD)
+     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
+
+    # If in locked mode, stay at current/jump to next movable unit
+    to_next_unit! unless freeroam
+  end
+
+  def draw
+    @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZCURSOR)
+  end
+
+  # Move to coordinates of given unit
+  def warp_to!(uu)
+    @x = uu.x
+    @y = uu.y
+    @unit = uu
+  end
+
+  # Move by given change of coordinates
+  def move!(xx, yy)
+    if freeroam
+      @x += xx
+      @y += yy
+      @unit = @map.get_unit(@x, @y)
+      return
+    end
+
+    # If in locked mode
+    if !@unit
+      abort("cursor.move!(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
+    end
+
+    @unit.x += xx
+    @unit.y += yy
+    @unit.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
+
+    uu = @map.get_unit(@unit.x, @unit.y)
+    if !uu # it got destroyed
+      @unit = nil # clear the last links so that (object of) given unit can be truly destroyed
+      return
+    end
+
+    warp_to!(@unit) # whether it moved or not, unless it got destroyed
+  end
+
+  # Tries to set function <func> to currently selected unit
+  def set_function_to_unit(func)
+      if freeroam
+        uu = @map.get_unit(@x, @y)
+      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
+  end
+
+  # Find next unit to target with cursor
+  def to_next_unit!
+    unless @unit && @unit.can_move? && @unit.function == FUNCNONE # unless the current one is still movable
+      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
+      if movable_units.size <= 0 # == would be enough
+        puts 'all movable units without functions moved'
+
+        switch_freeroam!
+        return
+      end
+
+      @unit = movable_units[0] # newly selected one
+    end
+
+    warp_to!(@unit) # stay at old or go to new
+    info unless @info_stopped # due to switching out of the play game state
+  end
+
+  # Switch between being attached to unit and being able to freeroam
+  def switch_freeroam!
+    if freeroam
+      @infopane.text = 'freeroam disabled'
+      puts 'freeroam disabled'
+      @freeroam = false
+      to_next_unit!
+    else
+      @infopane.text = 'freeroam enabled'
+      puts 'freeroam enabled'
+      @freeroam = true
+      @unit = nil
+    end
+  end
+
+  # Find some info about units on the current tile
+  def info
+    if freeroam
+      uu = @map.get_unit(@x, @y)
+    else
+      if !@unit
+        abort("cursor.info(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
+      end
+      uu = @unit
+    end
+
+    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'
+    end
+  end
+end

data/lib/{infopane.rb → lib/user_interface/infopane.rb}

@@ -1,3 +1,5 @@
+LINE_HEIGHT = 20
+
 # Score, turn and event texts
 class Infopane
   attr_writer :text, :act_fact
@@ -14,20 +16,20 @@ class Infopane
 
   def draw
     turnscore = Gosu::Image.from_text(
-      self, "Turn: #{@turn}, Score: #{@score[0]} -  #{@score[1]}", Gosu.default_font_name, 20)
+      "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}", LINE_HEIGHT)
     turnscore.draw(XTEXT, YTEXT, ZTEXT)
 
-    text = Gosu::Image.from_text(self, "#{@text}", Gosu.default_font_name, 20)
+    text = Gosu::Image.from_text("#{@text}", LINE_HEIGHT)
     text.draw(XTEXT, (TILESIZE / 2) + YTEXT, ZTEXT)
   end
 
   def next_faction
-    
+    # TODO active faction switching
   end
-  
+
   def next_turn
     @turn += 1
-    puts "Turn: #{@turn}, Score: #{@score[0]} -  #{@score[1]}"
+    puts "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}"
   end
 
   def add_score(to_whom, how_much)

data/lib/{map.rb → lib/user_interface/map.rb}

@@ -1,16 +1,22 @@
-SYMBOL_TOWN = 'T'
-SYMBOL_ARMY = 'A'
-SYMBOL_SHIP = 'S'
+require_relative './tile'
+
+require_relative './../units/army'
+require_relative './../units/ship'
+require_relative './../units/town'
 
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
 
-  # Fill tile map and prepare 
   def initialize(infopane)
     dir_path = File.dirname(__FILE__)
 
     @infopane = infopane
-    load_map(dir_path + '/save/m02.esf')
+    @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
 
   # Load map from file
@@ -20,10 +26,8 @@ class Map
 
     # Load tiles
     @tiles = []
-    @units = []
     0.upto(@mapy - 1) { |rr|
       @tiles[rr] = []
-      @units[rr] = []
       map_row = input.gets
       0.upto(@mapx - 1) { |cc|
         @tiles[rr][cc] = Tile.new(cc, rr, map_row[cc], @infopane)
@@ -53,21 +57,15 @@ class Map
     head[2].to_i # unit_count
   end
 
-  # Load one unit from given line
+  # Load one unit from given row
   def load_unit(row)
     unit = []
     coords = []
 
     unit = row.split(' ')
-    coords = unit[2].split('-')
-
-    # Check faction
-    fac = unit[1].to_i
-    if(fac < 0 || fac > FACTIONS)
-      abort("map.load_unit(): Bad faction id (#{fac})")
-    end
 
     # Check coordinates
+    coords = unit[2].split('-')
     coords_x = coords[0].to_i
     coords_y = coords[1].to_i
     if (coords_x < 0 || coords_x >= @mapx ||
@@ -75,30 +73,27 @@ class Map
       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})")
+    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() ?
-  end
-
-  # Draw all map units
-  def draw_units
-    all_map_units.each { |uu| uu.draw} # TODO do not draw transported units? only draw them on selection (with their tile)?
+    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
@@ -116,14 +111,14 @@ class Map
     ret
   end
 
-  # Getter for unit in given coordinates
+  # Getter for unit at given coordinates
   def get_unit(cc, rr)
-    @units[rr][cc]
+    @tiles[rr][cc].unit
   end
 
-  # Setter for tile type in given coordinates
+  # Setter for unit at given coordinates
   def set_unit(cc, rr, uu)
-    @units[rr][cc] = uu
+    @tiles[rr][cc].unit = uu
   end
 
   # Return both map units and transported units
@@ -137,8 +132,8 @@ class Map
     ii = 0
     0.upto(MAPX) { |rr|
       0.upto(MAPX) { |cc|
-        if @units[rr][cc]
-          ret[ii] = @units[rr][cc]
+        if get_unit(cc, rr)
+          ret[ii] = get_unit(cc, rr)
           ii += 1
         end
       }
@@ -149,7 +144,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/{tile.rb → lib/user_interface/tile.rb}

@@ -5,9 +5,8 @@ SYMBOL_SEA = '.'
 SYMBOL_GROUND = '#'
 
 class Tile
-  attr_accessor :terrain, :infopane
+  attr_accessor :terrain, :infopane, :unit
 
-  # Fill tile map and prepare 
   def initialize(x, y, loaded_symbol, infopane)
     dir_path = File.dirname(__FILE__)
 
@@ -18,10 +17,10 @@ class Tile
     case(loaded_symbol)
     when SYMBOL_SEA then
       @terrain = TILE_SEA
-      @image = Gosu::Image.new(dir_path + '/media/sea.png')
+      @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')
+      @image = Gosu::Image.new(dir_path + '/../../media/ground.png')
     else
       abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
     end
@@ -29,5 +28,9 @@ class Tile
 
   def draw
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTILE)
+
+    if @unit
+      @unit.draw
+    end
   end
 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

metadata

@@ -1,49 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.17'
-  prerelease: 
+  version: 0.22.3
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: ! 'Empi: Ruby Edition is a turn based wargame, currently deep in development.
+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.'
 email: rasunadon@seznam.cz
@@ -51,50 +46,58 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/docu/Empi v14.png
-- lib/docu/info.txt
-- lib/media/town.png
-- lib/media/ship.png
+- lib/empi.rb
+- lib/lib/game_states/build_state.rb
+- lib/lib/game_states/escape_state.rb
+- lib/lib/game_states/game_state.rb
+- lib/lib/game_states/play_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/user_interface/cursor.rb
+- lib/lib/user_interface/infopane.rb
+- lib/lib/user_interface/map.rb
+- lib/lib/user_interface/tile.rb
+- lib/media/Empi v18.png
 - lib/media/army.png
 - lib/media/cursor.png
-- lib/media/sea.png
 - lib/media/ground.png
-- lib/save/m02.esf
+- lib/media/sea.png
+- 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
-- lib/tile.rb
-- lib/unit.rb
-- lib/unitFunction.rb
-- lib/town.rb
-- lib/map.rb
-- lib/army.rb
-- lib/cursor.rb
-- lib/infopane.rb
-- lib/empi.rb
 homepage: http://www.bay12forums.com/smf/index.php?topic=157538
 licenses:
-- CC-BY-SA 3.0
+- CC-BY-SA-3.0
+metadata:
+  source_code_uri: https://gitlab.com/rasunadon/empi
+  bug_tracker_uri: https://gitlab.com/rasunadon/empi/issues
+  documentation_uri: https://gitlab.com/rasunadon/empi/blob/master/README.md
+  changelog_uri: https://gitlab.com/rasunadon/empi/blob/master/CHANGELOG.md
+  homepage_uri: http://www.bay12forums.com/smf/index.php?topic=157538
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Turn-based wargame
 test_files: []