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

Crafting & Cooking PR 1 #138

Closed
wants to merge 24 commits into from
Closed

Crafting & Cooking PR 1 #138

wants to merge 24 commits into from

Conversation

Peptide90
Copy link
Collaborator

@Peptide90 Peptide90 commented Nov 22, 2023

About the PR

Large content PR adding a bunch of new crafting and cooking recipes to the game.

Opening this PR early to formulate my thoughts and ideas and track my progress.

Done so far:

  • Added radscorpion and barkscorpion as hostile mobs (also added to the wave gamemode as later enemies.
  • Added radscorpion tail asset to be used for cooking and crafting.
  • Added lots of new meat textures to be used for butchering and cooking.

Todo:
Insects

  • Bloatfly & cazador acid sac butcher drop?
  • giant ant meat sprite + entity (+entity cooked +add entity to butcher component)
  • giant fire ant meat sprite + entity (+entity cooked +add entity to butcher component)
  • giant fire ant nectar + tea?
  • Radroach fillet entity + cooked + assigned to butcher component.
  • radscorpion meat entities + cooked + assigned to butcher component.
  • radscorpion tail entity + crafting recipe for antidote. (mix 1 part ethanol to 1 part scorpion tail)
  • Repeat for bark scorpion.
  • cazador fillet.
  • Cooking graphs for all of the above.
  • Add new sprites for bloatfly & cazador acid sacs, fire ant nectar and jars of liquid (fire ant nectar tea). More fallout like jar + one with label.

Animals

  • Molerat fillet / drumstick sprite + entities.
  • dog meat sprite + entities.
  • gecko meat entities assigned to gecko butcherable.
  • nightstalker meat sprite? + entities.
  • nightstalker head sprite + entity + crafting for helmet
  • yao guai meat sprite assigned and entities
  • deathclaw meat sprite assigned and entities
  • deathclaw hand sprite and entity
  • deathclaw head sprite and entity + crafting for helmet
  • Ghoul and human meat sprites + entities.
  • Molerat and other small animal skewers.
  • Brahmin hide entity, stack and a use.
  • Bighorner pelt entity, stack and a use.
  • Generic hide entity (radstag etc), stack and a use.
  • Gecko hide entity, stack and a use.

Misc

  • Added Nettles + Nettle extract (Add using nettle extract as enzyme).
  • Jams (Agave, Blackberry, Jalapeno, Mutfruit, Prickly Pear, Starlight, Tarberry). Reagents and Entities (mason jar).
  • Teas (Agave, barrel cactus, blackberry, broc, datura, mesquite, mutfruit, Prickly Pear, Starlight, Tarberry, white horsenettle, xander, yucca).
  • Add different effects to the teas (whitehorsenettle and datura are toxic, rest are generally thirst quenchers or mild healing in different categories?).
  • Add Tea entities.
  • Brahmin Cheese & Bighorner Cheese sprites + entities.
  • Add milk bottles for various milks.
  • roasted razorgrain coffee
  • razorgrain biscuits
  • Dried fruits
  • Add reactions purifying and filtering water. Irradiated Water + Abraxo = Dirty Water. Dirty Water + Charcoal = Filtered Water. Filtered Water + Boiling = Water.
  • Added shoveling as a tool quality.
  • Added sacks as a storage item. Also added compost sacks and crafting for soil from it for farming. Added fertiliser sacks for EZ nutrient. Added construction graph for creating planters too.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

@github-actions github-actions bot added Changes: Sprites No C# For easier issues relating to YAML labels Nov 22, 2023
Copy link
Contributor

github-actions bot commented Nov 22, 2023

RSI Diff Bot; head commit 97d9a3e merging into 6d8fc12
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nuclear14/Mobs/Insects/radscorpion.rsi

State Old New Status
dead Added
radscorpion Added

Resources/Textures/Nuclear14/Mobs/Insects/radscorpionbark.rsi

State Old New Status
dead Added
radscorpion Added

Resources/Textures/Nuclear14/Objects/Consumable/Food/meat.rsi

State Old New Status
barkscorpiontail Added
barkscorpiontail_roasted Added
fatty Added
fatty_roasted Added
glowroach Added
glowroach_roasted Added
goldengecko Added
goldengecko_roasted Added
icegecko Added
icegecko_roasted Added
meat Added
meat_roasted Added
meatcube Added
meatcube_roasted Added
mirelurk Added
mirelurk_roasted Added
morsels Added
morsels_roasted Added
porkchop Added
porkchop_roasted Added
radlurk Added
radlurk_roasted Added
radroach Added
radroach_roasted Added
ribs Added
scorpiontail Added
scorpiontail_roasted Added
silvergecko Added
silvergecko_roasted Added

Resources/Textures/Nuclear14/Objects/Misc/crafting_material.rsi

State Old New Status
radscorpiontail Added

Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi

State Old New Status
bone Added
bone_2 Added
bone_3 Added
bone_claw Added
chitin Added
chitin_2 Added
chitin_3 Added
egg Added
egg_deathclaw Added
egg_mirelurk Added
egg_nightstalker Added
hide_brahmin Added
hide_brahmin_2 Added
hide_deathclaw Added
hide_dog Added
hide_gecko Added
hide_generic Added
pelt_bighorner Added
pelt_nightstalker Added
sinew Added
sinewcuff Added
skin_human Added
skin_human_2 Added
skin_human_3 Added

Resources/Textures/Nuclear14/Objects/Specific/Hydroponics/equipment.rsi

State Old New Status
barrel Added
barrel_open Added
daesack Added
daesack2 Added
daesack3 Added
daesack4 Added
daesack5 Added

Resources/Textures/Nuclear14/Structures/Hydroponics/planterbox.rsi

State Old New Status
empty Added

Edit: diff updated after 97d9a3e

@Peptide90 Peptide90 marked this pull request as ready for review December 6, 2023 12:46
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

tea localisation
Adds health effects to teas
adds tea mug entities
Adds new milk entities
fire ant nectar, bloatfly and cazador acid.
nectar and acid sacs
adds new animal parts to butchering
fire ant nectar, tea, bloatfly, cazador acids.
This was referenced Jan 10, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Merge Conflict No C# For easier issues relating to YAML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant