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

Port over migration and tool use of centrifuges #1383

Merged
merged 2 commits into from
Mar 22, 2022

Conversation

chaosvolt
Copy link
Member

Summary

SUMMARY: Infrastructure "Port over updates to centrifuge terrain, port over ability to use centrifuge as a tool"

Purpose of change

Follow-up to #1374, since what was needed to get centrifuges as tools basically required a bit more work than initially intended.

Describe the solution

  1. Partially port over DDA conversion of utility terrain into furniture, specifically only centrifuges. This is because turns out terrain can't handle crafting_pseudo_item, and this would be easier.
  2. Obsoleted terrain version of centrifuge. json/obsoletion/terrains.json is evidently for overmap terrain, not terrain-type terrrain, so put it in uncategorized.json instead.
  3. Updated looks-like of microcentifuge.
  4. Replaced centifuge terrain with furntiure in lab basement, lab floorplans,
  5. Updated FEMA camp, hosptial, and lab mapgen palettes accordingly.
  6. Updated centrifuge spawns in mods. Lel, I actually can't find any sign that anyone ever bothered to do that in DDA. Good example can be seen in Dinomod: https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/mods/DinoMod/mapgen/DinoLabFinale.json#L41 and a modern Aftershock example: https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/mods/Aftershock/maps/mapgen/millyficent_lab.json#L245
  7. Ported over fix to computer_session.cpp that correctly looks for centrifuge furniture in the blood analysis mission.
  8. Re-added change to centrifuge furniture description from the previous PR's first commit.
  9. Ported over use of crafting_pseudo_item for centrifuge.
  10. Ported over tool entry for fake centrifuge, with same qualities as microcentrifuge now has.

Describe alternatives you've considered

Hacking together support for terrain being able to use crafting_pseudo_item, was reluctant to explore it just yet.

Testing

  1. Checked affected files for syntax and lint errors.
  2. Compiled and load tested.
  3. Zooped over to a hospital to confirm that centrifuge still works.

Additional context

Sources:

  1. Migration of centrifuge from terrain to furniture, by I-am-Erk: (done) Migrate some terrains that should be furnitures into furniture CleverRaven/Cataclysm-DDA#41731
  2. Fixing what the above PR broke, by johnstoecker: Fix analyze zombie blood quest at centrifuge CleverRaven/Cataclysm-DDA#43361
  3. Making centrifuges useful for separation, by zachary-kaelan: Allow use of lab centrifuge for mutagen crafting CleverRaven/Cataclysm-DDA#34344

Mapdata.cpp and mapdata.h still have references to t_centrifuge in DDA, should we remove them in BN or are they still important for something?

Sources:
1. Migration of centrifuge from terrain to furniture, by I-am-Erk: CleverRaven/Cataclysm-DDA#41731
2. Fixing what the above PR broke, by johnstoecker: CleverRaven/Cataclysm-DDA#43361
3. Making centrifuges useful for separation, by zachary-kaelan: CleverRaven/Cataclysm-DDA#34344
@Coolthulhu Coolthulhu self-assigned this Mar 18, 2022
@Coolthulhu Coolthulhu merged commit 47100bf into cataclysmbnteam:upload Mar 22, 2022
@chaosvolt chaosvolt deleted the centrifugation-part-2 branch March 22, 2022 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants