empi 0.21 → 0.25

data/lib/lib/game_states/win_state.rb

@@ -0,0 +1,61 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+require_relative './welcome_state'
+
+# Game state of summary of won game
+class WinState < GameState
+  include Singleton
+
+  attr_reader :faction
+
+  # What to do just after state gets activated
+  #def after_start
+  #end
+
+  # What to do just before state gets deactivated
+  #def before_end
+  #end
+
+  # Process given button
+  def update(button)
+    case(button)
+    when Gosu::KbEscape then
+      GameState.switch!(WelcomeState.instance)
+    when Gosu::KbReturn then
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  def draw
+    winner_text = "VICTORY FOR FACTION #{@faction}"
+    summary_text = "Summary:
+        victory type: #{@type}
+        won on turn: #{@turn}
+        ending score: #{@score}"
+    options_text = 'Do you want to continue playing?
+        Enter – resume
+        Esc – return to menu'
+
+    win_summary = Gosu::Image.from_text(
+      winner_text + "\n\n\n" + summary_text + "\n\n" + options_text, 20)
+    win_summary.draw((2*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+
+  def set_victory!(faction, type, turn, score)
+    @faction = faction
+    @type = type
+    @turn = turn
+    @score = score.clone # separate object is neeeded
+
+    GameState.switch!(WinState.instance)
+  end
+
+   def unset_victory!()
+    @faction = nil
+    @type = nil
+    @turn = nil
+    @score = nil
+  end
+end

data/lib/{army.rb → lib/units/army.rb}

@@ -9,9 +9,9 @@ class Army < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/army.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/army.png')
 
-    @armor_left = @armor_max = 3
+    @armour_left = @armour_max = 3
     @moves_max = 5
   end
 

data/lib/{ship.rb → lib/units/ship.rb}

@@ -9,9 +9,9 @@ class Ship < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/ship.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/ship.png')
 
-    @armor_left = @armor_max = 1
+    @armour_left = @armour_max = 1
     @moves_max = 2
     @cargo_max = 3
   end

data/lib/{town.rb → lib/units/town.rb}

@@ -1,10 +1,10 @@
-require_relative './game_state'
-require_relative './build_state'
-
 require_relative './army'
 require_relative './ship'
 require_relative './unit'
 
+require_relative './../game_states/game_state'
+require_relative './../game_states/build_state'
+
 class Town < Unit
   @name = 'town'
   @map_symbol = 'T'
@@ -15,18 +15,19 @@ class Town < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/town.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/town.png')
 
-    @armor_left = @armor_max = 1
+    @armour_left = @armour_max = 1
     @moves_max = 0
     @cargo_max = 10
 
-    @starting_project = Army unless @faction == 0
+    @starting_project = Army unless @faction == 0 # used once at the game start
+    @default_project = Army # used after capture
     @project = nil
     @parts_built = 0
     @parts_needed = 0
 
-    set_function!(FUNCBUILD)
+    set_function!(FUNCBUILD, @faction) unless @faction == 0
   end
 
   def can_build?
@@ -47,17 +48,21 @@ class Town < Unit
     super
 
     # Reset build process
+    # 1) remove old project so that it is not disclosed
+    # 2) set default project so that there is always some set (remove old parts)
+    # 3) offer change of the project to the new owner
+    @function.func = FUNCNONE
     @project = nil
-    @parts_built = 0
-    set_function!(FUNCBUILD)
+    set_project!(@default_project)
+    set_function!(FUNCBUILD, @faction)
   end
 
   # Set desired function and possibly also project
-  def set_function!(func)
+  def set_function!(func, commanding_faction)
     super
 
-    if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects
-      # Set once starting project or ask player about next project
+    if @faction != 0 and commanding_faction == @faction and func == FUNCBUILD
+      # Set starting project once or ask player about next project
       if @starting_project
          set_project!(@starting_project)
          @starting_project = nil
@@ -70,15 +75,10 @@ class Town < Unit
 
   # Set desired project
   def set_project!(desired_project)
-    # Figure out the price
-    prices = Hash[
-      [Army, Ship].collect { |ii| [ii, ii.price] } # TODO all subclasses of Unit which can_be_built?
-    ]
-
-    unless prices.key?(desired_project)
-      abort("town.set_project!(): Unknown project (#{desired_project})")
+    unless price_list.key?(desired_project)
+      abort("Town.set_project!(): Unknown project (#{desired_project})")
     end
-    @parts_needed = prices[desired_project]
+    @parts_needed = price_list[desired_project]
 
     # Compare new setting with the old one
     if desired_project == @project
@@ -90,11 +90,19 @@ class Town < Unit
       @parts_built = 0
 
       new_project_set_text = PROMPT + to_s + ": project set to #{@project.name} (#{build_info} done)"
-      unless lost_parts > 0
-        puts new_project_set_text
+      if previous_project and lost_parts > 0 # parts were lost but not due to capture
+        puts new_project_set_text + ", losing #{lost_parts} " +
+          "part#{ 's' unless lost_parts == 1 } of #{previous_project.name}"
       else
-        puts new_project_set_text + ", losing #{lost_parts} parts of #{previous_project.name} "
+        puts new_project_set_text
       end
     end
   end
+
+  # Load all prices
+  def price_list
+    prices = Hash[
+      [Army, Ship].collect { |ii| [ii, ii.price] } # TODO all subclasses of Unit which can_be_built?
+    ]
+  end
 end

data/lib/{unit.rb → lib/units/unit.rb}

@@ -1,4 +1,4 @@
-require_relative './unitFunction'
+require_relative './unit_function'
 
 # Both capturable and movable game pieces
 class Unit
@@ -6,7 +6,8 @@ class Unit
     attr_reader :name, :map_symbol, :price, :value
   end
 
-  attr_accessor :x, :y, :faction, :function, :cargo
+  attr_reader :armour_left
+  attr_accessor :x, :y, :faction, :function, :cargo, :cargo_max
 
   def initialize(x, y, faction, map, infopane)
     @x = x
@@ -15,8 +16,8 @@ class Unit
     @map = map
     @infopane = infopane
 
-    @armor_max = 1
-    @armor_left = @armor_max
+    @armour_max = 1
+    @armour_left = @armour_max
     @moves_max = 1
     @moves_left = @moves_max
     @cargo = [] # transported units
@@ -34,8 +35,8 @@ class Unit
 
   # 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})")
+    if by_whom.faction == @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?
@@ -45,7 +46,7 @@ class Unit
       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)
+          capture!(by_whom)
         else
           puts PROMPT + by_whom.to_s + ' can\'t capture other units'
         end
@@ -64,20 +65,22 @@ class Unit
   # Process capture targeted at this unit
   def capture!(by_whom)
     unless can_be_captured?
-      abort("unit.capture!(): This unit can\'t 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}")
+    if by_whom.faction == @faction
+      abort("Unit.capture!(): This unit already belongs to faction #{@faction}")
     end
 
     # Add <value> to the capturing faction
-    @infopane.add_score(by_whom - 1, self.class.value)
-    @faction = by_whom
+    @infopane.add_score(by_whom.faction - 1, self.class.value)
+    @faction = by_whom.faction
   end
 
   # Add <value> to the other faction and remove links to given unit
   def destroy!
+    @armour_left = 0 # for non-attack damage
+
     # If you are transporting somebody, destroy them first
     @cargo.each { |uu| uu.destroy! }
 
@@ -95,16 +98,17 @@ class Unit
   def check_movement(old_x, old_y)
     if @x != old_x || @y != old_y # only if it moved
       if @moves_left <= 0
-        abort("unit.check_movement(): Moving unit does not have enough move points (#{@moves_left} moves)")
+        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 there is nobody or is there friendly unit with some cargo space (and bigger cargo space)
       if !newcoords_unit || \
         (newcoords_unit.faction == @faction && \
          newcoords_unit.can_transport? && \
+         @cargo_max < newcoords_unit.cargo_max && \
          !newcoords_unit.is_full?)
 
         # Leave old coordinates
@@ -115,35 +119,40 @@ class Unit
         end
 
         # Get to new coordinates
-        if newcoords_unit == nil
+        if !newcoords_unit
           @map.set_unit(@x, @y, self)
-          @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
           @moves_left = 1 unless newcoords_unit.can_build? # use all your left moves unless you are getting loaded into a town
         end
 
+        # Update position of your cargo
+        @cargo.each { |uu|
+          uu.x = @x
+          uu.y = @y
+        }
+
       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
-
-          # 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_transport?; has to be full then
+        # Stay on your original tile
+        @x = old_x
+        @y = old_y
+
+        # 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
+            if @cargo_max >= newcoords_unit.cargo_max
+              puts PROMPT + "#{self.class.name} can\'t fit in #{newcoords_unit.class.name}"
+            else # thus newcoords_unit.is_full? is true
               puts PROMPT + newcoords_unit.to_s + ' is already full'
             end
-          else
-            # Enemy!
-            newcoords_unit.engage!(self)
           end
+        else
+          # Enemy!
+          newcoords_unit.engage!(self)
+        end
       end
       @moves_left -= 1
 
@@ -155,12 +164,17 @@ class Unit
     end
   end
 
-
   def draw
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZUNIT,
                 scale_x = 1, scale_y = 1, color = COLOUR[@faction])
   end
 
+  def is_waiting_for_commands?
+    @faction == @infopane.faction and
+    function == FUNCNONE and
+    can_move?
+  end
+
   def can_move?
     (can_fly? || can_sail? || can_ride?) && @moves_left > 0
   end
@@ -227,19 +241,31 @@ class Unit
   end
 
   # 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
+  def set_function!(func, commanding_faction)
+    # Check your neutrality
+    if @faction == 0
+      puts PROMPT + to_s + ": neutral units can't have functions set"
+      return
+    end
 
-      if @function.func == 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}"
-      end
+    # Check origin of command
+    if commanding_faction != @faction
+      puts PROMPT + to_s + ": this unit does not take commands from other factions"
+      return
+    end
+
+    # Check your abilities
+    if func == FUNCBUILD and !can_build?
+      puts PROMPT + to_s + ": this unit can't build other units"
+      return
+    end
+
+    # Check current function and set the new one
+    if @function.func == 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}"
     end
   end
 
@@ -253,9 +279,9 @@ class Unit
     "#{self.class.name} (FAC#{@faction} #{@x}-#{@y})"
   end
 
-  # Set long info string: short info string, armor, moves, function, cargo
+  # Set long info string: short info string, armour, moves, function, cargo
   def info
-    ret = to_s + ": armor #{@armor_left}/#{@armor_max}"
+    ret = to_s + ": armour #{@armour_left}/#{@armour_max}"
 
     if @moves_max > 0
       ret = ret + ", moves #{@moves_left}/#{@moves_max}"

