botemon 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM2NTA2NzA1OWZiMzYwMzZlNDNhMjEwZmY5MjcwYjBkYmM2MjM4OQ==
+    ODk1NDM4YzcwYWRkZWVmNzFmNTg0MmRhNTc1MjZkNWE4Njc5YmM5ZA==
   data.tar.gz: !binary |-
-    MDhkMmE0ZjVlY2RlNGZhZDRhMDU4MWU2MzcxOTM2M2FlODQ4NTViYg==
+    MTg4NDUxZmFjNzg2NGY4ZmViNWMyMjEyODYyY2Q1MDYzYWFjZWQ2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmQyNzk0MjFiZDFjZTcwYWY3ZTY2MjhhZDU1NWYzNzMzZTNkOWU0ODQ2MDc5
-    ZjdkMmI4ZDE1YTA3MzI4MmU3YTliMWYyNmU0ZmU1NTgyODJlNzVlMThhYjNk
-    NzVmMGI0YjUwNTg0YzQ2YzgxNTJiNDY5MzRmMWZkMzlkZTM3NGI=
+    ZTZkYjkwOGRlYjZhNDM4MzU5MTQ1N2ExODk5MDQ0YTIyNGJkZWJlZjI2MzVi
+    OGUwNDc5MGExZDZmYTM1ZWIwMDYxNWFkYmJkZTNjYmQzOGIzYjJmOTM0M2Y3
+    ZjE3ZDAyYmVmMjkyNmFiNzNlMDBmNGYzYWE5NmQ5YmQ1MDkyODg=
   data.tar.gz: !binary |-
-    ZWFjODljNTlhNDRkOWIyNWI0MzUxMTU1M2NhNDRiOGY0MWFlYWZiNmRjNjRl
-    YTQ3OTdhNTJhYzZlODQ0ZGYzNDAwZmQ3MjUwMzQ4NDZjZDhlZTEyMmZiZjA3
-    NTJmZjg4NTI0OGQyOTVjZWNmM2RkMGI4MTBhZjI1ODI5ZDM3NzI=
+    NjliN2Y0MjQyN2FlZWRkYjNmOTU0Mjc5ZTAyZmU0YzU4NTYyNjU2NjFiNjlm
+    ZDc3MzgxZjE0NDBhNDRjNzQ4YmEwMGQ1NzMwZTkwYzc0ODgwYjk3MzdiMDUy
+    NGVmZjE1MzFiMWYwYjAyYmQzZWEzYjI3MGYzNDhkYjQzMTdmNDU=

data/bin/botemon

@@ -39,6 +39,7 @@ Cinch::Bot.new {
     @pokemon_trivia = nil
     @players        = []
     @trivia_owner   = ''
+    @trivia_wrong   = 0
   end
 
   on :message, /^pkmn (.+)/ do |m, name|
@@ -74,26 +75,10 @@ Cinch::Bot.new {
     else
       @pokemon_trivia = Pokedex.get Pokedex.id2name(Random.new.rand(1..649)), @storage
       @trivia_owner   = m.user.nick
+      @trivia_wrong   = 0
       
       m.reply @pokemon_trivia.clues.split("\n").map { |l| Format(:red, l) }.join("\n")
-      m.reply Format(:red, "You have 30 seconds. Try to say which Pokémon is this!")
-      
-      Timer(60) {
-        if @pokemon_trivia != nil
-          m.reply Format(:red, "Time expired. The secret Pokémon is #{@pokemon_trivia.name}!")
-          @pokemon_trivia = nil
-        end
-      }
-    end
-  end
-
-  on :message, /^pkstop$/ do |m|
-    if @pokemon_trivia != nil && (m.user.nick == 'mirkosp' || m.user.nick == 'RoxasShadowRS' || m.user.nick == @trivia_owner)
-      @pokemon_trivia = nil
-      @trivia_owner   = ''
-      m.reply Format(:red, "Game aborted by #{m.user.nick}.")
-    else
-      m.reply Format(:red, "Only ops can stop the game. #{m.user.nick} GTFO.")
+      m.reply Format(:red, "You have 3 chances to try to say which Pokémon is this!")
     end
   end
 
@@ -103,8 +88,26 @@ Cinch::Bot.new {
     elsif pokemon.downcase == @pokemon_trivia.name.downcase
       m.reply Format(:red, "Right, #{m.user.nick} won!")
       @pokemon_trivia = nil
+      @trivia_wrong   = 0
     else
       m.reply Format(:red, "Nope, #{m.user.nick} was wrong.")
+      @trivia_wrong += 1
+      if @trivia_wrong >= 3
+        m.reply Format(:red, "Time expired. The secret Pokémon is #{@pokemon_trivia.name}!")
+        @pokemon_trivia = nil
+        @trivia_wrong   = 0
+      end
+    end
+  end
+
+  on :message, /^pkstop$/ do |m|
+    if @pokemon_trivia != nil && (m.user.nick == 'mirkosp' || m.user.nick == 'RoxasShadowRS' || m.user.nick == @trivia_owner)
+      @pokemon_trivia = nil
+      @trivia_owner   = ''
+      @trivia_wrong   = 0
+      m.reply Format(:red, "Game aborted by #{m.user.nick}.")
+    else
+      m.reply Format(:red, "Only ops and the game luncher can stop the game. #{m.user.nick} GTFO.")
     end
   end
 

data/lib/botemon/storage.rb

@@ -22,15 +22,15 @@ class Storage
   
   def initialize(file)
     @file = file
-    db  = File.exists?(file) ? JSON.load(File.read(file)) : []
-    @db = [].tap { |d|
-      db.each { |p| d << Pokemon.to_pokemon(p) }
+    @db = [].tap { |db|
+      (File.exists?(file) ? JSON.load(File.read(file)) : []).each { |p| db << Pokemon.to_pokemon(p) }
     }
   end
   
   def is_cached?(name)
     return @db.select { |p| p._name == name.downcase }.any?
   end
+  alias :include? :is_cached?
   
   def get(name)
     return @db.select { |p| p._name == name.downcase }.first
@@ -42,17 +42,16 @@ class Storage
   alias :dump :get_all
   
   def add(pokemon)
-    @db << pokemon
+    @db << pokemon unless is_cached?(pokemon.name)
   end
   alias :put :add
   
   def save
-    db_ary = [].tap { |ary|
+    [].tap { |ary|
       @db.each { |p| ary << p.to_ary }
-    }
-    
-    File.open(@file, 'wb') { |f|
-      f.write JSON.dump(db_ary)
+      File.open(@file, 'wb') { |f|
+        f.write JSON.dump(ary)
+      }
     }
   end
 end

data/lib/botemon/version.rb

@@ -20,6 +20,6 @@
 
 module Botemon
   def self.version
-    '0.2.3'
+    '0.2.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Giovanni Capuano