empi 0.18 → 0.23

data/lib/lib/user_interface/cursor.rb

@@ -0,0 +1,184 @@
+class Cursor
+  attr_accessor :freeroam, :info_stopped
+
+  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
+
+    # Give to Infopane link to yourself (for freeroam marker)
+    if !@infopane
+      abort("Cursor.initialize!(): Infopane is not set")
+    end
+    @infopane.cursor = self
+  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 unit the cursor is locked to
+  def warp_to_locked!()
+    @x = @locked_to.x
+    @y = @locked_to.y
+    @local_unit = @locked_to
+  end
+
+  # Move by given change of coordinates
+  def move!(xx, yy)
+    if freeroam
+      @x += xx
+      @y += yy
+      @local_unit = @map.get_unit(@x, @y)
+    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
+
+      # Is the unit still alive?
+      if @locked_to.armor_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
+      end
+    end
+  end
+
+  # Tries to set function <func> to local unit
+  def set_function_to_unit(func)
+    check_unit
+
+    if @local_unit
+      @local_unit.set_function!(func, @infopane.faction)
+    else
+      puts "no unit to set that function to (at #{@x}-#{@y})"
+    end
+  end
+
+  # Reset to locked mode
+  def reset!
+    @freeroam = true
+    switch_freeroam!
+    @local_unit = nil
+    @locked_to = 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
+  def to_next_unit!
+    if @local_unit and @local_unit.is_waiting_for_commands?
+      # Lock to such unit (though it may have already been locked)
+      @locked_to = @local_unit
+    else
+      unless @locked_to and @locked_to.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?
+        if waiting.size <= 0 # == would be enough
+          puts 'all movable units without functions moved'
+          switch_freeroam!
+          return
+        end
+
+        @locked_to = waiting[0] # newly selected one
+      end
+    end
+
+    warp_to_locked! # stay at old or go to new
+    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
+  def check_unit
+    if !@freeroam and !@local_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
+  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
+    else
+      @infopane.text = 'freeroam enabled'
+      puts 'freeroam enabled'
+      @freeroam = true
+    end
+  end
+
+  # Find some info about units on the current tile
+  def info
+    check_unit
+
+    unless !@local_unit
+      @infopane.text = @local_unit.info
+      puts @local_unit.info
+
+      if @local_unit.is_transporting?
+        @local_unit.cargo.each { |uu| puts '- cargo: ' + uu.info }
+      end
+    else
+      @infopane.text = ''
+      puts 'nothing here'
+    end
+  end
+end

data/lib/lib/user_interface/infopane.rb

@@ -0,0 +1,49 @@
+LINE_HEIGHT = 20
+
+# Score, turn and event texts
+class Infopane
+  attr_reader :faction
+  attr_writer :cursor, :text
+
+  def initialize
+    @turn = 0
+    @faction = FACTIONS # so that FAC1 will be then the first active faction
+    @score = [0, 0]
+    @text = 'ready'
+  end
+
+  def update
+  end
+
+  def draw
+    freeroam_text = ""
+    freeroam_text = " (freeroam)" if (@cursor and @cursor.freeroam)
+
+    state = Gosu::Image.from_text(turnscore + freeroam_text, LINE_HEIGHT)
+    state.draw(XTEXT, YTEXT, ZTEXT)
+
+    text = Gosu::Image.from_text("#{@text}", LINE_HEIGHT)
+    text.draw(XTEXT, (TILESIZE / 2) + YTEXT, ZTEXT)
+  end
+
+  def turnscore
+    "Turn: #{@turn}, " \
+    "Faction: FAC#{@faction}, " \
+    "Score: #{@score[0]} - #{@score[1]}"
+  end
+
+  # Increment faction counter (modulo count of factions)
+  def next_faction!
+    @faction += 1
+    @faction = 1 if @faction > FACTIONS # marks the end of turn
+  end
+
+  # Increment turn counter
+  def next_turn!
+    @turn += 1
+  end
+
+  def add_score(to_whom, how_much)
+    @score[to_whom] += how_much
+  end
+end

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

@@ -1,21 +1,31 @@
-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
 
-  def initialize(infopane)
+  def initialize(file, 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] }
+    ]
+
+    load_map!(dir_path + "/../../save/#{file}.esf")
   end
 
   # Load map from file
-  def load_map(filename)
-    input = File.open(filename, 'r')
-    unit_count = load_head(input.gets)
+  def load_map!(file_path)
+    unless File.file?(file_path)
+      abort("Map.load_map!(): File not found (#{file_path})")
+    end
+
+    input = File.open(file_path, 'r')
+    unit_count = load_head!(input.gets)
 
     # Load tiles
     @tiles = []
@@ -28,7 +38,7 @@ class Map
     }
 
     # Load units
-    unit_count.times { load_unit(input.gets) }
+    unit_count.times { load_unit!(input.gets) }
 
     puts("Save loaded: #{@name} with #{unit_count} units")
     input.close
@@ -36,7 +46,7 @@ class Map
 
   # Load core info from given head row of file
   # Return number of units to be loaded
-  def load_head(row)
+  def load_head!(row)
     head = []
     size = []
 
@@ -51,7 +61,7 @@ class Map
   end
 
   # Load one unit from given row
-  def load_unit(row)
+  def load_unit!(row)
     unit = []
     coords = []
 
@@ -63,34 +73,30 @@ 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
-    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() ?
+    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
@@ -108,12 +114,12 @@ class Map
     ret
   end
 
-  # Getter for unit in given coordinates
+  # Getter for unit at given coordinates
   def get_unit(cc, rr)
     @tiles[rr][cc].unit
   end
 
-  # Setter for unit in given coordinates
+  # Setter for unit at given coordinates
   def set_unit(cc, rr, uu)
     @tiles[rr][cc].unit = uu
   end
@@ -141,7 +147,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}

@@ -17,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

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.23'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -46,15 +46,22 @@ executables: []
 extensions: []
 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
-- lib/infopane.rb
-- lib/map.rb
+- lib/lib/game_states/build_state.rb
+- 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/welcome_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/ground.png
@@ -62,17 +69,18 @@ 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
-- lib/tile.rb
-- lib/town.rb
-- lib/unit.rb
-- lib/unitFunction.rb
 homepage: http://www.bay12forums.com/smf/index.php?topic=157538
 licenses:
 - CC-BY-SA-3.0
-metadata: {}
+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: