From 358316462b4ed6290ddb41c57cd760f1dae03ebb Mon Sep 17 00:00:00 2001 From: RedTerror Date: Thu, 14 Nov 2024 16:06:13 +0700 Subject: [PATCH 01/17] CUCUMBERgit add -A! --- .../Locale/ru-RU/_corvaxnext/cucumber.ftl | 6 +++ .../Objects/Consumable/Food/produce.yml | 32 ++++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 10 +++++ .../_CorvaxNext/Hydroponics/seeds.yml | 33 ++++++++++++++ .../Hydroponics/cucumber.rsi/dead.png | Bin 0 -> 351 bytes .../Hydroponics/cucumber.rsi/harvest.png | Bin 0 -> 808 bytes .../Hydroponics/cucumber.rsi/meta.json | 41 ++++++++++++++++++ .../Hydroponics/cucumber.rsi/produce.png | Bin 0 -> 358 bytes .../Hydroponics/cucumber.rsi/seed.png | Bin 0 -> 391 bytes .../Hydroponics/cucumber.rsi/stage-1.png | Bin 0 -> 226 bytes .../Hydroponics/cucumber.rsi/stage-2.png | Bin 0 -> 293 bytes .../Hydroponics/cucumber.rsi/stage-3.png | Bin 0 -> 428 bytes .../Hydroponics/cucumber.rsi/stage-4.png | Bin 0 -> 559 bytes .../Hydroponics/cucumber.rsi/stage-5.png | Bin 0 -> 652 bytes .../Hydroponics/cucumber.rsi/stage-6.png | Bin 0 -> 709 bytes 15 files changed, 122 insertions(+) create mode 100644 Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/dead.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/harvest.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/produce.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/seed.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-1.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-2.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-3.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-4.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-5.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-6.png diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl new file mode 100644 index 00000000000..f4d4cd6b0a0 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -0,0 +1,6 @@ +ent-CucumbertSeeds = пакет семян (огурец) + .desc = { ent-SeedBase.desc } +ent-FoodCucumber = Огурец + .desc = длинный и толстый... +seeds-cucumber-name = Огурцы +seeds-cucumber-display-name = Огуречный куст \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml new file mode 100644 index 00000000000..2b016b8184e --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -0,0 +1,32 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_produce.yml +# For produce that can't be immediately eaten + +- type: entity + name: cucumber + parent: [FoodProduceBase] + id: FoodCucumber + description: PHAHAHHAHA cu-cu-cu-cu-mbe-er + components: + - type: FlavorProfile + flavors: + - water + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Water + Quantity: 4 + - type: Sprite + sprite: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi + - type: Produce + seedId: cucumber + - type: Tag + tags: + - Fruit + - Vegetable + diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml new file mode 100644 index 00000000000..4e75b4b91fb --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -0,0 +1,10 @@ + +- type: entity + parent: SeedBase + name: packet of cucumber seeds + id: CucumbertSeeds + components: + - type: Seed + seedId: cucumber + - type: Sprite + sprite: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi diff --git a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml new file mode 100644 index 00000000000..b0f232a28b4 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml @@ -0,0 +1,33 @@ + +- type: seed + id: cucumber + name: seeds-cucumber-name + noun: seeds-noun-seeds + displayName: seeds-cucumber-display-name + plantRsi: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi + packetPrototype: CucumbertSeeds + productPrototypes: + - FoodCucumber + harvestRepeat: Repeat + lifespan: 25 + maturation: 8 + production: 5 + yield: 2 + potency: 10 + waterConsumption: 0.50 + nutrientConsumption: 0.40 + idealLight: 8 + idealHeat: 298 + chemicals: + Nutriment: + Min: 1 + Max: 7 + PotencyDivisor: 14 + Vitamin: + Min: 1 + Max: 3 + PotencyDivisor: 33 + Water: + Min: 1 + Max: 4 + PotencyDivisor: 25 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/dead.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..c1bb387fddd43b00acac961f5b4c31aaced9870d GIT binary patch literal 351 zcmV-l0igbgP)Px$8A(JzR9J=WRlyCyFc2$9tWvQ6eX~Iy6$|v!JURzE+_d3=EYi~@_(GA8h(8hZ z>~oxJ+I0=Tj(Zs5H@U}J@x4GB5RoV%)oIYsP3~dXH1?Rl5zrhIri68#T)R$_O3k~| z6Op*iQ}h_nNqNnifXF&ek)4AyfvTpt7+Ee1gX@|B9iwL#)&S?8Q374}Is%w`CxjYn zeq4hHkudffp`3_iE{uKM-I0YsFr5K*1Evr}*a$VBnE~o^ye!KBYbgcPSv4hY5mo1CaIfbR x*Bphn%X7{B-kX~hxLr<>5&DGN(9rPTcmOl=b8h})^eX@W002ovPDHLkV1m_1l`a4P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/harvest.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..46f198c0c92087f50cd1f68671f201ba967614b6 GIT binary patch literal 808 zcmV+@1K0eCP)Px%;z>k7R9J=WmcL6|Q545NuQb$x;Z3ClBX*Jq-GU;SvK0Cc1h=|4I0X0l$W%mt#g0w>FdjKsx}g&m3^0 zIYmW9JU9Xm_3ZKqq$NP9xghKQHPwTRX#$tkQxZ4s1O)^<6a{IM`}iKk z=`5sS{pSIspt1=}f$@no4@DY^i&;7+y(=sbjAbYRV;$H#Jfe1dL2)|E>iH}H&9_+* zXB-JnpPETnn#=%Dov5>VK1*c{8AUsuyxo!l3LkrZNvWuId_i@hE|s)_tq|5j(b4ZN zRMueSwf1wRs4LsDbJ`b?8v>;CQ_sHIt3!`?4Vblpi1+QA4785~JEe?mHC4du{4>HV%%7iCQ#5VY>8uW&JMy9b}OSKLL>P4qeu0u zepPwrq(^ZsD_Adb!&)8ik$KPQdH3|Z%{^c`U`QB2ndH9g?;Re=5$+24>RDX`y_mJN zpv|#@nX{hMRd)$QXT%BiOpS1pA%at(3{h+cOAEFrmQk_EBVB?}knqv+k?N!BH#ncG ztJ#=+3QTgt6aw*>s-r;+k!87rK*wl=s`eRb)5XOp0000Px$AW1|)R9J=Wls#(0KoEsLI{_OPkyRLin*vuwK=>R!hbvtmU78#q zConlcDivYfs7WDhBeF%<6v_%2H>)34*{>Q{X5X8~FyL@F9RHm`pP#KZ3vKH6mrtv| zhkc7r=aUmNXE#t6&(oqZVZ&t~28_6OJ8In5If2z?p^f-qp8=4kg?0Z$U*Z6RpJ63_ z_9a|zmnV}OY{gp}h~iM^X~F&76@fqE=D|k_)hPPb2BJ9BQYapuuJLALl1v@FH<=z9 z9HJ-=HNat?RpPJD;%NG&;?@SDIMjh(E}AzR10cV?Niu~LWdd)zk5*UJ>JCVuNdD>o zs@S`VTN{8f`ssW^Qmfm>UdOt5yPx$K}keGR9J=Wl_5;SKoo{Q2&!glQnQ_CX$T=8=9kXYpqe1DI0O=ho~uO6VUZ+L zGZ+>;g2_=t!892&O;ANFTehrS-Yp>@?lYI%y}bXw|8jR=Fc=Jf%#O71?8+~K$Ya<~ z*fauMpFWEF?&-L7ltmDE93CA2tc{Mc$kLp65EfDsVy7@mVgJOgTyJ$60Ay(n$db@X zV2<)@rSmUOpR_uSMG_LU4Jf~cqpY?0EX`4VjV#Se*Q?l-7RH0H2qLevd9ORdQI?jl zwgI40yxz3vbw?{T!+s*_DLR695Ef;^ZrjFf+f0-1l{M-4gGK_&yT89naND!n@cujj z;PU2JEV|5Ax8Um|UySvp#rcJ|mAKfz{FR%huxYnC@rw=UHc!V>aZl~PKqCJ3I^p4V l{5wyvq)sYsFc=K~f**k@Y-^Krj$;4-002ovPDHLkV1iLlur>ey literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-1.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..42eaf1a7d624c177f8f53d2446ef10641bcd204a GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b39!fLn2y} z6C_xhWw)fx_`7^*oLUj@axsb011p%_WDS1Eet7YdeG{*`+xrLnjg6%arp!0LGL*_( zICbE}0U)^G*XG<&VpA9xz*)+n+2C>faXEvfo%?m~10R7}TXSA(UhZaECHZgiT#3#L z-R2cCCJ_&3@!$F38)UV>MV}c6oL6WbVVL1)V7K<`B8i56U+%q&6GVENCUP>kvzkkp TReR(D-O1qT>gTe~DWM4fK)X`U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-2.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd3379d818881075cd178bb8c4175acff449d41 GIT binary patch literal 293 zcmV+=0owkFP)Px#-$_J4R9J=Wl|2rEKoEsLjMm(OSlDXq4XnHa1s5<|BUkV^9>T&{+SqDhN3j;{ zB8zePHze+BVA#Aj-_8_()7Z5SS8_=2q-}U#asUp%0gNBudb_s{uj3u*1OyU+1UM`% zKLyH~M_F?OGTa2s{sqw+K7U$dPCy`e0KTeYJOB~}RTZeuV>|>hJO$?WN&wwlH%6^s zhlj7uZ4lq!fm#>%P*Pe!aXmeGr`C{XsV+>WQeC`;M4Qpo_gbme^I2{_p3_D*=;8%n ryUYS~kgkXJ8UeQVA-qmbPXDPFx#D7+!lgz=00000NkvXXu0mjfVQ+QI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-3.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a88af36b60e2c5ad2ba1cf6d66ba88ba4675c6 GIT binary patch literal 428 zcmV;d0aN~oP)Px$W=TXrR9J=Wl)G)iFc^eC21zGC1Ed$SfP<9Tz?FAUp#=oiiWW%WHL`_gaB0AB zYXj_=f@H*ptjLZP1c(kG^q}tk zAnZVkIW{Li0g~&EU^||dZowYNfhJmgg&rl`qS=o(5gJgoxI=^39ge0GxivQ=?26|` zYj-$aXrMuS4Ii1E%lRJe8>iv6@k|H%L*_^g0*OuxjYPRD^!jCM9uy{9j|_xcqLFAS zYe1sQWpP;$E34u3V*RKKBACRw^g}4oWOU(#G@!o533x})qRUOe`eQ4Cjz$m(*)QVU z)^;o6`M%;{+N|t-M%VrxZWls7WUja(L~ezK;50JQpIHyL{}fPx$=}AOER9J=Wls`)&Q5400Z*jU=Qd!7C>?Dn_O#~}b?KenkZILgagO!W}Tl)!Y z?JTXb)xvJGkVfnbh=q;8bV05~-gRDP?&ugJ2%FQ)%$+&+ocm`UEb-ZKytgGE$^9~K z@t?!-b2T>o<)Vq&H4ho_GMKX8jSQ0_p6kRc>NwHddk80i@gcAs2pR?Ci3{R~J8<+17ywQGjkY*73?;~Og<~U6 z1<#cdsK@}=^!H&4EfdPss_~Wo_SYA<`4XnM8S$nUj(sBSz=&!nUqv?qE;iTx4V&bx z#G4reBGw2ruH#bk%5B&M*vpmq11Tmy6`|fjhTE@VC)J$t3;kEaLj~-rtGF<2z3$L} zO50eGPx%MoC0LR9J=Wl|O9LKorJ*MtC!_7#IMNZYTqhkWeaRN+w3Otjrxev9*z>$hE}4 z)Pb3`8zWOXA(aKm3{^KGRUHr#5!s^ZI^4aU|C}8MWg~B~{qDZ|zI*SxGwfo6`0xX@ z?KSVMn{a%vuK?mNntT%xf^CZXZ5R9b-2)WU*LZC)ZKAb+Pd5s-Ob)IVq$pAplU%7& z6o)OzQ%8$jxmp1LS0&&keudFU3u_fqljN!7$f z0SO+7*{uN{?Vanf2t~B!1PJ*dURk`D_uY$PHLE6^pa|@aj(_iS6rHa>dgV4HcpMnP z#!qE(sPRDj3SIuECJ{pXCimSGWfRLYa8EA^h)^tGdSbqpFu(o-!1N3%26K@c9B6Dj z1Tuqlw6I!%InXnp3_d=))ao;AkL$wpJ{|&r#!kDcE_?{n44D)$q#b4p7B$U+Ui+F6W#y2iJ1X{y%X}|i31C^ zVzTo=GuBoh!7Gq=3~^u<0^63l5WJA~a#-A0_eIn}A33>9I!2U`Bn}@)UfLz%1sl3I z;5JlhuH*pwUjSX+&ujh*`72q-8jM>Vkh7e>*TKE(IxOhYi-$65g*%g@uCHd#R{)H! zeNG?i_tB-#>|)g@WK(PPx%e@R3^R9J=WmcNS=K@`V7E2a>#1PdE4VkcYJ$)!yy|AVw%d&O0DCTtZQV}*dZdlqcwt)CGcUt@gouz)_s zk6`$qMeq06{*Qr^JIZl@AqH{}+jMII;X2XBFtZV+Z5Ujl(Kp@P7i@o2iSWhG(M;fc z1$yar6V71pL7g1_dImT_Q(zA`Dm7Ezof@AUi%r{3$TWZ}2$1yTX#Fxcee&I^&#?8c zvY8{9+iX#{*uf>*KLHD$0#^!VP7t1xRXuQoA@}y?K!P@L0IL}&k*94mV*dp6D=rn8 zPdr=`(ie8D%3icoE{dgT$_+GEaX_)7rGdqV2${HX1y(cQr!I5Pb@U{Fmc_mhdU`X8D9?J`CDWJj%7g6_f%>t)rIc5}74s`cx zw@yO$Tg~Do=&{Qb+xb|l#1 Date: Thu, 14 Nov 2024 16:37:35 +0700 Subject: [PATCH 02/17] CUCUMBER in vending --- Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl | 6 +++--- .../Catalog/VendingMachines/Inventories/seeds.yml | 1 + .../Entities/Objects/Consumable/Food/produce.yml | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index f4d4cd6b0a0..c35b0d30ad5 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -1,6 +1,6 @@ ent-CucumbertSeeds = пакет семян (огурец) .desc = { ent-SeedBase.desc } -ent-FoodCucumber = Огурец +ent-FoodCucumber = огурец .desc = длинный и толстый... -seeds-cucumber-name = Огурцы -seeds-cucumber-display-name = Огуречный куст \ No newline at end of file +seeds-cucumber-name = огурцы +seeds-cucumber-display-name = огуречный куст \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index bd0990050b3..1818a0c83f6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -14,6 +14,7 @@ CocoaSeeds: 3 CornSeeds: 5 CottonSeeds: 5 + CucumbertSeeds: 5 EggplantSeeds: 5 EggySeeds: 5 GalaxythistleSeeds: 3 diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml index 2b016b8184e..5717102fbfa 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -29,4 +29,9 @@ tags: - Fruit - Vegetable + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 1 From e04172fde7d1b84f12d913fae34fdf2c9f74bdfd Mon Sep 17 00:00:00 2001 From: RedTerror Date: Sat, 16 Nov 2024 15:22:10 +0700 Subject: [PATCH 03/17] CUCUMBER mutation --- .../Locale/ru-RU/_corvaxnext/cucumber.ftl | 9 +++- .../Objects/Consumable/Food/produce.yml | 27 ++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 10 +++++ .../_CorvaxNext/Hydroponics/seeds.yml | 33 ++++++++++++++ .../Hydroponics/shashamber.rsi/dead.png | Bin 0 -> 351 bytes .../Hydroponics/shashamber.rsi/harvest.png | Bin 0 -> 707 bytes .../Hydroponics/shashamber.rsi/meta.json | 41 ++++++++++++++++++ .../Hydroponics/shashamber.rsi/produce.png | Bin 0 -> 505 bytes .../Hydroponics/shashamber.rsi/seed.png | Bin 0 -> 397 bytes .../Hydroponics/shashamber.rsi/stage-1.png | Bin 0 -> 226 bytes .../Hydroponics/shashamber.rsi/stage-2.png | Bin 0 -> 293 bytes .../Hydroponics/shashamber.rsi/stage-3.png | Bin 0 -> 428 bytes .../Hydroponics/shashamber.rsi/stage-4.png | Bin 0 -> 583 bytes .../Hydroponics/shashamber.rsi/stage-5.png | Bin 0 -> 670 bytes .../Hydroponics/shashamber.rsi/stage-6.png | Bin 0 -> 739 bytes 15 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/dead.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/harvest.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/produce.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/seed.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-1.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-2.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-3.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-4.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-5.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-6.png diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index c35b0d30ad5..116028122bb 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -3,4 +3,11 @@ ent-CucumbertSeeds = пакет семян (огурец) ent-FoodCucumber = огурец .desc = длинный и толстый... seeds-cucumber-name = огурцы -seeds-cucumber-display-name = огуречный куст \ No newline at end of file +seeds-cucumber-display-name = огуречный куст + +ent-ShashambertSeeds = пакет семян (чтогурец) + .desc = { ent-SeedBase.desc } +ent-FoodShashamber = что это? + .desc = у меня созрел вопрос... +seeds-shashamber-name = ... что это? +seeds-shashamber-display-name = я не знаю что это \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml index 5717102fbfa..33a41ee10f8 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -35,3 +35,30 @@ types: Blunt: 1 +- type: entity + name: shashamber + parent: [FoodProduceBase] + id: FoodShashamber + description: what? + components: + - type: FlavorProfile + flavors: + - water + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Cryptobiolin + Quantity: 12 + - type: Sprite + sprite: _CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi + - type: Produce + seedId: shashamber + - type: Tag + tags: + - Fruit + - Vegetable + diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml index 4e75b4b91fb..ca479dd39d0 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -8,3 +8,13 @@ seedId: cucumber - type: Sprite sprite: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi + +- type: entity + parent: SeedBase + name: packet of shashamber seeds + id: ShashambertSeeds + components: + - type: Seed + seedId: shashamber + - type: Sprite + sprite: _CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi diff --git a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml index b0f232a28b4..29a7c16b09d 100644 --- a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml @@ -8,6 +8,8 @@ packetPrototype: CucumbertSeeds productPrototypes: - FoodCucumber + mutationPrototypes: + - shashamber harvestRepeat: Repeat lifespan: 25 maturation: 8 @@ -31,3 +33,34 @@ Min: 1 Max: 4 PotencyDivisor: 25 + +- type: seed + id: shashamber + name: seeds-shashamber-name + noun: seeds-noun-seeds + displayName: seeds-shashamber-display-name + plantRsi: _CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi + packetPrototype: ShashambertSeeds + productPrototypes: + - FoodShashamber + harvestRepeat: Repeat + lifespan: 25 + maturation: 8 + production: 5 + yield: 2 + potency: 10 + waterConsumption: 0.50 + nutrientConsumption: 0.40 + idealLight: 8 + idealHeat: 298 + chemicals: + Nutriment: + Min: 1 + Max: 7 + PotencyDivisor: 14 + chemicals: + Cryptobiolin: + Min: 5 + Max: 12 + PotencyDivisor: 25 + diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/dead.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..c1bb387fddd43b00acac961f5b4c31aaced9870d GIT binary patch literal 351 zcmV-l0igbgP)Px$8A(JzR9J=WRlyCyFc2$9tWvQ6eX~Iy6$|v!JURzE+_d3=EYi~@_(GA8h(8hZ z>~oxJ+I0=Tj(Zs5H@U}J@x4GB5RoV%)oIYsP3~dXH1?Rl5zrhIri68#T)R$_O3k~| z6Op*iQ}h_nNqNnifXF&ek)4AyfvTpt7+Ee1gX@|B9iwL#)&S?8Q374}Is%w`CxjYn zeq4hHkudffp`3_iE{uKM-I0YsFr5K*1Evr}*a$VBnE~o^ye!KBYbgcPSv4hY5mo1CaIfbR x*Bphn%X7{B-kX~hxLr<>5&DGN(9rPTcmOl=b8h})^eX@W002ovPDHLkV1m_1l`a4P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/harvest.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..b698f5087ec6fc3dea92249ad92f784a60b253df GIT binary patch literal 707 zcmV;!0zCbRP)Px%eMv+?R9J=WmOqaYK^TXhHEuZ1L#{ZRI|^e(K`yc2YD&HU^?d=lt8{Cjvb)08 z%HnDh5-p5{Q7LGMAr?dvFeY+2`4c0d7>k+N*%@|WmslCzWV5^T?(@DsW@mnj$C{{J zl!d--KkIqxp52yBOw=yQqVnioc;D$xQ;W#L-r7{G)19X2xi!01!0T5(0QhpV;Me!x znVP3%69wogD?G^Y?fp%r=2_T{uVC_Z0lF91_u+B!jocA_|KwS@r!fU}^MYal`oN3z z!sC+xf+0{;#ri;A+MkrH6J{4g-m7b& zSsXDdyRr>kpgryZj;mcdYe$Js#U=^}5beEWAau2d@vauj79IBGU}fz{0S&nT^|rB^ zsUp@pjCz8;pE&I4AgmX%fpJ({0KklJuZO^aJStnthL&H|z_=&8QsFvipUhze>WRAG}zhFH*aMf9Q)sipX_LrW1;O7kP=gk=) p?zwH*tIjghU;SO|Vi*5s`~|qBe^f)#CG-FQ002ovPDHLkV1l(*QyKsO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/meta.json new file mode 100644 index 00000000000..14e7452acaf --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By RedTerror", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/produce.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd53b2e1b1411be2feeae5ded438361dd06d947 GIT binary patch literal 505 zcmVPx$vq?ljR9J=WmcL5FP!z_0RUuNuG=qQW(vYE392|s@xs`&eOE%vjvyb3AI0#+3 z3W9s^0h}^OyOctQv`c9QxeoP)HWhnsA|lw|n%wi9eCOkyz?T0`rRc#<=!(g32Ea@A zt#BRfgPqV70H$p)?Wf2lYV|5lcdy#@_HOjqrfo2Y5&&g!fZejp#T&!rsj0!K7_EBkVZ&Ti1Yi1Ol1%K+cf zn)@=P9B5j`TH-(Y1S}r7h```=R<&&q-2;}?$+E=I9Kfg_QRGfTmCd3zfH@_PvfaT00000NkvXXu0mjfkS66d literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/seed.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..c9cb98e13af856be3a0f90b0848b5ce4fc95bd77 GIT binary patch literal 397 zcmV;80doF{P)Px$M@d9MR9J=WmA^~FKo~%uA_!TE5QLJ!SVRPe?$QnxQ5*^#UELl1GdjAvItm?1 zORMcp36ik*tr#O@gHMaU)L3Fsc9Nc|;KVEVPSS%LHAG0P6Y+RMnO5JDB zQhc`pT%SFN^KO`Q>v|5Ay3hW>9>AB?^&BQaLbFp#rA>%Cg_(uj!>y&~`y&ee zCb60V(C&{oKmM#=ije_5DL|~IL}8LOk&hX)lqjdjfSz8Xr@gyXSu^vPSP&bSpI#G% z2~n7Eap{W-=2__$Xm*a4Ur8w<1A~@Ys5P%1%wIwy1Nr19r`rqngJCSrY5XtviC`G> r_VUjC&G2_V#gaH_af`)b`4@Zu1faXEvfo%?m~10R7}TXSA(UhZaECHZgiT#3#L z-R2cCCJ_&3@!$F38)UV>MV}c6oL6WbVVL1)V7K<`B8i56U+%q&6GVENCUP>kvzkkp TReR(D-O1qT>gTe~DWM4fK)X`U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-2.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd3379d818881075cd178bb8c4175acff449d41 GIT binary patch literal 293 zcmV+=0owkFP)Px#-$_J4R9J=Wl|2rEKoEsLjMm(OSlDXq4XnHa1s5<|BUkV^9>T&{+SqDhN3j;{ zB8zePHze+BVA#Aj-_8_()7Z5SS8_=2q-}U#asUp%0gNBudb_s{uj3u*1OyU+1UM`% zKLyH~M_F?OGTa2s{sqw+K7U$dPCy`e0KTeYJOB~}RTZeuV>|>hJO$?WN&wwlH%6^s zhlj7uZ4lq!fm#>%P*Pe!aXmeGr`C{XsV+>WQeC`;M4Qpo_gbme^I2{_p3_D*=;8%n ryUYS~kgkXJ8UeQVA-qmbPXDPFx#D7+!lgz=00000NkvXXu0mjfVQ+QI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-3.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a88af36b60e2c5ad2ba1cf6d66ba88ba4675c6 GIT binary patch literal 428 zcmV;d0aN~oP)Px$W=TXrR9J=Wl)G)iFc^eC21zGC1Ed$SfP<9Tz?FAUp#=oiiWW%WHL`_gaB0AB zYXj_=f@H*ptjLZP1c(kG^q}tk zAnZVkIW{Li0g~&EU^||dZowYNfhJmgg&rl`qS=o(5gJgoxI=^39ge0GxivQ=?26|` zYj-$aXrMuS4Ii1E%lRJe8>iv6@k|H%L*_^g0*OuxjYPRD^!jCM9uy{9j|_xcqLFAS zYe1sQWpP;$E34u3V*RKKBACRw^g}4oWOU(#G@!o533x})qRUOe`eQ4Cjz$m(*)QVU z)^;o6`M%;{+N|t-M%VrxZWls7WUja(L~ezK;50JQpIHyL{}fPx%0ZBwbR9J=Wls{|RP!z>~uSA=QrwpawZpBNWP#owKPyGg7J9qG0NQEb%2r}mr zWX+bblQRWc3WY48TMQvXmzsJr<#l-PMo-dJBDo0^>a)o2$>*MP{|Pqu*KzQE*FGk9 zt8K99CvJnKZ!znds^UqPKR={!X9HK?%%hlSZQ%I#+N03XK#nEHk`z5B$FlzynddaR z*N5;L=sDs?KGR9OYSy3M9UA-MmGcp{v0Q-!%hHR-z!DCwc3W$cW4WfBu{U%4!5VFT z$_6qF8HSj8))U{F`^0;}xq@(&bpsXG#4x}4=_=EMT6R^4_&$cE=LQL+U+Y_>_cpRtcY(Xiy)S2Ai+-eieq{T%z@LELpZ^56d0caZvsIjfnp1SwM)-n zx<^q`2`J}GF_d6g_{=5S9hkm`RAMVUQwty>7cKx$E}>>ZxRNzK^K<{agIf$?hAD~n zy>RRUNd*=(L--=P6L8VF`Wp6e!?N`EeQ!!cv=+#H-=D?2aC>?J`fy1fW8CTq+6-hk z{UUbM%&EVSJr6%Bpl9901y_2Rp$i&~tCyoeWM?l|0E}-UPM*2nqwf*3%hjDmx^in5 zqd{b6mn$Px%SV=@dR9J=Wm9cBvKorJ*D%GZ9I&^4Doh^8Xp->#~WKa1Iyms#3DO+MR2}RJM zQ-;o6vvthmOof(0K^;Oi8$yOssHitnuEX8+PSQ!1ilIaOz*u^B-+kYE_udoyWAoZ< ze)AQfpN|jPVXN$3Tfnx68{65dLje$8BJ2#b!PeRRriU%Qc+if&ku?_Z?w5e0?Wez7 z0||lz!ORLbL2%NLJaMGS<*O6`a9aSjA-^pUD)BF0dm_9n3&{(ZAy@$&AOKd4X!GP9 zxA?v1f`?CJE8E4K7ZBqSt7sMQbnl~Fn#tD9pN1x$e-;mU%?DPpd!fN zY;nj&VohoX5L-kuQ&YuOc6LGd0-`J6DX@@{g(HYQZza(I&vg79094qIx<4Z!+-3x1YxU=mA`O zT6=oElKd~Re+~ec4CMc~=Znd}7cT!cu{+z@&i-%v4N6z{`YN-kdH?_b07*qoM6N<$ Ef?-2Aga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-6.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..888f9a3f0caf3e7cd8fe881aa8ccaf0c8f55cdb3 GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNR9J=WmcNS=K@`V7E2a<mR;8a7>!v6wfRw?7gR32KoC%Pw!``+j`icZP+3Y{530 z2V;!;Zavu!yUOlu3)ofSjjh+H8i39SqZ!x+yUy-!8tm?K0Ndr?$TlwE^)Ca@c29p+ z1APpA3~kkJAH$0cllOCI%JZ!(0AT8Y=Z|jKD)}^(P>O&4GBBM{wvc3C-E|R|L+^W) z^H(=PV(lWQAeX!>Sbzy|Y4>(Un1e&V-JPcV&e|9vpd!I0KuOlhYYLdlx5Gwi{nBFw zV~i^xGlIbwGdKl88=!Yrwf=^Ea+8A{(**&M6dOVBfyGi`$!_{6`(SMhGuvV31iBwo z_Z9Jd!s=tVhB-(7+%qvah1NB>TFQ!W2HiJ4NaN>YKnj`yM?fF;0kQ7xKza7x|V&|COS{0nQ|^l3TO(2k>9w~K}EXIRHlni zBVZzNr1OJAD?(;?ttj)<#nNdRPuY=&J)LyV+Eh?$-e>e_WddL>UQyWe{lD Date: Mon, 18 Nov 2024 20:16:35 +0700 Subject: [PATCH 04/17] CUCUMBER texture + fix --- .../Locale/ru-RU/_corvaxnext/cucumber.ftl | 2 +- .../Objects/Consumable/Food/produce.yml | 3 +- .../Objects/Consumable/Food/bowl.rsi/bowl.png | Bin 0 -> 401 bytes .../Consumable/Food/bowl.rsi/goool.png | Bin 0 -> 415 bytes .../Consumable/Food/bowl.rsi/meta.json | 29 ++++++++++++++++++ .../Consumable/Food/bowl.rsi/okroshka.png | Bin 0 -> 507 bytes .../Consumable/Food/bowl.rsi/oliviel.png | Bin 0 -> 469 bytes .../Objects/Consumable/Food/bowl.rsi/plow.png | Bin 0 -> 593 bytes .../Consumable/Food/bowl.rsi/solanka.png | Bin 0 -> 485 bytes .../Consumable/Food/misc.rsi/meta.json | 17 ++++++++++ .../Consumable/Food/misc.rsi/pureshka.png | Bin 0 -> 516 bytes .../Objects/Consumable/Food/misc.rsi/salt.png | Bin 0 -> 502 bytes 12 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/bowl.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/goool.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/okroshka.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/oliviel.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/plow.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/solanka.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/pureshka.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/salt.png diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index 116028122bb..8d5c11326e4 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -10,4 +10,4 @@ ent-ShashambertSeeds = пакет семян (чтогурец) ent-FoodShashamber = что это? .desc = у меня созрел вопрос... seeds-shashamber-name = ... что это? -seeds-shashamber-display-name = я не знаю что это \ No newline at end of file +seeds-shashamber-display-name = я не знаю что это diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml index 33a41ee10f8..822ccf1c301 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -1,5 +1,4 @@ -# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_produce.yml -# For produce that can't be immediately eaten + - type: entity name: cucumber diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/bowl.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/bowl.png new file mode 100644 index 0000000000000000000000000000000000000000..9f91f21ff45290c6290ab7088b4548db7df39772 GIT binary patch literal 401 zcmV;C0dD?@P)|`Qn6O}B-1+YfJx&?jz85kHCEUX==V!4B>FT?X^j~I;Y z{W0ug!KUHVsWS|EIvNZoj_yYhhdBsed^0dGFsN(mGcYhPFi1+tF)%PNFxPx$SxH1eR9J=Wl0QpAQ5c6GOA(Cj;E+QY*pN0fD(Dt{fIff@36gyPp}|=v*M>l} zL5HHx;NajQE!AQ};xz{a@1O>umrjG+oB#jp=b7H~p7)&R$KilPB9TZWTheSbMYGiu z8x7yEc5Y`I*|ORo7IcYN&?Nwrv?7!vWo;PiD*0sXK6G0Ee)Sgs-n%w(<(vR`%jX&V z46uB45Mq3+r}oUdl(ZrMdi?j+2AGxIUSEjU_AA!i4!Z83e4ob~2?KBzjZ!NV;nayY z5=PW3!nS8))E(g|c|`Ilxzu4<)J&C9V)$Gk6u(5*9kjoPV*!{_gUNoaP@LPZ)GHWa zvhnPkZ{Z)Xt9JGS=alXqO?khe(r>6#KdNYb&6FE`fL`DPt*@D(079M+{sTWgyKnOs zFvvV)raq4I*tu%lMElgH)`_dcQqRf&>jEufl~5v)NFPx$wMj%lR9J=W(N9RzVI0Ttw|{;c2lWtL#16lUhOAqO5+1yX z!ssxj1bQ>P1eF&BsT36>Wh6PnbV2-7;#XiQHc^?0i2IZC&mIqgplrg$i%G23OR%)bZX`;c!_Lsl*F+;BR!02*7`X?0 zIap+UaDwr>3KbC>RfTqsWpB-6Y{y&9W~C<@AP|o8$?ql07l7JcE}G5sj1O`7w)Nyr z_0=-G&pH`<+t1hGQ99~dQ6E3zdEYSVp9=t7TiQZ*IT(yDaPxXm!VM%{4M3?i@olV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/oliviel.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/oliviel.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7e353de8f6d895037131aef27fe5a1debe7514 GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R9J=W(>+LAVHC#kf6{mpQ{@VkM(q%y)(tqsi<|FnKIh?q!vRT> zBG}cl8rZWKmqu zl7V0PCh53``ar;NuHh4$YF?2_7vabSm|%<6cb{-6Z>Tz(;pGoMdhs4=LkG^9L%hK@ z!{;#6^y1s7_?L7skod~La5$s9^eepLne*eAs zh6>#5u8H({3WukF!|&@Ts*1g74|nJ@2k$@fwEQjCg?}Jw=Wi^=Fw0E4eGgaQKYb@G z&`)qyHnO4(QG8HO?O+#IPgW_iwiDMnaae*hghHm@TaqM6dVKBx4!wc&02p=!00000 LNkvXXu0mjfBUIN< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/plow.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/bowl.rsi/plow.png new file mode 100644 index 0000000000000000000000000000000000000000..a52f10b94d7f332aee3c8c289759f57c2e5cb268 GIT binary patch literal 593 zcmV-X0Px%3rR#lR9J=Wl21s}aTvxwOE*R}+}4b3MX&~%87}Z(H=Svc7oq4<2aBZaQnxY& zgO!o)RDuwTFb{R99rDl!lZZMLC1ZzCl7Co=*5>%lZMM11z8yw`;gr^~exKvZ^L?I& z_x*y5jEs!TzreIpDFB{79unog-S#(uO+J%2Ji1%NzmJM(r&2_cW#<-9lq2?f9JF`U z6w-p9zM)pDuv+xIomj!NYdcHPA9S9+{Kvjq3cVf&wgtBc?7gbk-(V0{i=Oas50Ru` zG4_-8+amylaDWtkqEehpd|$!)^>9E&9SNJlsR1wVzZvgERAh zN45EqzYD#7^%8()dmBDbBp~&|@VPx$pGibPR9J=W(NAd7VI0Ttw;E&Qi2VkVO(Oc$+QeXp;MOfMiViyzLJ>R7o8)DO z*ddYVwu1yhw}LLEFxsKRm=KbyZfyq(b#o@NUx#e{YRmFZ@^qSz=@Ps?uj9k>e7+yP z4@izj}oD=<+ z30LM9*3=pmA$Y%Vm(}D7>0FxVVB*zw}R$j?JP0 zmjIY*)EF$6Tjvj&qX3Kr&ZF!#QMEb%H}1bA9`dq(`~+XsF-8hoXj+LkwN3nH2f6%5 z0D=$S^;V$0$bs>*rvZ3W`GDW-Xno1=pEarm6YIh205o3Z{>tezxTgaDE7Z+l10_k4 bB&ppWh0>BMXIn?S00000NkvXXu0mjf17qln literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/meta.json new file mode 100644 index 00000000000..3e998d25f5c --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "fills by RedTerror", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pureshka" + }, + { + "name": "salt" + } + ] +} diff --git a/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/pureshka.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/misc.rsi/pureshka.png new file mode 100644 index 0000000000000000000000000000000000000000..6f1f01015a2fc200188fe66b0ee1b006bb381241 GIT binary patch literal 516 zcmV+f0{i`mP)Px$zDYzuR9J=WlQD18Kp2J}r`G8z+X@jw6e&u@P;LNb*oeZ!(upn%2(htb>lVS> zwF?Ua;twEIYUgaQXR_S{L&%s95krFk8(JqEz{eQUQi91a1n>ozK-^5>850dR47jMwg0 zdYtr(=;jKbQjcz~@Y;Q2P^oeLJ0qn8iW|RtcAs!{Ynm=DkIlGF3?RH-o3+8gVW|eN zmhW*Khr&pafH5$i&+|Br0eCTbh`ndw?c0Q_TZWJB0&sFVGA4d}4{8MqBZGs((mZu1 zxURcN&vEGWdRD~%z+$lg;PufH>^+MIgUzOnD~#aD=?JgguL#y9lDd;pV%=^Rz!+#1 zg&+u!QksTO=im7F!=Od9XrJf-7p5(p#BhtEf)TNdmJ?h5<9kJg$j%c^f+`x|Z>`5SBt7i)j~ zhFO+bNs=&|&2k|GT5E(5NGVHw%jL3my&y@Fif}{2KgUnqv(BkFg@`Hu0000Px$ut`KgR9J=Wl)pQlrvIJ(#8Lvb8&DmP;hr~5Y$yfVuzwj zv4hl1Vxe2-lh3Sp|_U~$i`0CdgxwW~C zWeX1XJuKUyT=JA^J6d5NpU-320+EPd*@C#)r(D~#fvNeoG8)qni3o+9OWf?^aQ}qI zS!k<)k@1v_#&rD78o=KOP5>B6y?WnP19KlorDY5J&KiN+{m>Qfm?cdb&4gO-#0E^)yL3G<@f)Has;2hPs!O& zZ{*(Y5y^pD67gYv{S4~j<&vkI`%{$MX0mA+k9J|k`q7OJu4)c{f=h}OAFt{Iu)ciI zP@GC1(cN{x>5a>2)!}u2gkt4Ev{`XbjKIBgDC8clx>)h+YeO@e5?3~`zI>orw!qL# s3OTpF*GT3~vGQed@mU2!LPDN{d(Wk!DkMdCRsaA107*qoM6N<$f<{{QPXGV_ literal 0 HcmV?d00001 From 2eb28f10a23941e56dbbe6fbc509bff076298f6f Mon Sep 17 00:00:00 2001 From: RedTerror Date: Mon, 18 Nov 2024 21:33:16 +0700 Subject: [PATCH 05/17] CUCUMBER soap + GOOOOOOL --- .../Locale/ru-RU/_corvaxnext/cucumber.ftl | 21 +++ .../Random/Food_Drinks/food_baked_single.yml | 6 + .../Entities/Objects/Consumable/Food/misc.yml | 50 ++++++ .../Entities/Objects/Consumable/Food/soup.yml | 147 ++++++++++++++++++ .../_CorvaxNext/Flavors/flavors.yml | 14 ++ 5 files changed, 238 insertions(+) create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/misc.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Flavors/flavors.yml diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index 8d5c11326e4..0355736b392 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -1,3 +1,4 @@ + ent-CucumbertSeeds = пакет семян (огурец) .desc = { ent-SeedBase.desc } ent-FoodCucumber = огурец @@ -11,3 +12,23 @@ ent-FoodShashamber = что это? .desc = у меня созрел вопрос... seeds-shashamber-name = ... что это? seeds-shashamber-display-name = я не знаю что это + +flavor-complex-bear = как медведь, карты и что-то про футбол +flavor-complex-sumer = как лето +flavor-complex-holidais = как новый год + +ent-FoodBakedPotatosCutlets = пюрешка с котлетками + .desc = ты потаропись... у нас щас котлетки... +ent-FoodPickles = соленный огурец + .desc = влажный... Самое то с водкой +ent-FoodGOOOOLsoup = медвежий суп + .desc = доигрался в карты.... +ent-FoodOkroshkasoup = окрошка + .desc = салат с квасом? че +ent-FoodOlivielsoup = оливье + .desc = у меня столько майонеза, сколько и не снилось моему отцу! +ent-FoodSolankasoup = солянка + .desc = мээээ..... +ent-FoodPlowsoup = плов + .desc = ой васа, пловъ просто пушка, отвечаю! + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index fa285676395..48caa983986 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -76,6 +76,12 @@ - FoodBakedBrownie - FoodPieBananaCreamSlice - FoodTartMimeSlice + - FoodBakedPotatosCutlets + - FoodGOOOOLsoup + - FoodOkroshkasoup + - FoodOlivielsoup + - FoodSolankasoup + - FoodPlowsoup chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/misc.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/misc.yml new file mode 100644 index 00000000000..bda1ea93aa3 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/misc.yml @@ -0,0 +1,50 @@ +- type: entity + name: mashed potatoes with cutlets + parent: FoodBakedBase + id: FoodBakedPotatosCutlets + description: You hurry up, we have cutlets right now... + components: + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/misc.rsi + state: pureshka + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Protein + Quantity: 2 + - type: FlavorProfile + flavors: + - meaty + - potatoes + - type: Tag + tags: + - Meat + +- type: entity + name: pickle + parent: FoodBase + id: FoodPickles + description: The very thing for vodka + components: + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/misc.rsi + state: salt + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 2 + - type: FlavorProfile + flavors: + - salty + - type: Tag + tags: + - Fruit \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml new file mode 100644 index 00000000000..3d1138a6de8 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml @@ -0,0 +1,147 @@ +- type: entity + name: footbear soup + parent: FoodBowlBase + id: FoodGOOOOLsoup + description: I don't think we're playing cards... + components: + - type: FlavorProfile + flavors: + - beary + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: goool + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 + - type: Tag + tags: + - Soup + - Fruit + - Meat + +- type: entity + name: okroshka soup + parent: FoodBowlBase + id: FoodOkroshkasoup + description: Salad with kvass and sour cream.. what + components: + - type: FlavorProfile + flavors: + - sumery + - bread + - potatoes + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: okroshka + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Water + Quantity: 8 + - type: Tag + tags: + - Soup + - Fruit + - Meat + +- type: entity + name: oliviel soup + parent: FoodBowlBase + id: FoodOlivielsoup + description: My father never dreamed of so much mayonnaise! + components: + - type: FlavorProfile + flavors: + - holidais + - potatoes + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: oliviel + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 10 + - type: Tag + tags: + - Soup + - Meat + +- type: entity + name: solanka soup + parent: FoodBowlBase + id: FoodSolankasoup + description: Meehhh..... + components: + - type: FlavorProfile + flavors: + - sour + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: solanka + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 7 + - type: Tag + tags: + - Soup + - Meat + +- type: entity + name: plow soup + parent: FoodBowlBase + id: FoodPlowsoup + description: Oh, Vasya, rice is fire + components: + - type: FlavorProfile + flavors: + - rice + - meaty + - type: Sprite + sprite: _CorvaxNext/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: plow + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 4 + - type: Tag + tags: + - Soup + - Meat \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Flavors/flavors.yml b/Resources/Prototypes/_CorvaxNext/Flavors/flavors.yml new file mode 100644 index 00000000000..e0bcca16c71 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Flavors/flavors.yml @@ -0,0 +1,14 @@ +- type: flavor + id: beary + flavorType: Complex + description: flavor-complex-bear + +- type: flavor + id: sumery + flavorType: Complex + description: flavor-complex-sumer + +- type: flavor + id: holidais + flavorType: Complex + description: flavor-complex-holidais \ No newline at end of file From 0841613f4db4ab0fc2418dbaf2d0b0bcd6a928f4 Mon Sep 17 00:00:00 2001 From: RedTerror Date: Mon, 18 Nov 2024 23:04:06 +0700 Subject: [PATCH 06/17] CUCUMBER let him cook --- .../Locale/ru-RU/_corvaxnext/cucumber.ftl | 53 +++++++++++ .../Catalog/Fills/Books/USSPcook.yml | 12 +++ .../Entities/Objects/Consumable/Food/soup.yml | 4 +- .../Recipes/Cooking/meal_recipes.yml | 88 ++++++++++++++++++ .../Objects/Misc/books.rsi/book_USSP.png | Bin 0 -> 672 bytes .../Objects/Misc/books.rsi/meta.json | 14 +++ 6 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_CorvaxNext/Catalog/Fills/Books/USSPcook.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml create mode 100644 Resources/Textures/_CorvaxNext/Objects/Misc/books.rsi/book_USSP.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Misc/books.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index 0355736b392..fe8a118fee4 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -32,3 +32,56 @@ ent-FoodSolankasoup = солянка ent-FoodPlowsoup = плов .desc = ой васа, пловъ просто пушка, отвечаю! +ent-BookUSSPCook = Копатыч. Кухонные хроники + .desc = Говорят, некий Копатыч, является легендарным Шеф-поваром всего СССП! + +book-text-ussp = + Вступление + Когда - то я был обычным актером мультфильма, но теперь я занимаюсь действительно любимым делом - кулинарией. В данной книге рецептов я вам расскажу о самых простых и в тоже время вкусных блюдах, прямиком из СССП! + Соленный огурец: + 1 огурец + 5u соли + на 5 сек в микроволновку - готово + Пюрешка с котлетками: + 2 сырые котлеты + 1 картошка + 5u молока + на 15 сек в микроволновку - готово + Медвежий суп(самое то под футбол): + 10u водки + 1 сырое мясо медведя + 1 миска + 2 яйца + 2 огурца + на 10 сек в микроволновку - готово + Окрошка: + 10u кваса + 1 сырое мясо + 1 огурец + 1 яйцо + 1 картошка + 2 колечка лука + 1 миска + на 10 сек в микроволновку - готово + Оливье: + 20u майонеза + 1 сырое мясо + 1 огурец + 1 яйцо + 1 картошка + 2 стручка гороха + 1 морковь + 1 миска + на 15 сек в микроволновку - готово + Солянка: + 1 мясо змеи + 1 соленный огурец + 2 лайма + 1 миска + на 10 сек в микроволновку - готово + Плов: + 10u риса + 2 мяса + 1 чеснок + 2 моркови + 1 миска diff --git a/Resources/Prototypes/_CorvaxNext/Catalog/Fills/Books/USSPcook.yml b/Resources/Prototypes/_CorvaxNext/Catalog/Fills/Books/USSPcook.yml new file mode 100644 index 00000000000..b3869c06aa8 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Catalog/Fills/Books/USSPcook.yml @@ -0,0 +1,12 @@ +- type: entity + parent: BookBase + id: BookUSSPCook + name: Kopatuch. Let him cook + description: Kopatych is a legendary chef of the USSP + components: + - type: Sprite + sprite: _CorvaxNext/Objects/Misc/books.rsi + layers: + - state: book_USSP + - type: Paper + content: book-text-ussp \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml index 3d1138a6de8..811404d36d1 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml @@ -118,9 +118,9 @@ - Meat - type: entity - name: plow soup + name: plow parent: FoodBowlBase - id: FoodPlowsoup + id: FoodPlow description: Oh, Vasya, rice is fire components: - type: FlavorProfile diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..68601857482 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,88 @@ +- type: microwaveMealRecipe + id: RecipeBakedPotatosCutlets + name: mashed potatoes with cutlets + result: FoodBakedPotatosCutlets + time: 15 + reagents: + Milk: 5 + solids: + FoodMeatCutlet: 2 + FoodPotato: 1 + +- type: microwaveMealRecipe + id: RecipePickles + name: pickle + result: FoodPickles + time: 5 + reagents: + TableSalt: 5 + solids: + FoodCucumber: 1 + +- type: microwaveMealRecipe + id: RecipeGOOOOLsoup + name: footbear soup + result: FoodGOOOOLsoup + time: 10 + reagents: + Vodka: 10 + solids: + FoodMeatBear: 1 + FoodBowlBig: 1 + FoodEgg: 2 + FoodCucumber: 2 + +- type: microwaveMealRecipe + id: RecipeOkroshkasoup + name: okroshka soup + result: FoodOkroshkasoup + time: 10 + reagents: + Kvass: 10 + solids: + FoodMeat: 1 + FoodCucumber: 1 + FoodEgg: 1 + FoodPotato: 1 + FoodOnionSlice: 2 + FoodBowlBig: 1 + +- type: microwaveMealRecipe + id: RecipeOlivielsoup + name: oliviel soup + result: FoodOlivielsoup + time: 15 + reagents: + Mayo: 20 + solids: + FoodMeat: 1 + FoodCucumber: 1 + FoodEgg: 1 + FoodPotato: 1 + FoodPeaPod: 2 + FoodCarrot: 1 + FoodBowlBig: 1 + +- type: microwaveMealRecipe + id: RecipeSolankasoup + name: solanka soup + result: FoodSolankasoup + time: 10 + solids: + FoodMeatSnake: 1 + FoodPickles: 1 + FoodLime: 2 + FoodBowlBig: 1 + +- type: microwaveMealRecipe + id: RecipePlow + name: plow + result: FoodPlow + time: 20 + reagents: + Rice: 10 + solids: + FoodMeat: 2 + FoodGarlic: 1 + FoodCarrot: 2 + FoodBowlBig: 1 \ No newline at end of file diff --git a/Resources/Textures/_CorvaxNext/Objects/Misc/books.rsi/book_USSP.png b/Resources/Textures/_CorvaxNext/Objects/Misc/books.rsi/book_USSP.png new file mode 100644 index 0000000000000000000000000000000000000000..00ab0ee97333bf90c583b4484d70799e189d567a GIT binary patch literal 672 zcmV;R0$=@!P)Px%T1iAfR9J=WmOp3{Q5?rVkt-pgck~9AVx@tiLxYoI2D!yamkiwm2N$s@bZ}`M z9PC;_Q4m~o5C@l%K?Dm9htOc%awpg&F%>O{TyiH#&m5e?{YheM@1@|=0@{PqMr~zBzbKOP1C4V ztNZ%Q=5pw|j=a1q8de;jH~DNXH(;+-tJJDhG)*I_-D|Z*2hf|ml+O>?i-r+H0Qgoz zD6TL-RCOtzr|`%IpuDKW_EJ7i(J%loJx?^OI6zeO{9PL-{AVMO`d9dJM~Qu;Y!=tq z5sG_67&Vl6Q^9HyCytUIRzm|!-wvv_n$X?^wE`Ee*aLpQ_luDML`l^OOi#k`pzriS zc&%34kVXO^O-ulA?vl;?QBX6m@FGZl=5gR-wfnyj-37z1fp5XMbrtSy!t2XW{tV8~ zVIv6wIDpsb0Pyy?Lg85Oe&hZLF1|a3;|5c~fydQf06=#N0A4)_R(#>wHlNr-&49VC zV6Go-CnN&M;aD_`xY5YzV9w=*ZLD^80rvWg48RG;sLd7)gL=5Wtc{@RdSkE^i)yG= z93_}rtphN(+O_wd73L6~P#8eh_4q{Gugd5+&PWp8kB>O6I~oA5)4^F<;w9Z3(HA7V zl9}OiMw0lj^_^R;n|LJ?x)ZJlZZbKYj(>|JA8V|CLcahlTkkoMI=|Ea0000 Date: Mon, 18 Nov 2024 23:33:13 +0700 Subject: [PATCH 07/17] CUCUMBER fix --- Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl | 2 +- .../_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml | 4 ++-- .../Entities/Objects/Specific/Hydroponics/seeds.yml | 4 ++-- Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl index fe8a118fee4..5e933b008b0 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl @@ -29,7 +29,7 @@ ent-FoodOlivielsoup = оливье .desc = у меня столько майонеза, сколько и не снилось моему отцу! ent-FoodSolankasoup = солянка .desc = мээээ..... -ent-FoodPlowsoup = плов +ent-FoodPlow = плов .desc = ой васа, пловъ просто пушка, отвечаю! ent-BookUSSPCook = Копатыч. Кухонные хроники diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml index 822ccf1c301..daec7847d4a 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -23,7 +23,7 @@ - type: Sprite sprite: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi - type: Produce - seedId: cucumber + seedId: cucumberSeed - type: Tag tags: - Fruit @@ -55,7 +55,7 @@ - type: Sprite sprite: _CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi - type: Produce - seedId: shashamber + seedId: shashamberSeed - type: Tag tags: - Fruit diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml index ca479dd39d0..d07e9b9a607 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -5,7 +5,7 @@ id: CucumbertSeeds components: - type: Seed - seedId: cucumber + seedId: cucumberSeed - type: Sprite sprite: _CorvaxNext/Objects/Specific/Hydroponics/cucumber.rsi @@ -15,6 +15,6 @@ id: ShashambertSeeds components: - type: Seed - seedId: shashamber + seedId: shashamberSeed - type: Sprite sprite: _CorvaxNext/Objects/Specific/Hydroponics/shashamber.rsi diff --git a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml index 29a7c16b09d..ea5b36332d6 100644 --- a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml @@ -1,6 +1,6 @@ - type: seed - id: cucumber + id: cucumberSeed name: seeds-cucumber-name noun: seeds-noun-seeds displayName: seeds-cucumber-display-name @@ -35,7 +35,7 @@ PotencyDivisor: 25 - type: seed - id: shashamber + id: shashamberSeed name: seeds-shashamber-name noun: seeds-noun-seeds displayName: seeds-shashamber-display-name From 258ae4110a091e7032253c8d2c2ab0a44fa0a24c Mon Sep 17 00:00:00 2001 From: RedTerror Date: Mon, 18 Nov 2024 23:42:53 +0700 Subject: [PATCH 08/17] CUCUMBER fix 2 --- .../_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml | 6 +++--- Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml index 811404d36d1..6cf9039544e 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/soup.yml @@ -49,11 +49,11 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 4 - ReagentId: Vitamin - Quantity: 6 + Quantity: 4 - ReagentId: Water - Quantity: 8 + Quantity: 7 - type: Tag tags: - Soup diff --git a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml index ea5b36332d6..957c0225f69 100644 --- a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml @@ -58,7 +58,6 @@ Min: 1 Max: 7 PotencyDivisor: 14 - chemicals: Cryptobiolin: Min: 5 Max: 12 From c43f1dff4df45f9c798f6d0c9f7b42838123ab00 Mon Sep 17 00:00:00 2001 From: RedTerror Date: Mon, 18 Nov 2024 23:52:28 +0700 Subject: [PATCH 09/17] CUCUMBER fix 3 --- .../Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index 4379a978966..c44ea253196 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -12,3 +12,4 @@ ClothingShoesColorBlack: 2 ClothingShoesChef: 2 ClothingBeltChef: 2 + BookUSSPCook: 3 From e08181d1ef16af3e2c11ba2b15b4aff5bb78c026 Mon Sep 17 00:00:00 2001 From: RedTerror Date: Tue, 19 Nov 2024 23:41:57 +0700 Subject: [PATCH 10/17] CUCUMBER more ftlsgit add -A --- .../ru-RU/_corvaxnext/flavors/flavors.ftl | 3 ++ .../{cucumber.ftl => paper/book-kopatuch.ftl} | 37 ------------------- .../Locale/ru-RU/_corvaxnext/seeds/seeds.ftl | 4 ++ .../catalog/fills/books/kopatch.ftl | 2 + .../objects/consumble/food/produce.ftl | 4 ++ .../entities/objects/consumble/food/soup.ftl | 14 +++++++ .../entities/objects/specific/seeds.ftl | 4 ++ 7 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 Resources/Locale/ru-RU/_corvaxnext/flavors/flavors.ftl rename Resources/Locale/ru-RU/_corvaxnext/{cucumber.ftl => paper/book-kopatuch.ftl} (53%) create mode 100644 Resources/Locale/ru-RU/_corvaxnext/seeds/seeds.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/catalog/fills/books/kopatch.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/produce.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/soup.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/specific/seeds.ftl diff --git a/Resources/Locale/ru-RU/_corvaxnext/flavors/flavors.ftl b/Resources/Locale/ru-RU/_corvaxnext/flavors/flavors.ftl new file mode 100644 index 00000000000..d622feb39b3 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/flavors/flavors.ftl @@ -0,0 +1,3 @@ +flavor-complex-bear = как медведь, карты и что-то про футбол +flavor-complex-sumer = как лето +flavor-complex-holidais = как новый год diff --git a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl b/Resources/Locale/ru-RU/_corvaxnext/paper/book-kopatuch.ftl similarity index 53% rename from Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl rename to Resources/Locale/ru-RU/_corvaxnext/paper/book-kopatuch.ftl index 5e933b008b0..685a56de21e 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/cucumber.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/paper/book-kopatuch.ftl @@ -1,40 +1,3 @@ - -ent-CucumbertSeeds = пакет семян (огурец) - .desc = { ent-SeedBase.desc } -ent-FoodCucumber = огурец - .desc = длинный и толстый... -seeds-cucumber-name = огурцы -seeds-cucumber-display-name = огуречный куст - -ent-ShashambertSeeds = пакет семян (чтогурец) - .desc = { ent-SeedBase.desc } -ent-FoodShashamber = что это? - .desc = у меня созрел вопрос... -seeds-shashamber-name = ... что это? -seeds-shashamber-display-name = я не знаю что это - -flavor-complex-bear = как медведь, карты и что-то про футбол -flavor-complex-sumer = как лето -flavor-complex-holidais = как новый год - -ent-FoodBakedPotatosCutlets = пюрешка с котлетками - .desc = ты потаропись... у нас щас котлетки... -ent-FoodPickles = соленный огурец - .desc = влажный... Самое то с водкой -ent-FoodGOOOOLsoup = медвежий суп - .desc = доигрался в карты.... -ent-FoodOkroshkasoup = окрошка - .desc = салат с квасом? че -ent-FoodOlivielsoup = оливье - .desc = у меня столько майонеза, сколько и не снилось моему отцу! -ent-FoodSolankasoup = солянка - .desc = мээээ..... -ent-FoodPlow = плов - .desc = ой васа, пловъ просто пушка, отвечаю! - -ent-BookUSSPCook = Копатыч. Кухонные хроники - .desc = Говорят, некий Копатыч, является легендарным Шеф-поваром всего СССП! - book-text-ussp = Вступление Когда - то я был обычным актером мультфильма, но теперь я занимаюсь действительно любимым делом - кулинарией. В данной книге рецептов я вам расскажу о самых простых и в тоже время вкусных блюдах, прямиком из СССП! diff --git a/Resources/Locale/ru-RU/_corvaxnext/seeds/seeds.ftl b/Resources/Locale/ru-RU/_corvaxnext/seeds/seeds.ftl new file mode 100644 index 00000000000..097411de9c4 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/seeds/seeds.ftl @@ -0,0 +1,4 @@ +seeds-cucumber-name = огурцы +seeds-cucumber-display-name = огуречный куст +seeds-shashamber-name = ... что это? +seeds-shashamber-display-name = я не знаю что это diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/catalog/fills/books/kopatch.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/catalog/fills/books/kopatch.ftl new file mode 100644 index 00000000000..a6eabd144bf --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/catalog/fills/books/kopatch.ftl @@ -0,0 +1,2 @@ +ent-BookUSSPCook = Копатыч. Кухонные хроники + .desc = Говорят, некий Копатыч, является легендарным Шеф-поваром всего СССП! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/produce.ftl new file mode 100644 index 00000000000..b3f0b39036b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/produce.ftl @@ -0,0 +1,4 @@ +ent-FoodCucumber = огурец + .desc = длинный и толстый... +ent-FoodShashamber = что это? + .desc = у меня созрел вопрос... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/soup.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/soup.ftl new file mode 100644 index 00000000000..583e9b88e4e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/consumble/food/soup.ftl @@ -0,0 +1,14 @@ +ent-FoodBakedPotatosCutlets = пюрешка с котлетками + .desc = ты потаропись... у нас щас котлетки... +ent-FoodPickles = соленный огурец + .desc = влажный... Самое то с водкой +ent-FoodGOOOOLsoup = медвежий суп + .desc = доигрался в карты.... +ent-FoodOkroshkasoup = окрошка + .desc = салат с квасом? че +ent-FoodOlivielsoup = оливье + .desc = у меня столько майонеза, сколько и не снилось моему отцу! +ent-FoodSolankasoup = солянка + .desc = мээээ..... +ent-FoodPlow = плов + .desc = ой васа, пловъ просто пушка, отвечаю! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/specific/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/specific/seeds.ftl new file mode 100644 index 00000000000..e597c44408c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/specific/seeds.ftl @@ -0,0 +1,4 @@ +ent-CucumbertSeeds = пакет семян (огурец) + .desc = { ent-SeedBase.desc } +ent-ShashambertSeeds = пакет семян (чтогурец) + .desc = { ent-SeedBase.desc } From c628f7344817347887f029da97853e299d732cb7 Mon Sep 17 00:00:00 2001 From: RedTerror Date: Wed, 20 Nov 2024 17:30:54 +0700 Subject: [PATCH 11/17] CUCUMBER fix 4 --- .../Markers/Spawners/Random/Food_Drinks/food_baked_single.yml | 2 +- Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 48caa983986..1d5be5fc64e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -81,7 +81,7 @@ - FoodOkroshkasoup - FoodOlivielsoup - FoodSolankasoup - - FoodPlowsoup + - FoodPlow chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml index 957c0225f69..fb62847626f 100644 --- a/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Hydroponics/seeds.yml @@ -9,7 +9,7 @@ productPrototypes: - FoodCucumber mutationPrototypes: - - shashamber + - shashamberSeed harvestRepeat: Repeat lifespan: 25 maturation: 8 From fc69be60efd8c75295d80c751bc309265392dd3b Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:21:31 +0300 Subject: [PATCH 12/17] next --- .../Catalog/VendingMachines/Inventories/chefdrobe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index c44ea253196..2c5d30e79a1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -12,4 +12,4 @@ ClothingShoesColorBlack: 2 ClothingShoesChef: 2 ClothingBeltChef: 2 - BookUSSPCook: 3 + BookUSSPCook: 1 # Corvax NEXT From f673c856e2dddcb57f05cc694fe8bad3e432c10d Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:22:04 +0300 Subject: [PATCH 13/17] next --- .../Prototypes/Catalog/VendingMachines/Inventories/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 1818a0c83f6..fa3ac2a4ae9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -14,7 +14,7 @@ CocoaSeeds: 3 CornSeeds: 5 CottonSeeds: 5 - CucumbertSeeds: 5 + CucumbertSeeds: 5 # Corvax NEXT EggplantSeeds: 5 EggySeeds: 5 GalaxythistleSeeds: 3 From 1a7c71aa2edf4f37100dfd220994b390f5342608 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:22:40 +0300 Subject: [PATCH 14/17] meh --- .../Prototypes/Catalog/VendingMachines/Inventories/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index fa3ac2a4ae9..086cd8711eb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -14,7 +14,6 @@ CocoaSeeds: 3 CornSeeds: 5 CottonSeeds: 5 - CucumbertSeeds: 5 # Corvax NEXT EggplantSeeds: 5 EggySeeds: 5 GalaxythistleSeeds: 3 @@ -40,5 +39,6 @@ TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 + CucumbertSeeds: 5 # Corvax NEXT emaggedInventory: FlyAmanitaSeeds: 1 From e8629501dc886a69b7fecb0ea43163ac80b33a50 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:23:39 +0300 Subject: [PATCH 15/17] Update food_baked_single.yml --- .../Markers/Spawners/Random/Food_Drinks/food_baked_single.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 1d5be5fc64e..3355a2303b5 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -76,12 +76,14 @@ - FoodBakedBrownie - FoodPieBananaCreamSlice - FoodTartMimeSlice + # Corvax NEXT USSP food start - FoodBakedPotatosCutlets - FoodGOOOOLsoup - FoodOkroshkasoup - FoodOlivielsoup - FoodSolankasoup - FoodPlow + # Corvax NEXT USSP food end chance: 0.8 offset: 0.0 #rare From 8567f965c63346efaeeb25c8e5cf55644f7c0639 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:24:27 +0300 Subject: [PATCH 16/17] clean shit --- .../_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml index daec7847d4a..69ad7c4980e 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/produce.yml @@ -1,5 +1,3 @@ - - - type: entity name: cucumber parent: [FoodProduceBase] From 6f2493173ad9638de52ceb301ff82a9bbeea9057 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:25:38 +0300 Subject: [PATCH 17/17] clean shit --- .../_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml index d07e9b9a607..6fff314c900 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -1,4 +1,3 @@ - - type: entity parent: SeedBase name: packet of cucumber seeds