empi 0.19 → 0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d95cf3fd4165a2f088ce364e4a5e1a1511ee395a2f0f9a697528a8860d1b69d
-  data.tar.gz: b1e56a884ed3f3db2909379e73ddd9d5079ecab4c7e80e92524d543e0ef0800b
+  metadata.gz: f44b7fcbf8da0bfeb456b1aa7515b343466669b84ce1bbb758da28c08c18bd47
+  data.tar.gz: 0d9da419f8352641e1a42829c38302b2306481a5c7015b7ed656c020980999e8
 SHA512:
-  metadata.gz: bfb3d1398928e814bba042ac3017fb051df0073cead2fa24119f7c53406d3767a20c39e44de8631b3c17ebd53e0a9b7ea5ec7c9382a974b30fa2e27b16720755
-  data.tar.gz: e4a85873b8bd9127b051ea262aadca0c251e3cfabbbea3a09bc211f067b8590fefb241b1236e6ab59855223fef4f44a8c7dfc094cb105b70c845ccc8d23de42f
+  metadata.gz: 905bf655272b2cb5b38fcd615b895a599b05376524cd5f904ee95fc4607f7d4a5f1edb4403bdade52dfb57bd8223a632f712de31b19cca38f0c06325edde65fa
+  data.tar.gz: 4674d0c6c7ba49ec9fb559ccf8ff808ced32beb91863cdca1d0bbf26de9766d6257c150e3a69c0a3bf1d28fc9c84e803d6dd120b3d64b7a08fa3e4ddd175e61d

data/lib/cursor.rb

@@ -18,23 +18,23 @@ class Cursor
   def update(key)
     case key
     # Cardinal directions
-    when Gosu::KbLeft, Gosu::KbA then
+    when Gosu::KbLeft, Gosu::KbA, Gosu::KB_NUMPAD_4 then
       move!(-1, 0) unless @x <= 0
-    when Gosu::KbRight, Gosu::KbD then
+    when Gosu::KbRight, Gosu::KbD, Gosu::KB_NUMPAD_6 then
       move!(1, 0) unless @x >= MAPX
-    when Gosu::KbUp, Gosu::KbW then
+    when Gosu::KbUp, Gosu::KbW, Gosu::KB_NUMPAD_8 then
       move!(0, -1) unless @y <= 0
-    when Gosu::KbDown, Gosu::KbX then
+    when Gosu::KbDown, Gosu::KbX, Gosu::KB_NUMPAD_2 then
       move!(0, 1) unless @y >= MAPY
 
     # Intercardinal directions
-    when Gosu::KbQ then
+    when Gosu::KbQ, Gosu::KB_NUMPAD_7 then
       move!(-1, -1) unless @x <= 0 || @y <= 0
-    when Gosu::KbE then
+    when Gosu::KbE, Gosu::KB_NUMPAD_9 then
       move!(1, -1) unless @x >= MAPX || @y <= 0
-    when Gosu::KbZ then
+    when Gosu::KbZ, Gosu::KB_NUMPAD_1 then
       move!(-1, 1) unless @x <= 0 || @y >= MAPY
-    when Gosu::KbC then
+    when Gosu::KbC, Gosu::KB_NUMPAD_3 then
       move!(1, 1) unless @x >= MAPX || @y >= MAPY
 
     # Functions
@@ -45,7 +45,7 @@ class Cursor
      when Gosu::KbN then
       set_function_to_unit(FUNCNONE)
 
-    when Gosu::KbReturn then
+    when Gosu::KbReturn, Gosu::KB_NUMPAD_5 then
       info
     end
 

data/lib/empi.rb

@@ -5,8 +5,8 @@ require_relative './army'
 require_relative './cursor'
 require_relative './infopane'
 require_relative './map'
-require_relative './tile'
 require_relative './ship'
+require_relative './tile'
 require_relative './town'
 
 TILESIZE = 50
@@ -36,7 +36,7 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.19 dev'
+    self.caption = 'Empi: Ruby Edition 0.20 dev'
 
     @infopane = Infopane.new
     @map = Map.new(@infopane)
@@ -52,7 +52,7 @@ class GameWindow < Gosu::Window
   # Process given button to cursor
   def update
     case(@button)
-    when -1 then # no keys pressed
+    when -1, nil then # no keys pressed (yet)
       return
     when Gosu::KbEscape then
       close
@@ -60,7 +60,7 @@ class GameWindow < Gosu::Window
       new_turn
     when Gosu::KbH then
       help
-    when Gosu::KbJ then
+    when Gosu::KbJ, Gosu::KB_NUMPAD_0 then
       @cursor.switch_freeroam!
     else
       @cursor.update(@button)

data/lib/infopane.rb

@@ -1,3 +1,5 @@
+LINE_HEIGHT = 20
+
 # Score, turn and event texts
 class Infopane
   attr_writer :text, :act_fact
@@ -14,10 +16,10 @@ 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
 

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

@@ -14,9 +14,9 @@ class Town < Unit
     @moves_max = 0
     @cargo_max = 10
 
+    @project = nil
     @parts_built = 0
     @parts_needed = 0
-    @project = nil
 
     set_function!(FUNCBUILD)
   end
@@ -48,7 +48,7 @@ class Town < Unit
   def set_function!(func)
     super
 
-    if @faction != 0 and func == FUNCBUILD # neutral towns dom't need projects either
+    if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects either
        set_project!
     end
   end

data/lib/unit.rb

@@ -122,7 +122,7 @@ class Unit
             uu.y = @y
           }
 
-        else  # if you are going to be transported
+        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
           @moves_left = 1 unless newcoords_unit.can_build? # use all your left moves unless you are getting loaded into a town

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-01-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
@@ -48,11 +48,10 @@ extra_rdoc_files: []
 files:
 - lib/army.rb
 - lib/cursor.rb
-- lib/docu/Empi v18.png
-- lib/docu/info.txt
 - lib/empi.rb
 - lib/infopane.rb
 - lib/map.rb
+- lib/media/Empi v18.png
 - lib/media/army.png
 - lib/media/cursor.png
 - lib/media/ground.png
@@ -71,7 +70,12 @@ files:
 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:

data/lib/docu/info.txt

@@ -1,372 +0,0 @@
-/--  ///  /-/  -/-
-/--  |||  /-/   |
-/--  |||  |    -/-
-
-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
-- help shown after the first load of new map
-- units use all left moves when loaded, unless they are loaded into towns
-- even units with 0 moves left show their moves in their info
-- added "End of turn" marker
-- added licensing/contact info also to this info file and not just to gem specs
-- several exception handlers added to Cursor
-- units stored in Tile class
-  fixed: units are still stored via Map class instead of Tile one
-- movement and function keys processed in Cursor, movement checked in Unit
-  fixed: units are still accessed via Window class instead of Cursor one
-- moving of cursor stores the current unit so it can possibly get moved (again)
-- 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
-
-map.rb
-  all_map_units() uses indirect access via get_unit()
-  get_unit(), set_unit() access given coordinates of @tiles
-  draw_units() and @units removed
-
-unit.rb
-  removed processing of movement and function keys
-  info() uses @moves_max > 0 instead of can_move()
-  check_movement() sets @moves_left to 1 when unit is loaded so it then gets lowered to 0
-
-cursor.rb
-  switch_freeroam() renamed to switch_freeroam!()
-  +move! - Move by given change of coordinates
-  +to_next_unit! - Find next unit to target with cursor
-  @unit
-  +set_function_to_unit(func) - Tries to set function <func> to currently selected unit
-
-tile.rb
-  @unit
-
-infopane.rb
-  removed one space from score output
-
-docu/Empi v18.png
-docu/Empi v18 - printouts.png
-
-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() prints out 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
-=========
-- units on sentry duty say so when functioning
-- 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
-  fixed: new units are saved in map instead of the towns that built them
-! transported units are never drawn
-! transported units show only info of their transport instead when selected
-! all units can capture and visit towns
-
-file changes
---------------
-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.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
-  checking of movement separated from update()
-  +check_movement() - Processes move of unit and takes care of its (un)loading or attack
-  capture() makes newly captured towns start building
-
-town.rb
-  initialize() uses full path to file
-  +parts_built
-  +@cargo_max set to 10
-
-army.rb
-  initialize() uses full path to file
-
-ship.rb
-  initialize() uses full path to file
-  +@cargo_max set to 3
-
-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
-  fixed: no loading
-- checks of loaded terrain tiles and units
-- map stored as [row, column], not [xx, yy]
-
-file changes
---------------
-empi.rb
-  -scenario_units() - Return list of units for given scenario
-
-map.rb
-  load_map() now loads units too
-  load_head() now returns number of units to load too
-  load_map(), tile(), get_unit(), set_unit() use rr and cc instead of xx and yy
-  +load_unit() - Load one unit from given line
-  +draw_units() - Draw all units
-
-save/m01.esf
-  8 units from old empi.scenario_units()
-
-save/m02.esf
-  10 units similar to old empi.scenario_units()
-
-save/m03.esf
-
-
-v14 dev
-=========
-- loading of terrain tiles from file
-  fixed: hardcoded starting scenario
-! hardcoded save file name
-! hardcoded map size
-
-file changes
---------------
-empi.rb
-  TILE constants moved to map.rb
-
-map.rb
-  -scenario_tiles() - Return map tile for given scenario
-  +load_map() - Load map from file (for now only terrain tiles)
-  +load_head() - Load head row of file
-
-unit.rb
-  removed generic unit image
-
-save/m01.esf
-save/m02.esf
-
-
-older versions
-================
-- towns and armies
-- functions none and sentry
-- armor and movement points
-- movement of units
-- rudimentary terrain checking after move
-- capturing of units
-- turn and score counting
-- command line and screen text output
-- next available unit / freeroam cursor
-
-
-current state
-===============
-old wishlist
-! no panning of map
-!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
-! no fog of war
-! no saving
-!x no loading
-! no title screen
-! no highscore screen
-! no settings
-! no sound, no music
-
-new problems
-! hardcoded save file name
-! hardcoded map size
-! 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 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
-!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
-!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
-!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)