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

Fix incorrect migration #72594

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Conversation

hexagonrecursion
Copy link
Contributor

Summary

None

Purpose of change

Fixes #72583

#72431 removed some oter_id's, but made a couple of mistakes when writing a migration

Describe the solution

  1. "dirt_road_forest_3way_north" and 3 other rotations never existed (verified via git log -S) - I replaced it with the correct id - "dirt_road_3way_forest_north" - 3way before forest instead of after it
  2. It looks like the map I was testing this with generated "cabin_liam_driveway_north" rather than "cabin_liam_driveway" - I kept "cabin_liam_driveway" migration just in case. Note: we don't need migrations for "cabin_liam_driveway_west" and 2 other rotations because cabin_liam has "rotate": false

Testing

Loaded my save - no more errors from overmap::unserialize(const JsonObject&)] Loaded invalid oter_id

Additional context

I am still getting this error in my save:

ERROR : src/generic_factory.h:513 [int_id<T> generic_factory<T>::convert(const string_id<T>&, const int_id<T>&, bool) const [with T = oter_t]] invalid overmap terrain id "dirt_road_3way_east"

The log does contain messages about successful migrations from dirt_road_3way_east to rural_road_nsw.
It appears something in C++ might be trying to read a save file before it is migrated - out of scope for this PR - will debug and report separately

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 24, 2024
@hexagonrecursion
Copy link
Contributor Author

CI failed - unrelated build error: "no matching function for call to 'write_var_value'". Did someone check in and merge code that fails to build?

@perryprog
Copy link
Contributor

It was two PRs being merged at once that didn't account for each other, it's fixed on master now if you want to rebase.

@Procyonae
Copy link
Contributor

Whoops sorry I meant to double check those before I put the PR up, writing the migration was really messing with my head

@hexagonrecursion
Copy link
Contributor Author

hexagonrecursion commented Mar 25, 2024

Can't run tests:

item homeopathic_pills could not be put in container pillbox when spawning item group pillbox_used: not enough space. This can be resolved either by changing the container or contents to ensure that they fit, or by specifying an overflow behaviour via "on_overflow" on the item group.
item antifungal could not be put in container pillbox when spawning item group pillbox_used: not enough space. This can be resolved either by changing the container or contents to ensure that they fit, or by specifying an overflow behaviour via "on_overflow" on the item group.

possibly broken by #72261. Ping: @tmqCypher

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 26, 2024
@dseguin dseguin merged commit 98b5858 into CleverRaven:master Mar 26, 2024
66 of 95 checks passed
@hexagonrecursion hexagonrecursion deleted the patch-2 branch March 27, 2024 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Experimental] some "Rural Roads" replaced with "% nether-chewed field"
4 participants