From 4cb93fc965f726818a5e762268cabcd7260921d1 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:39:47 +0300 Subject: [PATCH] Food update (#412) * meat refactor * document and remove verb * cooking table * cutlets * dough and cheese update * flat dough * size edit, egg added * Update test-ship.yml * meat and cheese randomsprite --- .../_CP14/Workbench/CP14WorkbenchComponent.cs | 12 ++ .../_CP14/Workbench/CP14WorkbenchSystem.cs | 86 +++++-------- .../CP14WorkbenchRecipePrototype.cs | 6 + Resources/Maps/_CP14/Shuttles/test-ship.yml | 4 +- .../Objects/Consumable/Food/cheese.yml | 78 ++++++++++++ .../Objects/Consumable/Food/dough.yml | 64 ++++++++++ .../Entities/Objects/Consumable/Food/egg.yml | 100 +++++++++++++++ .../Entities/Objects/Consumable/Food/meat.yml | 117 +++++++++++++++--- .../Structures/Furniture/workbenchs.yml | 54 +++----- .../Construction/Graphs/Food/steak.yml | 16 --- .../_CP14/Recipes/Workbench/cooking_table.yml | 32 +++++ .../Food/cheese.rsi/cheese_part.png | Bin 0 -> 303 bytes .../Food/cheese.rsi/cheese_part2.png | Bin 0 -> 305 bytes .../Food/cheese.rsi/cheese_part3.png | Bin 0 -> 334 bytes .../Food/cheese.rsi/cheese_slice.png | Bin 0 -> 282 bytes .../Food/cheese.rsi/cheese_slice2.png | Bin 0 -> 297 bytes .../Food/cheese.rsi/cheese_slice3.png | Bin 0 -> 279 bytes .../Food/cheese.rsi/cheese_wheel.png | Bin 0 -> 339 bytes .../Consumable/Food/cheese.rsi/meta.json | 32 +++++ .../Food/dough.rsi/bread_cooked.png | Bin 0 -> 446 bytes .../Consumable/Food/dough.rsi/bun_cooked.png | Bin 0 -> 375 bytes .../dough.rsi/bun_cooked_slice_bottom.png | Bin 0 -> 308 bytes .../Food/dough.rsi/bun_cooked_slice_top.png | Bin 0 -> 351 bytes .../Consumable/Food/dough.rsi/dough_large.png | Bin 0 -> 375 bytes .../Food/dough.rsi/dough_medium.png | Bin 0 -> 346 bytes .../Food/dough.rsi/dough_medium_flat.png | Bin 0 -> 341 bytes .../Consumable/Food/dough.rsi/meta.json | 32 +++++ .../Objects/Consumable/Food/egg.rsi/brown.png | Bin 0 -> 288 bytes .../Consumable/Food/egg.rsi/brown_shell.png | Bin 0 -> 303 bytes .../Objects/Consumable/Food/egg.rsi/icon.png | Bin 0 -> 277 bytes .../Objects/Consumable/Food/egg.rsi/meta.json | 23 ++++ .../Consumable/Food/egg.rsi/white_shell.png | Bin 0 -> 299 bytes .../Consumable/Food/meat.rsi/cutlet.png | Bin 0 -> 335 bytes .../Food/meat.rsi/cutlet_cooked.png | Bin 0 -> 341 bytes .../Consumable/Food/meat.rsi/meat_slice.png | Bin 0 -> 243 bytes .../Consumable/Food/meat.rsi/meta.json | 31 ++++- ...epmeat-cooked.png => sheepmeat_cooked.png} | Bin .../Food/meat.rsi/sheepmeat_slice.png | Bin 0 -> 291 bytes .../Food/meat.rsi/sheepmeat_slice2.png | Bin 0 -> 250 bytes .../Food/meat.rsi/sheepmeat_slice2_cooked.png | Bin 0 -> 259 bytes .../Food/meat.rsi/sheepmeat_slice3.png | Bin 0 -> 296 bytes .../Food/meat.rsi/sheepmeat_slice3_cooked.png | Bin 0 -> 313 bytes .../Food/meat.rsi/sheepmeat_slice_cooked.png | Bin 0 -> 305 bytes 43 files changed, 557 insertions(+), 130 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml delete mode 100644 Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Food/steak.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_wheel.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bread_cooked.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bun_cooked.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bun_cooked_slice_bottom.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bun_cooked_slice_top.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_large.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_medium.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_medium_flat.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/brown.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/brown_shell.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/white_shell.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/cutlet.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/cutlet_cooked.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meat_slice.png rename Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/{sheepmeat-cooked.png => sheepmeat_cooked.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice2_cooked.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice3_cooked.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice_cooked.png diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs index 6ff737d640..6c28f177da 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs @@ -4,16 +4,28 @@ using Robust.Shared.Prototypes; namespace Content.Server._CP14.Workbench; +/// +/// This entity can be used to craft other objects through the interface +/// [RegisterComponent] [Access(typeof(CP14WorkbenchSystem))] public sealed partial class CP14WorkbenchComponent : Component { + /// + /// Crafting speed modifier on this workbench. + /// [DataField] public float CraftSpeed = 1f; + /// + /// List of recipes available for crafting on this type of workbench + /// [DataField] public List> Recipes = new(); + /// + /// Played during crafting. Can be overwritten by the crafting sound of a specific recipe. + /// [DataField] public SoundSpecifier CraftSound = new SoundCollectionSpecifier("CP14Hammering"); } diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs index 6990b028bb..fd3d34bfaf 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.DoAfter; using Content.Server.Popups; using Content.Server.Stack; @@ -6,7 +7,6 @@ using Content.Shared._CP14.Workbench.Prototypes; using Content.Shared.DoAfter; using Content.Shared.Stacks; using Content.Shared.UserInterface; -using Content.Shared.Verbs; using Robust.Server.Audio; using Robust.Server.GameObjects; using Robust.Shared.Prototypes; @@ -22,6 +22,9 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!; + [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + private EntityQuery _metaQuery; private EntityQuery _stackQuery; @@ -39,7 +42,6 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem SubscribeLocalEvent(OnBeforeUIOpen); SubscribeLocalEvent(OnCraft); - SubscribeLocalEvent>(OnInteractionVerb); SubscribeLocalEvent(OnCraftFinished); } @@ -48,36 +50,6 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem UpdateUIRecipes(ent); } - private void OnInteractionVerb(Entity ent, ref GetVerbsEvent args) - { - if (!args.CanAccess || !args.CanInteract || args.Hands is null) - return; - - var placedEntities = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, WorkbenchRadius); - - var user = args.User; - foreach (var craftProto in ent.Comp.Recipes) - { - if (!_proto.TryIndex(craftProto, out var craft)) - continue; - - if (!_proto.TryIndex(craft.Result, out var result)) - continue; - - args.Verbs.Add(new() - { - Act = () => - { - StartCraft(ent, user, craft); - }, - Text = result.Name, - Message = GetCraftRecipeMessage(result.Description, craft), - Category = VerbCategory.CP14Craft, - Disabled = !CanCraftRecipe(craft, placedEntities), - }); - } - } - // TODO: Replace Del to QueueDel when it's will be works with events private void OnCraftFinished(Entity ent, ref CP14CraftDoAfterEvent args) { @@ -87,7 +59,7 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem if (!_proto.TryIndex(args.Recipe, out var recipe)) return; - var placedEntities = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, WorkbenchRadius); + var placedEntities = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, WorkbenchRadius, LookupFlags.Uncontained); if (!CanCraftRecipe(recipe, placedEntities)) { @@ -95,14 +67,35 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem return; } + var resultEntity = Spawn(_proto.Index(args.Recipe).Result); + + _solutionContainer.TryGetSolution(resultEntity, recipe.Solution, out var resultSoln, out var resultSolution); + if (recipe.TryMergeSolutions && resultSoln is not null) + { + resultSoln.Value.Comp.Solution.MaxVolume = 0; + _solutionContainer.RemoveAllSolution(resultSoln.Value); //If we combine ingredient solutions, we do not use the default solution prescribed in the entity. + } + foreach (var requiredIngredient in recipe.Entities) { var requiredCount = requiredIngredient.Value; foreach (var placedEntity in placedEntities) { - var placedProto = MetaData(placedEntity).EntityPrototype?.ID; - if (placedProto != null && placedProto == requiredIngredient.Key && requiredCount > 0) + if (!TryComp(placedEntity, out var metaData) || metaData.EntityPrototype is null) + continue; + + var placedProto = metaData.EntityPrototype.ID; + if (placedProto == requiredIngredient.Key && requiredCount > 0) { + // Trying merge solutions + if (recipe.TryMergeSolutions + && resultSoln is not null + && _solutionContainer.TryGetSolution(placedEntity, recipe.Solution, out var ingredientSoln, out var ingredientSolution)) + { + resultSoln.Value.Comp.Solution.MaxVolume += ingredientSoln.Value.Comp.Solution.MaxVolume; + _solutionContainer.TryAddSolution(resultSoln.Value, ingredientSolution); + } + requiredCount--; Del(placedEntity); } @@ -130,8 +123,7 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem requiredCount -= count; } } - - Spawn(_proto.Index(args.Recipe).Result, Transform(ent).Coordinates); + _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates); UpdateUIRecipes(ent); args.Handled = true; } @@ -159,26 +151,6 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem _audio.PlayPvs(recipe.OverrideCraftSound ?? workbench.Comp.CraftSound, workbench); } - private List GetPossibleCrafts(Entity workbench, HashSet ingrediEnts) - { - List result = new(); - - if (ingrediEnts.Count == 0) - return result; - - foreach (var recipeProto in workbench.Comp.Recipes) - { - var recipe = _proto.Index(recipeProto); - - if (CanCraftRecipe(recipe, ingrediEnts)) - { - result.Add(recipe); - } - } - - return result; - } - private bool CanCraftRecipe(CP14WorkbenchRecipePrototype recipe, HashSet entities) { var indexedIngredients = IndexIngredients(entities); diff --git a/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs b/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs index f0dbf789c8..4474b07a12 100644 --- a/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs +++ b/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs @@ -24,4 +24,10 @@ public sealed class CP14WorkbenchRecipePrototype : IPrototype [DataField(required: true)] public EntProtoId Result; + + [DataField] + public bool TryMergeSolutions = false; + + [DataField] + public string Solution = "food"; } diff --git a/Resources/Maps/_CP14/Shuttles/test-ship.yml b/Resources/Maps/_CP14/Shuttles/test-ship.yml index fc546cbb7f..c35fe50281 100644 --- a/Resources/Maps/_CP14/Shuttles/test-ship.yml +++ b/Resources/Maps/_CP14/Shuttles/test-ship.yml @@ -1243,7 +1243,7 @@ entities: - type: Transform pos: -5.439834,-4.863015 parent: 1 -- proto: CP14CookedFoodMeat +- proto: CP14FoodMeatLamb entities: - uid: 734 components: @@ -2749,7 +2749,7 @@ entities: rot: 3.141592653589793 rad pos: 6.042266,-21.159649 parent: 1 -- proto: CP14RawFoodMeat +- proto: CP14FoodCheeseWheel entities: - uid: 735 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml new file mode 100644 index 0000000000..af566996c5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml @@ -0,0 +1,78 @@ +- type: entity + id: CP14FoodCheeseWheel + parent: FoodInjectableBase + name: cheese wheel + description: A large wheel of soft, fragrant piece of cheese. + components: + - type: Item + size: Normal + - type: FlavorProfile + flavors: + - cheesy + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/cheese.rsi + layers: + - state: cheese_wheel + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 21 + - type: SliceableFood + count: 5 + slice: CP14FoodCheesePart + +- type: entity + id: CP14FoodCheesePart + parent: CP14FoodCheeseWheel + name: cheese + description: A triangle of soft, fragrant cheese. + components: + - type: Item + size: Tiny + - type: Sprite + layers: + - state: cheese_part + map: [ "random" ] + - type: RandomSprite + available: + - random: + cheese_part: "" + cheese_part2: "" + cheese_part3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 # 1/5 cheese wheel + reagents: + - ReagentId: Nutriment + Quantity: 4.2 + - type: SliceableFood + count: 3 + slice: CP14FoodCheeseSlice + +- type: entity + id: CP14FoodCheeseSlice + parent: CP14FoodCheesePart + name: cheese slice + description: A thin slice of delicious smelling cheese + components: + - type: Sprite + layers: + - state: cheese_slice + map: [ "random" ] + - type: RandomSprite + available: + - random: + cheese_slice: "" + cheese_slice2: "" + cheese_slice3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 # 1/3 cheese part + reagents: + - ReagentId: Nutriment + Quantity: 1.4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml new file mode 100644 index 0000000000..050807b467 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml @@ -0,0 +1,64 @@ +- type: entity + parent: FoodInjectableBase + id: CP14FoodDoughLarge + name: large piece of dough + description: The perfect ingredient for any flour product. The only thing left to do is to shape it. + components: + - type: Item + size: Normal + - type: FlavorProfile + flavors: + - bread #TODO smth disguisting. raw dough + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/dough.rsi + state: dough_large + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 21 + - ReagentId: UncookedAnimalProteins + Quantity: 2 + - type: SliceableFood + count: 5 + slice: CP14FoodDoughMedium + +- type: entity + parent: CP14FoodDoughLarge + id: CP14FoodDoughMedium + name: medium piece of dough + components: + - type: Item + size: Tiny + - type: Sprite + state: dough_medium + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 # 1/5 large dough + reagents: + - ReagentId: Nutriment + Quantity: 4.2 + - ReagentId: UncookedAnimalProteins + Quantity: 0.4 + +- type: entity + parent: CP14FoodDoughMedium + id: CP14FoodDoughMediumFlat + name: rolled dough + components: + - type: Item + size: Normal + - type: Sprite + state: dough_medium_flat + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 # 1/5 large dough + reagents: + - ReagentId: Nutriment + Quantity: 4.2 + - ReagentId: UncookedAnimalProteins + Quantity: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml new file mode 100644 index 0000000000..6abff4399c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml @@ -0,0 +1,100 @@ +# Base + +- type: entity + parent: [FoodInjectableBase, ItemHeftyBase] + id: CP14FoodEggBase + description: An egg! + abstract: true + components: + - type: Food + trash: + - CP14Eggshells + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/egg.rsi + state: brown + - type: Item + size: Tiny + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Egg + Quantity: 6 + - type: DrawableSolution + solution: food + - type: SolutionSpiker + sourceSolution: food + ignoreEmpty: true + popup: spike-solution-egg + # egg fragile + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:SpawnEntitiesBehavior + spawn: + CP14Eggshells: + min: 1 + max: 1 + # Wow double-yolk you're so lucky! + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Temperature + currentTemperature: 290 + - type: InternalTemperature + # ~1mm shell and ~1cm of albumen + thickness: 0.011 + area: 0.04 + # conductivity of egg shell based on a paper from Romanoff and Romanoff (1949) + conductivity: 0.456 + +# Splat +- type: entity + name: eggshells + parent: BaseItem + id: CP14Eggshells + description: You're walkin' on 'em bud. + components: + - type: Food + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/egg.rsi + state: brown_shell + - type: Item + size: Tiny + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Egg + Quantity: 1 + +- type: entity + parent: CP14FoodEggBase + id: CP14FoodEgg + name: egg + components: + - type: Sprite + layers: + - state: icon + map: [ "random" ] + - type: RandomSprite + available: + - random: + brown: "" + icon: "" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml index d232714a3e..83f8c132cb 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml @@ -1,27 +1,110 @@ -- type: entity - name: raw meat - parent: FoodMeat - id: CP14RawFoodMeat - description: It smells weird, but looks like normal meat... +# Base + +- type: entity + parent: FoodInjectableBase + id: CP14FoodMeatBase + abstract: true + components: + - type: FlavorProfile + flavors: + - meaty + - type: Extractable + grindableSolutionName: food + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: UncookedAnimalProteins + Quantity: 1 + - ReagentId: Fat + Quantity: 6 + - type: Temperature + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.02 + area: 0.02 # arbitrary number that sounds right for a slab of meat + +- type: entity + id: CP14FoodMeatSliceBase + parent: CP14FoodMeatBase + abstract: true + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: UncookedAnimalProteins + Quantity: 0.33 + - ReagentId: Fat + Quantity: 2 + - type: InternalTemperature + thickness: 0.006 + area: 0.006 # 1\3 of meat value + +# Lamb Meat + +- type: entity + id: CP14FoodMeatLamb + parent: CP14FoodMeatBase + name: raw lamb + description: Succulent lamb steak components: - type: Sprite sprite: _CP14/Objects/Consumable/Food/meat.rsi state: sheepmeat - - type: Construction - graph: CP14MeatSteak - node: start - defaultTarget: sheep steak + - type: SliceableFood + count: 3 + slice: CP14FoodMeatLambSlice + - type: Item + size: Tiny + shape: + - 0,0,1,0 - type: entity - name: steak - parent: FoodMeatCooked - id: CP14CookedFoodMeat - description: A cooked slab of meat. Smells primal. + id: CP14FoodMeatLambSlice + parent: CP14FoodMeatSliceBase + name: meat pieces + description: Succulent lamb steak components: + - type: Item + size: Tiny - type: Sprite sprite: _CP14/Objects/Consumable/Food/meat.rsi layers: - - state: sheepmeat-cooked - - type: Construction - graph: CP14MeatSteak - node: sheep steak + - state: sheepmeat_slice + map: [ "random" ] + - type: RandomSprite + available: + - random: + sheepmeat_slice: "" + sheepmeat_slice2: "" + sheepmeat_slice3: "" + +- type: entity + id: CP14FoodMeatLambCutlet + parent: CP14FoodMeatSliceBase + name: lamb cutlet + description: the result of mixing sliced lamb and egg - a raw round cutlet. + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: cutlet + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: UncookedAnimalProteins + Quantity: 0.66 + - ReagentId: Fat + Quantity: 4 + - ReagentId: Egg + Quantity: 6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 8d92237c03..03fa7504a5 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -91,41 +91,6 @@ - type: Icon sprite: _CP14/Structures/Furniture/workbench.rsi state: melting_crafter - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14WoodenPlanks1: - min: 1 - max: 2 - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepWood - - type: FireVisuals - sprite: _CP14/Effects/fire.rsi - normalState: full - type: CP14Workbench craftSound: collection: CP14Sawing @@ -138,4 +103,21 @@ - CP14MeltingMoldSickle - CP14MeltingMoldSword - CP14MeltingMoldThrowableSpear - - CP14MeltingMoldTwoHandedSword \ No newline at end of file + - CP14MeltingMoldTwoHandedSword + +- type: entity + id: CP14WorkbenchCooking + parent: + - CP14WorkbenchMeltingMolds + - CP14BaseWooden + name: cooking table + description: Lets cook + components: + - type: CP14Workbench + craftSound: + collection: CP14Sawing + recipes: + - CP14FoodDoughLarge + - CP14FoodDoughMediumFlat + - CP14FoodDoughMedium + - CP14FoodMeatLamb \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Food/steak.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Food/steak.yml deleted file mode 100644 index c663cd6968..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Food/steak.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: constructionGraph - id: CP14MeatSteak - start: start - graph: - - - node: start - edges: - - to: sheep steak - completed: - - !type:PlaySound - sound: /Audio/Effects/sizzle.ogg - steps: - - minTemperature: 335 - - - node: sheep steak - entity: CP14CookedFoodMeat diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml new file mode 100644 index 0000000000..df3bfef3be --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml @@ -0,0 +1,32 @@ +- type: CP14Recipe + id: CP14FoodMeatLamb + craftTime: 2 + entities: + CP14FoodMeatLambSlice: 2 + CP14FoodEgg: 1 + result: CP14FoodMeatLambCutlet + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodDoughLarge + craftTime: 3 + entities: + CP14FoodDoughMedium: 5 + result: CP14FoodDoughLarge + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodDoughMedium + craftTime: 3 + entities: + CP14FoodDoughMediumFlat: 1 + result: CP14FoodDoughMedium + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodDoughMediumFlat + craftTime: 3 + entities: + CP14FoodDoughMedium: 1 + result: CP14FoodDoughMediumFlat + tryMergeSolutions: true \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part.png new file mode 100644 index 0000000000000000000000000000000000000000..94c6dc1eca9eba52407db3aced86db2c3d6e1494 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Yk1sWV^m?+~bF8=$E`?J@_^Au0ZOp;~T91-Iz;QHrj@Ankzwv40te#ifb zPd84l`1wL5u2esNkNQbL7wtRo&wtGSs;=Bz8Yr-AX-1#YQ9+#}Rt#)?-_|-mEcPfg zlyI+Du=0?+mxv{Uw8icu_Bnqa-!yM4Utf3O8l$&=TzUc!c<`AVo3Q!i9rqxm6s53- z&yU*&{W0V&GKLUp-n;T0?C#}3Kf|uGvS4p9?P6s3d(@ZnT*V_tpr;u;UHx3vIVCg!0J-ORg#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_part2.png new file mode 100644 index 0000000000000000000000000000000000000000..4a6b4caa751205607ce602eef3bc94f7c0a5f3eb GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uRUEHLn2y} z6C_v{Cy4Yk1sWV^m?(5sT>SSR_h+w<=PBN_nPjREt+h_EL+SgcW7U&nohC8s>3#dz zpQmXhFx@!4;^zyM=9ZU9i_WAiJW^C>Se%c~Vn5uU ze!pW|j}rTwS!L55J>FT#8yg!F-~HOmQ+$1XYC=N7 zf*X!5)(t?xhaNkHZHgu{_ZF`D{pW}JSJ@4k7rPcb_4bcbzm+se)`6$P?7B)M|HV!L z@rtsCvTZZ&|4H7W*)d^pqs(cygBl>e1u!xEJZY~G{6aVh=xqj1S3j3^P67tb&c3waX6Nw4Ya-T=D%C`&*ds3nO`Vlq>W`m4UCtBY^O z?teOm`_u2Axa7Ts`Oh=?zXwcp9_nG|S8+QT?xZDnE cERY5Uj!Xp0jOQP}0|SV`)78&qol`;+0HI%s9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..5f6384ce8b7851231c2832213f83fc2668993e19 GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R9J=W(mM*mKoo`HKcbis3^-LJR-(H|>k4!+F2T)MX=iJhPPDRAoGOAT zqF87p_=w2_?7Uw&bC`R$36IQY|_k}_LcqgG6kLoY-Xcd)}Zawlzpyz zfk%mVMVt9)fp4Y0Z6=TPCj?N<4qhvGIXfNqq{$9|px?)91*qm8nE$pwvc9ldM?jR5 gG6nZS2qDC$I~X1}W&UA&i~s-t07*qoM6N<$fPx#<4Ht8R9J=W(J^kqKoEuDAB2USf{3k*+@L6wDN}`(6To3|1dfplP*KuS(jif~ zjK!w0Bd0JC1ymau1Ytl>F<-ee+I=$%N-3r8T}9eBeeZ4jRvpj$-?vU-wfv~_zT*vFEpAFd6rQ8d;$=4Iy9Qm vPG6oSKz98A^N$%Y+dH)f&XiJ0sq<_BMo>7~VMR}i00000NkvXXu0mjfF?@T0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/cheese_slice3.png new file mode 100644 index 0000000000000000000000000000000000000000..28791384936466e22033249aeb160c7918072c86 GIT binary patch literal 279 zcmV+y0qFjTP)Px#(Md!>R9J=Wk|7U*P!xp^P6oK)1_hZW6F-7#^9T78_#bAQjcTMY$3`&9gaVrc zWClzkvNw1#P2Mlvci!1OCtQFa2!i-`1YYA|v#MlMf~a@#c%Jvf`bdN0+TRdwS&6(U+ULyKDcw-dSk?0()voCfTr`m}v~+#N67-oUXCqf$@Wk`&Mjx zntE)HIrw)-C>}qclbVo_V6i)i{cwN!eTjxlFaFbzopr09tf|zW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json new file mode 100644 index 0000000000..67cc605cc8 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by Artista.rar", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cheese_part" + }, + { + "name": "cheese_part2" + }, + { + "name": "cheese_part3" + }, + { + "name": "cheese_slice" + }, + { + "name": "cheese_slice2" + }, + { + "name": "cheese_slice3" + }, + { + "name": "cheese_wheel" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bread_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bread_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..16d78123e5b20206bdaac0064969d5ffcacf6c64 GIT binary patch literal 446 zcmV;v0YUzWP)Px$cu7P-R9J=Wl(A02Kpe(DjU-o=29h>)X&lSY5;xe0kHDkgbNCppz5&LKQN+QH zgvA1bVYxPOsDs{lT>p2#q{IEDws-x$-}Mdvhr{9cW6n-};chgnZR593vy(E9nyi*y z-&|VfK0m&nBx9W*iq+C~)V2olf;VJrBF2Hc(Xj5N9k75kN?T!!&&|qsugX;03U99; zMu~Ik;Upc%az9HNQV2=?T{ZKdfS}q|GL#n_EMR+wOota7>**Z4;BubGFma(jSnf(7 z2QmO*(^b07*qoM6N<$f++yYegFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bun_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/bun_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..8a6723269c4384c9d9eb4ba75245b055501a3667 GIT binary patch literal 375 zcmV--0f_#IP)Px$F-b&0R9J=Wlrc-gKp2J}MImO9Hbh#a8Jt=nE!`}FluVubQ*^CAq2NF0>>^Se zoT7_3ia0n3B05+M7F^lGH2E2sl0NjMHrHqJ*$NgT?4e9{cHJka}oT^_1AfCnAh{VLQ#6X5! zvjMa?KqDBGX;s|7zQ2Qf7ruIoIeES<+*kY&4ZY67373c)3t=`Ln2y} z6C_v{Cy4Yk1sZUt!j#;mCtv;_mQhqY*s1jW z)zR{{?duh%t*Px$8A(JzR9J=Wlrc-gKorM+ibKp&QYo}UMVyRqO1Bn4N~X^JD0S^us9&MqK%|q4 z#YJ>exgnbb9TW-)S(0pV2nhv?^DfGZpp(|L8=0DH&hKrs`IlOtT=s7SI?H!z4( zd>P>ihisLRtum~ZMJTVaT2`@l`;0Fmf;g>hKxqgkqMrwG%GqHt17)|qi~zWQO*m-m xaw#8c>uSB-@&4(?JHC2*(f(Hq27}?x_yYCtQz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_large.png b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_large.png new file mode 100644 index 0000000000000000000000000000000000000000..bfd118fd4cd78a5cf54ce61bf1b84af5f0ea31e5 GIT binary patch literal 375 zcmV--0f_#IP)Px$F-b&0R9J=Wlrc}jKp2K!mDzB{bb+NN5?tJv9NbwPx$6iGxuR9J=Wl(9;~P!xv0+AM-CX>6x<5|no7Aav2ey^GMbkKuFlF|CexYz+f;K4F8=<*^QI&F#WndJHIM5 zOS~xyJ~`dbJ-@!ZFC`*so{Wd-;n6O&mV;&6xmuzWuTK%T(`S*ymPB9^XbWVY{=2sa zuxy)J%gOcrssKQ*-y{rT5~T{YL@B}`rq^#uM(PW=p3i)?04PXg;Q;g50@w4k1uX5( zPaYp)+MNbr5VO4#0r37-S=Xe91zw^hunKB-8oA(AO@`Px$4@pEpR9J=Wl&cQHFcgLl30XI{83bT>1QMQt1dGHW36f_(5+n|ZCE+P}hnmgI zbeVw>lA#XiPTO5DnDfi_wBOe&0EffjaQ>WL*8#WvsvJxrYhNlA%y;Kbb2b)JU_T6N z>)%<{NyyoWU>)d*0001dAu6@cqJUTNa0=ClSR3z`ZHZunBEThqB6=+qnJo_n&uBon zCxQyZHF@2x(0ZFhp9-W>!EhQHAOuiQo@WL~m-mJE)}&HVoGFmR3h?Y*68b7V5g5mV zeRTCnYzkQKfb9b6v28nUIe>Xgbr-Sm6=0fVD7fu&Z2SjKn?*SqM}RVI|AAC0NMZ%+ n^| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json new file mode 100644 index 0000000000..d83c98c506 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "bun_cooked bun_cooked_slice_bottom bun_cooked_slice_top dough_medium Created by Artista.rar, bread_cooked dough_large dough_medium_flat created by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bread_cooked" + }, + { + "name": "bun_cooked" + }, + { + "name": "bun_cooked_slice_bottom" + }, + { + "name": "bun_cooked_slice_top" + }, + { + "name": "dough_large" + }, + { + "name": "dough_medium" + }, + { + "name": "dough_medium_flat" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/brown.png b/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/brown.png new file mode 100644 index 0000000000000000000000000000000000000000..0755c1a1bdfb81f0aca15bddb1932d7554e67f2a GIT binary patch literal 288 zcmV+*0pI?KP)Px#+DSw~R9J=WlrajzKoCWr;srzqDUxC(1k>1Qm%>^>Jcf;h2eI%5osqF7nSLIMVCGJ-bqs@;YE_s{O^f}$vj@@HyN;Vd+H&~^csu6AM{k#H88e9-IS z_y&MeoHAK#L|%1?2*B|Tw&!AdE{<!kI@p~giN%hkZ1t>z;ttO{9m0AG8XE+S3eAMrh)}kb1xlb$mi9e8G mV3j(48(qX+ilQjWUwHzM%RAte5CRPV0000L2wUk$ydLYDqkWCRdejHGOsc_uv1##*gy{4jg!p zvC92|Ad76l_p{+V-XPKa`%cKOKFsvn%*boS2_u_(mw(5*`A(ehkw=Fm)WI=li@kG> z$>DlV(a0S)CP#laykZMfF~6~~@!`?A$9eqo?jHZZaFeg1=(SyQ&n%_G-PZjN|NLF9 zZ)jkku!u8up2Pu<9;JNWjsG?0P18vF?H`{sqvVHOjQzGPM(Mu`+tyx>f4H?-gZ+R^ sMch`hJ{jzxf>IVKmozv>FVdQ&MBb@0M68Z*8l(j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/icon.png b/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b5835b9412889cfa435982b4c1f75916c7cca24f GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}=RI8AP*%e(XcSDvqu5jjU<_hUv1n3hcvmf^bJ^lO%)3!ZD3g*{d z@6Y!T=(@4=v$&*}l-lGRxtpvWd27VIy5{exkgnxk9B9Dhc2Glt^$HWi9O3BGJH%J- Q26~Ob)78&qol`;+01gaqi~s-t literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/meta.json new file mode 100644 index 0000000000..9d973a39a3 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "By Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "brown" + }, + { + "name": "white_shell" + }, + { + "name": "brown_shell" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/white_shell.png b/Resources/Textures/_CP14/Objects/Consumable/Food/egg.rsi/white_shell.png new file mode 100644 index 0000000000000000000000000000000000000000..65129d27e0555b696aa8e7e89a6a11384dc4e8da GIT binary patch literal 299 zcmV+`0o4A9P)Px#Va% zXkT#l$$Wv&AXg@v-it}$`?dS$JLlZP1sH~580KH_Jwd)F=&#ImW@3&r+Jq7pR*S-iZ?t z0l@8gL39X95BNGjbO<4ZrT8g60(i6{t1q7GVCY;DgEn>gy_daHe8kjSKIg0c%5J^E xa<%{Hp%p-eD6Xr7eNRxaa+Nv5Fbwk(+yQ3mceP0WLU{lH002ovPDHLkV1jdFd=UTu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/cutlet.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/cutlet.png new file mode 100644 index 0000000000000000000000000000000000000000..361251001be2345c035e98b367996d772d7bd6f7 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^Ty)CH8{=SgnOmIpJxe)6}7MJ znD_S?-MQ3$y6nKyCyQ+)xR#w!xW%ZVdT8=hVMz%fI1~L@(k^c2X@v#LPaRmg_>2NW zZh@QVc`upZv0c_<= zM-#Un|9B^h<%frHw&3GdpzI44t_L|k3Ufby&DAN))Cy>8IR#d+>SyBi<@a-MZh3Ml zZR6veE`>!xLR#{3pSGN0e=2;mb85p!UY%*Pj^Aedo5wx(DM)(VW|@ZNzpcf*b9EB_ zu(_ReD=d~}`e0L;u+@+8#a8C9*HhxGA3QA$JGrkmueU1tZ&TprK!zzwrKcv(Zj0u= k;`-_a3wM(OM}3=o&*3DlwM?QVz;I&lboFyt=akR{0KeasxBvhE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meat_slice.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meat_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..ab71b4086a83b3f8cff24235be83675e4f41cec5 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2y} z6C_v{Cy4Yk1sZU%Nf-#N-r(Z@(O%KicKSQvTsfW%6Bb2;waA_e3!Qp=8OuA5Bw6Pv z%wAta{-5sJusEXX_c!M`d@ZYf`}Zh!6g5m)=qk>EpvhCagqCSa2d;UNF z7P_e8?Ci}P%YQAIV$pV(o!_Y9>>bYwHH(COXRzpdDY=vj7jt2c+zx60-N(Q%W2xRWtMq@*fDUKyboFyt=akR{0D47OWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json index 87172278a1..9a4d39e225 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json @@ -1,17 +1,44 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "By omsoyk", + "copyright": "sheepmeat and sheepmeat_cooked By omsoyk, sheepmeat_slice and sheepmeat_slice_cooked by TheShuEd, cutlet and cutlet_cooked and meat_slice by Artista.rar", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "cutlet" + }, + { + "name": "cutlet_cooked" + }, + { + "name": "meat_slice" + }, { "name": "sheepmeat" }, { - "name": "sheepmeat-cooked" + "name": "sheepmeat_cooked" + }, + { + "name": "sheepmeat_slice" + }, + { + "name": "sheepmeat_slice2" + }, + { + "name": "sheepmeat_slice3" + }, + { + "name": "sheepmeat_slice_cooked" + }, + { + "name": "sheepmeat_slice2_cooked" + }, + { + "name": "sheepmeat_slice3_cooked" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat-cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_cooked.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat-cooked.png rename to Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_cooked.png diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..16098de5fdf415c9cda563c9a7657d84cbd10d7b GIT binary patch literal 291 zcmV+;0o?wHP)Px#-AP12R9J=W)S(W-Fc5&@eE{ z1k)JI#39I*20^y61jK!AX|BE9T?j$bqT#!s@os^)G>qlF^cEu)GpQZ3Wo|LDEi&NM zo@KrnwfCeMuo$`5XK9N{++plRW|iEZmjGsaMyZcucuc6F83h! pugAU(lV{+)wBI~JN-3rO!V^^kO+}@u`4<2H002ovPDHLkV1jY)eQ*E( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/sheepmeat_slice2.png new file mode 100644 index 0000000000000000000000000000000000000000..960a5ca16614f676bc4eb384ac0ca1a182a0c58a GIT binary patch literal 250 zcmVPx#v`IukR9J=WlOYbnFbqZiq=kg+7?px^g`trta5Si=$T4z*z-qi#7~WAz3OwW~ zl?t2&){n(<{D15iP!vT`&dx=enBfTkp5qGu@XiIZSum|%agDki%Gqp7B71hwE^oJUh) zLNJb6{zQ|3J!Z229si+gg_wFYy=$o`ilUs4AK6(abVi(> zt8?|iG?1bz;Y*B8baooFcz*b|{0O7Y5sjwEoa}sl@$5GPx#;z>k7R9J=WlPwN|Fcg44lGR|QcLEZ0uP`;UAh9UyE!eGddd5QIMy`5wqrYWG9TvCILum==JNoA+Jb0xo#ooat|m zkF|?wgCv3k0P^NM&O4c%Ijt-3E#bJTo^H6W{{>Tt>DUE-mbC?lbwXQIi@qdCV2)>5 z+gK+6v_-WzE1QsD25sS8`I$jq!EGhooxwP36hw#8wTnC@Fz6G0i6raDup?S^|4 uT7=#LSJgvNg~XcW=Pn3+xgZFF;CKPNa8QRgcf&jY0000Px#^GQTOR9J=Wlc5U2Kp4k=igit7Nw6%gFN}i~!3S8di!Wdhi`WdlfcOSJfM5~C zU^iL>lZed+ID_2S#IU=8mhYFwvAgeg|L;2x1VIq~OwD#f>U+A~YLY|&0K4NEfW_%z zeHK97rTBC_$kvi5Ac+D-VMn_NSXmnZpdfMB?*Zs7x7H~*w;<2;{$PE3I<>%QQ|fz# zxJ~iRu&V)LrI^iErRKs(;2WD^SI0^LFq^MRr{W}F2F~2DN?WW2Mqx*rCm1V**Pmn( z`Txq!M8j6V6oz-ysqg9a?OFTT5Prs8Px#>q$gGR9J=Wl%Wd3P!xtg#d@2_(qP57ZjgaR@BtR=!xvZ>mSHpa0^%F^0D?sr z3wEPLFp1cFfNPMAxggtB&~UzX!#V%YIsdsJ2!bH|n1)HwW-`#^~U;gH|hh> zG!+MkqX4_p#R=NOI7x0JR!?fktsoQzjsjBhDj9)0LKI&_^{ z>-d`U&~@~n*9D&IQR8W)-mSVKaTJgy2>_$z_C=)cc>v7jD|}1oD%VkK0@?24C;%W$ zlH5c&7gf*G$Uu>zP%#r#|AyKbC31LHG+EmTXGKLBB4@00000NkvXXu0mjf DeJO=k literal 0 HcmV?d00001