Skip to content

Fix genshin_merge_mods.py #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jere344 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix genshin_merge_mods.py #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Tools/genshin_merge_mods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,19 @@ def main():
# First time we have seen this hash, need to add it to overrides
if (all_mod_data[i]["hash"], index) not in command_data:
command_data[(all_mod_data[i]["hash"], index)] = [all_mod_data[i]]
overrides += f"[{all_mod_data[i]['header']}{all_mod_data[i]['name']}]\nhash = {all_mod_data[i]['hash']}\n"
if "header" in all_mod_data[i] and 'name' in all_mod_data[i]:
overrides += f"[{all_mod_data[i]['header']}{all_mod_data[i]['name']}]"
overrides += f"\nhash = {all_mod_data[i]['hash']}\n"
if index != -1:
overrides += f"match_first_index = {index}\n"
# These are custom commands GIMI implements, they do not need a corresponding command list
if "VertexLimitRaise" not in all_mod_data[i]["name"]:
overrides += f"run = CommandList{all_mod_data[i]['name']}\n"
if index != -1 and args.reflection:
overrides += f"ResourceRef{all_mod_data[i]['name']}Diffuse = reference ps-t1\nResourceRef{all_mod_data[i]['name']}LightMap = reference ps-t2\n$reflection = {n}\n"
reflection[all_mod_data[i]['name']] = f"ResourceRef{all_mod_data[i]['name']}Diffuse,ResourceRef{all_mod_data[i]['name']}LightMap,{n}"
n+=1
if "name" in all_mod_data[i]:
if "VertexLimitRaise" not in all_mod_data[i]["name"]:
overrides += f"run = CommandList{all_mod_data[i]['name']}\n"
if index != -1 and args.reflection:
overrides += f"ResourceRef{all_mod_data[i]['name']}Diffuse = reference ps-t1\nResourceRef{all_mod_data[i]['name']}LightMap = reference ps-t2\n$reflection = {n}\n"
reflection[all_mod_data[i]['name']] = f"ResourceRef{all_mod_data[i]['name']}Diffuse,ResourceRef{all_mod_data[i]['name']}LightMap,{n}"
n+=1
if args.active:
if "Position" in all_mod_data[i]["name"]:
overrides += f"$active = 1\n"
Expand All @@ -171,8 +174,8 @@ def main():
command_data.setdefault((all_mod_data[i]["name"],0),[]).append(all_mod_data[i])
# Resources
elif "filename" in all_mod_data[i] or "type" in all_mod_data[i]:

resources += f"[{all_mod_data[i]['header']}{all_mod_data[i]['name']}.{all_mod_data[i]['ini_group']}]\n"
if "header" in all_mod_data[i] and 'name' in all_mod_data[i]:
resources += f"[{all_mod_data[i]['header']}{all_mod_data[i]['name']}.{all_mod_data[i]['ini_group']}]\n"
for command in all_mod_data[i]:
if command in ["header", "name", "location", "ini_group"]:
continue
Expand Down Expand Up @@ -382,7 +385,7 @@ def parse_section(section):
mod_data[key.strip()] = data.strip()
# Properties
elif "=" in line:
key, data = line.split("=")
key, data = line.split("=", 1)
# See note on reflection fix above
if "CharacterIB" in key or "ResourceRef" in key:
continue
Expand Down