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

Mainline/jsonify megastore #34625

Merged
merged 3 commits into from
Oct 18, 2019

Conversation

chaisawlajatang
Copy link
Contributor

Summary

SUMMARY: Content "Mainline jsonified megastore from the Mapgen Demo mod"

Purpose of change

The old megastore is boring and obsolete.

Describe the solution

But the Mapgen Demo offers a really nice solution.

Describe alternatives you've considered

Leave everything as is.

Additional context

I tweaked the building a bit and squeezed it into one file. Removed the old megastore from the hardcode completely.

@Night-Pryanik
Copy link
Contributor

I'd prefer having both variants in game.

Copy link
Member

@anothersimulacrum anothersimulacrum left a comment

Choose a reason for hiding this comment

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

I'd suggest you use https://github.com/CleverRaven/Cataclysm-DDA/blob/master/tools/merge_maps.py
On this map, there's no need for each OMT to be defined individually.

@chaisawlajatang
Copy link
Contributor Author

chaisawlajatang commented Oct 10, 2019

I'd prefer having both variants in game.

An old one looks like an empty hangar with rows of metal shelves.

I'd suggest you use

I doubt it will help. @SunshineDistillery (author of the mod) made the building (and FEMA camp, and missile silo) in a strange (for me) way and introduced lots of 24x24 variations of each overmap tile and rotated them as needed.

@chaisawlajatang
Copy link
Contributor Author

Hmmm, that's strange, it says megastore.json has to be linted, but I already linted it via http://dev.narc.ro/cataclysm/format.html

@anothersimulacrum
Copy link
Member

https://github.com/CleverRaven/Cataclysm-DDA/pull/34625/checks?check_run_id=255493810#step:4:13

@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods Issues related to mods or modding labels Oct 10, 2019
@ZhilkinSerg
Copy link
Contributor

I'd prefer having both variants in game.

I agree, but in json form instead of hardcode C++ mapgen functrion.

@chaisawlajatang
Copy link
Contributor Author

I agree, but in json form instead of hardcode C++ mapgen functrion.

It would be heavily modified anyway, because new building has 2 stories+roof and parking lots. And just compare them, I believe megastore made by @SunshineDistillery is much better.

Before
mega1
After
mega2

@kevingranade kevingranade merged commit ee848d1 into CleverRaven:master Oct 18, 2019
@JonnieCache
Copy link

JonnieCache commented Oct 18, 2019

this breaks my savegame with a crash in a deserialize function in savegame.cpp (iirc, ive rolled back now), is this expected behaviour?

I guess its because the old megastore definition is removed?

Sorry if this is intended, I looked to see if the project has a policy about breaking savegames or not but I couldnt see one

@ZhilkinSerg
Copy link
Contributor

this breaks my savegame with a crash in a deserialize function in savegame.cpp (iirc, ive rolled back now), is this expected behaviour?

Provide a savegame.

@JonnieCache
Copy link

Abell.zip

running windows 7, x64 build

bring up the map, go up the the surface Z level and then pan westwards until the large city is in view, this triggers the crash for me

@ZhilkinSerg
Copy link
Contributor

Savegame migration code is missing - it needs to be something like in #33339.

I've started it in 5995ba3, but it is not migrating all tiles properly (some numbers need to be updated in savegame.cpp).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants