basecamps: Basecamps anywhere #34184
Merged
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
mlangsdorf
force-pushed
the
basecamps_anywhere
branch
from
8604e0c to
d6fa5ed
Compare
mlangsdorf
added
<Enhancement / Feature>
mlangsdorf
force-pushed
the
basecamps_anywhere
branch
from
d6fa5ed to
98be384
Compare
BevapDin
reviewed
Sep 22, 2019
src/recipe_groups.cpp
Outdated
| base_om_ter_id = om_terrain_id.substr( 0, om_ter_len - 6 ); | ||
| } | ||
| } | ||
| if( om_ter_len > 6 ) { |
There was a problem hiding this comment.
It's nice of you to split this check for length 7 and length 6 here, but why did you not keep this up in the checks below? (The below won't catch a terrain named "tt_east" is has not more than 7 characters).
As I've often seen this kind of code around the mapgen code, it should really be put into a separate function, instead of repeating it (partially wrong) over and over again.
There was a problem hiding this comment.
Functions added, thanks for the suggestion.
There was a problem hiding this comment.
Also, please don't add sarcastic comments in another commit instead of fixing a problem; you just caused an unnecessary merge conflict.
mlangsdorf
force-pushed
the
basecamps_anywhere
branch
from
c80f9e5 to
28caa18
Compare
Add the special return string "FACTION_CAMP_START" to the at_om_location condition, which returns true if the player or NPC is standing on an overmap tile where a basecamp can be built.
Strip any suffix off of an overmap terrain id before attempting to find it in the list of terrains that are valid for a recipe.
Remove the confusing and unnecessary check for swamps, and convert the check for nearby fields to be a warning, instead of a failure, so that players can build camps in cities if that's something they want to do.
Adjust the faction camp start dialogue to appear if the NPC, not the player, is standing at a valid location and allow the valid locations to be places other than fields. Update the tutorial text to reflect this change.
The modular field camp does everything that the primitive field camp does, but is a better design. Remove the "Old Camp" from the list of available camps. Existing camps will not be affected, but people will not be able to start new camps using the Old Camp mapgen.
Add some functions to parse oter_id and return the base string without any directional suffixes, or the rotation int for the the suffix, or the directional suffix itself. Use these functions to make some code in recipe_groups, conditions, and mapgen a little more correct.
mlangsdorf
force-pushed
the
basecamps_anywhere
branch
from
28caa18 to
a778635
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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: Features "basecamps: Basecamps anywhere"Purpose of change
Add support for #34181 and allow faction camps to be built in any z-level location that has a recipe group, not just fields.
Describe the solution
Adjust recipe_groups to match terrains by the root terrain id, not including any directional suffix.
Add a new keyword to the at_om_location dialogue condition, FACTION_CAMP_START, which returns true if there is a faction camp recipe group that matches the om terrain id.
Adjust start_camp() to not fail if there are less than 4 fields adjacent to the camp. Also, remove the warning if there aren't any swamps nearby because that warning was irrelevant and confusing.
Adjust the faction camp start response to check the NPC position and FACTION_CAMP_START instead of the player position and if the player was in a field.
Remove the Old Camp from the list of options; no one should be starting those anymore.
Additional context
Tested by applying #34181 and confirming that I could start a camp in a fire station. I also confirmed that I still couldn't start a camp in a ranch camp field (which is ranch_camp_#, not field) and could still start a camp in an actual field.
Merging this is a prerequesite for testing and merging #34181