summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <mike.wollmann@gmail.com>2020-04-06 16:35:22 +0200
committerjak1 <mike.wollmann@gmail.com>2020-04-06 16:35:22 +0200
commit56e85c313c2b1a369eeea7fba19f6c7540d121b8 (patch)
tree81e5877131115cf7d100b9e48fd58e66f2ae963a
parentee012bfd77768f6ec4f38aa6d949d19697c6c8c7 (diff)
downloadmanachat-56e85c313c2b1a369eeea7fba19f6c7540d121b8.tar.gz
manachat-56e85c313c2b1a369eeea7fba19f6c7540d121b8.tar.bz2
manachat-56e85c313c2b1a369eeea7fba19f6c7540d121b8.tar.xz
manachat-56e85c313c2b1a369eeea7fba19f6c7540d121b8.zip
moved item and monster db to db/
-rwxr-xr-xcurses/tmwcli.py4
-rwxr-xr-xdb/itemdb.txt (renamed from itemdb.txt)0
-rwxr-xr-xdb/monsterdb.txt (renamed from monsterdb.txt)0
-rwxr-xr-xgui/managui.py2
-rwxr-xr-xitemdb.py2
-rwxr-xr-xmonsterdb.py2
-rwxr-xr-xrunshop.py2
-rwxr-xr-xsimple.py4
8 files changed, 8 insertions, 8 deletions
diff --git a/curses/tmwcli.py b/curses/tmwcli.py
index 109fd71..93ae52d 100755
--- a/curses/tmwcli.py
+++ b/curses/tmwcli.py
@@ -107,8 +107,8 @@ if __name__ == "__main__":
plugins.load_plugins(config)
- monsterdb.read_monster_db('../monsterdb.txt')
- itemdb.load_itemdb('../itemdb.txt')
+ monsterdb.read_monster_db('../db/monsterdb.txt')
+ itemdb.load_itemdb('../db/itemdb.txt')
online_users = OnlineUsers(config.get('Other', 'online_txt_url'))
online_users.start()
diff --git a/itemdb.txt b/db/itemdb.txt
index c89df34..c89df34 100755
--- a/itemdb.txt
+++ b/db/itemdb.txt
diff --git a/monsterdb.txt b/db/monsterdb.txt
index 74c5bbe..74c5bbe 100755
--- a/monsterdb.txt
+++ b/db/monsterdb.txt
diff --git a/gui/managui.py b/gui/managui.py
index e24d836..9a72fd7 100755
--- a/gui/managui.py
+++ b/gui/managui.py
@@ -91,7 +91,7 @@ class ManaGuiApp(App):
netlog.addHandler(fh)
monsterdb.read_monster_db()
- itemdb.load_itemdb('itemdb.txt')
+ itemdb.load_itemdb('db/itemdb.txt')
dbgh = DebugLogHandler(self)
dbgh.setFormatter(logging.Formatter("[%(asctime)s] %(message)s",
diff --git a/itemdb.py b/itemdb.py
index 34bde26..593699f 100755
--- a/itemdb.py
+++ b/itemdb.py
@@ -4,7 +4,7 @@ from loggers import debuglog
item_names = {0: 'GP'}
-def load_itemdb(dbfile='itemdb.txt'):
+def load_itemdb(dbfile='db/itemdb.txt'):
with open(dbfile, 'rt') as f:
for l in f.readlines():
try:
diff --git a/monsterdb.py b/monsterdb.py
index 5235b5f..a4cfd1e 100755
--- a/monsterdb.py
+++ b/monsterdb.py
@@ -2,7 +2,7 @@
monster_db = {}
-def read_monster_db(file='monsterdb.txt'):
+def read_monster_db(file='db/monsterdb.txt'):
with open(file) as f:
for l in f.readlines():
try:
diff --git a/runshop.py b/runshop.py
index c25da04..b126fdf 100755
--- a/runshop.py
+++ b/runshop.py
@@ -48,7 +48,7 @@ if __name__ == '__main__':
config = ConfigParser()
config.read('config/manachat.ini')
- load_itemdb('itemdb.txt')
+ load_itemdb('db/itemdb.txt')
plugins.load_plugins(config)
diff --git a/simple.py b/simple.py
index 11f46bf..e96cc1d 100755
--- a/simple.py
+++ b/simple.py
@@ -111,8 +111,8 @@ if __name__ == '__main__':
fh.setFormatter(fmt)
netlog.addHandler(fh)
- load_itemdb('itemdb.txt')
- read_monster_db('monsterdb.txt')
+ load_itemdb('db/itemdb.txt')
+ read_monster_db('db/monsterdb.txt')
plugins.load_plugins(config)