-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Rectify incorrect densities of steel resource items #63365
Conversation
Unrelated test failure likely originating from #62604 |
Rebased to resolve conflicts. |
Alright, so you need to move back hinges, blades, and wire (as well as any other moved items) I understand messy organization can be frustrating, but moving the items means we lose all the history of changes to the entries which is a hard no for the project. The same goes for grouping the items, moving them around messes with history (and also makes this PR very annoying to review). The reorganizing within the file causes the same issues. doing either of these things the code will be rejected because we lose the history of the items and it breaks all other concurrent work. Again sorry I know this must be frustrating and I wish I had noticed the issue sooner. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
requesting changes so no one yolo merges this while it has these problems
??? This is untrue -- keeping history of changes is the whole point of version control systems like git. I've previously traced change history in this project across moved/renamed files, files that were split up, and other instances of c++ code or json entries moved across different files; no problem whatsoever. I don't understand what your complaint is, please elaborate,
You do realize you can review changes commit-by-commit or for a subset of commits in the PR, right? I make it a point to organize my work into commits that reflect coherent steps; in this case the sorting is in a separate commit of its own, which can be checked to ensure that entries were only moved as-is, without changes. |
I spoke in simple terms because I didn't recognize your name, many people working on the project don't understand the nuances of GIT, so explaining things simply is important to get points across. It looks like you've been doing a lot of work over the last while and you understand how software works, so I'll speak clearly: The project position is that JSON organization is pointless data churn and that it isn't worth even the minor inconvenience of burying git history over reorganization commits. Someone else is just going to come along and fuck it up by putting stuff in between, so it just makes data gathering annoying for 0 long-term benefit.
150 PRs have been merged in the last 2 days. I would encourage you to have some perspective. Hopefully, that makes the position of the developers clearer, you should incorporate that instruction into this PR and others, or they will not get merged. |
The merits of moving entities around aside (though I think it ought be avoided).
Human checking of this is rarely perfect, and effort intensive. The easier you make your PR to review, the faster it is to merge and less effort will be required of you. |
unwanted commits dropped and overall rebased to resolve merge conflicts |
Summary
Bugfixes "Rectify incorrect densities of steel resource items"
Purpose of change
Resolves #62928
reordering and reorganization ofdata/json/items/resources/metal.json
so that related entries (material or form factor) are clustered togethermove some misplaced items out of the file, to more appropriate locationsDescribe the solution
Cross reference known good version of the file from before the regression.
Fix impacted budget steel smelting recipes per discussion.
Oven componentsfanblade_metal
andheavy_wire_rack
moved toappliance_parts.json
Door hingehinge
moved tohome_improvement.json
Describe alternatives you've considered
Simply revert the commits responsible for the regression, but it's already been a few months and there have been other intervening commits.
Testing
Check in game that:
Additional context and future work
Part of #62936 which is being reorganized and re-done as it was starting to get out of hand.
Bits of that PR will continue to be split off as smaller, more manageable chunks and dealt with separately.
It was originally intended in #62936 to take advantage of the change from unitless weights/volumes to improve the accuracy of some of these stats which in the past had to be rounded off, leading to pretty crude approximations in some cases. That is now being deferred as a non-critical enhancement.
For instance, based on preexisting comments, we know that steel was intended to be 7.6g/cm³, but in practice it is 8.0 due to rounding errors (in the age of unitless stats). That can be rectified by adjusting either mass or volume; it seems preferable to leave mass untouched but further discussion may be warranted.
Note that steel ingots stats currently don't line up with the general density of other smaller steel resource items, as they appear to have used 7.859g/cm³. Leaving it alone for now as these are uncommon: they don't spawn in world, only player-craftable for bulk-storage and handling convenience. In any case, resolution of this discrepancy will depend on how steel density overall gets adjusted.