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

Wildfire: do not always hose hidden temple #967

Merged
merged 5 commits into from
Nov 13, 2021

Conversation

libraryaddict
Copy link
Contributor

@libraryaddict libraryaddict commented Nov 10, 2021

Description

If the player has already progressed pass hidden temple, there's no need to force a hose down of the area in wildfire path.

How Has This Been Tested?

Hasn't

Checklist:

  • My code follows the style guidelines of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have based by pull request against the master branch or have a good reason not to.

@taltamir
Copy link
Contributor

the first commit looks to be a duplicate of #964

@libraryaddict
Copy link
Contributor Author

the first commit looks to be a duplicate of #964

Looks to be a github issue isaacs/github#750

Should be a non-issue, otherwise I can open a new PR

@Alium58
Copy link
Member

Alium58 commented Nov 10, 2021

the first commit looks to be a duplicate of #964

Looks to be a github issue isaacs/github#750

Should be a non-issue, otherwise I can open a new PR

If making a new PR fixes the issue, I'd prefer you do that. Even if this is no issue technically it does muddy the history of this repo. Just my 2 cents

@taltamir
Copy link
Contributor

taltamir commented Nov 11, 2021

the first commit looks to be a duplicate of #964

Looks to be a github issue isaacs/github#750

Should be a non-issue, otherwise I can open a new PR

huh. interesting. well ok then. Maybe rebasing this PR will fix it?

@libraryaddict
Copy link
Contributor Author

Did some witch magic and the diffs are now normal. I think the issue is that I pulled from my own master branch which had commits that were not the same sha as the official branch.

Did you need me to edit the code as per @taltamir's thoughts?

@Alium58
Copy link
Member

Alium58 commented Nov 11, 2021

Did some witch magic and the diffs are now normal. I think the issue is that I pulled from my own master branch which had commits that were not the same sha as the official branch.

Did you need me to edit the code as per @taltamir's thoughts?

Yes. With how large this script is any improvements to readability is good imo

@taltamir
Copy link
Contributor

taltamir commented Nov 11, 2021

Did some witch magic and the diffs are now normal. I think the issue is that I pulled from my own master branch which had commits that were not the same sha as the official branch.

you should rebase your master branch to the lass master branch while dropping all commits from it. this will make it identical to the LASS:master branch.

Did you need me to edit the code as per @taltamir's thoughts?

please do

@taltamir taltamir merged commit 1314116 into loathers:master Nov 13, 2021
@taltamir taltamir changed the title Don't always hose hidden temple Wildfire: do not always hose hidden temple Nov 13, 2021
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