Skip to content
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.

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

Update DialogicAnimaResources.gd #1974

Merged
merged 2 commits into from
Jan 26, 2024

Conversation

TheMeddlingMechanic
Copy link

Hi,
This is theMeddlingMechanic from the dialogic discord (sorry for taking a while). I've added a single line of of code (line 39) on the DialogicAnimaResources.gd script. This is to account for developers who use PckEncryption in their game builds.

Hi,
This is theMeddlingMechanic from the dialogic discord (sorry for taking a while).
I've added a single line of of code (line 39) on the DialogicAnimaResources.gd script.
This is to account for developers who use PckEncryption in their game builds.
@zaknafean zaknafean self-assigned this Dec 28, 2023
@Jowan-Spooner
Copy link
Collaborator

@zaknafean This seems like a pretty simple PR, anything you need to test before we can merge this?

@zaknafean
Copy link
Collaborator

Unfortunately it may break non encrypted builds as written. I gotta add a branch of some kind that can determine if you're encrypted or not.

@TheMeddlingMechanic
Copy link
Author

TheMeddlingMechanic commented Jan 20, 2024

Hi guys, I believe this shouldn't cause issues like that as it adds a new line (rather than changing the existing one) , replacing both .gdc and .gde with .gd in the saved list. Feel free to test it, but if I remember correctly, that should work.

@Jowan-Spooner
Copy link
Collaborator

Hmmm... I'm unable to test this as I don't have a dialogic 1 environment anymore.
Wouldn't it need to be something like

filtered.push_back(file.replace('.gde', '.gd').replace('.gdc', '.gd'))

So any file is only added once and depending on what "wrong" extension it has they get corrected?

@TheMeddlingMechanic
Copy link
Author

Hmm, this could be the case, I'm not home at the moment, but when I am I'll record myself testing this for both encrypted and not (I can print out the list and check the logs). I'll get back to you with the recording once I've got an answer.

@TheMeddlingMechanic
Copy link
Author

TheMeddlingMechanic commented Jan 20, 2024

EDIT: just checked the docs for the push back function, and I believe you're almost definitely right

Actually, I doubt this will be an issue, as every script in the pck should be the same type (gdc vs gde), so only one of these lines of code should make a difference,
but I'll still test it once I have the chance, just in case.

@TheMeddlingMechanic
Copy link
Author

I didn't record this in the end, just added another commit because of the obvious meaning of the docs for that method.

@zaknafean
Copy link
Collaborator

Confirmed it still works on non-encrypted exports just fine. Thanks for the PR @TheMeddlingMechanic , merging it in now.

@zaknafean zaknafean merged commit 9430dc5 into dialogic-godot:dialogic-1 Jan 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants