From 752e30ec7b044aee96d8f8e15d32aba81b7dde0e Mon Sep 17 00:00:00 2001 From: jak1 Date: Mon, 6 Apr 2020 16:44:53 +0200 Subject: moved maps to db/ --- .gitignore | 2 +- db/mapdb.zip | Bin 0 -> 256414 bytes db/mapnames.txt | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gui/tmxmap.py | 2 +- mapdb.zip | Bin 256414 -> 0 bytes mapnames.py | 2 +- mapnames.txt | 104 -------------------------------------------------------- 7 files changed, 107 insertions(+), 107 deletions(-) create mode 100755 db/mapdb.zip create mode 100755 db/mapnames.txt delete mode 100755 mapdb.zip delete mode 100755 mapnames.txt diff --git a/.gitignore b/.gitignore index ec06a8c..6610404 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ #configuration files -manachat.ini +config/manachat.ini config/*.txt #compiled python files diff --git a/db/mapdb.zip b/db/mapdb.zip new file mode 100755 index 0000000..0efdc80 Binary files /dev/null and b/db/mapdb.zip differ diff --git a/db/mapnames.txt b/db/mapnames.txt new file mode 100755 index 0000000..03bc6a4 --- /dev/null +++ b/db/mapnames.txt @@ -0,0 +1,104 @@ +001-1 Tulimshar Port +001-2 South Tulimshar Indoor +001-3 Tulimshar Arena +002-1 Tulimshar South +002-2 Sandstorm Desert Indoors +002-3 Tulimshar Mining Camp +002-4 Desert Mines +002-5 Deep Desert Mines +004-3 Pirate Caves First Floor +004-4 Pirate Caves Second Floor +004-5 Pirate Den +005-3 Snake Pit +006-1 Desert Mountains +006-2 Pachua's Village +006-3 Desert Mountain Cave +007-1 Woodland +007-2 Illia forsaken inn +008-1 Hurnscald Outskirts +009-1 Hurnscald +009-2 Hurnscald Indoor +009-3 Hurnscald Cave +009-4 Orum Caves +009-5 Last man standing +009-6 Cave +009-7 The Sanguine Vault +010-1 Woodland +010-2 Dimond's Cove +011-1 Woodland +011-3 Hermit's Cave +011-4 Lake Cave +011-6 Bandit Cave +012-1 Woodland Hills +012-3 Moggun Cave +012-4 Terranite Cave +013-1 Woodland Hills +013-2 Magic House +013-3 Woodland Hills Cave +014-1 Woodland +014-3 Woodland Cave +015-1 Woodland +015-3 Cat's Cave +016-1 Woodland +017-1 Woodland Hills +017-2 Theater +017-3 Woodland Cave +017-4 Hideout +017-9 GM Lounge +018-1 Woodland Mining Camp +018-2 Woodland Mining Camp Indoor +018-3 Northern Mines +019-1 snow Field +019-3 Snow Cave +019-4 Snow Cave +020-1 Nivalis +020-2 Nivalis Indoor +020-3 Ice cave +021-3 Central Tulimshar Sewers +025-1 Woodland Swamp +025-3 Rossy Main Hall +025-4 Rossy Battle Caves +026-1 Swamp +027-1 Graveyard +027-2 Graveyard Indoor +027-3 Crypt Basement +027-4 Crypt Sub-Basement One +027-5 Crypt Sub-Basement Two +027-6 Crypt Sub-Basement Two +027-7 Crypt Sub-Basement Two +027-8 Crypt Sub-Basement Two +028-1 GM Island +028-3 GM Island Cave +029-1 Candor Island +029-2 Candor Island Indoor +029-3 Candor Cave +030-2 Christmas Inn +030-3 The Frozen Lake +030-4 Christmas Inn Warehouse +031-1 Nivalis Port +031-2 Angela's House +031-3 Ice Labyrinth +031-4 Cindy Cave +032-3 Outback Cave +033-1 snow Path +034-1 Snow Forest +034-2 Trappers Huts +035-2 Koga - Main +036-2 Koga - Candor +043-3 Sandy Dungeon Level 1 +043-4 Sandy Dungeon Level 2 +045-1 Deep Snow Forest +046-1 Rock Plateau +046-3 Frosty Underground +047-1 snow Hills +047-3 Snow Hills Cave +048-2 Blue Sages' Mansion +051-1 Illia outskirts +051-3 Illia Bandit Cave +052-1 Illia archipelago +052-2 Illia forsaken inn +055-1 Woodland Hills +055-3 Cave +056-2 Mirak's House +057-1 Woodland +botcheck Botcheck Area diff --git a/gui/tmxmap.py b/gui/tmxmap.py index 800868e..58ee490 100755 --- a/gui/tmxmap.py +++ b/gui/tmxmap.py @@ -82,7 +82,7 @@ class MapWidget(Image): def load_map(self, name, *args): if name not in self.maps: Logger.info("Caching map %s", name) - zf = zipfile.ZipFile('mapdb.zip', 'r') + zf = zipfile.ZipFile('db/mapdb.zip', 'r') self.maps[name] = pickle.load(zf.open(name + '.pickle')) zf.close() # m = pytmx.TiledMap(filename=filename) diff --git a/mapdb.zip b/mapdb.zip deleted file mode 100755 index 0efdc80..0000000 Binary files a/mapdb.zip and /dev/null differ diff --git a/mapnames.py b/mapnames.py index 5c01280..612908b 100755 --- a/mapnames.py +++ b/mapnames.py @@ -2,7 +2,7 @@ map_names = {} -def read_map_names(file='mapnames.txt'): +def read_map_names(file='db/mapnames.txt'): with open(file) as f: for l in f.readlines(): try: diff --git a/mapnames.txt b/mapnames.txt deleted file mode 100755 index 03bc6a4..0000000 --- a/mapnames.txt +++ /dev/null @@ -1,104 +0,0 @@ -001-1 Tulimshar Port -001-2 South Tulimshar Indoor -001-3 Tulimshar Arena -002-1 Tulimshar South -002-2 Sandstorm Desert Indoors -002-3 Tulimshar Mining Camp -002-4 Desert Mines -002-5 Deep Desert Mines -004-3 Pirate Caves First Floor -004-4 Pirate Caves Second Floor -004-5 Pirate Den -005-3 Snake Pit -006-1 Desert Mountains -006-2 Pachua's Village -006-3 Desert Mountain Cave -007-1 Woodland -007-2 Illia forsaken inn -008-1 Hurnscald Outskirts -009-1 Hurnscald -009-2 Hurnscald Indoor -009-3 Hurnscald Cave -009-4 Orum Caves -009-5 Last man standing -009-6 Cave -009-7 The Sanguine Vault -010-1 Woodland -010-2 Dimond's Cove -011-1 Woodland -011-3 Hermit's Cave -011-4 Lake Cave -011-6 Bandit Cave -012-1 Woodland Hills -012-3 Moggun Cave -012-4 Terranite Cave -013-1 Woodland Hills -013-2 Magic House -013-3 Woodland Hills Cave -014-1 Woodland -014-3 Woodland Cave -015-1 Woodland -015-3 Cat's Cave -016-1 Woodland -017-1 Woodland Hills -017-2 Theater -017-3 Woodland Cave -017-4 Hideout -017-9 GM Lounge -018-1 Woodland Mining Camp -018-2 Woodland Mining Camp Indoor -018-3 Northern Mines -019-1 snow Field -019-3 Snow Cave -019-4 Snow Cave -020-1 Nivalis -020-2 Nivalis Indoor -020-3 Ice cave -021-3 Central Tulimshar Sewers -025-1 Woodland Swamp -025-3 Rossy Main Hall -025-4 Rossy Battle Caves -026-1 Swamp -027-1 Graveyard -027-2 Graveyard Indoor -027-3 Crypt Basement -027-4 Crypt Sub-Basement One -027-5 Crypt Sub-Basement Two -027-6 Crypt Sub-Basement Two -027-7 Crypt Sub-Basement Two -027-8 Crypt Sub-Basement Two -028-1 GM Island -028-3 GM Island Cave -029-1 Candor Island -029-2 Candor Island Indoor -029-3 Candor Cave -030-2 Christmas Inn -030-3 The Frozen Lake -030-4 Christmas Inn Warehouse -031-1 Nivalis Port -031-2 Angela's House -031-3 Ice Labyrinth -031-4 Cindy Cave -032-3 Outback Cave -033-1 snow Path -034-1 Snow Forest -034-2 Trappers Huts -035-2 Koga - Main -036-2 Koga - Candor -043-3 Sandy Dungeon Level 1 -043-4 Sandy Dungeon Level 2 -045-1 Deep Snow Forest -046-1 Rock Plateau -046-3 Frosty Underground -047-1 snow Hills -047-3 Snow Hills Cave -048-2 Blue Sages' Mansion -051-1 Illia outskirts -051-3 Illia Bandit Cave -052-1 Illia archipelago -052-2 Illia forsaken inn -055-1 Woodland Hills -055-3 Cave -056-2 Mirak's House -057-1 Woodland -botcheck Botcheck Area -- cgit v1.2.3-70-g09d2