diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml index c914ac8dcc..4fe4c747b2 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml @@ -63,6 +63,10 @@ amount: 3 - id: CP14SeedTomato amount: 3 + - id: CP14SeedOnion + amount: 3 + - id: CP14SeedPepper + amount: 3 - type: entity parent: CP14BrassChest diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index fd7a4921f5..f993b9df9f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -369,4 +369,71 @@ Quantity: 2.5 - ReagentId: Vitamin Quantity: 1 - \ No newline at end of file + +- type: entity + id: CP14FoodPepper + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: pepper + description: Red and sweetish. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - peppery + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/pepper.rsi + layers: + - state: base1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 + +- type: entity + id: CP14FoodOnion + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: onion + description: If you eat too much, you can cry tears of joy. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - onion + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/onion.rsi + layers: + - state: base1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 17 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Vitamin + Quantity: 4 + - ReagentId: Allicin + Quantity: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml index d8a6a9b80a..e241d54ae6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml @@ -73,3 +73,29 @@ - state: tomato - type: CP14Seed plantProto: CP14PlantTomatoes + +- type: entity + id: CP14SeedOnion + name: onion seeds + description: Onion seeds, small but strong. + parent: CP14BaseSeed + components: + - type: Sprite + layers: + - state: bag + - state: onion + - type: CP14Seed + plantProto: CP14PlantOnion + +- type: entity + id: CP14SeedPepper + name: pepper seeds + description: Pepper seeds, with a peppercorn inside. + parent: CP14BaseSeed + components: + - type: Sprite + layers: + - state: bag + - state: pepper + - type: CP14Seed + plantProto: CP14PlantPepper diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml new file mode 100644 index 0000000000..8414d4de8c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml @@ -0,0 +1,69 @@ +- type: entity + id: CP14PlantOnion + parent: CP14GatherablePlantBase + name: onion + description: OOO # TODO + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/onion.rsi + layers: + - state: grow-1 + map: ["enum.PlantVisualLayers.Base"] + - type: CP14PlantMetabolizer + metabolizerId: Base + - type: CP14PlantEnergyFromLight + energy: 1 + daytime: true + - type: CP14PlantVisuals + growthSteps: 6 + - type: CP14PlantGrowing + energyCost: 1 + resourceCost: 1 + growthPerUpdate: 0.05 # 20 minute to full grow + - type: CP14PlantFading + resourcePerMinute: 0.15 + - type: CP14PlantGatherable + deleteAfterHarvest: false + loot: + All: CP14GatherOnion + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Cellular + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14PlantTomatoesDeath: + min: 1 + max: 1 + +- type: entity + id: CP14PlantOnionDeath + name: dead onion + description: The sad spectacle of wasted food. + parent: CP14GatherableBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/onion.rsi + state: death + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + +- type: entityLootTable + id: CP14GatherOnion + entries: + - id: CP14FoodOnion + amount: 3 + maxAmount: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml new file mode 100644 index 0000000000..e5011777e6 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml @@ -0,0 +1,69 @@ +- type: entity + id: CP14PlantPepper + parent: CP14GatherablePlantBase + name: pepper + description: OOO # TODO + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/pepper.rsi + layers: + - state: grow-1 + map: ["enum.PlantVisualLayers.Base"] + - type: CP14PlantMetabolizer + metabolizerId: Base + - type: CP14PlantEnergyFromLight + energy: 1 + daytime: true + - type: CP14PlantVisuals + growthSteps: 5 + - type: CP14PlantGrowing + energyCost: 1 + resourceCost: 1 + growthPerUpdate: 0.05 # 20 minute to full grow + - type: CP14PlantFading + resourcePerMinute: 0.15 + - type: CP14PlantGatherable + deleteAfterHarvest: false + loot: + All: CP14GatherPepper + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Cellular + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14PlantTomatoesDeath: + min: 1 + max: 1 + +- type: entity + id: CP14PlantPepperDeath + name: dead pepper + description: The sad spectacle of wasted food. + parent: CP14GatherableBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Farm/pepper.rsi + state: death + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + +- type: entityLootTable + id: CP14GatherPepper + entries: + - id: CP14FoodPepper + amount: 3 + maxAmount: 5 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml index ac7048a470..1031033ba9 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml @@ -46,4 +46,24 @@ - !type:ProtoIdResource protoId: CP14FoodCucumber count: 1 - result: CP14SeedCucumber \ No newline at end of file + result: CP14SeedCucumber + +- type: CP14Recipe + id: CP14SeedOnion + tag: CP14RecipeCooking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodOnion + count: 1 + result: CP14SeedOnion + +- type: CP14Recipe + id: CP14SeedPepper + tag: CP14RecipeCooking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPepper + count: 1 + result: CP14SeedPepper diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base1.png new file mode 100644 index 0000000000..bcbb5a8068 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base2.png new file mode 100644 index 0000000000..5cbb936ce2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base3.png new file mode 100644 index 0000000000..46f04cf2ee Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json new file mode 100644 index 0000000000..0e000b787a --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base1.png new file mode 100644 index 0000000000..c9f2dd9ee0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base2.png new file mode 100644 index 0000000000..320069c685 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base3.png new file mode 100644 index 0000000000..7e169cff9b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json new file mode 100644 index 0000000000..0e000b787a --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json index 5ffebf930b..fb9b936289 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json @@ -28,6 +28,12 @@ { "name": "tomato" }, + { + "name": "onion" + }, + { + "name": "pepper" + }, { "name": "wheat" } diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/onion.png b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/onion.png new file mode 100644 index 0000000000..a9aef9fa97 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/onion.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/pepper.png b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/pepper.png new file mode 100644 index 0000000000..a4f516c120 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/pepper.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/death.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/death.png new file mode 100644 index 0000000000..dbcf028984 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/death.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-1.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-1.png new file mode 100644 index 0000000000..16e4e1d6a8 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-2.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-2.png new file mode 100644 index 0000000000..4945f2b01f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-3.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-3.png new file mode 100644 index 0000000000..f5e36ac95e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-4.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-4.png new file mode 100644 index 0000000000..6cb41e7a23 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-5.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-5.png new file mode 100644 index 0000000000..c7d4ac0f78 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-5.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-6.png b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-6.png new file mode 100644 index 0000000000..15fb1942ef Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/grow-6.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/meta.json new file mode 100644 index 0000000000..d77b756183 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Farm/onion.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "grow-1" + }, + { + "name": "grow-2" + }, + { + "name": "grow-3" + }, + { + "name": "grow-4" + }, + { + "name": "grow-5" + }, + { + "name": "grow-6" + }, + { + "name": "death" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/death.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/death.png new file mode 100644 index 0000000000..df1817f755 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/death.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-1.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-1.png new file mode 100644 index 0000000000..2ff59037f2 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-2.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-2.png new file mode 100644 index 0000000000..b3351d0899 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-3.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-3.png new file mode 100644 index 0000000000..6015c11cd7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-4.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-4.png new file mode 100644 index 0000000000..498f009b16 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-5.png b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-5.png new file mode 100644 index 0000000000..25cfa6f7ac Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/grow-5.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/meta.json new file mode 100644 index 0000000000..478acd4dbb --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Farm/pepper.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "grow-1" + }, + { + "name": "grow-2" + }, + { + "name": "grow-3" + }, + { + "name": "grow-4" + }, + { + "name": "grow-5" + }, + { + "name": "death" + } + ] +}