-
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
Fix missing mapgen keys #37839
Merged
Rivet-the-Zombie
merged 13 commits into
CleverRaven:master
from
jbytheway:mapgen_fix_missing_keys
Feb 16, 2020
Merged
Fix missing mapgen keys #37839
Rivet-the-Zombie
merged 13 commits into
CleverRaven:master
from
jbytheway:mapgen_fix_missing_keys
Feb 16, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZhilkinSerg
added
<Bugfix>
This is a fix for a bug (or closes open issue)
[JSON]
Changes (can be) made in JSON
Map / Mapgen
Overmap, Mapgen, Map extras, Map display
labels
Feb 8, 2020
all your corrections for me look good, thanks so much! |
This was referenced Feb 9, 2020
jbytheway
force-pushed
the
mapgen_fix_missing_keys
branch
from
February 9, 2020 11:36
eca5354
to
dec0932
Compare
I-am-Erk
approved these changes
Feb 9, 2020
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.
Good on my end, I also checked the unknown maps
This was referenced Feb 16, 2020
fengjixuchui
added a commit
to fengjixuchui/Cataclysm-DDA
that referenced
this pull request
Feb 16, 2020
Merge pull request CleverRaven#37839 from jbytheway/mapgen_fix_missin…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
<Bugfix>
This is a fix for a bug (or closes open issue)
[JSON]
Changes (can be) made in JSON
Map / Mapgen
Overmap, Mapgen, Map extras, Map display
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Fix assorted minor mapgen errors"
Purpose of change
There was a lot of mapgen which used characters in the
"rows"
layout with no definition in the"terrain"
,"furniture"
, etc. I have a branch which makes such undefined characters an error, but before I can PR that I need to fix all the existing errors of that sort.This PR is the first step: fixing all the examples in the core mapgen (i.e. non-mods).
Describe the solution
For each undefined character, try to figure out how to fix it. Fixes roughly fall into a few categories:
.
orfill_ter
and which will not cause an error if undefined.fill_ter
.Describe alternatives you've considered
All of these changes are somewhat subjective judgement calls. In some cases I was able to contact the original author for clarification, but in many cases I have just made my best guess. There are certainly other alternatives.
Testing
For a couple of the maps where I was less certain about the changes I spawned them in-game, but the vast majority of these changes are untested.
Additional context
I split the changes into commits based on who I believe to be the original author / maintainer of the changed maps. Hopefully this will allow them to review more easily (Edit: I've rebased, so these commit ids are no longer the ones on this branch, but hopefully they should still exist and be essentially correct):
3372695 @Night-Pryanik
48fbdd2 @nexusmrsep
48ada88 @mlangsdorf
366db53 @LovamKicsiGazsii
b39f862 @John-Candlebury
dcf4d47 @I-am-Erk
07f7a18 @curstwist
7a9d097 @CountAlex
582bdd8 @chaisawlajatang
391f476 uncertain/mixed ownership