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

Add field_remove and clear back bay and garage #56984

Merged
merged 4 commits into from
Apr 22, 2022

Conversation

haveric
Copy link
Contributor

@haveric haveric commented Apr 21, 2022

Summary

Infrastructure "Add field_remove and clear back bay and garage"

Purpose of change

Clean the back bay after Boris's cleanup quest.

Describe the solution

  • Added field_remove similar to item_remove that removes all fields (blood, acid, etc.)
  • Clears the back bay/garage after Boris's quest.
    • Removes all fields (blood, acid)
    • Removes all items
    • Clears most furniture (crates, lockers) from garage. Leaves vending machine, trash can, and shelves alone.
    • Clears beds from back bay. Moves lockers along the wall

Describe alternatives you've considered

Make field_remove work more like trap_remove where you have to define an id.

Testing

Load game right before finishing Boris's quest.

Additional context

Before:
image

After:
image
image

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON [Markdown] Markdown issues and PRs NPC / Factions NPCs, AI, Speech, Factions, Ownership Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style labels Apr 21, 2022
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Apr 21, 2022
@Night-Pryanik
Copy link
Contributor

We already have a way to remove fields: #53605.

@haveric
Copy link
Contributor Author

haveric commented Apr 21, 2022

We already have a way to remove fields: #53605.

In my testing, that method only removed random fields, but did not allow to remove all of them, which is why I added this version.

@Ilysen
Copy link
Contributor

Ilysen commented Apr 21, 2022

Quick side note: "back bay" is actually kind of a misnomer. The place with concrete floors with the teamster and the guard is the garage; the back bay is the room with beds and lockers that actually has all the zombies in it. You could probably run the same (or a similar) mapgen on that tile too!

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 21, 2022
@haveric haveric marked this pull request as draft April 21, 2022 20:38
@haveric haveric marked this pull request as draft April 21, 2022 20:38
@haveric
Copy link
Contributor Author

haveric commented Apr 21, 2022

Quick side note: "back bay" is actually kind of a misnomer. The place with concrete floors with the teamster and the guard is the garage; the back bay is the room with beds and lockers that actually has all the zombies in it. You could probably run the same (or a similar) mapgen on that tile too!

That's a fair point. I figured it would need to be expanded, but I focused on the initial garage area where the combat is likely to happen. It's fairly easy to expand this to another overmap though. Erk's planning on expanding this out to happen over time, so I'll work with him to see what needs to be expanded here.

@haveric haveric marked this pull request as ready for review April 21, 2022 21:46
@haveric haveric changed the title Add field_remove and clear back bay Add field_remove and clear back bay and garage Apr 21, 2022
@I-am-Erk
Copy link
Member

We'll want to look into whether or not we need to clean up the map on the other side of the "back bay" as well, but this is good for the moment. Thanks!!

@I-am-Erk I-am-Erk merged commit 5c9be55 into CleverRaven:master Apr 22, 2022
@haveric haveric deleted the boris-cleanup branch April 23, 2022 19:20
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 [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants