summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace>2013-10-02 13:50:54 +1300
committerFreeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace>2013-10-02 13:50:54 +1300
commit97cbd37944e907a29a0ff6342cfce3a95fa8945c (patch)
treeb9df9c1a2b8b5c1fad0ecef402b36a72eb6e37b6
parent134c9a0b1bbdff32edaccabac03759a2a90fbf5b (diff)
downloadmanavis-97cbd37944e907a29a0ff6342cfce3a95fa8945c.tar.gz
manavis-97cbd37944e907a29a0ff6342cfce3a95fa8945c.tar.bz2
manavis-97cbd37944e907a29a0ff6342cfce3a95fa8945c.tar.xz
manavis-97cbd37944e907a29a0ff6342cfce3a95fa8945c.zip
Relax constraints on map name parsing
It now only need be a name that does not contain a comma.
-rw-r--r--public/js/mv/parse.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/js/mv/parse.js b/public/js/mv/parse.js
index 2c8b916..6afe96a 100644
--- a/public/js/mv/parse.js
+++ b/public/js/mv/parse.js
@@ -64,7 +64,7 @@ var mv = function(mv) {
};
function checkXP(e) {
/* Try to parse an XP record. */
- var d = e.match(/^(\d+\.\d+) PC(\d+) (\d+):(\d+),(\d+) GAINXP (\d+) (\d+) (\w+)/);;
+ var d = e.match(/^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) GAINXP (\d+) (\d+) (\w+)/);;
if (!d) {
return false;
}
@@ -119,7 +119,7 @@ var mv = function(mv) {
return true;
}
function checkStat(e) {
- var d = e.match(/^(?:\d+\.\d+) PC(\d+) (?:\d+):(?:\d+),(?:\d+) STAT (\d+) (\d+) (\d+) (\d+) (\d+) (\d+) /);
+ var d = e.match(/^(?:\d+\.\d+) PC(\d+) (?:[^,]+):(?:\d+),(?:\d+) STAT (\d+) (\d+) (\d+) (\d+) (\d+) (\d+) /);
if (!d) {
return false;
}
@@ -148,7 +148,7 @@ var mv = function(mv) {
return true;
}
function checkDmg(e) {
- var d = e.match(/^(\d+\.\d+) PC(\d+) (\d+):(\d+),(\d+) ([A-Z]+)DMG MOB(\d+) (\d+) FOR (\d+) (?:WPN|BY) ([^ ]+)/);
+ var d = e.match(/^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) ([A-Z]+)DMG MOB(\d+) (\d+) FOR (\d+) (?:WPN|BY) ([^ ]+)/);
if (!d) {
return false;
}
@@ -162,7 +162,7 @@ var mv = function(mv) {
return true;
}
function checkMobMobDmg(e) {
- var d = e.match(/^^(\d+\.\d+) PC(\d+) (\d+):(\d+),(\d+) MOB-TO-MOB-DMG FROM MOB(\d+) (\d+) TO MOB(\d+) (\d+) FOR (\d+)/);
+ var d = e.match(/^^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) MOB-TO-MOB-DMG FROM MOB(\d+) (\d+) TO MOB(\d+) (\d+) FOR (\d+)/);
if (!d) {
return false;
}