From 617756acb199befe0d731a46eafb70daebd9745a Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 13 Jul 2024 18:00:20 +0300 Subject: [PATCH] Moving Some Files To Correct Locations (#1666) --- .../Objects/Consumable/Food/ingredients.yml | 99 +++++++++++++++++++ .../Objects/Consumable/Food/meat_goblin.yml | 0 .../Objects/Consumable/Food/produce.yml | 32 ++++++ .../Objects/Devices/admin_hand_teleporter.yml | 0 .../Objects}/Misc/dragon_egg.yml | 0 .../Objects/Specific/Hydroponics/seeds.yml | 72 ++++++++++++++ .../Prototypes/_NF/Hydroponics/seeds.yml | 71 ------------- .../Objects/Consumable/Food/ingredients.yml | 98 ------------------ .../_NF/Objects/Consumable/Food/produce.yml | 31 ------ 9 files changed, 203 insertions(+), 200 deletions(-) rename Resources/Prototypes/_NF/{ => Entities}/Objects/Consumable/Food/meat_goblin.yml (100%) rename Resources/Prototypes/_NF/{ => Entities}/Objects/Devices/admin_hand_teleporter.yml (100%) rename Resources/Prototypes/_NF/{ => Entities/Objects}/Misc/dragon_egg.yml (100%) delete mode 100644 Resources/Prototypes/_NF/Hydroponics/seeds.yml delete mode 100644 Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml delete mode 100644 Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml index 97111e3e096..12b074dedb0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml @@ -105,3 +105,102 @@ Quantity: 600 - type: StaticPrice price: 60 + +- type: entity + name: raw coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRaw + description: Green coffee beans, just waiting to be roasted. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Theobromine # Caffeine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: start + defaultTarget: light roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + +- type: entity + name: light roasted coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRoastedLight + description: Cinnamon roast coffee beans. Bright and fruity. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: CoffeeGrounds + Quantity: 5 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-light + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: light roasted coffee + defaultTarget: medium roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + conductivity: 1.5 # Arbitrarily chosen + - type: Extractable + grindableSolutionName: food + +- type: entity + name: medium roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedMedium + description: City roast coffee beans. Smooth and nutty. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-medium + - type: Construction + graph: Coffee + node: medium roasted coffee + defaultTarget: dark roasted coffee + +- type: entity + name: dark roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedDark + description: Viennese roast coffee beans. Smoky and spicy. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-dark + - type: Construction + graph: Coffee + node: dark roasted coffee diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat_goblin.yml similarity index 100% rename from Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml rename to Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat_goblin.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml index 9ab84a26dc1..c842a5de2f3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml @@ -23,3 +23,35 @@ - type: Tag tags: - Fruit + +- type: entity + name: coffee berries + parent: FoodProduceBase + id: FoodCoffee + description: Red berries encasing coffee beans. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Theobromine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + - type: Produce + seedId: coffee + - type: Tag + tags: + - Fruit + - type: SpawnItemsOnUse + items: + - id: FoodCoffeeBeansRaw + sound: + path: /Audio/Effects/packetrip.ogg diff --git a/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/admin_hand_teleporter.yml similarity index 100% rename from Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml rename to Resources/Prototypes/_NF/Entities/Objects/Devices/admin_hand_teleporter.yml diff --git a/Resources/Prototypes/_NF/Misc/dragon_egg.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/dragon_egg.yml similarity index 100% rename from Resources/Prototypes/_NF/Misc/dragon_egg.yml rename to Resources/Prototypes/_NF/Entities/Objects/Misc/dragon_egg.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml index 6731bee0421..e722885f836 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -30,3 +30,75 @@ seedId: coffee - type: Sprite sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + +- type: seed + id: spesos + name: seeds-spesos-name + noun: seeds-noun-seeds + displayName: seeds-spesos-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/spesostree.rsi + packetPrototype: SpesosTreeSeeds + productPrototypes: + - SpaceCash + harvestRepeat: Repeat + lifespan: 45 + maturation: 15 + production: 8 + yield: 3 + potency: 10 + growthStages: 2 + idealLight: 6 + +- type: seed + id: pear + name: seeds-pear-name + noun: seeds-noun-seeds + displayName: seeds-pear-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi + packetPrototype: PearSeeds + productPrototypes: + - FoodPear + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + +- type: seed + id: coffee + name: seeds-coffee-name + noun: seeds-noun-seeds + displayName: seeds-coffee-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi + packetPrototype: CoffeeSeeds + productPrototypes: + - FoodCoffee + lifespan: 25 + maturation: 9 + production: 1 + yield: 2 + potency: 5 + idealLight: 8 + growthStages: 5 + harvestRepeat: Repeat + waterConsumption: 0.60 + chemicals: + Nutriment: + Min: 2 + Max: 8 + PotencyDivisor: 16 + Theobromine: + Min: 1 + Max: 4 + PotencyDivisor: 25 diff --git a/Resources/Prototypes/_NF/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Hydroponics/seeds.yml deleted file mode 100644 index 45dd6e089af..00000000000 --- a/Resources/Prototypes/_NF/Hydroponics/seeds.yml +++ /dev/null @@ -1,71 +0,0 @@ -- type: seed - id: spesos - name: seeds-spesos-name - noun: seeds-noun-seeds - displayName: seeds-spesos-display-name - plantRsi: _NF/Objects/Specific/Hydroponics/spesostree.rsi - packetPrototype: SpesosTreeSeeds - productPrototypes: - - SpaceCash - harvestRepeat: Repeat - lifespan: 45 - maturation: 15 - production: 8 - yield: 3 - potency: 10 - growthStages: 2 - idealLight: 6 - -- type: seed - id: pear - name: seeds-pear-name - noun: seeds-noun-seeds - displayName: seeds-pear-display-name - plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi - packetPrototype: PearSeeds - productPrototypes: - - FoodPear - harvestRepeat: Repeat - lifespan: 55 - maturation: 6 - production: 6 - yield: 3 - potency: 10 - idealLight: 6 - chemicals: - Nutriment: - Min: 1 - Max: 10 - PotencyDivisor: 10 - Vitamin: - Min: 1 - Max: 4 - PotencyDivisor: 25 - -- type: seed - id: coffee - name: seeds-coffee-name - noun: seeds-noun-seeds - displayName: seeds-coffee-display-name - plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi - packetPrototype: CoffeeSeeds - productPrototypes: - - FoodCoffee - lifespan: 25 - maturation: 9 - production: 1 - yield: 2 - potency: 5 - idealLight: 8 - growthStages: 5 - harvestRepeat: Repeat - waterConsumption: 0.60 - chemicals: - Nutriment: - Min: 2 - Max: 8 - PotencyDivisor: 16 - Theobromine: - Min: 1 - Max: 4 - PotencyDivisor: 25 diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml deleted file mode 100644 index 29e840ffe42..00000000000 --- a/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml +++ /dev/null @@ -1,98 +0,0 @@ -- type: entity - name: raw coffee beans - parent: FoodProduceBase - id: FoodCoffeeBeansRaw - description: Green coffee beans, just waiting to be roasted. - components: - - type: FlavorProfile - flavors: - - bitter - - type: Food - - type: SolutionContainerManager - solutions: - food: - maxVol: 6 - reagents: - - ReagentId: Nutriment - Quantity: 1 - - ReagentId: Theobromine # Caffeine - Quantity: 1 - - type: Sprite - sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi - state: produce-beans - - type: Tag - tags: - - Fruit - - type: Construction - graph: Coffee - node: start - defaultTarget: light roasted coffee - - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them - - type: Temperature # Temperature components needed to cook the beans - currentTemperature: 290 - - type: InternalTemperature - thickness: 0.008 # 8mm (roughly bean sized) - area: .2 # essentially a giant sheet of beans - -- type: entity - name: light roasted coffee beans - parent: FoodProduceBase - id: FoodCoffeeBeansRoastedLight - description: Cinnamon roast coffee beans. Bright and fruity. - components: - - type: FlavorProfile - flavors: - - bitter - - type: Food - - type: SolutionContainerManager - solutions: - food: - maxVol: 6 - reagents: - - ReagentId: CoffeeGrounds - Quantity: 5 - - type: Sprite - sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi - state: produce-beans-light - - type: Tag - tags: - - Fruit - - type: Construction - graph: Coffee - node: light roasted coffee - defaultTarget: medium roasted coffee - - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them - - type: Temperature # Temperature components needed to cook the beans - - type: InternalTemperature - thickness: 0.008 # 8mm (roughly bean sized) - area: .2 # essentially a giant sheet of beans - conductivity: 1.5 # Arbitrarily chosen - - type: Extractable - grindableSolutionName: food - -- type: entity - name: medium roasted coffee beans - parent: FoodCoffeeBeansRoastedLight - id: FoodCoffeeBeansRoastedMedium - description: City roast coffee beans. Smooth and nutty. - components: - - type: Sprite - sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi - state: produce-beans-medium - - type: Construction - graph: Coffee - node: medium roasted coffee - defaultTarget: dark roasted coffee - -- type: entity - name: dark roasted coffee beans - parent: FoodCoffeeBeansRoastedLight - id: FoodCoffeeBeansRoastedDark - description: Viennese roast coffee beans. Smoky and spicy. - components: - - type: Sprite - sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi - state: produce-beans-dark - - type: Construction - graph: Coffee - node: dark roasted coffee diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml deleted file mode 100644 index 1b2862aa610..00000000000 --- a/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - name: coffee berries - parent: FoodProduceBase - id: FoodCoffee - description: Red berries encasing coffee beans. - components: - - type: FlavorProfile - flavors: - - bitter - - type: Food - - type: SolutionContainerManager - solutions: - food: - maxVol: 12 - reagents: - - ReagentId: Nutriment - Quantity: 2 - - ReagentId: Theobromine - Quantity: 1 - - type: Sprite - sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi - - type: Produce - seedId: coffee - - type: Tag - tags: - - Fruit - - type: SpawnItemsOnUse - items: - - id: FoodCoffeeBeansRaw - sound: - path: /Audio/Effects/packetrip.ogg