From 667cebef52ae656760f806edbd4c550996d3dd6d Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Sat, 10 Feb 2024 18:21:44 +1000 Subject: [PATCH] Laughin' Peas (#25089) * laughter * make clownmobs bleed laughter * laughin syrup and laughter recipe * add laughin peas --- Resources/Locale/en-US/reagents/laughter.ftl | 1 + .../meta/consumable/food/condiments.ftl | 3 ++ Resources/Locale/en-US/reagents/meta/fun.ftl | 4 ++ .../en-US/reagents/meta/physical-desc.ftl | 1 + Resources/Locale/en-US/seeds/seeds.ftl | 2 + .../Prototypes/Entities/Mobs/NPCs/animals.yml | 3 ++ .../Entities/Mobs/NPCs/behonker.yml | 3 ++ .../Objects/Consumable/Food/produce.yml | 30 +++++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 11 ++++++ Resources/Prototypes/Hydroponics/seeds.yml | 35 ++++++++++++++++++ .../Reagents/Consumable/Food/condiments.yml | 10 +++++ Resources/Prototypes/Reagents/fun.yml | 21 +++++++++++ .../Prototypes/Recipes/Reactions/fun.yml | 10 +++++ .../Hydroponics/laughin_pea.rsi/dead.png | Bin 0 -> 250 bytes .../Hydroponics/laughin_pea.rsi/harvest.png | Bin 0 -> 410 bytes .../Hydroponics/laughin_pea.rsi/meta.json | 32 ++++++++++++++++ .../Hydroponics/laughin_pea.rsi/produce.png | Bin 0 -> 344 bytes .../Hydroponics/laughin_pea.rsi/seed.png | Bin 0 -> 300 bytes .../Hydroponics/laughin_pea.rsi/stage-1.png | Bin 0 -> 266 bytes .../Hydroponics/laughin_pea.rsi/stage-2.png | Bin 0 -> 297 bytes .../Hydroponics/laughin_pea.rsi/stage-3.png | Bin 0 -> 364 bytes 21 files changed, 166 insertions(+) create mode 100644 Resources/Locale/en-US/reagents/laughter.ftl create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png diff --git a/Resources/Locale/en-US/reagents/laughter.ftl b/Resources/Locale/en-US/reagents/laughter.ftl new file mode 100644 index 000000000000..b9f7c583cdd7 --- /dev/null +++ b/Resources/Locale/en-US/reagents/laughter.ftl @@ -0,0 +1 @@ +laughter-effect-control-laughter = You can't contain your laughter! diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl index a448b45a10f4..38cd16b01c71 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -22,6 +22,9 @@ reagent-desc-ketchup = Made from pureed tomatoes and flavored with spices. reagent-name-ketchunaise = ketchunaise reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Americans. +reagent-name-laughin-syrup = laughin' syrup +reagent-desc-laughin-syrup = The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with! + reagent-name-mayo = mayonnaise reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid. diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl index 510d9d084aa6..68de618a3652 100644 --- a/Resources/Locale/en-US/reagents/meta/fun.ftl +++ b/Resources/Locale/en-US/reagents/meta/fun.ftl @@ -21,3 +21,7 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t reagent-name-fresium = Fresium reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested. + +reagent-name-laughter = Laughter +reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue. + diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 8d55e592f87e..24340e63a61f 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -91,6 +91,7 @@ reagent-physical-desc-energizing = energizing reagent-physical-desc-exhilarating = exhilarating reagent-physical-desc-vibrant = vibrant reagent-physical-desc-fluffy = fluffy +reagent-physical-desc-funny = funny reagent-physical-desc-alkaline = alkaline reagent-physical-desc-reflective = reflective reagent-physical-desc-holy = holy diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index f4c136e29520..dca67fa04c4b 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -71,6 +71,8 @@ seeds-poppy-name = poppy seeds-poppy-display-name = poppies seeds-aloe-name = aloe seeds-aloe-display-name = aloe +seeds-laughin-pea-name = laughin' peas +seeds-laughin-pea-display-name = laughin' peas seeds-lingzhi-name = lingzhi seeds-lingzhi-display-name = lingzhi seeds-ambrosiavulgaris-name = ambrosia vulgaris diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6087123b4334..1251884965e9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2222,6 +2222,9 @@ collection: FootstepClownFast - type: Speech speechVerb: Cluwne + - type: Bloodstream + bloodMaxVolume: 150 + bloodReagent: Laughter - type: entity name: possum diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index 3b3b9b441203..bc63deeac36f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -112,6 +112,9 @@ Radiation: 10 - type: Input context: "human" + - type: Bloodstream + bloodMaxVolume: 300 + bloodReagent: Laughter - type: entity name: behonker diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index cabeba7dfe29..24788bb3cc99 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -95,6 +95,36 @@ - type: Produce seedId: sugarcane +- type: entity + parent: FoodProduceBase + id: FoodLaughinPeaPod + name: laughin' pea pod + description: The clown's favorite plant. + components: + - type: FlavorProfile + flavors: + - peas + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Sugar + Quantity: 2 + - ReagentId: Laughter + Quantity: 2 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: LaughinSyrup + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/laughin_pea.rsi + - type: Produce + seedId: laughinPea + - type: entity name: tower-cap log description: It's better than bad, it's good! diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 2bbb720259d2..affdc79defa7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -82,6 +82,17 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/garlic.rsi +- type: entity + parent: SeedBase + id: LaughinPeaSeeds + name: packet of laughin' pea pods + description: "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas." + components: + - type: Seed + seedId: laughinPea + - type: Sprite + sprite: Objects/Specific/Hydroponics/laughin_pea.rsi + - type: entity parent: SeedBase name: packet of lemon seeds diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 7c94546602c8..649ffa85224a 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -136,6 +136,39 @@ Max: 4 PotencyDivisor: 25 +- type: seed + id: laughinPea + name: seeds-laughin-pea-name + noun: seeds-noun-seeds + displayName: seeds-laughin-pea-display-name + plantRsi: Objects/Specific/Hydroponics/laughin_pea.rsi + packetPrototype: LaughinPeaSeeds + productPrototypes: + - FoodLaughinPeaPod + lifespan: 25 + growthStages: 3 + maturation: 8 + production: 6 + yield: 3 + potency: 25 + idealLight: 8 + harvestRepeat: Repeat + nutrientConsumption: 0.6 + waterConsumption: 0.6 + chemicals: + Nutriment: + Min: 1 + Max: 3 + PotencyDivisor: 33 + Sugar: + Min: 1 + Max: 5 + PotencyDivisor: 50 + Laughter: + Min: 1 + Max: 5 + PotencyDivisor: 50 + - type: seed id: lemon name: seeds-lemon-name @@ -1344,6 +1377,8 @@ packetPrototype: PeaSeeds productPrototypes: - FoodPeaPod + mutationPrototypes: + - laughinPea lifespan: 25 growthStages: 3 maturation: 8 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index f980f5066aa6..8fbfd3cd64b7 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -77,6 +77,16 @@ color: "#fba399" recognizable: true +- type: reagent + id: LaughinSyrup + name: reagent-name-laughin-syrup + group: Foods + desc: reagent-desc-laughin-syrup + physicalDesc: reagent-physical-desc-funny + flavor: sweet + color: "#803280" + recognizable: true + - type: reagent id: Mayo name: reagent-name-mayo diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index d22e2213ace7..25b0e8da8091 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -298,3 +298,24 @@ messages: [ "fresium-effect-frozen"] probability: 0.4 +- type: reagent + id: Laughter + name: reagent-name-laughter + group: Special + desc: reagent-desc-laughter + physicalDesc: reagent-physical-desc-funny + flavor: funny + color: "#FF4DD2" + slippery: true #clown juice gotta slip + metabolisms: + Medicine: + effects: + - !type:Emote + emote: Laugh + probability: 0.3 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "laughter-effect-control-laughter" ] + probability: 0.2 + diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index 818030a3b33d..a8ccd5f0455b 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -161,3 +161,13 @@ Carbon: 3 Sugar: 2 +- type: reaction + id: Laughter + reactants: + JuiceBanana: + amount: 1 + Sugar: + amount: 1 + products: + Laughter: 2 + diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..ded6b2eb7733d1c1a650240da8cf45fdaac6ccc0 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUYg779t-rf!_SVVui-2N_KOUa~q*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP%zok#WBRf|7~9&-vI>FO~98H1NF?hQAxvX&;$;@*MnM_kW7--#tnHFKJ)=5%K+n^Ydl;{}1N5ShRK6Sia5gxYYAJYSs9m-s5 z^DH0rGR#|c_uxm{!h=lZKN=>bg{h_gV#s0CZMeY9AQ!gwYRn0S`-i4{-0*5KZ-*c& z?}|C4ZmXanMpx|6j7sn6_|ECwc z#SSU(uwIzqkg@em{qAKmX7S6&T7K$X5F;n@BK}i8L!On#Mz#pyau&XcQ<)tcSXOM- zW=rW6_`HiTQs2X>aA(7twM?u0bl>q!mF(`*m78)bZx!c)ExD^cM3?2+#2#u+b!7?q z$f=_(G@L XLIb{K^DV`J4rTCk^>bP0l+XkKgjI;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..a4ad791bb1a13aa17e829660ea81face1099de69 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?ST=P}IMtG44>?8V#lH#W(xyQTT*y3Ct@i~jxJ@PC!eoA1-U0~Ov; z;hh4ccuIo&g8w4`gV6nR=YZmz1s;*b3=DjSL74G){)!Z!V5O&vV~Bw gaCi6LhNUG;Om(UUZy$PjALs}MPgg&ebxsLQ0LBe>{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1c710f40db2fb3062341f07ac7eaa10668bc606f GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbU>&;#*)B9hh^JuNz|NjjC92pj#Q$HKZb6}y<^ES1!w@hws;ol5Y z%UoG(2&8yRg8YL2BLN267fNkF3C;qK$YKTtzQZ8Qcszea3Q#cE)5S5w!vAfbuT+Bq zhs)M8`*-}W^QVQ9p0-1U4t2@eH1>elF{r5}E+ur(+8M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..157a081b35d7131100b5347291ed80199402f74d GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?ST_ayyqv;CN*aBaQI|1zCNFN~i3Px@DH_Uf$I>4i?uZz^5~Dr7J} zdIw1Ilmz(&|3?4@q5J2~0mV5BJR*x382Ao@Fyrz36)8Z$GEW!B5DWjeecpTx3Op{X zPj3IdfBh2Q)=tB`*biboTh4Q`*KS~a8s22g928M}Uu5E;D3v7w8WG$q@dthj$M@t2 zaTP5)B&cz(?cXUj?LB9TmPVLLRyX%_ab2~&%wj1m^=k3LWTt}~rB<9z-l8bp&Y7Q+ c=v2bE^qJP}-+yj60bRi0>FVdQ&MBb@0OLt>L;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..311098b975ae4171a9e42c3e426a762dc137a72c GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbU>&;&Mulv6z>Hm+2@0YYMzA$>0rEqP%%l|gpk7YWK{wMuAD|ULJ z)AO5(*MT}}POa|*Qv4-Be!>4y0K=6#GZq4+I14-?iy0XB4ude`@%$AjK*6=1E{-7< z{%W!LY$)vbwp}?nS>E=A^o31*si8?ZD7@QhUjo`~|B-ts5KC%XkkwdMNxXzVyMD tHwP9q&XZdAc+=TMmam)tHF!N?TlmLBeO