From 970dc7bb1fe88f804c6f88c5e5cae42a1b653fb5 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:46:09 +0200 Subject: [PATCH] Sack new (#822) * new * tag --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Objects/Consumable/Food/produce.yml | 18 ++++ .../_CP14/Entities/Objects/Flora/farm.yml | 3 +- .../Objects/Specific/Farming/sack.yml | 78 ++++++++++++++++++ Resources/Prototypes/_CP14/tags.yml | 3 + .../_CP14/Objects/Storage/sack.rsi/icon.png | Bin 0 -> 475 bytes .../_CP14/Objects/Storage/sack.rsi/meta.json | 14 ++++ 6 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml create mode 100644 Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index f993b9df9f..05fd10b763 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -34,6 +34,9 @@ count: 4 sliceTime: 1.5 slice: CP14FoodCabbageSlice + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodCabbageSlice @@ -106,6 +109,9 @@ count: 5 sliceTime: 2 slice: CP14FoodPumpkinSlice + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodPumpkinSlice @@ -176,6 +182,9 @@ Quantity: 2 - type: CP14Seed plantProto: CP14PlantPotato #TODO sliceable potato + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodCucumber @@ -212,6 +221,9 @@ Quantity: 2 - ReagentId: Water Quantity: 3 + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodTomatoes @@ -277,6 +289,9 @@ damage: types: Blunt: 1 + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodTomatoesSlice @@ -343,6 +358,9 @@ count: 4 sliceTime: 1.5 slice: CP14FoodAppleSlice + - type: Tag + tags: + - CP14FarmFood - type: entity id: CP14FoodAppleSlice diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml index 11d6eeac9c..34356abd6c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml @@ -20,4 +20,5 @@ base2: "" - type: Tag tags: - - CP14Wheat \ No newline at end of file + - CP14Wheat + - CP14FarmFood diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml new file mode 100644 index 0000000000..a8048a39e4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml @@ -0,0 +1,78 @@ +- type: entity + name: sack + id: CP14SackFarming + parent: BaseStorageItem + description: A bag for various fruits, vegetables, plants and anything else that grows in the bed. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Storage/sack.rsi + state: icon + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Normal + grid: + - 0,0,6,3 + quickInsert: true + areaInsert: true + whitelist: + tags: + - CP14FarmFood + - CP14FitInMortar + - type: Dumpable + +- type: entity + id: CP14SackFarmingVegetables + parent: CP14SackFarming + categories: [ ForkFiltered ] + suffix: Vegetables + components: + - type: StorageFill + contents: + - id: CP14Wheat + amount: 4 + - id: CP14FoodCabbage + orGroup: LargeVegetables + amount: 3 + - id: CP14FoodPumpkin + orGroup: LargeVegetables + amount: 3 + - id: CP14FoodPotato + amount: 3 + - id: CP14FoodCucumber + amount: 3 + - id: CP14FoodTomatoes + amount: 3 + +- type: entity + id: CP14SackFarmingApple + parent: CP14SackFarming + suffix: Apple + components: + - type: StorageFill + contents: + - id: CP14FoodApple + amount: 6 + - id: CP14FoodApple + amount: 5 + prob: 0.6 + - id: CP14FoodApple + amount: 5 + prob: 0.4 + +- type: entity + id: CP14SackFarmingWheat + parent: CP14SackFarming + suffix: Wheat + components: + - type: StorageFill + contents: + - id: CP14Wheat + amount: 8 + - id: CP14Wheat + amount: 5 + prob: 0.6 + - id: CP14Wheat + amount: 5 + prob: 0.4 diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index db90a14ecf..c15db14717 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -106,5 +106,8 @@ - type: Tag id: CP14PlatePie +- type: Tag + id: CP14FarmFood + - type: Tag id: CP14AlchemicalHerbals diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9d6f5b721326e0ee5bcca165f3f971d2cc59a21c GIT binary patch literal 475 zcmV<10VMv3P)Px$l}SWFR9J=WmBC5^K^Vt>Nnl}^p|~vQC9I2?V221h*2O(}>e>r<_T*F4D|F}q z^a<)9kr3uhx+usl3Mz_uvP-kAmd&gZUG@jdvNPYz|35R|Hwzvf9{eARuJgH>D=SDmjovMaYYc-UP zOUXbXYs@kiQTw}C%1g%>xfGYzhtfFZ9q5={0LJEoYNbxGlwWGZ$fYUAw*w+Ufk#M$P=*}t*@YcwFE z9T1L%00_rI_KKaN%f#+q9@a0za4bZx-3Or8?sJ+;kvNXe#YA^@e|)ae=h8Bi=D_Q7 z6J3kYYxn2O1hj2*Ekeia641Wl$L0ipq2-rN4Y(*nz!nE=ac6!AaW}ZW2b^zVVjZMO zvg{skvbgf0<;NNgl#)>CXH>`SLt3j>&JUl!+1Rq9Rp69eN RL$&|_002ovPDHLkV1i>x*=qm* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json new file mode 100644 index 0000000000..c57e82414c --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Artista", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +}