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

Camp upgrade vehicle fixes #36100

Merged
merged 5 commits into from Dec 17, 2019
Merged

Camp upgrade vehicle fixes #36100

merged 5 commits into from Dec 17, 2019

Conversation

ghost
Copy link

@ghost ghost commented Dec 14, 2019

Summary

SUMMARY: Bugfixes "Camp upgrade vehicle fixes"

Purpose of change

Fixes #30691

Describe the solution

Add proper vehicle collision checks to update_mapgen for other jmapgen types.

Describe alternatives you've considered

In the linked issue, there is a comment stating that starting a faction camp on a vehicle makes the vehicle dissappear.

I noticed this too, it reappears after a while, but contsant unboarding vehicle debugmsgs appear, Ill try and fix this in a separate PR

Testing

Sent NPC at camp on mission to build tents, put vehicle over where the tents would appear, NPC could not be recalled ( with a popup info msg about there being a vehicle in the way )

Additional context

Thanks to ralreegorganon for assisting me through this, infact lets be honest, he wrote this commit mostly, told me to "clean it up" , seeing as I couldnt actually see anything wrong with it, I may not be the best person to judge what needs cleaning, but here it is.

@curstwist curstwist added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` NPC / Factions NPCs, AI, Speech, Factions, Ownership Player Faction Base / Camp All about the player faction base/camp/site labels Dec 14, 2019
davidpwbrown and others added 3 commits December 16, 2019 19:53
Co-Authored-By: Kevin Granade <[email protected]>
Co-Authored-By: Kevin Granade <[email protected]>
Co-Authored-By: Kevin Granade <[email protected]>
@Rivet-the-Zombie Rivet-the-Zombie merged commit befe6dd into CleverRaven:master Dec 17, 2019
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request Dec 17, 2019
Merge pull request CleverRaven#36100 from davidpwbrown/camp_upgrade_v…
@ghost ghost deleted the camp_upgrade_vehicle_fixes branch December 19, 2019 14:15
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) [C++] Changes (can be) made in C++. Previously named `Code` NPC / Factions NPCs, AI, Speech, Factions, Ownership Player Faction Base / Camp All about the player faction base/camp/site
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrading faction camp puts buildings into vehicles
3 participants