data/lib/{unitFunction.rb → lib/units/unit_function.rb}

@@ -12,6 +12,9 @@ class UnitFunction
     when FUNCNONE
       "no function"
     when FUNCBUILD
+      unless @unit.project
+        abort("UnitFunction.info(): No project set (" + @unit.to_s + ")")
+      end
       "building #{@unit.project.name} (#{@unit.build_info})"
     when FUNCSENTRY
       "sentrying"
@@ -19,11 +22,13 @@ class UnitFunction
   end
 
   def func!(map, infopane)
-    ret = " didn't actually do anything (ERROR)"
-
     case @func
     # Build given unit
     when FUNCBUILD
+      unless @unit.project
+        abort("UnitFunction.func!(): No project set (" + @unit.to_s + ")")
+      end
+
       @unit.parts_built += 1
 
       unless @unit.parts_built >= @unit.parts_needed # just == should be enough
@@ -34,9 +39,9 @@ class UnitFunction
         @unit.project.new(@unit.x, @unit.y, @unit.faction, map, infopane)
       end
 
-    # Wake when enemies are nearby
+    # Wake when enemies are nearby (checking just map units is enough)
     when FUNCSENTRY
-      units_around = map.all_units.select { |uu|
+      units_around = map.all_units(0,0).select { |uu|
         (uu.x - @unit.x).abs <= 1 &&
         (uu.y - @unit.y).abs <= 1 &&
         uu.faction != @unit.faction
@@ -49,6 +54,10 @@ class UnitFunction
       end
     end
 
+    unless ret
+      abort("UnitFunction.func!(): Functionable unit didn't function (" + @unit.to_s + ")")
+    end
+
     ret
   end
 end