Skip to content

Commit

Permalink
[Fix] Reunify Resource File Locations
Browse files Browse the repository at this point in the history
Running from source and built had these json files in different locations. Fixing to the intended unified spot.
  • Loading branch information
Rixxan committed Jan 3, 2024
1 parent 07c5fef commit 620188a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions coriolis-update-files.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def add(modules, name, attributes) -> None:
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
Expand Down Expand Up @@ -92,5 +92,5 @@ def add(modules, name, attributes) -> None:
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)
File renamed without changes.
File renamed without changes.

0 comments on commit 620188a

Please sign in to comment.