From 2ef29fb222648d909d22d8f5bd60a5896fd808f9 Mon Sep 17 00:00:00 2001 From: DoubleRiceEddiedd <149714181+DoubleRiceEddiedd@users.noreply.github.com> Date: Thu, 9 Nov 2023 09:54:07 +0800 Subject: [PATCH] New crop: Cotton (#21536) * Add cotton plant * Adddescription and tag to cotton bal allow moth eat it * Fix typo. Add cotton seed into MegaSeed * Fix typo * Fix typo * Fix cottonbol component typo * Fix the amount of cotton that bol gives * Adding correct component to make cotton bol edible * Change cotton bol parent to see if it is edible * Adding flavor to cotton bol, and fix typo * Replace image * fixing plant image position * Increase the Megaseed restock crate price to avoid money farming loop hole --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + Resources/Locale/en-US/seeds/seeds.ftl | 2 ++ .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/seeds.yml | 1 + .../Objects/Consumable/Food/produce.yml | 28 +++++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 10 ++++++ Resources/Prototypes/Hydroponics/seeds.yml | 24 +++++++++++++ .../Specific/Hydroponics/cotton.rsi/dead.png | Bin 0 -> 310 bytes .../Hydroponics/cotton.rsi/harvest.png | Bin 0 -> 496 bytes .../Specific/Hydroponics/cotton.rsi/meta.json | 32 ++++++++++++++++++ .../Hydroponics/cotton.rsi/produce.png | Bin 0 -> 235 bytes .../Specific/Hydroponics/cotton.rsi/seed.png | Bin 0 -> 194 bytes .../Hydroponics/cotton.rsi/stage-1.png | Bin 0 -> 197 bytes .../Hydroponics/cotton.rsi/stage-2.png | Bin 0 -> 283 bytes .../Hydroponics/cotton.rsi/stage-3.png | Bin 0 -> 368 bytes 15 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index a17b9019d5..3998429d1c 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -99,6 +99,7 @@ flavor-complex-tomato = like tomatoes flavor-complex-corn = like corn flavor-complex-banana = like bananas flavor-complex-apple = like apples +flavor-complex-cotton = like cottons flavor-complex-bungo = like bungo flavor-complex-raisins = like dried grapes flavor-complex-orange = like oranges diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 890d292660..64b5e0d4f7 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -101,3 +101,5 @@ seeds-pea-name = pea seeds-pea-display-name = pea vines seeds-pumpkin-name = pumpkin seeds-pumpkin-display-name = pumpkins +seeds-cotton-name = cotton +seeds-cotton-display-name = cotton plant \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 0d38d1088e..cfe69d98d2 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3250 + cost: 3375 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index c48100f4ec..05e3ae0eb0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -35,5 +35,6 @@ CocoaSeeds: 3 BerrySeeds: 5 PeaSeeds: 5 + CottonSeeds: 5 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 6a19f801a6..8232a34b59 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1636,3 +1636,31 @@ - type: Tag tags: - Fruit + +- type: entity + name: cotton bol + description: Moth people's favorite snack, and just as fluffy as them. + id: CottonBol + parent: FoodProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/cotton.rsi + - type: FlavorProfile + flavors: + - cotton + - type: Food + requiresSpecialDigestion: true + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: Log + spawnedPrototype: MaterialCotton1 + spawnCount: 2 + - type: Produce + seedId: cotton + - type: Tag + tags: + - ClothMade diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index a731a12997..b225d3afdd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -519,3 +519,13 @@ seedId: pumpkin - type: Sprite sprite: Objects/Specific/Hydroponics/pumpkin.rsi + +- type: entity + parent: SeedBase + name: packet of cotton seeds + id: CottonSeeds + components: + - type: Seed + seedId: cotton + - type: Sprite + sprite: Objects/Specific/Hydroponics/cotton.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 20d3f2d853..2c0a0c87c5 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1357,3 +1357,27 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: cotton + name: seeds-cotton-name + noun: seeds-noun-seeds + displayName: seeds-cotton-display-name + plantRsi: Objects/Specific/Hydroponics/cotton.rsi + packetPrototype: CottonSeeds + productPrototypes: + - CottonBol + lifespan: 25 + maturation: 8 + production: 3 + yield: 3 + potency: 5 + idealLight: 8 + growthStages: 3 + waterConsumption: 0.60 + chemicals: + Fiber: + Min: 5 + Max: 10 + PotencyDivisor: 20 + diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..490e558a273f738cdf2588965ec8e7931eaa1212 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;Au}6$B+p3w-XL>GCA_NZl0FF*kr16;@;k> zk15P?YmzqdS8w2zydlNHy@B=V`p?sSPUz`W1f1CY$7j;~nVl?-0xXUnrZ1TiXE~)x zH}8+=n}T_gx2yQvYd3%JF-zBPO0o{Fo#uLtDSw7sQ$_sr=T|>1UVb?3#KLyFjOrY= z^C~8n*61sj?RdK|{`(i!=G}~^AJ1fFExr*{KHcm4hvmC-gXh@ZVUMw1xgbLOY*-+3 zjHN@bz3bnaonMPrY`&l^9ldmV`nl82%?ccKJQL05J}OyL_$^u)=q(0MS3j3^P6Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0fk9KK~z{r?UOrB z!$1&*CsfoFQK}$Hnly>rP;iD&z!~5ITmcRPIRgcaMVd5}NUp3D)b5PFjej%VED8;x z*-u){V`t~FURx%U$z=YUQ78X|vMk$9wW27JwSLur5-G_~HsF&znM|y%>t3ds*mI5@Vpe_b+n(5WdcCmc$G1Vvy&C`y3JNUe7P@E27d9gl zqkR>Z9T$gW12OSrARnKK0zQW8Ml!LtQzRQ$t#=)B6FMAA-ID*WeIfQWacc5|_;-LV mJN9?#!Fa!)$z(F$n0*0%eMOcY9P32@0000L*oH}*t$B!S69z8Nv zWC%27Nc@pd1e9eg3GxeOaCmkj4ajNtba4#Pn7Fm?An#!V4%g0>_nEU;A8l}GW?#^f zbKu|RE32+ZJ)h+LTUGwggWr-5rth5l&ROpF%PqZsznnYIaE&$m(Ke&c%*I>K9oThq z-JUINX&0;P5|Xrx-hZiG^o?^5OSc$fznG1RL*bact&7BDPcYI*Te z=Kue*PMtdS45X5=B*-tA!Qt7BG$1F))5S4FV`6fGgik}DAj<@n zme|Gvk&KE7LQG6-9!v`z8ngtaP3zK{Fz;TcT0mf@mciaytyKy%Q7FNTjq!_tL<|GNG*LODZzVDNfu=Kfy85}Sb4q9e08#ZpJ^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0b49286a831d6ca753a58c81f13c9000057210fd GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V3eneV@QPi+jEY54GKIi7vqi^KXCnGBqwjQ zY;uOM(4$jF>!qV+Ffjs^uCa*vq7#2h?C+j$zjLMurcOCq*2`}5rhU(;&zEMcl>haI nG4Soacj=aAqu(+!lvI6;>1s;*b3=DjSL74G){)!Z!;08|@$B+p3w-ZkD9&+Gu;Z+S_=#ZM^_P{~= zi;Hdmvl8nCrW5C)j1H%5bm6l+GkMXCk12lyoj4R*bS6FCSwHo{ff~PSPyf0u%iJ!0 zc}1A~`TuOaS;zM8JKD%M_eMh)gPOj;&bz6tyyeUPEnaA*x$xtTnAF{pj~`k-o4Hyl z>zYw{l$4A_v3e=v-2|@ttCoF?s`}jFzs5d0#<)9r;W7P3vsU;vJ~Le$*7GYuy=4Nc b;wQF8f1;nv{LFU&=ynEAS3j3^P6qc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..77ab34fa1b323a6f5e70be09659fb910cbcfeac5 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!23AiO$B+p3x0CksF**ty`+h|$YT}D8>QUz# zoE~z9c*Qw>k#ku2KvzV(YOa9p)vxOJ@AaMOJu1dE>8I-SpPTQWJNIT@ponYWl>N($ zbJEWJ<=gA2{dm52HNTUd=cIN%L%V(b6;s(&)46?qb3cDN`}yOgx#yPZT#dTf!Gpu z+41_y*jTn(E!+M@^l`8!?_G|}9cCPncfw!H)&E)(8z}O$-QXGD{4aBkmq}H|14D_y M)78&qol`;+0DGL1=>Px# literal 0 HcmV?d00001 -- 2.51.2