just_go 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '092381e0ddeac1e70de71d939e77ab8c8b7d598f'
-  data.tar.gz: acd055e8b73b7b58f4c57c727f09ed065f637f9d
+  metadata.gz: c9e75ebd41948471c4f4ca768b14afa0151840af
+  data.tar.gz: f199d796daf821fc9fa7d0a656dfbe687e87d466
 SHA512:
-  metadata.gz: 331c2b423b529339689dbbcf62435ad55366cc2394e330033f37076860d44f84383530befca7c701ed1578c4a08e4cb937c4d95ff931e31e653b29a219e4940c
-  data.tar.gz: c4b557abf53ad9e6c041299d6059afef322c994738abd70c43536f5a607a1cbe17656d9df35f078a3f2fc2ba528dcaab1f40983ccf875f4261b609a47868a09b
+  metadata.gz: 4c165f3cd84e3646dcc53988490b4af3ac1e6144181b8e343c04722975000e76271cc0b64c2d85dd17bbced347840f1fe3a2eab3a5d7f190270f835b45aa809c
+  data.tar.gz: 5d07ae4529f1a95cd4e113fc5e9300bad9e14c2e81bcd6877e7ca6c14656bd4e115a2b6b8eaa85a0c5eb72ac29f1130d76fe48593d50ef062350b298b35eb4f9

data/lib/just_go/game_state.rb

@@ -13,21 +13,19 @@ module JustGo
   class GameState
     BOARD_SIZE = 19
 
-    def initialize(current_player_number: , points: , prisoner_counts: , previous_state: nil, passed: { 0 => false, 1 => false })
+    def initialize(current_player_number: , points: , previous_state: nil, player_stats: nil)
       @current_player_number = current_player_number
       @points = JustGo::PointSet.new(points: points)
-      @prisoner_counts = prisoner_counts
       @previous_state = previous_state
-      @passed = passed
+      @player_stats = player_stats
       @errors = []
       @last_change = {}
     end
 
     attr_reader :current_player_number 
     attr_reader :points
-    attr_reader :prisoner_counts
     attr_reader :previous_state
-    attr_reader :passed
+    attr_reader :player_stats
     attr_reader :errors 
     attr_reader :last_change 
 
@@ -44,11 +42,11 @@ module JustGo
             }
           end
         end.flatten,
-        prisoner_counts: [ 
-          { player_number: 1, count: 0 },
-          { player_number: 2, count: 0 },
-        ],
-        previous_state: nil
+        previous_state: nil,
+        player_stats: [
+          { player_number: 1, prisoner_count: 0, passed: false },
+          { player_number: 2, prisoner_count: 0, passed: false }
+        ]
       )
     end
 
@@ -56,8 +54,8 @@ module JustGo
       {
         current_player_number: current_player_number,
         points: points.as_json,
-        prisoner_counts: prisoner_counts,
-        previous_state: previous_state
+        previous_state: previous_state,
+        player_stats: player_stats
       }
     end
 
@@ -81,13 +79,13 @@ module JustGo
         if dupped.minify == @previous_state
           @errors.push JustGo::KoRuleViolationError.new 
         else
-          @passed[next_player_number] = false
+          @player_stats.detect { |p| p[:player_number] == next_player_number }[:passed] = false 
           
           @previous_state = points.minify
 
           stone_count = points.perform_move(point, player_number)
 
-          @prisoner_counts.detect { |pc| pc[:player_number] == player_number }[:count] += stone_count
+          @player_stats.detect { |pc| pc[:player_number] == player_number }[:prisoner_count] += stone_count
 
           pass_turn
         end
@@ -100,8 +98,9 @@ module JustGo
       if current_player_number != player_number
         @errors.push JustGo::NotPlayersTurnError.new
       else
-        @passed[player_number] = true
-        if @passed[next_player_number]
+        @player_stats.detect { |p| p[:player_number] == player_number }[:passed] = true 
+        next_player_passed = @player_stats.detect { |p| p[:player_number] == next_player_number }[:passed] 
+        if next_player_passed 
           points.mark_territories
         else
           pass_turn
@@ -119,7 +118,7 @@ module JustGo
     end
 
     def winner
-      if @passed.values.all?
+      if @player_stats.map { |ps| ps[:passed] }.all?
         score.max_by { |_player, score| score }.first
       else
         nil
@@ -133,7 +132,7 @@ module JustGo
     end
 
     def prisoner_count(player_number)
-      prisoner_counts.detect { |pc| pc[:player_number] == player_number }[:count]
+      player_stats.detect { |pc| pc[:player_number] == player_number }[:prisoner_count]
     end
 
     def territory_count(player_number)

data/lib/just_go/version.rb

@@ -1,4 +1,4 @@
 module JustGo
   # :nodoc:
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: just_go
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler