From 2ea54b1913c73660ad056e12b891ebc5e99fb8e0 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 21 Sep 2024 22:54:56 +0300 Subject: [PATCH] Flora anomaly seeds (#31987) * content * Update meta.json * Update mobspawn.yml * Update mobspawn.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml * Update Resources/Prototypes/Entities/Effects/mobspawn.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../nutrition/components/food-sequence.ftl | 2 + Resources/Locale/en-US/seeds/seeds.ftl | 2 + .../Prototypes/Entities/Effects/mobspawn.yml | 56 ++++++++---------- .../Objects/Consumable/Food/produce.yml | 36 +++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 10 ++++ .../Structures/Specific/Anomaly/cores.yml | 4 ++ Resources/Prototypes/Flavors/flavors.yml | 5 ++ Resources/Prototypes/Hydroponics/seeds.yml | 31 ++++++++++ .../Recipes/Cooking/food_sequence_element.yml | 17 ++++++ .../Hydroponics/anomaly_berry.rsi/dead.png | Bin 0 -> 570 bytes .../Hydroponics/anomaly_berry.rsi/harvest.png | Bin 0 -> 589 bytes .../Hydroponics/anomaly_berry.rsi/meta.json | 29 +++++++++ .../Hydroponics/anomaly_berry.rsi/produce.png | Bin 0 -> 548 bytes .../Hydroponics/anomaly_berry.rsi/seed.png | Bin 0 -> 403 bytes .../Hydroponics/anomaly_berry.rsi/stage-1.png | Bin 0 -> 389 bytes .../Hydroponics/anomaly_berry.rsi/stage-2.png | Bin 0 -> 491 bytes 17 files changed, 161 insertions(+), 32 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 3e7cde8449..0ba65217ef 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -20,6 +20,7 @@ flavor-base-fishy = fishy flavor-base-crabby = crabby flavor-base-cheesy = cheesy flavor-base-funny = funny +flavor-base-strange = strange flavor-base-tingly = tingly flavor-base-acid = acidic flavor-base-leafy = leafy diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 97dd7ffcc6..b21d2a8315 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -76,6 +76,7 @@ food-sequence-content-berries = berries food-sequence-content-spacemans-trumpet = spaceman's trupmet food-sequence-content-cherry = cherry food-sequence-content-snail = snail +food-sequence-content-anomaly-berry = anomaly berry # BURGERS @@ -116,6 +117,7 @@ food-sequence-burger-content-suppermatter = supper food-sequence-burger-content-hamster = hams food-sequence-burger-content-berries = berri food-sequence-burger-content-spacemans-trumpet = spacetrump +food-sequence-burger-content-anomaly-berry = anom food-sequence-burger-content-extradimensional-orange = 3d food-sequence-burger-content-world-pea = peace diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index c8d524ba1d..1ca559db30 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -140,3 +140,5 @@ seeds-capfruit-name = capfruit seeds-capfruit-display-name = capfruit tree seeds-cherry-name = cherry seeds-cherry-display-name = cherry tree +seeds-anomaly-berry-name = anomaly berry +seeds-anomaly-berry-display-name = anomaly berries diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index c4396a775d..1489c26493 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -82,36 +82,28 @@ tags: - HideContextMenu - type: AnimationPlayer - - type: RandomSpawner + - type: EntityTableSpawner deleteSpawnerAfterSpawn: false - rareChance: 0.1 - offset: 0.3 - chance: 1 - prototypes: - - FoodAmbrosiaVulgaris - - FoodAloe - - FoodCabbage - - FoodCarrot - - FoodGalaxythistle - - FoodLemon - - FoodLime - - FoodPeaPod - - FoodPineapple - - FoodOnionRed - - FoodWatermelon - - FoodAmbrosiaVulgaris - - FoodAloe - - FoodCabbage - - FoodCarrot - - FoodGalaxythistle - - FoodLemon - - FoodLime - - FoodPeaPod - - FoodPineapple - - FoodOnionRed - - FoodWatermelon - - FoodGatfruit - - MobTomatoKiller - rarePrototypes: - - MobLuminousEntity - - MobLuminousObject + table: !type:NestedSelector + tableId: AnomalyFloraLootTable + +- type: entityTable + id: AnomalyFloraLootTable + table: !type:GroupSelector + children: + - id: FoodAmbrosiaVulgaris + - id: FoodAloe + - id: FoodCabbage + - id: FoodGalaxythistle + - id: FoodLemon + - id: FoodLime + - id: FoodPeaPod + - id: FoodPineapple + - id: FoodOnionRed + - id: FoodWatermelon + - id: FoodCherry + - id: MobTomatoKiller + - id: MobLuminousEntity + - id: MobLuminousObject + - id: FoodGatfruit # 0.007% spawn chance. 1 / 141 + weight: 0.10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 42fd0967ff..fa88f30074 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2553,3 +2553,39 @@ seedId: cherry - type: SpaceGarbage - type: BadFood + +- type: entity + name: anomaly berry + description: A strange blue fruit. Something about it doesn't seem right. + parent: FoodProduceBase + id: FoodAnomalyBerry + components: + - type: FlavorProfile + flavors: + - strange + - type: Sprite + sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi + state: produce + - type: Produce + seedId: anomalyBerry + - type: Food + trash: + - EffectAnomalyFloraBulb # Random loot + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Artifexium + Quantity: 1 + - type: Tag + tags: + - Fruit + - type: FoodSequenceElement + entries: + Taco: AnomalyBerry + Burger: AnomalyBerryBurger \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 6015a8bf01..1ad3dd5bdf 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -725,3 +725,13 @@ seedId: cherry - type: Sprite sprite: Objects/Specific/Hydroponics/cherry.rsi + +- type: entity + parent: SeedBase + name: packet of anomaly berry seeds + id: AnomalyBerrySeeds + components: + - type: Seed + seedId: anomalyBerry + - type: Sprite + sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 71065a8e3d..315505b81e 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -147,6 +147,8 @@ id: AnomalyCoreFlora suffix: Flora components: + - type: Seed + seedId: anomalyBerry - type: Sprite sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi - type: PointLight @@ -307,6 +309,8 @@ id: AnomalyCoreFloraInert suffix: Flora, Inert components: + - type: Seed + seedId: anomalyBerry - type: Sprite sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi - type: PointLight diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 3f536c871a..a351e942e8 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -59,6 +59,11 @@ flavorType: Base description: flavor-base-funny +- type: flavor + id: strange + flavorType: Base + description: flavor-base-strange + - type: flavor id: tingly flavorType: Base diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 54c5c29d55..07e08ef75b 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1951,3 +1951,34 @@ Min: 1 Max: 3 PotencyDivisor: 40 + +- type: seed + id: anomalyBerry + name: seeds-anomaly-berry-name + noun: seeds-noun-seeds + displayName: seeds-anomaly-berry-display-name + plantRsi: Objects/Specific/Hydroponics/anomaly_berry.rsi + packetPrototype: AnomalyBerrySeeds + productPrototypes: + - FoodAnomalyBerry + lifespan: 25 + maturation: 12 + production: 3 + yield: 3 + potency: 10 + growthStages: 2 + waterConsumption: 0.60 + nutrientConsumption: 0.50 + chemicals: + Artifexium: + Min: 1 + Max: 1 + PotencyDivisor: 4 + Nutriment: + Min: 1 + Max: 2 + PotencyDivisor: 30 + Vitamin: + Min: 1 + Max: 2 + PotencyDivisor: 40 diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 43d6fe8852..0654376442 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1176,3 +1176,20 @@ sprites: - sprite: Objects/Consumable/Food/Baked/cake.rsi state: suppermatter-shard + + +# Anomaly berries + +- type: foodSequenceElement + id: AnomalyBerry + name: food-sequence-content-anomaly-berry + sprites: + - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi + state: produce + +- type: foodSequenceElement + id: AnomalyBerryBurger + name: food-sequence-burger-content-anomaly-berry + sprites: + - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi + state: produce diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..e6082a57443e4d0e42fb264b9fc856bc78775430 GIT binary patch literal 570 zcmV-A0>%A_P)Px$^hrcPR9J=Wl`(4@K@f#MVMBxqVFgRvvBsr?gMyUk2S{K90)aZYRGTujAiaM> z+LU%@2nf=|RVtekF(jxAI!>Gf2PuMGZ3=l;yLYFv0_k$E($37@ym>P_f*d(=Z&OvbRc+Z(&`l;8uzRi+iG3XsHs-LI7R;>5CtP(S!Dn zuO|rtnKJ;ZIq;@ScJ|kPRqeXpSZB|>cU(c^_#mNz{*g9(jw?8F_IO^}1E5-d24Kl*+7(Q{QotNSlYrF%^)%G; zn+HDgAX%kJwA-rdgzA1g7Ql-sVi7Q_#|X?=K&$vz(hc#tt>aAu;_RQ=eCnwxrLyiA zcB#|=q_qdOS+$#BZnbSl$L*=la9gBJ^%f-l9n$__a{Mj+0N%zGB>2`bP5=M^07*qo IM6N<$g4Ov9Hvj+t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..5a405285d7eccb8435c44cd5b21420eb54232d34 GIT binary patch literal 589 zcmV-T0Px%2T4RhR9J=Wl`&7-Kp2LfRF-fTkSo`X>!?ebEKM?HC?lP!h=IS;U%=n#fKa#o zflR;zMwKFHz_FZ?DM*&C!*S-$c1%sX)$iuJ@B7~O{qDOnG-%MEL4*Gtt-nd$+dmZf zweLq?YSny}07d-q^CxyXTijjUa~rMz_z_NPiKs1LZ~sszVgN6&iLTcGnUFdnUepx; zu+!PX3v7d2;m!N)TD2-wj{02zaB_ax0@J-0*Z>6qo4TNC={PyRY*|&ry|Js73dv>U zRYrPamt`cs{ei{l@eKe40i%9b3@2^YQJN*V?_3-Yl2tYN-PL_1x#PjbG$x)scC{ej zVZ(5oskeEUc6rWf5Owm~aK$pYHq6Y=(u`aYE0i9A9yIEAh3#4R9{dcE#X~u4dB^H1 z{z~QqyWa?QJBUS!KPaWyEI=Qa-q>Xwr2xFz{z{S@$c?bPpmHx3GDqdwUbzUP9f~+V z10V-S6-!nJ8yzX3fRXQbQpD-;jnUyumOgy*vouT6)xZ28uio3mk?G>K=}s)f6 zU>Si!S`cew=7}$+aj8SSL;k?Z+O4iuJ{Bao-VsB9?p`O(PpocoIBDY`yA{tW?0v}uJQrnC{Rblc9m;+% b4eH`ImfsvO8U`ay00000NkvXXu0mjflzkEL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json new file mode 100644 index 0000000000..7d86d10f9b --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..ce9f83bd5929734767b8b8aa5fe3b3a7830ab630 GIT binary patch literal 548 zcmV+<0^9wGP)Px$-bqA3R9J=Wl|4_wKpe(@HBDr~0Z>pvVj!KMlY^@+DwE&9#V_G^Vc{Dv88=r4 zCuC}BNC=8AbbS%K<&!W{XGZ{>0FkM8Pv3Q>1jXXB@($`)}Yg#2lrD-x51R($g>vU%1 z_f&gm0I5n`0%cw@sWf3Sm?Cn=6s(~A;PeQ9*YP`77pV3Zr=w#Vc(Z~Zk!3XCo)mN(!MMomT zO!ZWWXhE3yZQjfOyf)c(qAh80000P)Px$O-V#SR9J=Wm9a|0P!xv0NT}(O;&4++T?*;cj)hR%N{7CKFX01p>;w1!uD(MA zaT5_7>sD~FlqQ4N#aIGyC~0eraxN-5+;6$VJvsk>|9iLrgTY|J2pTL~BKf7?KQua>eY#Y3vT3&4D`V5vrHQR&HZ zw1;qdGob3bG=mDwphDGmDaFHgH2|}*%!tUq_Eb0g4wb`w0HSG9Sg(_UIDy@Jjiw3D zkFU%p3mztSV!>Ushj6JzT$~MP_?@+Iy&L|nfz>OwNuk~iSrSrLA8U1oP%8mx^CXg+ x(Eb-l#GfL#y1W(j)_#g5by9JI!C?3oyaDU8c!|r)FpdBK002ovPDHLkV1n8!w!i=Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b6511c4e61d6ba3b1841897845ebfaa783291fca GIT binary patch literal 389 zcmV;00eb$4P)Px$KS@MER9J=Wk}*%hKp2J}3`1Q=AhiKaObFOTVCoNmQR3j=@fY}a91JUepc6Pj z35h|)f)bcY(&QZK)jF8=ESvW%cWK}I-uL_NK%>!UG#br+r=WVEcYP=7O^3PX0x*2I zRj!ew_!o1#dxG7)lAlGM5J~~0xpijXKL>0Vd+JSxce^2yy3u5oIgnBSfbC)*uW#NC z0Q20W){07v2TP@TsR25P?xK5lfKqHe_gpI0x3Nn1kn#vSc0;uLRbC%M0Lm78>~4N& zDy4fie)MnZt`8ePh5)#5OaP8A4PJ%;Wh>f?RY>56Y<#G-ii`)#!@hyhWLD_d4I#}S z>UQG;1Wes^tX)54wN(fp5vwr1XE_aNt~&N4M_Gl*(Hd5f)1Hyr95PNIY4Wuf?S3_n juUdd#0*O?iMw5Y0qf~%KmjLF~00000NkvXXu0mjfuY{&C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ba2f74e233e31c32a42c141a982fca7e135e70 GIT binary patch literal 491 zcmVPx$rAb6VR9J=Wl)X;EP#A_EOozIdU`hj#kQlU!+KF8qB@SMI3D@BT7_Wmna4@Xg z0244Nh6M$S3DKz}O^ySe!-2Lmpb1Ogr8(#OdEf8n6jG!}ks?Kk6kA4S-GIyM2XS~* zQRjZI1wixZZtYwE#wO&>MGpJG#C!8`F0Q0mY$9T3mC<#|!gb0*o^^5^UxO)nSJpvd z2hOT_043sUFb$D^^u8lwb@A=z*U0W93h=!Et7K6)ow?4)_CkLBUTc96P;s5cC^mnh z0MjdohRPhKWoqJnVi9U(^vN|txq6+{viRbQxgPM*Fv-;PFfs5SS5?y6O(p*5b3{kCzkDhg6ovU?ftn}e)pST<*#@Z h^qtrW{-gR706$iI#01l$;%)!{002ovPDHLkV1li=)WiS) literal 0 HcmV?d00001 -- 2.52.0