Spacehaven-modding-tools / spacehaven-modloader

An *unofficial* mod loader and modding tool for Space Haven by Bugbyte
15 stars 8 forks source link

Annotation updates, annotate nearly everything in `haven` xml file, ability to add Scenarios, Tech, and TechTrees. #9

Closed WalterLPearson closed 3 years ago

WalterLPearson commented 3 years ago

Like it says. Small changes to merging, large changes to annotation. Much more data is searched to give information to modders. Also laid the groundwork to track relationships (ie. foreign keys) between different sections and files, to create reports I've been dreaming up.

Eventually I want to export HTML for the wiki, spreadsheets, diagrams, and maybe even a MySQL database that modders could run queries.

Tahvohck commented 3 years ago

This needs to be rebased off of the development branch before merging can be considered.

Tahvohck commented 3 years ago

Also, don't bump version numbers while making PRs. Version numbers will get bumped during Release Candidate branch drafting.

WalterLPearson commented 3 years ago

Agreed, I will not touch version numbers in the future.

Here is what I believe I need to do for a pull:

  1. Drop all the new files, in particular the batch files.
  2. Roll back changes to everything except merge.py and annotate.py
  3. Separate merge.py and annotate.py into separate branches.
  4. Rebase to your dev branch, and merge changes.

I will issue separate Pull requests for merge.py and annotate.py These are the only two files I really need to change. In the future my branches will have more focused small changes, and I will issue Pull requests more frequently. This started out just as tinkering, so I did not follow my typical professional practices. I apologize.

Thank you for your time, attention, and advice!

Tahvohck commented 3 years ago

That's a good summary of changes. No need to apologize, I can certainly appreciate tinkering, especially with intent to improve. 😛 Closing this PR.