diff --git a/build.py b/build.py index e1d37f49..a86689a7 100644 --- a/build.py +++ b/build.py @@ -77,8 +77,8 @@ def generate_data_files( "snd_good.wav", "snd_bad.wav", "modules.p", # TODO: Remove in 6.0 - "resources/modules.json", - "resources/ships.json", + "modules.json", + "ships.json", "ships.p", # TODO: Remove in 6.0 f"{app_name}.VisualElementsManifest.xml", f"{app_name}.ico", diff --git a/coriolis-update-files.py b/coriolis-update-files.py index b68d9647..9c1d7ecc 100755 --- a/coriolis-update-files.py +++ b/coriolis-update-files.py @@ -57,7 +57,7 @@ if __name__ == "__main__": modules['_'.join([reverse_ship_map[name], 'armour', bulkhead])] = {'mass': m['bulkheads'][i]['mass']} ships = OrderedDict([(k, ships[k]) for k in sorted(ships)]) # sort for easier diffing - with open("resources/ships.json", "w") as ships_file: + with open("ships.json", "w") as ships_file: json.dump(ships, ships_file, indent=4) # Module masses @@ -92,5 +92,5 @@ if __name__ == "__main__": add(modules, 'hpt_multicannon_fixed_medium_advanced', {'mass': 4}) modules = OrderedDict([(k, modules[k]) for k in sorted(modules)]) # sort for easier diffing - with open("resources/modules.json", "w") as modules_file: + with open("modules.json", "w") as modules_file: json.dump(modules, modules_file, indent=4) diff --git a/resources/modules.json b/modules.json similarity index 100% rename from resources/modules.json rename to modules.json diff --git a/resources/ships.json b/ships.json similarity index 100% rename from resources/ships.json rename to ships.json