From d2469d72bbe4cc413ff6f505f3e0cb2145cbd2dd Mon Sep 17 00:00:00 2001 From: AsikKEsel Date: Fri, 27 Oct 2023 10:36:29 +0300 Subject: [PATCH 1/4] add plastitanium sheet --- .../Catalog/Cargo/cargo_materials.yml | 10 ++++ .../Catalog/Fills/Crates/materials.yml | 9 ++++ .../Objects/Materials/Sheets/metal.yml | 54 +++++++++++++++++++ .../Stacks/Materials/Sheets/metal.yml | 8 +++ .../_Nyano/Recipes/Lathes/materials.yml | 12 +++++ 5 files changed, 93 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 947a08abb1be..52216ad567e8 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -38,6 +38,16 @@ category: Materials group: market +- type: cargoProduct + id: MaterialPlastitanium + icon: + sprite: Objects/Materials/Sheets/metal.rsi + state: plastitanium_3 + product: CrateMaterialPlastitanium + cost: 16000 # TODO: Lower the cost back when possible + category: Materials + group: market + - type: cargoProduct id: MaterialTextiles icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index 735e8c25f7cf..2cc8b3450dcc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -52,6 +52,15 @@ - id: SheetPlasteel amount: 3 +- type: entity + id: CrateMaterialPlastitanium + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: SheetPlastitanium + amount: 3 + - type: entity id: CrateMaterialPlasma parent: CratePlasma diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 69b7f83ddb53..e94e19a28233 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -161,3 +161,57 @@ count: 1 - type: Item size: 1 + +- type: entity + parent: SheetMetalBase + id: SheetPlastitanium + name: plastitanium + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Plastitanium: 100 + - type: Stack + stackType: Plastitanium + baseLayer: base + layerStates: + - plastitanium + - plastitanium_2 + - plastitanium_3 + - type: Sprite + state: plastitanium_3 + layers: + - state: plastitanium_3 + map: ["base"] + - type: Item + heldPrefix: plastitanium + - type: Appearance + +- type: entity + parent: SheetPlastitanium + id: SheetPlastitanium10 + name: plastitanium + suffix: 10 + components: + - type: Sprite + state: plastitanium + - type: Stack + stackType: Plastitanium + count: 10 + - type: Item + size: 10 + +- type: entity + parent: SheetPlastitanium + id: SheetPlastitanium1 + name: plastitanium + suffix: Single + components: + - type: Sprite + state: plastitanium + - type: Stack + stackType: Plastitanium + count: 1 + - type: Item + size: 1 diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml index d56ef4165aa0..b9bbe068054e 100644 --- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml @@ -13,3 +13,11 @@ spawn: SheetPlasteel1 maxCount: 30 itemSize: 1 + +- type: stack + id: Plastitanium + name: пластитаніум + icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plastitanium } + spawn: SheetPlastitanium1 + maxCount: 30 + itemSize: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml b/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml index 11970087e7ea..5968102fabad 100644 --- a/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml +++ b/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml @@ -20,3 +20,15 @@ materials: Steel: 100 Plasma: 100 + +- type: latheRecipe + id: SheetPlastitanium + icon: + sprite: Objects/Materials/Sheets/metal.rsi + state: plastitanium + result: SheetPlastitanium1 + applyMaterialDiscount: false + completetime: 2 + materials: + Steel: 150 + Uranium: 100 From 8bc47379b89973568b62ec8d3787e64cb6a8b136 Mon Sep 17 00:00:00 2001 From: AsikKEsel Date: Fri, 27 Oct 2023 10:44:19 +0300 Subject: [PATCH 2/4] fix ftl file --- .../en-US/prototypes/catalog/fills/crates/materials-crates.ftl | 3 +++ .../uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl index 505220730fe7..8a10cd667fb4 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl @@ -16,6 +16,9 @@ ent-CrateMaterialWood = Wood crate ent-CrateMaterialPlasteel = Plasteel crate .desc = 90 sheets of plasteel. +ent-CrateMaterialPlasteel = Plastitanium crate + .desc = 90 sheets of plastitanium. + ent-CrateMaterialPlasma = Solid plasma crate .desc = 90 sheets of plasma. diff --git a/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl index 505220730fe7..aabb668b2f0d 100644 --- a/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl +++ b/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl @@ -16,6 +16,9 @@ ent-CrateMaterialWood = Wood crate ent-CrateMaterialPlasteel = Plasteel crate .desc = 90 sheets of plasteel. +ent-CrateMaterialPlasteel = Plastitanium crate + .desc = 90 sheets of plastitanium. + ent-CrateMaterialPlasma = Solid plasma crate .desc = 90 sheets of plasma. From 08c9ed2ebe58f9b394cdccb481b6b57fc0850a5d Mon Sep 17 00:00:00 2001 From: AsikKEsel Date: Fri, 27 Oct 2023 13:03:41 +0300 Subject: [PATCH 3/4] add plamirum sheets --- .../Objects/Materials/Sheets/metal.yml | 66 ++++++++ .../Stacks/Materials/Sheets/metal.yml | 8 + .../Materials/Sheets/metal.rsi/meta.json | 144 ++++++++++++++++++ .../Materials/Sheets/metal.rsi/plamirum.png | Bin 0 -> 1606 bytes .../Materials/Sheets/metal.rsi/plamirum_2.png | Bin 0 -> 1788 bytes .../Sheets/metal.rsi/plamirum_2_unshaded.png | Bin 0 -> 788 bytes .../Materials/Sheets/metal.rsi/plamirum_3.png | Bin 0 -> 1941 bytes .../Sheets/metal.rsi/plamirum_3_unshaded.png | Bin 0 -> 787 bytes .../Sheets/metal.rsi/plamirum_unshaded.png | Bin 0 -> 787 bytes 9 files changed, 218 insertions(+) create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3_unshaded.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index e94e19a28233..0f35e6d25501 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -215,3 +215,69 @@ count: 1 - type: Item size: 1 + +- type: entity + parent: SheetMetalBase + id: SheetPlamirum + name: plamirum + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Plamirum: 100 + - type: Stack + stackType: Plamirum + baseLayer: base + layerStates: + - plamirum + - plamirum_2 + - plamirum_3 + - type: Sprite + state: plamirum_3 + layers: + - state: plamirum_3 + map: ["base"] + - state: plamirum_3_unshaded + shader: unshaded + - type: Item + heldPrefix: plamirum + - type: Appearance + +- type: entity + parent: SheetPlamirum + id: SheetPlamirum10 + name: plamirum + suffix: 10 + components: + - type: Sprite + state: plamirum_2 + layers: + - state: plamirum_2 + map: ["base"] + - state: plamirum_2_unshaded + shader: unshaded + - type: Stack + stackType: Plamirum + count: 10 + - type: Item + size: 10 + +- type: entity + parent: SheetPlamirum + id: SheetPlamirum1 + name: plamirum + suffix: Single + components: + - type: Sprite + state: plamirum + layers: + - state: plamirum + map: ["base"] + - state: plamirum_unshaded + shader: unshaded + - type: Stack + stackType: Plamirum + count: 1 + - type: Item + size: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml index b9bbe068054e..83ab6a80d296 100644 --- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml @@ -20,4 +20,12 @@ icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plastitanium } spawn: SheetPlastitanium1 maxCount: 30 + itemSize: 1 + +- type: stack + id: Plamirum + name: пламірум + icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plamirum} + spawn: SheetPlamirum1 + maxCount: 30 itemSize: 1 \ No newline at end of file diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json index 920eb637311e..76e08e94f25d 100644 --- a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -91,6 +91,150 @@ { "name": "titanium-inhand-right", "directions": 4 + }, + { + "name": "plamirum", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] + }, + { + "name": "plamirum_2", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] + }, + { + "name": "plamirum_3", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] + }, + { + "name": "plamirum_unshaded", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] + }, + { + "name": "plamirum_2_unshaded", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] + }, + { + "name": "plamirum_3_unshaded", + "delays": [ + [ + 0.7, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.7 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png new file mode 100644 index 0000000000000000000000000000000000000000..c27d67142757c2b08c06b51f43d0c4bacdd99dab GIT binary patch literal 1606 zcmai#dpOg39LIkfZPn}yVM;YQC5}6}R42>Qap^*iTt=pmOU_e-P8YwKWV$HQ?Ksg$ zOh@K6A=xIaPVTXAXf{b>S&kSs&p5x;Ij86Rb^dsNzQ51&e16~O`TRbg*ZX(Td%qic z<(icM0H8hGU45XF3n_Ft0*ZUM;5c-^;(go*0JCE)lpp{PR~O$?xzaqZ7y~!`=Qt&* zW`nlYNi-rS|3-E;P5VsLcu_lY%;q)$PqmW6x6Ywvx-r+n3jF78bnkjupiWp`>>6tA z;8P^RSLxQLpLwU8X6|U{-dzKWXgxW+5rO zetuBQAs(VD_;W?1S}l@r(dM!<5Zt!lmG3OGmz6sBujWwh5am(gOn&k%P}0!Li9;+8 zi9O*|p_p*P;Af7?06ne^b}9>U-ux@9fdI@U(36 z%vEML!cW^03&_ShyA#AMD>ntM_xCe-`N^q@;Bo84Mcqrp_0!x)7J;{yYG{e&YOC}O zqz*l<3mlUi#qYER^zg7?OX?<-)=pi`lji%W&O~0Z7UHR4+aC|mF_B3y$1^hM%KiqEHaD$B^fRglU9~pU` z!fi0)bTtk7Qbh7_&Gue;k+TdO4+_lh;Rpjz20w8gdxDY$zSzs?ffx8?aG$65HMkEC z-ySX@9R+)l`IHB;Kpa(3)Efx`lG{XlB1j!(rTW!iFS&&g#myswo1G@h^ItjVjH4NO z0ekmwKFKjogQX+A@73F7hXC$azQJXSm<4c-Gp7KWqmij}&ePa|dWT}(>EvaT6gfhy z)YV|*1&WbjzvfC`Pjz}_#y#?XAyV$p7!qFQZJ82Kgv#;*I75Mkw-n~3)pF9bcy}Rq zu1ty@)~XQX@L2UVTbl%t+m|wDYpo)w?Uo;%2VIVo(gw!W>&h6D4NCR`9xH;+-L^64dAD@NC_Ihzr+^ZVVJmRdB?SQ8{`1|%)vb!C zU^TmeWsIbr;a7Etc9|dx4YxikDvU!X)e7IFmMufb+Cb`V}_qc zs47LJOR(U^*_i`4Zcy*HA5&n@hAzgC*Hi2yj>aSXcd5qg!Q)$!WO!gn2FvKX9xKy} zidoog62Ut3WSMOUUSExw-OLLzBuO35K)vjwNYqXVG+|7E<_VXs1-D29cK#S=a*@QR z1r!fGj@}iXJ9^KQm3jyNmX`I_Mh?w7qYK?Qb&X7f>gtiu#}mCrSB5R@Il{zrJ=MA= zuI?nah?{F;)svDER%g6;PQ-AFDDhH~$ZnM?OEfysy_j>CvB)_mgOzwG>u0{K-T$sB z{VcdI0NT*{-aZ=i=09m#SD#TL2pITwrZXtfGJAK>yydeq*oUmZpT9*WPN0ZBdr{;4 znHiBI*ELpDd@`ZDOVRmpB*pr%yN!i|%1Y7_voz>n2xnqqEjl`&ZXV3&hC(o62_%#X m(2p|vVTfg@@&CY_Bgd%kuu(28Yf}9m0FT}KU73W?bAJKQzy{+0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png new file mode 100644 index 0000000000000000000000000000000000000000..02fb64d389e93d79b238f2fcbf6c68474f8d8d05 GIT binary patch literal 1788 zcma)7dsLFy7XOe8ALHn#;|ph)$_z>?%`24#jAIXy31M7U3sSPKnvayq)NvGaBy)(> zn3dg`6f;e03SViO8K~JqOPn#aK!NlUA(5Jr`XM+UPTjlazx&5;@88*H?{n7KYp>ra z2;H;O#>&kK000}}u3#$UMGzPk%OM*g%2GoPc8t0+2oUtTLyP52#Ne;P(l2RCp2j1? z9Um^9eG`g|{_MaI<7dm=7|dbJW$uL|l0ZW73r7%;{l~oit@ZK#{7K)wo2|Rm<%cL{ zD_p)?xzT0a(MpBw=`~QJErQM1@i2IELK2f*Y@hJ zEJe{nJUzB$()hOFdBU2UY;d(9g!ztF!mpo$DYj0q%nUOjdJPlh(k3A%;YReUbi&L0 zY-i&mS5am=abnq+Od5ubzFKp46%5LpcSr>Qmswed^7t;i!QS}X@lj7XIe#Wx%uioF z8JY4&0CDEUnR|17TBW)wYJh(S4iKh)#}?qQerqlurZFn!wuB%=D;u5DsP;OpC z#@t#8DQ^JhFI?=A%bFt0x}~sPjeE6-ote{0vXAw-R(RgF>VK|vyznlrGUx#24An%d zDXiEUw`KfuWjR{>48qI5+ z#l>>$c$Ev_Tm_F?&rUJ{4WZhb-FC=b*9Kjg@+|Fon(sLB=xH#rdjz(5JYXQeRc90P z>^5bFR#rh1Q-i_J{qL_dSRtbevpF_(XyJpC5$Es|CnFLO&2#$Ha%`?~gA00p%LapemO2EusEKjG^e3E^ig7SDxEPX88)W+4~9>>hLEw39tBLebpt5 zT0QLzrz%$$P=F7?8zjasuEI+lTBt#Q>J1Y9c+GJqLmmLC*L)n4rCG69acBi23jo(? zWB(5;rlS}s13MaIx~|xRR8{9#>%-t=_s)>5 zZfkx~+N_xmk&YK?-fyVK5t>}fWag!!A!(8i<^oOiT$b?`1*2&XlYXJm9EP**%r3^U z^qrs74z!O{WmYF)`yxvSN@{W7W%b>D3dLtf~)xkQh2J)`;`74op?E0?B<{vfKi7Jd3 zA}^T;9ycLstp`V=!pT_8cR^&sFm)Nonn6ql)L*$^}AmYhQpOz>dXl5fVmfBsE{ z#X(0gvd7_ZiKl|+ulVQrEy#vhCt~_0TeGu=wEVPhyqeCJf9k=L+PSX2!$~y8v}vRZ zbw?~duXRAZijr;?*?l2LqG+VUE8DSEjG1ZMjAkHwG+mzZon`NQCToa0C3?NC_U z809vIC}SNlxYgnS!!d2~NgeDpKU3&&!LuW%B*Bbe;$PNpn{~)RQJ8~ri+eE2l3QW9{K2T_WAtwRkn#fK3_)caHf%d`j*?{ zRMc_8e&2)s->;JdolHwiK+9G_ME8{oR-DSfeb+)Edfr4y9Q&f*;CYpS@&Ai0ZFh#D zeK?hb>(&h9FCXBp+eC>#gzg8Vee}PesODQ1{)6r2t{VZJf&Vi0uny)23BzsK-$Z4l zc=i%DI)E^oQvqp59irUogO)@aI*`$OKdta~Xwkrf%TM3}4cym5Y*T*{gnp*}9A2>h gt3M7OzK}>G+`Fb8^xYD>ANtM!;`Tkkf*?ljpC@2{F8}}l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..29e9659d26b73be28f6f06396b8851ac252060be GIT binary patch literal 788 zcmeAS@N?(olHy`uVBq!ia0vp^2Y@(%gAGV}AE;eoB=nzcvVTs(vYm^7aRWkywR^jY0n>oHNQ{(wVHaNC#6WUZrzuBmY( zsdH>A%T_$~^qp?jq{{b?YU8)=(Y|-~+?zMErSrDG23i9F3rsSBF?@@2nY-@R|X%!j}=k^dfj3;$mKC1A}L_SDex3|Ea8SRY`z z&sZm!RdB6S;?;*WjRqzUHtV�x5g>_+xusW#sll3#048Gz~&NrA&3Y`gZ-h|3E)) z6`8e;aq;76%d#K5*pc~fCD7-0Ou(+G&%4JzVJAaZiXOw^Kb_nU3?OcN<9Sgu{O^*k z$oD?~nj-)EfL*db@;)#~_CGja|NZerdz)IDT|Xbi{)jy0X<56^ZrA5GzCiW@i@TBX zckfooKKI|DvFdjG-T(RK^Lp}ZYvk*u{iW5tt`TCHH_iZ85!4Es}oF*_6Fu}4f6XY#MH2hIF?_SXTW&5CKxJP-?J a7~3;6n8-#5U%0jeB;x7n=d#Wzp$Py5g?l^z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png new file mode 100644 index 0000000000000000000000000000000000000000..0563ab6b1ab1cc657054702b82664385a7f42bdf GIT binary patch literal 1941 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 f1(?AWM40Sncw8hKapKm#*&qQ=S3j3^P6EU!R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..30c768eedce9ae660f67cf579a73313c6a525e7d GIT binary patch literal 787 zcmeAS@N?(olHy`uVBq!ia0vp^2Y@(%gAGV}AE;eoB=nzcvVTs(vYn8b=!nylR$vFz$0yCoh|?GqHXX*&PfVmLJ^FVMn>`wr97`-PwIC#_wRJNMj^t|Z+a{=Q%9m-C69+Vyi@!~RqD0iRN)IytNQhiRIGd`g)DWcCMjEH&KA*3mcJt#q-m_<_WKM_3C~ zvKeJ0EpH?#kGHJKr3=GU{o(*CB({J2oMU$3e1uS}I{J?pDozwS5Zc3jQvD2=^- zQy_U|sDA_4y>Q|{Q}|%WY$yty!z7r)Bj1k^kOK{#SMV`($RjF4NQTcmBQl*Du#K_1}UuuOt^# zv6Zk#JhDEJ@63D7O3+z$o~b|^Tg|oBfV)6t`n5LyF6ipN4znmZeO`;T&1>G8pcT9R zUj1ty@@dI5r^}`ZC3h~B@XE-VpS9l#^!e;(VAtrM`ORn~?lAETYr+isLPi;g=yY4n zU5{4H4>5c__jJ6$>-i9un7^J443c80AJgk>ejQKucQcRQ$8UeyLNi_8%&mOheqQ_2 z5+dolr5EqMo&V?$r?_kB@72Hm-+gxZ;#zn4L+69;^MCkz_3+H-hb3#4>aV|^?$!7* z!h3$X{P`(Pmp4vZbvyp<|EKTSSKJd=c~4-IVwy7#JWL@BvD3G%y*y+8esP5M Date: Fri, 27 Oct 2023 14:30:29 +0300 Subject: [PATCH 4/4] add recipe to ore processor --- .../Locale/uk-UA/materials/materials.ftl | 2 + .../Entities/Structures/Machines/lathe.yml | 3 ++ .../Prototypes/Reagents/Materials/metals.yml | 16 ++++++ Resources/Prototypes/Recipes/Lathes/sheet.yml | 53 +++++++++++++++++++ .../Materials/Sheets/metal.rsi/meta.json | 24 ++++----- 5 files changed, 86 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/uk-UA/materials/materials.ftl b/Resources/Locale/uk-UA/materials/materials.ftl index f03961a54743..81c009633054 100644 --- a/Resources/Locale/uk-UA/materials/materials.ftl +++ b/Resources/Locale/uk-UA/materials/materials.ftl @@ -9,6 +9,8 @@ materials-steel = сталь materials-gold = золото materials-silver = срібло materials-plasteel = пласталь +materials-plastitanium = пластитаніум +materials-plamirum = пламірум # Other materials-biomass = біомаса diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 320f0069f66a..8b0d99f7d578 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -868,6 +868,9 @@ canEjectStoredMaterials: false staticRecipes: - SheetSteel30 + - SheetPlasteel30 + - SheetPlastitanium30 + - SheetPlamirum30 - SheetGlass30 - SheetRGlass30 - SheetPlasma30 diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index affeb9427eee..6808f2ecb809 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -30,3 +30,19 @@ icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic price: 0.28 # 1-1 mix of plasma and steel. + +- type: material + id: Plastitanium + stackEntity: SheetPlastitanium1 + name: materials-plastitanium + icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plastitanium } + color: "#696969" + price: 0.50 + +- type: material + id: Plamirum + stackEntity: SheetPlamirum1 + name: materials-plamirum + icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plamirum } + color: "#6bdce2" + price: 0.98 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index cbfc0ca4527f..d462357ab0e2 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -139,3 +139,56 @@ completetime: 6.4 materials: Meaterial: 200 + +- type: latheRecipe + id: SheetPlasteel + result: SheetPlasteel1 + applyMaterialDiscount: false + completetime: 2 + materials: + Steel: 100 + Plasma: 100 + +- type: latheRecipe + id: SheetPlasteel30 + result: SheetPlasteel + completetime: 2 + materials: + Steel: 3000 + Plasma: 3000 + +- type: latheRecipe + id: SheetPlastitanium + result: SheetPlastitanium1 + applyMaterialDiscount: false + completetime: 2 + materials: + Steel: 150 + Uranium: 100 + +- type: latheRecipe + id: SheetPlastitanium30 + result: SheetPlastitanium + completetime: 2 + materials: + Steel: 4500 + Uranium: 3000 + +- type: latheRecipe + id: SheetPlamirum + result: SheetPlamirum1 + applyMaterialDiscount: false + completetime: 2 + materials: + Steel: 200 + Plasma: 200 + Uranium: 200 + +- type: latheRecipe + id: SheetPlamirum30 + result: SheetPlamirum + completetime: 2 + materials: + Steel: 60000 + Plasma: 60000 + Uranium: 60000 \ No newline at end of file diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json index 76e08e94f25d..18ba6dfe95bc 100644 --- a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -96,7 +96,6 @@ "name": "plamirum", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -112,7 +111,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }, @@ -120,7 +120,6 @@ "name": "plamirum_2", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -136,7 +135,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }, @@ -144,7 +144,6 @@ "name": "plamirum_3", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -160,7 +159,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }, @@ -168,7 +168,6 @@ "name": "plamirum_unshaded", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -184,7 +183,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }, @@ -192,7 +192,6 @@ "name": "plamirum_2_unshaded", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -208,7 +207,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }, @@ -216,7 +216,6 @@ "name": "plamirum_3_unshaded", "delays": [ [ - 0.7, 0.1, 0.1, 0.1, @@ -232,7 +231,8 @@ 0.1, 0.1, 0.1, - 0.7 + 0.1, + 0.1 ] ] }