Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleans up Hydroponics content. (#3025)

Browse Source 
* Adds to IgnoredComponents.cs

* Jackboots

* Half Done

* Moved to diff PR

* Everything functional

* Fixed Sprays

* Nice

* Fixed

* Update submodule

* Fix tests

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Swept
2021-02-17 12:59:15 +00:00
committed by GitHub
parent 48eea211bc
commit 83f102ea75
102 changed files with 545 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Resources/Prototypes/Catalog/LatheRecipes/botany.yml
View File

@@ -1,8 +1,8 @@
- type: latheRecipe
id: MiniHoe
icon:
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: hoe
sprite: Objects/Tools/Hydroponics/hoe.rsi
state: icon
result: MiniHoe
completetime: 500
materials:
@@ -12,8 +12,8 @@
- type: latheRecipe
id: Scythe
icon:
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: scythe
sprite: Objects/Tools/Hydroponics/scythe.rsi
state: icon
result: Scythe
completetime: 500
materials:
@@ -23,33 +23,21 @@
- type: latheRecipe
id: Hatchet
icon:
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: hatchet
sprite: Objects/Tools/Hydroponics/hatchet.rsi
state: icon
result: Hatchet
completetime: 500
materials:
steel: 60
glass: 10
- type: latheRecipe
id: Shovel
icon:
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: shovel
result: Shovel
completetime: 500
materials:
steel: 60
glass: 10
- type: latheRecipe
id: Spade
icon:
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: spade
sprite: Objects/Tools/Hydroponics/spade.rsi
state: icon
result: Spade
completetime: 500
materials:
steel: 30
glass: 10

11
Resources/Prototypes/Catalog/LatheRecipes/tools.yml
View File

@@ -105,3 +105,14 @@
materials:
steel: 90
glass: 80
- type: latheRecipe
id: Shovel
icon:
sprite: Objects/Tools/Hydroponics/hatchet.rsi
state: icon
result: Shovel
completetime: 500
materials:
steel: 60
glass: 10

4
Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
View File

@@ -8,8 +8,8 @@
- type: Clickable
- type: InteractionOutline
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: sextractor
sprite: Constructible/Hydroponics/machines.rsi
state: seedextractor
- type: Physics
mass: 25
anchored: true

4
Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml
View File

@@ -34,7 +34,7 @@
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
sprite: Constructible/Hydroponics/misc.rsi
state: soil
- type: PlantHolder
drawWarnings: false
@@ -60,7 +60,7 @@
snap: true
- type: Pullable
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
sprite: Constructible/Hydroponics/containers.rsi
state: hydrotray3
- type: PlantHolder
drawWarnings: true

6
Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml
View File

@@ -29,7 +29,7 @@
components:
- type: StorageFill
contents:
- name: MiniHoe
- name: HydroponicsToolMiniHoe
amount: 1
- name: PlantBGoneSpray
amount: 1
@@ -37,9 +37,9 @@
amount: 1
- name: PestSpray
amount: 1
- name: Scythe
- name: HydroponicsToolScythe
amount: 1
- name: Hatchet
- name: HydroponicsToolHatchet
amount: 1
- name: ClothingOuterApronBotanist
amount: 1

12
Resources/Prototypes/Entities/Objects/Consumable/botany.yml → Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
View File

@@ -8,6 +8,7 @@
- type: Sprite
state: produce
- type: Produce
- type: Grindable
- type: entity
name: wheat
@@ -27,7 +28,6 @@
Quantity: 5
- type: Produce
seed: wheat
- type: Grindable
- type: entity
name: sugarcane
@@ -47,7 +47,6 @@
Quantity: 5
- type: Produce
seed: sugarcane
- type: Grindable
- type: entity
name: tower-cap log
@@ -81,7 +80,6 @@
sprite: Objects/Specific/Hydroponics/banana.rsi
- type: Produce
seed: banana
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -104,7 +102,6 @@
sprite: Objects/Specific/Hydroponics/carrot.rsi
- type: Produce
seed: carrots
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -127,7 +124,6 @@
sprite: Objects/Specific/Hydroponics/lemon.rsi
- type: Produce
seed: lemon
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -150,7 +146,6 @@
sprite: Objects/Specific/Hydroponics/potato.rsi
- type: Produce
seed: potato
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -173,7 +168,6 @@
sprite: Objects/Specific/Hydroponics/tomato.rsi
- type: Produce
seed: tomato
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -196,7 +190,6 @@
sprite: Objects/Specific/Hydroponics/eggplant.rsi
- type: Produce
seed: eggplant
- type: Grindable
- type: entity
name: apple
@@ -214,7 +207,6 @@
sprite: Objects/Specific/Hydroponics/apple.rsi
- type: Produce
seed: apple
- type: Grindable
- type: Juiceable
result:
reagents:
@@ -238,7 +230,6 @@
sprite: Objects/Specific/Hydroponics/corn.rsi
- type: Produce
seed: corn
- type: Grindable
- type: entity
name: chanterelle cluster
@@ -256,4 +247,3 @@
sprite: Objects/Specific/Hydroponics/chanterelle.rsi
- type: Produce
seed: chanterelle
- type: Grindable

0
Resources/Prototypes/Entities/Objects/Specific/seeds.yml → Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
View File

63
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml Normal file
View File

@@ -0,0 +1,63 @@
- type: entity
name: Plant-B-Gone
id: PlantBGoneSpray
parent: SprayBottle
description: Kills those pesky weeds!
suffix: "Filled"
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/sprays.rsi
state: plantbgone
- type: SolutionContainer
maxVol: 100
caps: Drainable
contents:
reagents:
- ReagentId: chem.PlantBGone
Quantity: 100
- type: Item
sprite: Objects/Tools/Hydroponics/sprays.rsi
HeldPrefix: plantbgone
- type: entity
name: weed spray
id: WeedSpray
parent: SprayBottle
description: It's a toxic mixture, in spray form, to kill small weeds.
suffix: "Filled"
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/sprays.rsi
state: weedspray
- type: SolutionContainer
maxVol: 50
caps: Drainable
contents:
reagents:
- ReagentId: chem.WeedKiller
Quantity: 50
- type: Spillable
- type: ItemCooldown
- type: Spray
transferAmount: 1
- type: Item
sprite: Objects/Tools/Hydroponics/sprays.rsi
- type: entity
name: pest spray
id: PestSpray
parent: WeedSpray
description: Objects/Tools/Hydroponics/sprays.rsi
suffix: "Filled"
components:
- type: Sprite
state: pestspray
- type: SolutionContainer
maxVol: 50
caps: Drainable
contents:
reagents:
- ReagentId: chem.PestKiller
Quantity: 50
- type: Item
sprite: Objects/Tools/Hydroponics/sprays.rsi

59
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml Normal file
View File

@@ -0,0 +1,59 @@
- type: entity
name: mini hoe
parent: BaseItem
id: HydroponicsToolMiniHoe
description: It's used for removing weeds or scratching your back.
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/hoe.rsi
state: icon
- type: ItemCooldown
- type: MeleeWeapon
- type: Item
sprite: Objects/Tools/Hydroponics/hoe.rsi
- type: Hoe
- type: entity
name: scythe
parent: BaseItem
id: HydroponicsToolScythe
description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow.
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/scythe.rsi
state: icon
- type: ItemCooldown
- type: MeleeWeapon
- type: BotanySharp
- type: Item
sprite: Objects/Tools/Hydroponics/scythe.rsi
- type: entity
name: hatchet
parent: BaseItem
id: HydroponicsToolHatchet
description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood.
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/hatchet.rsi
state: icon
- type: ItemCooldown
- type: MeleeWeapon
- type: BotanySharp
- type: Item
sprite: Objects/Tools/Hydroponics/hatchet.rsi
- type: entity
name: spade
parent: BaseItem
id: Spade
description: A small tool for digging and moving dirt.
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/spade.rsi
state: spade
- type: ItemCooldown
- type: MeleeWeapon
- type: Shovel
- type: Item
sprite: Objects/Tools/Hydroponics/spade.rsi

129
Resources/Prototypes/Entities/Objects/Tools/botany_tools.yml
View File

@@ -1,129 +0,0 @@
- type: entity
name: mini hoe
parent: BaseItem
id: MiniHoe
description: It's used for removing weeds or scratching your back.
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: hoe
- type: ItemCooldown
- type: MeleeWeapon
- type: Item
- type: Hoe
- type: entity
name: Plant-B-Gone
id: PlantBGoneSpray
parent: SprayBottle
description: Kills those pesky weeds!
suffix: "Filled"
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: plantbgone
- type: SolutionContainer
maxVol: 100
caps: Drainable
contents:
reagents:
- ReagentId: chem.PlantBGone
Quantity: 100
- type: entity
name: weed spray
id: WeedSpray
parent: SprayBottle
description: It's a toxic mixture, in spray form, to kill small weeds.
suffix: "Filled"
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: weedspray
- type: SolutionContainer
maxVol: 50
caps: Drainable
contents:
reagents:
- ReagentId: chem.WeedKiller
Quantity: 50
- type: SolutionTransfer
transferAmount: 1.0
- type: Spillable
- type: ItemCooldown
- type: Spray
transferAmount: 1
- type: entity
name: pest spray
id: PestSpray
parent: WeedSpray
description: It's some pest eliminator spray! Do not inhale!
suffix: "Filled"
components:
- type: Sprite
state: pestspray
- type: SolutionContainer
maxVol: 50
caps: Drainable
contents:
reagents:
- ReagentId: chem.PestKiller
Quantity: 50
- type: entity
name: scythe
parent: BaseItem
id: Scythe
description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow.
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: scythe
- type: ItemCooldown
- type: MeleeWeapon
- type: BotanySharp
- type: Item
- type: entity
name: hatchet
parent: BaseItem
id: Hatchet
description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood.
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: hatchet
- type: ItemCooldown
- type: MeleeWeapon
- type: BotanySharp
- type: Item
- type: entity
name: spade
parent: BaseItem
id: Spade
description: A small tool for digging and moving dirt.
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: spade
- type: ItemCooldown
- type: MeleeWeapon
- type: Shovel
- type: Item
- type: entity
name: shovel
parent: BaseItem
id: Shovel
description: A large tool for digging and moving dirt.
components:
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: shovel
- type: ItemCooldown
- type: MeleeWeapon
- type: Shovel
- type: Item

15
Resources/Prototypes/Entities/Objects/Tools/tools.yml
View File

@@ -194,3 +194,18 @@
- type: Sprite
sprite: Objects/Tools/rcd.rsi
state: rcd_ammo
- type: entity
name: shovel
parent: BaseItem
id: Shovel
description: A large tool for digging and moving dirt.
components:
- type: Sprite
sprite: Objects/Tools/Hydroponics/shovel.rsi
state: icon
- type: ItemCooldown
- type: MeleeWeapon
- type: Shovel
- type: Item
sprite: Objects/Tools/Hydroponics/shovel.rsi