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

Locations #356

Merged
merged 10 commits into from
Nov 18, 2024
Merged

Locations #356

merged 10 commits into from
Nov 18, 2024

Conversation

DaleStan
Copy link
Collaborator

@DaleStan DaleStan commented Nov 16, 2024

This is some more parts of #316. I think it covers all location information required by dependency/milestone analysis, except space-connections (which don't add any additional unlocks): It knows that lava isn't accessible until you get to Vulcanus and knows that Promethium science pack is accessible. It is happy loading new and existing pY and SA projects, though the pY projects need a change to pypostprocessing.

In order to not break Space science when fixing Promethium science, I had to implement these, both internally and in the UI:
image image
The vertical bar will connect as many horizontal OR bars as necessary. Lists that are not separated by an OR bar (almost all of them) use the standard AND behavior.

I also decided this (1364 pixels high) was bad
image
and changed it to this instead (down to 970 px)
image

Copy link
Owner

@shpaass shpaass left a comment

Choose a reason for hiding this comment

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

That's massive. Thank you for implementing the feature!

@DaleStan
Copy link
Collaborator Author

The change from the medium oxide asteroid from requiring Fulgora to requiring only space science in 6335a71 was unintentional and ... possibly wrong?
image image

On the other hand, saying the medium oxide asteroids require Fulgora when they actually require Fulgora or Gleba or Vulcanus is also wrong. (All three locations are un-reached milestones in both screenshots.)

This exact change won't be visible, but in a project with the Circuit network, Concrete, Electric energy distribution 1, and Railway technologies all as milestones, Iron stick will go from picking one of them as the required milestone (and sticking with that even if others are unlocked) to picking none of them instead. I'm not sure what the correct behavior is here.

@veger
Copy link
Collaborator

veger commented Nov 17, 2024

In order to reduce the popup/tooltip height even further, we could also squash 'Made in' into a single line, as it is not very interesting (as most will be the same) and the icons are distinctive enough (I think)? (People on laptops/small screens will like the reduced height, at least when I am on my laptop it often does not fit)

Copy link
Collaborator

@veger veger left a comment

Choose a reason for hiding this comment

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

When I made the milestone bits support more than 64 bits (with the Bits class), modifying the milestone (analysis) was a huge pain and very error-prone.

Since you modified this heavily (again), we need to make sure all is still working as expected. You wrote about the different mod packs/save files that you tested and work properly, but I just wanted to mention this to make sure we are not breaking this 😉

Yafc.Model/Analysis/AutomationAnalysis.cs Outdated Show resolved Hide resolved
Yafc.Model/Analysis/DependencyNode.cs Outdated Show resolved Hide resolved
Yafc.Model/Analysis/DependencyNode.cs Show resolved Hide resolved
Yafc.Model/Analysis/DependencyNode.cs Show resolved Hide resolved
Yafc.Parser/Data/FactorioDataDeserializer.cs Show resolved Hide resolved
@DaleStan
Copy link
Collaborator Author

I think I've covered all of @veger's comments now? I also realized I was drawing (A or B) and (C or D) like this. That display should mean A or (B and C) or D, so I added a small gap between B and C (making a gap in the vertical bar) in that case.

image

@shpaass shpaass merged commit 6b0561f into shpaass:master Nov 18, 2024
1 check passed
@DaleStan DaleStan deleted the locations branch November 22, 2024 17:51
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