mjai 0.0.3 → 0.0.4

data/lib/mjai/mjai_command.rb

@@ -22,21 +22,29 @@ module Mjai
               action = argv.shift()
               opts = OptionParser.getopts(argv, "",
                   "port:11600", "host:127.0.0.1", "room:default", "game_type:one_kyoku",
-                  "games:1", "repeat", "log_dir:")
+                  "games:auto", "repeat", "log_dir:")
               case action
                 when "server"
                   $stdout.sync = true
+                  player_commands = argv
                   if opts["repeat"]
-                    num_games = 1.0/0.0
-                  else
-                    num_games = opts["games"].to_i()
+                    $stderr.puts("--repeat is deprecated. Use --games=inifinite instead.")
+                    exit(1)
+                  end
+                  case opts["games"]
+                    when "auto"
+                      num_games = player_commands.size == 4 ? 1 : 1.0/0.0
+                    when "infinite"
+                      num_games = 1.0/0.0
+                    else
+                      num_games = opts["games"].to_i()
                   end
                   server = TCPActiveGameServer.new({
                       :host => opts["host"],
                       :port => opts["port"].to_i(),
                       :room => opts["room"],
                       :game_type => opts["game_type"].intern,
-                      :player_commands => argv,
+                      :player_commands => player_commands,
                       :num_games => num_games,
                       :log_dir => opts["log_dir"],
                   })
@@ -47,13 +55,22 @@ module Mjai
                   GameStats.print(argv)
                 else
                   $stderr.puts(
-                      "Usage:\n" +
+                      "Basic Usage:\n" +
                       "  #{$PROGRAM_NAME} server --port=PORT\n" +
                       "  #{$PROGRAM_NAME} server --port=PORT " +
                           "[PLAYER1_COMMAND] [PLAYER2_COMMAND] [...]\n" +
                       "  #{$PROGRAM_NAME} stats 1.mjson [2.mjson] [...]\n" +
                       "  #{$PROGRAM_NAME} convert hoge.mjson hoge.html\n" +
                       "  #{$PROGRAM_NAME} convert hoge.mjlog hoge.mjson\n\n" +
+                      "Complete usage:\n" +
+                      "  #{$PROGRAM_NAME} server \\\n" +
+                      "    --host=IP_ADDRESS \\\n" +
+                      "    --port=PORT \\\n" +
+                      "    --room=ROOM_NAME \\\n" +
+                      "    --game_type={one_kyoku|tonpu|tonnan} \\\n" +
+                      "    --games={NUM_GAMES|infinite} \\\n" +
+                      "    --log_dir=LOG_DIR_PATH \\\n" +
+                      "    [PLAYER1_COMMAND] [PLAYER2_COMMAND] [...]\n\n" +
                       "See here for details:\n" +
                       "http://gimite.net/pukiwiki/index.php?" +
                       "Mjai%20%CB%E3%BF%FDAI%C2%D0%C0%EF%A5%B5%A1%BC%A5%D0\n")

data/lib/mjai/player.rb

@@ -222,7 +222,7 @@ module Mjai
           if action.type == :dahai &&
               action.actor != self &&
               !self.reach? &&
-              @game.num_pipais >= 4
+              @game.num_pipais > 0
             
             for consumed in get_pais_combinations([action.pai] * 3, @tehais)
               result.push(create_action({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjai
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json