Add support for custom battle backgrounds.

Fix typos and minor bugs.

3 files changed, 76 insertions, 1 deletions

diff --git a/quests.json b/quests.json
index 2baa3c4..3645df8 100644
--- a/quests.json
+++ b/quests.json
@@ -16,6 +16,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 0,
    "loot": [
     [
@@ -76,6 +77,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 1,
    "loot": [
     [
@@ -150,6 +152,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 2,
    "loot": [
     [
@@ -246,6 +249,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 3,
    "loot": [
     [
@@ -340,6 +344,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 4,
    "loot": [
     [
@@ -438,6 +443,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 5,
    "loot": [
     [
@@ -467,6 +473,72 @@
    ]
   },
   {
+   "difficulty": 30,
+   "cost": 3,
+   "flags": 1,
+   "quest_id": 7,
+   "waves": [
+    [
+     {
+      "attribute": 1,
+      "boss": false,
+      "name": "Spearman",
+      "sprite": 950000
+     }
+    ]
+   ],
+   "music": "bgm03",
+   "bg": "battle",
+   "requeriment": 6,
+   "loot": [
+    [
+     "1010",
+     1025
+    ],
+    [
+     "1020",
+     110
+    ],
+    [
+     "1030",
+     11
+    ]
+   ]
+  },
+  {
+   "difficulty": 35,
+   "cost": 3,
+   "flags": 1,
+   "quest_id": 8,
+   "waves": [
+    [
+     {
+      "attribute": 1,
+      "boss": false,
+      "name": "Spearman",
+      "sprite": 950000
+     }
+    ]
+   ],
+   "music": "bgm03",
+   "bg": "battle",
+   "requeriment": 7,
+   "loot": [
+    [
+     "1010",
+     1025
+    ],
+    [
+     "1020",
+     110
+    ],
+    [
+     "1030",
+     11
+    ]
+   ]
+  },
+  {
    "difficulty": 45,
    "cost": 10,
    "flags": 4,
@@ -534,6 +606,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 1,
    "loot": [
     [
@@ -666,6 +739,7 @@
     ]
    ],
    "music": "bgm03",
+   "bg": "battle",
    "requeriment": 5,
    "loot": [
     [
diff --git a/security.py b/security.py
index 112f636..8383fae 100644
--- a/security.py
+++ b/security.py
@@ -91,7 +91,7 @@ def get_score(proto):
         return 5
     elif proto == PACKET_ACK:
         return 0
-    else
+    else:
         stdout("\"%s\" is not a valid packet reply code" % str(proto))
         return 0
 
diff --git a/server.py b/server.py
index 011ab4a..9ecf08c 100755
--- a/server.py
+++ b/server.py
@@ -90,6 +90,7 @@ class WebSocketConn(WebSocket):
 
         # TODO: Drop OLD connections when same IP tries to connect
         # TODO: Either auto-ban or limit to <= 3 connections from same IP at once
+        # TODO: Also, inheir the previous connection MS score and MS Auth
 
         # By last, keep a "sane" amount of clients connected
         # This program must not, under any circumstances, interfer