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

Big Food PR PT1 #29

Merged
merged 25 commits into from
Feb 14, 2023
Merged

Big Food PR PT1 #29

merged 25 commits into from
Feb 14, 2023

Conversation

Peptide90
Copy link
Collaborator

@Peptide90 Peptide90 commented Aug 5, 2022

About the PR

Opening this PR so people can keep track of progress and see that work is going on in the background.

This PR has the following content:

  • Add a variety of pre-war foods from all fallout games. Including pristine and irradiated variants.
  • Add a variety of meats which will be obtained by butchering animals in the wastes.
  • Add unique reagents for irradiated animals such as irradiated animal proteins (cooked and raw) and generic radioactive particles (this means eating most foods in the wastes will deal some radiation damage when you metabolise it, if precautions aren't taken).

TODO BEFORE MERGE

  • Add flavor profiles to all food and drink added in this PR.
  • Add seeds for all produce.
  • Add trash variants for all snacks and food that need it.

In a future PR we can look at:

  • Crafting (construction graph) based cooking.
  • More sources of anti-rad products like charcoal.
  • Crafting medications (crushing plants and elements into reagents and mixing etc mortar and pestle style).
  • Relevant vendors for both vault and wasteland botany.
  • Adding the mobs to be butchered into said meat and crafting components like hides.

Cut Content

  • Add fallout based botany such as irradiated variants of regular foods and fallout foods / plants (tato, broc flower, xander root, mutfruit etc). This includes both the produce and the seed packs and botany pathways.
    Some food produce was added, going to do all botany related stuff in a separate PR including some crafting recipes for drugs.

  • Add a variety of pre-war foods from all fallout games. Including pristine and irradiated variants.
    Skimped on the dirty and irradiated versions for now since we're targeting vault only release.

Screenshots

@github-actions github-actions bot added No C# For easier issues relating to YAML Status: Needs Review labels Aug 5, 2022
@Peptide90 Peptide90 marked this pull request as draft August 5, 2022 22:51
@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

RSI Diff Bot; head commit 0bdda48 merging into e7853f7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nuclear14/Objects/Consumable/Food/pre-war.rsi

State Old New Status
sugarbombs-chocolate Removed
sugarbombs-cinnamon Removed
ant_brain Added
ant_egg Added
ant_meat Added
antegg_omelette Added
baked_ant_brain Added
baked_bloatfly Added
baked_nightstalker_tail Added
blamco Added
blamco_large Added
blamco_large_trash Added
blamco_trash Added
bloatfly_meat Added
borscht Added
borscht_open Added
brahmin_dog Added
brahmin_liver Added
brahmin_potpie Added
brahmin_tonge Added
broiled_deathclaw Added
bubblegum Added
bubblegum_large Added
bubblegum_large_trash Added
bubblegum_trash Added
c_ration_1 Added
c_ration_1_open Added
c_ration_2 Added
c_ration_2_open Added
c_ration_3 Added
c_ration_3_open Added
c_ration_cracker Added
caravanlunch Added
charred_brahmin_liver Added
chitlins_con_carne Added
cooked_ant_meat Added
cooked_fireant_meat Added
cram Added
cram_large Added
cram_trash Added
crisps Added
crisps_trash Added
dandyapples Added
dandyapples_trash Added
deathclaw_egg Added
deathclaw_egg_omelette Added
deathclaw_omelette Added
deathclaw_wellington Added
dogfood Added
dogfood_open Added
fancylads Added
fancylads_trash Added
fire_ant_fricassee Added
fireant_meat Added
fried_brahmin_skin Added
fried_molerat_lung Added
galette Added
gecko_kebab Added
gecko_pie Added
ghoul_steak Added
instamash Added
instamash_trash Added
k_ration_can Added
k_ration_can_open Added
k_ration_cracker Added
mechanist Added
mirelurk_cake Added
mirelurk_meat Added
mirelurk_roast Added
mirelurk_stew Added
molerat_manicotti Added
molerat_stew Added
moth_steak Added
mre Added
packet-inhand-left Added
packet-inhand-right Added
porknbeans Added
porknbeans_open Added
radscorpion_casserole Added
radscorpion_encroute Added
radscorpion_meat Added
rottenfood Added
scorpsting Added
specialapples Added
squirrel_bits Added
squirrel_soup Added
squirrel_steak Added
squirrel_stick Added
steak Added
steak_trash Added
sugarbombs Added
sugarbombs_trash Added
tato_surprise Added
trail_mix Added
wasteland_wellington Added
wondermeat Added
yucca_syrup Added
yumyum Added
yumyum_trash Added

Edit: diff updated after 0bdda48

@Peptide90
Copy link
Collaborator Author

Peptide90 commented Dec 25, 2022

Note for myself. Added more check boxes to the original post that need completing before merge.

Need to add two more produce items (pear and jalapeño) and need sprites for pear, jalapeño, cabbage at minimum, maybe maize too?

Also possibly for irradiated food gourds and watermelon, check if they actually carry rads.

Then add flavor profiles to all foods, juices and slices of food for any produce that need it.

So this PR does drag on too long possibly leave resprited and all the additional pre-war foods for a PT 2.

Edit: maybe upstream the basic produce, also look at tau ceti etc for pumpkin, lemon, ice pepper, chanterelle mushrooms.

@Peptide90
Copy link
Collaborator Author

Note to self, left a lot of TODO s for sprites for things like seeds and trash items (the pre war food sprites in general are trash and should all be replaced).

@Peptide90
Copy link
Collaborator Author

Peptide90 commented Feb 13, 2023

Note to self, added lonestar sprites and changed all the old sprites to be the trash variants. All these sprites are now in one big pre-war.rsi folder despite there being meat and stuff in there too...

Going to do a cardinal sin with this PR too and add all these assets that aren't currently used and come back to them in a later PR since too much needs done to actually get them working (cooking etc) and it's better to just have them.

@Peptide90 Peptide90 marked this pull request as ready for review February 13, 2023 23:48
@Peptide90 Peptide90 merged commit e3c6d6c into Vault-Overseers:master Feb 14, 2023
@Peptide90 Peptide90 deleted the food branch February 14, 2023 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant