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

Dungeons (Update) #829

Closed
wants to merge 16 commits into from
Closed

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jan 4, 2024

About the PR

Moved all dungeon files to _NF to not be mixed with upstream, except the upstream ones.
Upgraded all files to v6 except templates
Nothing changes in the dungeons files other them moving and upgrades.

Why / Balance

Groundworks for future edits, after that ill be redoing rewards and then layout updates with new content.

Technical details

Mapping

Media

N/A

Breaking changes

N/A

Changelog
N/A

@github-actions github-actions bot added Map-Dungeon Map - Dungeon No C# labels Jan 4, 2024
@dvir001 dvir001 mentioned this pull request Jan 7, 2024
1 task
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont move upstream files here please, keep upstream files where they belong, this will just make merging upstream a nightmare.

@dvir001
Copy link
Contributor Author

dvir001 commented Jan 7, 2024

Dont move upstream files here please, keep upstream files where they belong, this will just make merging upstream a nightmare.

Im fine with leaving files on the upstream folder but wont it be more easy to just let the upstream ones go there and our to stay on _NF since we have balance changes on them, so we dont mess with our custom ones?

I can also just make a "copy" of the files and leave them in the original folders and the new _NF if its fine with you.

@Cheackraze
Copy link
Member

because if you move upstream files, git is going to re-add them when I do a merge and then the game is going to crash when it tries to load duplicate yml prototypes and then I have to spend time figuring out why and where and for what reason we have duplicates. Its a nightmare, so dont move upstream files please

@dvir001
Copy link
Contributor Author

dvir001 commented Jan 7, 2024

because if you move upstream files, git is going to re-add them when I do a merge and then the game is going to crash when it tries to load duplicate yml prototypes and then I have to spend time figuring out why and where and for what reason we have duplicates. Its a nightmare, so dont move upstream files please

I got the original current files from upstream, and made sure the ones were using keep to a new format name, let me know if this fix is fine.

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 7, 2024
@dvir001 dvir001 changed the title Dungeons Dungeons (Update) Jan 25, 2024
@dvir001
Copy link
Contributor Author

dvir001 commented Feb 3, 2024

No need anymore

@dvir001 dvir001 closed this Feb 3, 2024
dvir001 added a commit that referenced this pull request Feb 4, 2024
Moved the _NF ones under _NF
Updated all the tilesets to v6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map-Dungeon Map - Dungeon No C# Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants