From ac6d73c0f366691cb8884b86aade9efc9f7e0d07 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Sun, 11 Aug 2024 21:54:33 +0200 Subject: [PATCH] Add poultry cube boxes! (#1847) Also slightly rebalance the vend price of monkey and variant cube boxes. --- .../Catalog/Cargo/cargo_livestock.yml | 38 ++++++------- .../Entities/Objects/Misc/monkeycube.yml | 5 +- .../_NF/Catalog/Cargo/cargo_livestock.yml | 10 ++++ .../_NF/Catalog/Fills/Crates/npc.yml | 10 ++++ .../_NF/Entities/Objects/Misc/monkeycube.yml | 50 ++++++++++++++++++ .../Objects/Specific/rehydrateable.yml | 21 ++++++++ .../Misc/monkeycube.rsi/box_poultry.png | Bin 0 -> 1271 bytes .../_NF/Objects/Misc/monkeycube.rsi/meta.json | 20 +++++++ .../Misc/monkeycube.rsi/wrapper_chicken.png | Bin 0 -> 324 bytes .../Misc/monkeycube.rsi/wrapper_duck.png | Bin 0 -> 314 bytes 10 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index cb864d8cd0c..2479d48878d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -31,15 +31,15 @@ category: cargoproduct-category-name-livestock group: market -- type: cargoProduct - id: LivestockChicken - icon: - sprite: Mobs/Animals/chicken.rsi - state: icon-1 - product: CrateNPCChicken - cost: 4000 - category: cargoproduct-category-name-livestock - group: market +# - type: cargoProduct # Frontier - replaced by poultry cube crate +# id: LivestockChicken +# icon: +# sprite: Mobs/Animals/chicken.rsi +# state: icon-1 +# product: CrateNPCChicken +# cost: 4000 +# category: cargoproduct-category-name-livestock +# group: market - type: cargoProduct id: LivestockCrab @@ -52,16 +52,16 @@ category: cargoproduct-category-name-livestock group: market -- type: cargoProduct - id: LivestockDuck - abstract: true # Frontier - icon: - sprite: Mobs/Animals/duck.rsi - state: icon-0 - product: CrateNPCDuck - cost: 4000 - category: cargoproduct-category-name-livestock - group: market +# - type: cargoProduct # Frontier - replaced by poultry cube crate +# id: LivestockDuck +# abstract: true # Frontier +# icon: +# sprite: Mobs/Animals/duck.rsi +# state: icon-0 +# product: CrateNPCDuck +# cost: 4000 +# category: cargoproduct-category-name-livestock +# group: market - type: cargoProduct id: LivestockCorgi diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml index ab05db0521c..1f1973fd33f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -13,7 +13,7 @@ state: box - type: StaticPrice price: 20 - vendPrice: 900 # Frontier - 150 per monkey (Meat worth 200) + vendPrice: 960 # Frontier - 120 per monkey (meat worth 540 at a depot) - type: entity parent: BaseItem @@ -67,6 +67,9 @@ - type: Sprite sprite: Objects/Misc/monkeycube.rsi state: box_variant + - type: StaticPrice + price: 20 + vendPrice: 800 # Frontier - 120 per monkey, 80 per kobold (meat worth 450 at a depot) - type: entity parent: MonkeyCubeWrapped diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml index c9dde6c4d9e..192242e6ac8 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml @@ -8,3 +8,13 @@ cost: 10000 category: cargoproduct-category-name-livestock group: market + +- type: cargoProduct + id: LivestockPoultryCube + icon: + sprite: _NF/Objects/Misc/monkeycube.rsi + state: box_poultry + product: CrateNPCPoultryCube + cost: 2000 + category: cargoproduct-category-name-livestock + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml index 5bc092f289b..93bb8c09471 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml @@ -73,3 +73,13 @@ - type: entity id: PetCarrierNPCEmotionalSupportSafe parent: [PetCarrier, FillNPCEmotionalSupportSafe] + +- type: entity + id: CrateNPCPoultryCube + parent: CrateGenericSteel + name: poultry cube crate + description: A crate containing single box of poultry cubes. + components: + - type: StorageFill + contents: + - id: PoultryCubeBox diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml new file mode 100644 index 00000000000..2c2e82ba147 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml @@ -0,0 +1,50 @@ +- type: entity + parent: BoxCardboard + name: poultry cube box + id: PoultryCubeBox + description: Drymate brand poultry cubes, chicken and duck. Just add water! + components: + - type: StorageFill + contents: + - id: ChickenCubeWrapped + amount: 6 + - id: DuckCubeWrapped + amount: 2 + - type: Sprite + sprite: _NF/Objects/Misc/monkeycube.rsi + state: box_poultry + - type: StaticPrice + price: 20 + vendPrice: 800 # Meat only worth 180 at a depot, but can produce eggs and more poultry for free + +- type: entity + parent: MonkeyCubeWrapped + name: chicken cube + suffix: Wrapped + id: ChickenCubeWrapped + description: Unwrap this to get a chicken cube. + components: + - type: SpawnItemsOnUse + items: + - id: ChickenCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _NF/Objects/Misc/monkeycube.rsi + state: wrapper_chicken + +- type: entity + parent: MonkeyCubeWrapped + name: duck cube + suffix: Wrapped + id: DuckCubeWrapped + description: Unwrap this to get a duck cube. + components: + - type: SpawnItemsOnUse + items: + - id: DuckCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: _NF/Objects/Misc/monkeycube.rsi + state: wrapper_duck diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml new file mode 100644 index 00000000000..7619a0c71f7 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml @@ -0,0 +1,21 @@ +- type: entity + parent: MonkeyCube + id: ChickenCube + name: chicken cube + components: + - type: Rehydratable + possibleSpawns: + - MobChicken + - MobChicken1 + - MobChicken2 + +- type: entity + parent: MonkeyCube + id: DuckCube + name: duck cube + components: + - type: Rehydratable + possibleSpawns: + - MobDuckMallard + - MobDuckWhite + - MobDuckBrown diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png new file mode 100644 index 0000000000000000000000000000000000000000..db43b5812c536c15d3ac027cb8d72f113dcd002a GIT binary patch literal 1271 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vf$KFkz^NCM6mkoIHoK%2WtOF;xE1B+DuBIgm5JLeE;!AD z>P^Av79&@jdi8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-z*=xq~YU|`Jlba4!+ zxRvzh|9|_#4oqrojBJbfBuWo7SU0pzXkwn*U3kiNXBhXn!$whOdv;v0m~uSm8ADE+ zZf7_{w2sn=vkJ@J9w>OraYWIOTi)PNvB6P3hwV2sO0^H02rU zvm0LwbOgTe~DWM4f?a;aA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json new file mode 100644 index 00000000000..3f145068680 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "box_poultry edited by Arimah from monkeycubebox from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. wrapper_chicken and wrapper_duck made by Stagnation for Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box_poultry" + }, + { + "name": "wrapper_chicken" + }, + { + "name": "wrapper_duck" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png new file mode 100644 index 0000000000000000000000000000000000000000..a320eac82580c7ef59a333a034db8c2d88640268 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;6JY5_^BHWWDSQjUV^fUz;EIDYyd-=Zt&(le)5(`Z{6OuO@-?+5h+rIIq zf`ZK1;}7C@Pfz(gV}Z#wi93Fo#!m&qsRa1pS(VV~RP0i`=nr`}E zS6dXplN5g5+I`YY73+k|R$YsEl{;=8s0r|B&}m}~l65E&aVeK!i)QfVKG6_zT9a+T zg$!S#MJr_B&cDRS%*+s7A2M??mlrqCe|)JCo@u_m3|c@o2M~k6rQpdR%G1@)Wt~$( F69D`fb0h!& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png new file mode 100644 index 0000000000000000000000000000000000000000..a8909a6433ecbbb254c17a10f572ddf3590eb143 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6<1JY5_^BHWWDSQjUV^fUz;EIIh|^Yj1B22;Gn5?U^)FwR)IXV0F5f6vd) zKe%P#LdBEMCaz&jvD|g^L`{(FL6)VRZ1?xoGDm;;^wfL9QH7ev$9N6?zr4IWAoK|H zBv}TgUqX`)n4D3Z!Z1lTVWmlX