Merge branch 'mc'

44af210f · nanahira · 8302930d · a88f32ab · 44af210f · 44af210f
Commit 44af210f authored Jul 08, 2019 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 179 additions and 167 deletions

data/constants.json data/constants.json +8 -3

ygopro-server.coffee ygopro-server.coffee +85 -81

ygopro-server.js ygopro-server.js +86 -83

No files found.
--- a/data/constants.json
+++ b/data/constants.json
@@ -269,6 +269,14 @@
        "LINK_MARKER_TOP": 128,
        "LINK_MARKER_TOP_RIGHT": 256
    },
+    "DUEL_STAGE": {
+        "BEGIN": 0,
+        "FINGER": 1,
+        "FIRSTGO": 2,
+        "DUELING": 3,
+        "SIDING": 4,
+        "END": 5
+    },
    "COLORS": {
        "LIGHTBLUE": 8,
        "RED": 11,
@@ -282,6 +290,3 @@
        "DARKGRAY": 19
    }
 }
-
-
-
--- a/ygopro-server.coffee
+++ b/ygopro-server.coffee
--- a/ygopro-server.js
+++ b/ygopro-server.js