Merge branch 'mc'

data/default_config.json

@@ -67,7 +67,9 @@
       "enabled": true,
       "split_zh": false,
       "get": "https://api.moecube.com/biu-tips/tips.json",
-      "get_zh": false
+      "get_zh": false,
+      "interval": 30000,
+      "interval_ingame": 120000
     },
     "dialogues": {
       "enabled": true,

ygopro-server.coffee

@@ -628,11 +628,18 @@ init = () ->
     load_tips_zh()
 
   if settings.modules.tips.enabled
+    if settings.modules.tips.interval
       setInterval ()->
-      for room in ROOM_all when room and room.established
-        ygopro.stoc_send_random_tip_to_room(room) if room.duel_stage == ygopro.constants.DUEL_STAGE.SIDING or room.duel_stage == ygopro.constants.DUEL_STAGE.BEGIN
+        for room in ROOM_all when room and room.established and room.duel_stage != ygopro.constants.END
+          ygopro.stoc_send_random_tip_to_room(room) if room.duel_stage != ygopro.constants.DUEL_STAGE.DUELING
+        return
+      , settings.modules.tips.interval
+    if settings.modules.tips.interval_ingame
+      setInterval ()->
+        for room in ROOM_all when room and room.established and room.duel_stage != ygopro.constants.END
+          ygopro.stoc_send_random_tip_to_room(room) if room.duel_stage == ygopro.constants.DUEL_STAGE.DUELING
         return
-    , 30000
+      , settings.modules.tips.interval_ingame
   
   if settings.modules.dialogues.enabled and settings.modules.dialogues.get
     load_dialogues()

ygopro-server.js

@@ -787,17 +787,32 @@
       load_tips_zh();
     }
     if (settings.modules.tips.enabled) {
+      if (settings.modules.tips.interval) {
         setInterval(function() {
           var l, len1, room;
           for (l = 0, len1 = ROOM_all.length; l < len1; l++) {
             room = ROOM_all[l];
-          if (room && room.established) {
-            if (room.duel_stage === ygopro.constants.DUEL_STAGE.SIDING || room.duel_stage === ygopro.constants.DUEL_STAGE.BEGIN) {
+            if (room && room.established && room.duel_stage !== ygopro.constants.END) {
+              if (room.duel_stage !== ygopro.constants.DUEL_STAGE.DUELING) {
                 ygopro.stoc_send_random_tip_to_room(room);
               }
             }
           }
-      }, 30000);
+        }, settings.modules.tips.interval);
+      }
+      if (settings.modules.tips.interval_ingame) {
+        setInterval(function() {
+          var l, len1, room;
+          for (l = 0, len1 = ROOM_all.length; l < len1; l++) {
+            room = ROOM_all[l];
+            if (room && room.established && room.duel_stage !== ygopro.constants.END) {
+              if (room.duel_stage === ygopro.constants.DUEL_STAGE.DUELING) {
+                ygopro.stoc_send_random_tip_to_room(room);
+              }
+            }
+          }
+        }, settings.modules.tips.interval_ingame);
+      }
     }
     if (settings.modules.dialogues.enabled && settings.modules.dialogues.get) {
       load_dialogues();