Repository navigation
feat: grill octopus, cut jellyfish into strips for salads, ladle Seafood Chowder and Seafood Stew - #120
Merged
Conversation
Octopus grilled in the frying pan now becomes Grilled Octopus (a pan cooking-option output, like grilled mushrooms); boiled in the pot it stays octopus. Jellyfish cubes cut on the cutting board become Jellyfish Strips, keeping their cooking, age and food. Both go into salads as a new seafood ingredient, where any jellyfish is just "Jellyfish". The pot can now name a soup by its kind: pot.yml ingredients and kinds, written like salads.yml's, give the soup its kind as origin, and a types.yml soup override names it. Boiled seafood mashed with a potato is a Seafood Chowder; with other vegetables or another seafood it is a Seafood Stew. Soups of one seafood alone, or with meat, keep their old names. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…l kinds Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
# Conflicts: # src/main/resources/pot.yml
# Conflicts: # src/main/resources/crafting-stations.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Gives octopus and jellyfish (
seafood_octopus,seafood_jellyfish) real uses. Config and assets only, no Java.What was already there
tfmc_octopus(10-80 cm) and the blue and pink jellyfish (1-40 cm) are in CustomFishing'stfmc_warm_oceangroup. Any rod can catch them in ocean, lukewarm/warm ocean and river/beach biomes, sharing that group's weight with the other warm-water fish.custom-fishing.ymlgives them cutsoctopusandjellyfish, so the cutting board'scut_seafoodturns a whole catch into oneseafood_octopusorseafood_jellyfishpiece, the same way it makes a fish filet.cooked) and pot (boiled) options, models for every state, and they mash into a generic "Octopus Soup". That's all they had: they weren't salad, sandwich or pie ingredients, and nothing named a seafood soup.pan_slotwhitelist has lost the three seafood lines that Main still has, so filets, octopus and jellyfish can't go in the pan on Dev at all. The Dev script adds them back.Changes
seafood_octopusgets a frying-panoutput: seafood(type=grilled_octopus), the same pattern as grilled mushrooms. When it's done it becomes Grilled Octopus, keeping its stars, age, lineage and origin, and it burns as grilled octopus if left on. Boiled in the pot, it stays octopus. Newgrilled_octopustype and model: its own grilled look, and the octopus burnt and rotten looks for those states.slice_jellyfish(inherit,share-food): jellyfish cubes are cut where they lie intojellyfish_strips. The strips stay raw, fried or boiled, as the cubes were, and keep the cubes' age and food. Models exist for every state.salads.ymlgets aseafoodingredient that takes grilled octopus and jellyfish strips. Any jellyfish counts as just "Jellyfish" in the name: "Octopus, Jellyfish and Tomato Salad". Raw strips keep their raw penalty, like raw cut vegetables, so boil the cubes first (blanched, as in a real jellyfish salad).pot.ymlkindsadded by feat: grind sugar cane into sugar, ladle beetroot soup as Borscht, convert sweet berries #119 (Borscht):grilled_octopusis the existing octopus tentacle geometry with a new texture made fromoctopus_cooked.png: seared skin, grill bars across the tentacle, golden suckers.jellyfish_strips_<state>is a pile of thin strips on the cubes' own textures. Both are generated bytf-minecraft/scratch/new-foods/octopus-jellyfish/bin/gen.py, which also makes Dev's salad-bowl heaps (rounds of tentacle, strips of jellyfish) with the salad-models generator's code. Offline preview:bin/preview.js.Contract
types.ymlmodels.ymlblockscrafting-stations.ymlsalads.ymlpot.ymlboard_slotandboard_slot_mirroredneedc.seafood(type=seafood_jellyfish)salad_bowl_grilled_octopus_*,salad_bowl_jellyfish_strips_*) are Dev-only, like the other salad bowl items. Without them, an ingredient shows as it looks in hand.Tests
mvn -o -B clean verify: 1455 tests, JaCoCo 100% line coverage met. New tests:SeafoodSoupCoverageTest)SeafoodSaladTest)OctopusJellyfishAssetsTest)🤖 Generated with Claude Code