From 7bea452f7e31eef2a44410ad902b64d2f461a914 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Tue, 8 Feb 2022 19:47:06 -0500 Subject: [PATCH] Added Gatfruit (#6569) --- .../Objects/Consumable/Food/produce.yml | 22 +++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 11 +++++++ Resources/Prototypes/Hydroponics/seeds.yml | 26 ++++++++++++++++ .../Hydroponics/gatfruit.rsi/dead.png | Bin 0 -> 792 bytes .../Hydroponics/gatfruit.rsi/harvest.png | Bin 0 -> 1202 bytes .../Hydroponics/gatfruit.rsi/meta.json | 29 ++++++++++++++++++ .../Hydroponics/gatfruit.rsi/produce.png | Bin 0 -> 1096 bytes .../Hydroponics/gatfruit.rsi/seed.png | Bin 0 -> 939 bytes .../Hydroponics/gatfruit.rsi/stage-1.png | Bin 0 -> 694 bytes .../Hydroponics/gatfruit.rsi/stage-2.png | Bin 0 -> 994 bytes 10 files changed, 88 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-2.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index ba6c2f4e3c..6e56c7320a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -715,3 +715,25 @@ seed: flyAmanita - type: Extractable grindableSolutionName: food + +- type: entity + name: gatfruit + parent: FoodProduceBase + id: FoodGatfruit + description: A delicious, gun-shaped fruit with a thick wooden stem. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sulfur + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/gatfruit.rsi + - type: Produce + seed: gatfruit + - type: Food + trash: RevolverPredator diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 43538038cd..09b9478453 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -269,3 +269,14 @@ seed: flyAmanita - type: Sprite sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + +- type: entity + parent: SeedBase + name: packet of gatfruit seeds + description: "These are no peashooters." + id: GatfruitSeeds + components: + - type: Seed + seed: gatfruit + - type: Sprite + sprite: Objects/Specific/Hydroponics/gatfruit.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index c4a5dd6645..fe41bbc8bb 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -623,3 +623,29 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: gatfruit + name: gatfruit + seedName: gatfruit + displayName: gatfruit tree + plantRsi: Objects/Specific/Hydroponics/gatfruit.rsi + productPrototypes: + - FoodGatfruit + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 2 + potency: 10 + growthStages: 2 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Sulfur: + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..d367f019cc22b2f1c351164aa8b31578b5a7e00a GIT binary patch literal 792 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 N002ovPDHLkV1l$YkTC!N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7a145aace76c31cbff1931b56fc1bf85383ea2 GIT binary patch literal 694 zcmV;n0!jUeP)EX>4Tx04R}tkv&MmKpe$iQ>8^J4i*u0$WWauNELC^DionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?K>DYS_3;J6>}?mh0_0YbgZG^=X@&~)2O zCE{WxyDA1=As~nW3?n8p%b1g-Bs|C0J$!tC`-Nm{=@yu+qV-Xlle$#1U1~DPPFA zta9Gstd*;*bx;1nP)=W2<~q$0B(R7jND!f*iW17O5v5fp#X^eq;~xH@re7kLLaq`R zITlcX2D#}6|AXJ%TKUPCn-q!z-7k*wF$x5Bfkw@7zK8He1u%L;00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^l*793$@r+Fbwu02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{0053jL_t(o!((6=1*2dTjDk@x)B*QahW`U*G1r^{vYeW} zXQIT?Bflv31j!Eg>dnA-em$no>7EwOuV?rVa|kvE(FM$GLO6nMQGgB%0~r_x)B$u) zgvj9f-2rsK%qB?O!)S5=S@Bm8k7?EX>4Tx04R}tkv&MmKpe$iQ>8^J4i*u0$WWauNELC^DionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?K>DYS_3;J6>}?mh0_0YbgZG^=X@&~)2O zCE{WxyDA1=As~nW3?n8p%b1g-Bs|C0J$!tC`-Nm{=@yu+qV-Xlle$#1U1~DPPFA zta9Gstd*;*bx;1nP)=W2<~q$0B(R7jND!f*iW17O5v5fp#X^eq;~xH@re7kLLaq`R zITlcX2D#}6|AXJ%TKUPCn-q!z-7k*wF$x5Bfkw@7zK8He1u%L;00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^l*795eE<$~gc402y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00Fv5L_t(o!|j%_OCv!P#(%S8~=fjQc|Rh zrI1Rkgfv&AO_Sn^3v3lhlk=*>EmIse2jRM_(s+$lVuZliC|exlUGXyPswlhTLO}Mb zhWBRY`{upx4GTHm3(8|;<%BktshGfj`B0mS=i{+VMFc)l>_vwcdq{bVv|Ac04WI8x zfL=Gp=9AVO4&P%#c=5TQdgDzq!QT(I^hZE?JFoCaC z$y`9-BVh+~Qd1EJ-&K(L0AFrYM6ri7kJDG6kjU*<&~712luYJu^ar;8sUSAM+tK|G z4HZ!yBX;c!+w0O0iLU|n>S{o1zPLGGo1CXGX=i^i)zX`aw!-?rR6u5M8p8fPd|OlV zX6AvwN4{P`*wI5}7LnW1%N!=Zlar@@@ru32bKhH`}~ zOKe;!vY0~SC+t?2QveLMqV{C|62@Ui>kQcZsJFeog>dB7bI-LEgKk8A_QTz9&H`-d z-wKZv!+UG_cdIK9aB->R0O!A=`FBCV<)eQ13B12iAY2DN=Rd|da^!Hrf6)ibz@S+P Q761SM07*qoM6N<$f~yF`D*ylh literal 0 HcmV?d00001