add random tag duel

room.coffee

@@ -37,7 +37,7 @@ class Room
   @players_oppentlist = {}
 
   @find_or_create_by_name: (name, player_ip)->
-    if settings.modules.enable_random_duel and (name == '' or name.toUpperCase() == 'S' or name.toUpperCase() == 'M')
+    if settings.modules.enable_random_duel and (name == '' or name.toUpperCase() == 'S' or name.toUpperCase() == 'M' or name.toUpperCase() == 'T')
       return @find_or_create_random(name.toUpperCase(), player_ip)
     if room = @find_by_name(name)
       return room
@@ -47,8 +47,9 @@ class Room
       return new Room(name)
   
   @find_or_create_random: (type, player_ip)->
+    max_player = if type == 'T' then 4 else 2
     result = _.find @all, (room)->
-      room.random_type != '' and !room.started and (type == '' or room.random_type == type) and room.get_playing_player().length == 1 and room.get_playing_player()[0].remoteAddress != Room.players_oppentlist[player_ip]
+      room.random_type != '' and !room.started and ((type == '' and room.random_type != 'T') or room.random_type == type) and room.get_playing_player().length < max_player and room.get_host().remoteAddress != Room.players_oppentlist[player_ip]
     if result
       result.welcome = '对手已经在等你了，开始决斗吧！'
       #log.info 'found room', player_name
@@ -283,14 +284,21 @@ class Room
       return
     return playing_player
 
+  get_host: ->
+    host_player=null
+    _.each @players, (player)=>
+      if player.is_host then host_player=player
+      return
+    return host_player
+
   connect: (client)->
     @players.push client
     if @random_type
-      playing_players=@get_playing_player()
-      if playing_players.length
+      host_player=@get_host()
+      if host_player && (host_player != client)
         #进来时已经有人在等待了，互相记录为匹配过
-        Room.players_oppentlist[playing_players[0].remoteAddress] = client.remoteAddress
-        Room.players_oppentlist[client.remoteAddress] = playing_players[0].remoteAddress
+        Room.players_oppentlist[host_player.remoteAddress] = client.remoteAddress
+        Room.players_oppentlist[client.remoteAddress] = host_player.remoteAddress
       else
         #第一个玩家刚进来，还没就位
         Room.players_oppentlist[client.remoteAddress] = null

room.js

@@ -47,7 +47,7 @@
 
     Room.find_or_create_by_name = function(name, player_ip) {
       var room;
-      if (settings.modules.enable_random_duel && (name === '' || name.toUpperCase() === 'S' || name.toUpperCase() === 'M')) {
+      if (settings.modules.enable_random_duel && (name === '' || name.toUpperCase() === 'S' || name.toUpperCase() === 'M' || name.toUpperCase() === 'T')) {
         return this.find_or_create_random(name.toUpperCase(), player_ip);
       }
       if (room = this.find_by_name(name)) {
@@ -60,9 +60,10 @@
     };
 
     Room.find_or_create_random = function(type, player_ip) {
-      var name, result;
+      var max_player, name, result;
+      max_player = type === 'T' ? 4 : 2;
       result = _.find(this.all, function(room) {
-        return room.random_type !== '' && !room.started && (type === '' || room.random_type === type) && room.get_playing_player().length === 1 && room.get_playing_player()[0].remoteAddress !== Room.players_oppentlist[player_ip];
+        return room.random_type !== '' && !room.started && ((type === '' && room.random_type !== 'T') || room.random_type === type) && room.get_playing_player().length < max_player && room.get_host().remoteAddress !== Room.players_oppentlist[player_ip];
       });
       if (result) {
         result.welcome = '对手已经在等你了，开始决斗吧！';
@@ -360,14 +361,27 @@
       return playing_player;
     };
 
+    Room.prototype.get_host = function() {
+      var host_player;
+      host_player = null;
+      _.each(this.players, (function(_this) {
+        return function(player) {
+          if (player.is_host) {
+            host_player = player;
+          }
+        };
+      })(this));
+      return host_player;
+    };
+
     Room.prototype.connect = function(client) {
-      var playing_players;
+      var host_player;
       this.players.push(client);
       if (this.random_type) {
-        playing_players = this.get_playing_player();
-        if (playing_players.length) {
-          Room.players_oppentlist[playing_players[0].remoteAddress] = client.remoteAddress;
-          Room.players_oppentlist[client.remoteAddress] = playing_players[0].remoteAddress;
+        host_player = this.get_host();
+        if (host_player && (host_player !== client)) {
+          Room.players_oppentlist[host_player.remoteAddress] = client.remoteAddress;
+          Room.players_oppentlist[client.remoteAddress] = host_player.remoteAddress;
         } else {
           Room.players_oppentlist[client.remoteAddress] = null;
         }