summaryrefslogtreecommitdiff
path: root/merge-server.py
diff options
context:
space:
mode:
Diffstat (limited to 'merge-server.py')
-rwxr-xr-xmerge-server.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/merge-server.py b/merge-server.py
index 3b4eecb..169a289 100755
--- a/merge-server.py
+++ b/merge-server.py
@@ -59,10 +59,19 @@ def parse(l, offset, prefix):
#################################################################################
## Moubootaur Legends is a raw copy (prefix = 0)
with open("%s/db/re/item_db.conf" % MOUBOO, "r") as f:
+ skip = False
for l in f:
#l=l.replace(" ", "\t")
- ## Disabled commands
+ ## Disabled commands (statusup2, AllowCards)
l=l.replace('statusup2', '//statusup2')
+ if skip and not "}" in l:
+ continue
+ elif skip and "}" in l:
+ skip=False
+ continue
+ elif not skip and "AllowCards" in l:
+ skip=True
+ continue
## Add headers
if "== License ==" in l:
item_db.append("//=========================================================================\n")