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

Cannibalism and demihumans #38313

Merged

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Feb 25, 2020

Summary

SUMMARY: Content "Demihuman Meat type"

Purpose of change

Heavily mutated humanoid meat already exists that is both cannibalism and toxic. There is not currently not human intelligent creature meats that are non-toxic. Korg and I spoke and decided that both Aftershock and Magiclysm needs this.

Describe the solution

Adds Demihuman meats and links them in to standard recipes that use human flesh.

Describe alternatives you've considered

creating duplicate entries for both Magiclysm and Aftershock

Testing

Spawned in all items and cooked the appropriate items with them.

Additional context

@Amoebka
Copy link
Contributor

Amoebka commented Feb 25, 2020

Could probably be used in mainline for human snails and such.

@l29ah
Copy link
Contributor

l29ah commented Feb 26, 2020

Is it going to have any gameplay difference from a human meat proper?

@ZhilkinSerg ZhilkinSerg added 0.E Content Freeze [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks labels Feb 26, 2020
@Maleclypse
Copy link
Member Author

Is it going to have any gameplay difference from a human meat proper?

I'm still working it out in my notes and checking to see if it's feasible but basically right now my goal will be to have a starting trait of something like "Pure Blood Fanatic" that is able to eat demihuman meat without cannibalism problems but not regular human meat and is basically incapable of persuading/interacting in a healthy fashion with mutant NPCs and gets stacking morale penalties if they develop mutations. So end goal state would be a cannibalism lite character that can only go transhuman via bionics or they can't see the point of living anymore.

@Maleclypse Maleclypse changed the title Cannibalism and demihumans WIP Cannibalism and demihumans Mar 1, 2020
@Maleclypse
Copy link
Member Author

Need to add demihuman harvests.

@Maleclypse
Copy link
Member Author

@KorGgenT I'm guessing I probably need to rebase this branch to resolve the conflicts?

@KorGgenT
Copy link
Member

that's a pretty good guess. if you need help with it tomorrow let me know.

@Maleclypse
Copy link
Member Author

that's a pretty good guess. if you need help with it tomorrow let me know.

Ok yes. I have definitely jacked this up somehow. :(

@Maleclypse Maleclypse force-pushed the Cannibalism-and-Demihumans branch from f6983dc to cec53f7 Compare March 30, 2020 19:03
@Maleclypse
Copy link
Member Author

Note to self need to find where flag strings have moved to and recreate the Strict_Humanitarian ones.

@Maleclypse
Copy link
Member Author

Maleclypse commented Apr 19, 2020

@ifreund this could be wishful thinking (or poor memory) on my part but I believe I had this working pre 0.E and then there was a refactor that deleted a whole page that had most of my changes, so I rebased thinking I'd be able to mimic the changes I'd made across to where they now belonged but I can't seem to figure it out post refactor. If you have time to spare looking at this I would appreciate any help you can give. I've got some later PR's that are reliant on parts of this to finish.

Copy link
Contributor

@ifreund ifreund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, sorry you lost some of your work, it's likely still floating around in your local reflog somewhere and you should be able to retrieve it.

Not entirely sure what your intended changes were, but i've added a couple of comments on the current state of the PR.

src/activity_handlers.cpp Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
@Maleclypse Maleclypse changed the title WIP Cannibalism and demihumans Cannibalism and demihumans Apr 29, 2020
@kevingranade kevingranade merged commit 8b4a4e2 into CleverRaven:master May 4, 2020
@Maleclypse Maleclypse deleted the Cannibalism-and-Demihumans branch August 1, 2022 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants