were_wolf 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bddf36a281f5189a36ae1c65dede53c43f567de
-  data.tar.gz: d0dae2add604f028fd24ef2fe791a677588f848f
+  metadata.gz: a63c18b5139dcf4282bbc79aa18bd08df03b654d
+  data.tar.gz: 6ff720629a4862574e3e68f92d151e5f26e2b2f8
 SHA512:
-  metadata.gz: 6c2a9ef75b7441395bdb853dd2c3053bf125cb34fcc783ab8801b4844e5723ce9dbf97e60e5cf8e01cd86aefee9f43c03f6b0daaae2ed14edab63ce08144c4d3
-  data.tar.gz: cb47b1a687f2ebc9c06dff229f33ad5411bcbacda845f753449143d00ee19754b2c7cd400a28b103112e13bb69357b18ca2091f66c32dd0799356b6c4b038137
+  metadata.gz: ea4e4bc2cc2102a967d9445f8db83aa330f8023b983bb6ce845c896b44352710f40265139b0ed09da282ebc5f375372a1af096a67252adc709c94ac7a347f5f2
+  data.tar.gz: 6b9370e4d9f1c1d7ac869639ed7cb4bf26f274e6e6f3db0d2618f53c221e2c6db6b4a0a7eca634376fbc8318df1b030c9f3ab4f189ed49889874aba48533de47

data/lib/were_wolf/game.rb

@@ -31,9 +31,14 @@ private
     # Cop identifies a person
     cop = @players.cop
     cop.identify_a_player(@players) if cop
+    saved_people = []
     # Doctor chooses to save a person
     doctor = @players.doctor
-    saved_person = doctor.choose_a_player_to_save(@players)
+    saved_people.push(doctor.choose_a_player_to_save(@players)) if doctor
+    # Witch chooses to save a person once in the entire game
+    witch = @players.witch
+    person_saved_by_witch = witch.choose_a_player_to_save(@players) if witch
+    saved_people.push(person_saved_by_witch) if witch && person_saved_by_witch
     # Wolves kill a villager
     wolves_victim = villagers_alive.sample
     # Rogue kills a players once in the entire game
@@ -41,12 +46,23 @@ private
     rogues_victim = rogue.choose_victim(@players) if rogue
 
     # Don't kill the person if the doctor saved the person
-    @players.kill(wolves_victim) unless wolves_victim == saved_person
+    @players.kill(wolves_victim) unless saved_people.include?(wolves_victim)
     # Don't kill the person again, if the wolves have already killed the person
-    @players.kill(rogues_victim) unless (rogues_victim == saved_person) || (rogues_victim == wolves_victim)
+    @players.kill(rogues_victim) unless (saved_people.include?(rogues_victim)) || (rogues_victim == wolves_victim)
   end
 
   def day_mode
+    # Witch can kill a player once in the entire game
+    witch = @players.witch
+    if witch
+      witchs_victim = witch.choose_a_player_to_kill(@players)
+      if witchs_victim
+        @players.kill(witchs_victim) if witchs_victim
+        return if over?
+      end
+    end
+
+    # Run voting to kick out a player
     victim = run_voting
     if victim == DRAW
       @draw = true

data/lib/were_wolf/game_suggestor.rb

@@ -34,7 +34,8 @@ private
     players['cops'] = 1
     players['doctors'] = 1 if @players_count - wolves_count > 1
     players['rogues'] = 1 if @players_count - wolves_count > 2
-    players['villagers'] = (@players_count - wolves_count - 3) if @players_count - wolves_count > 3
+    players['witches'] = 1 if @players_count - wolves_count > 3
+    players['villagers'] = (@players_count - wolves_count - 4) if @players_count - wolves_count > 4
 
     probabilities = {}
     probabilities['wolves_win'] = (100.0*(best_wins[Game::WOLF] || 0)/@no_of_runs)

data/lib/were_wolf/player/doctor.rb

@@ -1,5 +1,8 @@
 class Doctor < Villager
   def choose_a_player_to_save(players)
+    # Save myself when ther eare only 2 players,a s the other player
+    # should be a wolf
+    return self if players.alive_players.count == 2
     # Assumption: Doctor saves him/her self 50% of the times
     if rand < 0.5
       return self

data/lib/were_wolf/player/player_collection.rb

@@ -3,6 +3,7 @@ require_relative 'villager'
 require_relative 'cop'
 require_relative 'doctor'
 require_relative 'rogue'
+require_relative 'witch'
 
 class PlayerCollection
   def initialize(no_of_wolves, no_of_villagers)
@@ -25,6 +26,9 @@ class PlayerCollection
       elsif i == 3
         villager = Rogue.new
         @rogue = villager
+      elsif i == 4
+        villager = Witch.new
+        @witch = villager
       else
         villager = Villager.new
       end
@@ -51,7 +55,9 @@ class PlayerCollection
       promote_rogue_to_wolf
     else
       @cop = nil if player.is_a?(Cop)
+      @doctor = nil if player.is_a?(Doctor)
       @rogue = nil if player.is_a?(Rogue)
+      @witch = nil if player.is_a?(Witch)
       collection = @villagers
     end
     collection.delete(player)
@@ -71,6 +77,10 @@ class PlayerCollection
     @rogue
   end
 
+  def witch
+    @witch
+  end
+
 private
   def promote_rogue_to_wolf
     return if @wolves.count > 0

data/lib/were_wolf/player/witch.rb

@@ -0,0 +1,40 @@
+class Witch < Doctor
+  def initialize
+    super
+    @save_power_used = false
+    @kill_power_used = false
+  end
+
+  def choose_a_player_to_save(players)
+    return if @save_power_used
+
+    if choose_to_use_power?(players)
+      # Choose a person to save
+      @save_power_used = true
+      return super(players)
+    else
+      # Save the save power for a later round
+      return nil
+    end
+  end
+
+  def choose_a_player_to_kill(players)
+    return if @kill_power_used
+
+    if choose_to_use_power?(players)
+      @kill_power_used = true
+      return (players.alive_players - [self]).sample
+    else
+      return
+    end
+  end
+
+private
+  def choose_to_use_power?(players)
+    # Always use the power if there is only one another player in the game,
+    # as the other player should be a wolf
+    return true if players.alive_players.count == 2
+
+    rand < (1.0/(players.alive_wolves.count + 1))
+  end
+end

data/lib/were_wolf/version.rb

@@ -1,3 +1,3 @@
 module WereWolf
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: were_wolf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - BV Satyaram
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/were_wolf/player/player_collection.rb
 - lib/were_wolf/player/rogue.rb
 - lib/were_wolf/player/villager.rb
+- lib/were_wolf/player/witch.rb
 - lib/were_wolf/player/wolf.rb
 - lib/were_wolf/version.rb
 - were_wolf.gemspec