From e7330ece9c9ba9b573da772880f494e3355aebf4 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:58:53 -0800 Subject: [PATCH] Adds Advanced SMES, an SMES with higher capacity for mapping (#33757) * Adds Advanced SMES machine and board to autolathe roundstart * Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun * fix attribution formatting * Update smes.yml to address review Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * add new sprites and change naming scheme, testing something * address review, tested it a bit more, works ingame --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --- .../Circuitboards/Machine/production.yml | 19 ++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Entities/Structures/Power/smes.yml | 45 ++++++++++++++++++ .../Prototypes/Recipes/Lathes/electronics.yml | 5 ++ Resources/Prototypes/Research/industrial.yml | 1 + .../Power/smes.rsi/advancedsmes-open.png | Bin 0 -> 1208 bytes .../Power/smes.rsi/advancedsmes-static.png | Bin 0 -> 1124 bytes .../Power/smes.rsi/advancedsmes.png | Bin 0 -> 1093 bytes .../Structures/Power/smes.rsi/meta.json | 13 ++++- 9 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index fd0ff475dfa7..fde151f20e08 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -640,6 +640,25 @@ amount: 4 defaultPrototype: PowerCellSmall +- type: entity + id: SMESAdvancedMachineCircuitboard + parent: BaseMachineCircuitboard + name: advanced SMES machine board + description: A machine printed circuit board for an Advanced SMES. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: power_mod + - type: MachineBoard + prototype: SMESAdvancedEmpty + stackRequirements: + Capacitor: 2 + CableHV: 20 + componentRequirements: + PowerCell: + amount: 4 + defaultPrototype: PowerCellMedium + - type: entity id: CellRechargerCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d511f5b1af5c..55f754df3d1b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -520,6 +520,7 @@ - MassMediaCircuitboard - ReagentGrinderIndustrialMachineCircuitboard - JukeboxCircuitBoard + - SMESAdvancedMachineCircuitboard - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index a9f647ec9e74..db98b0d0f7cf 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -111,3 +111,48 @@ components: - type: Battery startingCharge: 0 + +- type: entity + parent: BaseSMES + id: SMESAdvanced + suffix: Advanced, 16MJ + name: advanced SMES + description: An even-higher-capacity superconducting magnetic energy storage (SMES) unit. + components: + - type: Sprite + sprite: Structures/Power/smes.rsi + snapCardinals: true + layers: + - state: advancedsmes + - map: [ "enum.SmesVisualLayers.Charge" ] + state: "smes-og1" # -og0 does not exist + shader: unshaded + visible: false + - map: [ "enum.SmesVisualLayers.Input" ] + state: "smes-oc0" + shader: unshaded + - map: [ "enum.SmesVisualLayers.Output" ] + state: "smes-op1" + shader: unshaded + - map: ["enum.WiresVisualLayers.MaintenancePanel"] + state: advancedsmes-open + - type: Machine + board: SMESAdvancedMachineCircuitboard + - type: Battery + maxCharge: 16000000 + startingCharge: 16000000 + - type: PowerMonitoringDevice + group: SMES + sourceNode: input + loadNode: output + collectionName: smes + sprite: Structures/Power/smes.rsi + state: advancedsmes-static + +- type: entity + parent: SMESAdvanced + id: SMESAdvancedEmpty + suffix: Empty + components: + - type: Battery + startingCharge: 0 diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 99ff9f25eef1..af74e7f3c79b 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -399,6 +399,11 @@ id: SMESMachineCircuitboard result: SMESMachineCircuitboard +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: SMESAdvancedMachineCircuitboard + result: SMESAdvancedMachineCircuitboard + - type: latheRecipe parent: BaseCircuitboardRecipe id: PortableGeneratorPacmanMachineCircuitboard diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 817e50834b70..e05212bf68e5 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -41,6 +41,7 @@ recipeUnlocks: - PowerCellHigh - TurboItemRechargerCircuitboard + - SMESAdvancedMachineCircuitboard - type: technology id: MechanicalCompression diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png new file mode 100644 index 0000000000000000000000000000000000000000..c45b42460087914af05fd68805c35298df20c577 GIT binary patch literal 1208 zcmV;p1V{UcP)Px(SV=@dR9J<*mtANhRTRg6Q}Q6TYE`sh5u_Hkg)MNBc>62XndH? z%}g@Wq^|gfkl~)2^Z%c7PtH9faSGgScl|Vbr^x5?lAX=cpcC)y?fn=0csw3kA*O|9 z;%c=jY)eZ^XChr$SrN}YJw3KUq|=Cvq;qp~XA-csw$>uXN{HlkyX(eOSF2S)Y(?7J z+j}Z;rBbmKv$C=xMCd{!x7%IMX0yVuv$I2AU!N^uu~EQFOcc`FTqrR$|&gC$%Eh z|7H1nUK0=whgn`;7C&ef(k!ME=%hyC#l=P5?0o>hrH{X2YHF$>05FNL6LJ<9BbFqI zi_hN2`|kVPfA|XkAAWYLaRj=EW+9SfdyjOC+1XjPZ(J4R@})_X?F;}8Nsnb;>f!nG7m?3{vYinkL?g001|51jjTe*^^yAXMOQjN-Oa`7B5yU!v zRC2AI&`LNJIzn^F{3TS7Z%jEzV7#Lt{YwKk9ISRM$!396Je*!M}?e79B zL?RK(_4W02{C>Z%tE!66=VPq9+qCcQ(GlHajkQ!Dbv6MT8yhXefk1#jAYighOibAN zIJ$czp3~{HCg9-UfZ^d`(?(TQTe_d$?-$P=kH>ao)2m*Q8>IXD`<8nhwOS2_!(l7J z2xFAZQR~@&Mh1-0j*gB3Fg@Kkg3FgvI5syoC7`~rut1?u0AOfn$WpB_1I@yW+0cd0 zpVYwgojXFr&70;U=yJQ=_0`o?5{U$fL;`?9p+K!xYaxn8qrCBri@#kiqS2_RdZXRA zrks5A=mEyMyTu34YCu(0K6!N)fD;V>mLlH%{tBO7u}p*s>2#VvDkYu)4i68-nhr^y zh`)SGOWW~#w?y$JlSx9M&=WPHSS%(Q(e{n2xcXn@hthAHd*NvwJ+5gP2nK_2?;`** znGBPYlO~5wr&Em9owQTF0000kU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png new file mode 100644 index 0000000000000000000000000000000000000000..7611f14c2c63fcffbf09d3cbc8524dbd54016d86 GIT binary patch literal 1124 zcmV-q1e^PbP)Px(1W80eR9J<*mrZCRWf;eQlLl6ruGWKX4uZ7cw!IXFxs+_z%AyePV0#gIbSb1u z{h&okN)ivYAv7XIu}Din@Dh4*E<#war5}W%3<0TZ;$h=qSu$1D$fnV~Y&=Zgw=>C1 zKC1Y?Oqh4x=l^@&=gs?}&_b%J)?2lAs(e1Lc(u7U2;<}9G$nfCYhw=}L) zDxNT@R7ye!5JgqhdN!Mt4F?AY3=R%@8WxMimH;CoBc4E}X)-l61z3rO!(sehf!s0` z=9;ECG7$j{!=P9!Iv_+Gw~+zxwM@rFnxJJbOhf$)@s9fz97Z+VY++f;Cn7SE@e_1}Cw*V4} z1gop7vO^^e&Ty7gM7z{EyJ4+}O>Igve z5i(5^UDtW_?-OY()b&!_twagt=H?vlAN}cHZ>8R|$mtySuvzP+wkNrcfvVFgiNwo(jM= zpkZaZVU+;j4gFI%xkv5L31R;ixXGugYJGiuopd@)I-LffP$*EV)m%Fm+d$;vd7)4! z1Sj{dR06;F;GP4!%5*?|=XEuSKL{ zmgLqesLSOtnM}q#Jr`v%8HR_4n-(HB`N29w@WTfH=(^7I^t9unU@$0;)}1WHIMo8cQICUIM_yO=TijKYQ{F!!YFG zvQ#Ry&A1b3n#Rt~j$;HKJ+5(QV_%V*(OX}YmGABb<@pe-WBAdLH96az1sfHM#bgY( z!|E6NfB2xyX*591eE{Ao^spS$U{=Z|VgA?riKk?}lFbKd$Hh08wK3{0?Q4 qV*mgE4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px&Aevzq?NX^E2ab=A85CZ)9Efl*L48`^#_Q@<7lZ=N_M-|)zwgtFqnQ4reVh7S5_{UJ%DUB z%jV{$e4!Jh6J`(zQ@?R4mE!j3j{w|x|8o`>7q0+-0E7x;82KaCG>u!&Js|%2n>={< z3jpta_|;Vj1Vkr@rYZN4ft5@qIsE7?X>Q(Gz&^A9h-#WfCXGW?Nrl{33Xj3kw_4W#RdWp?+CfB zi)C57^5=bNEHrd09#*0ROG`_E`;Wf+20*@M*dC~&@*u3v3C`U#bRK4P+@Xim%Y8c(6LCX)gl^=4h-?eUvT@n zca`Qq^Q1}hq}lbnssuvOgM$MNXs@rYQ>jz{n3|dj4+Y?-%fCyB65N~jO0d)HU4l+U z48v$|Z*Nm56etu508}a!TCJ8EqC>G*tXBnkmLMt~_~7MJ04^B-LLt8Fh)|T^q}iQ* z2$taZll$`iuYWwb0$5&N<})vYtgWrdtyfSxjzh6nRK(YQx z2Y_W+EG#Sp9@2GP9<2vy#naQ%fgMyfqA-ARxvb@Kx%Sq~Q(n9t!8A>;cjKkcKe7Kh zs5(m^QZE7E@=Ik#Z~y%GDYk9P!)2{j>l^VPGEI~H{rx}&9{twh?#_`WJK<}eI@;H7 z>+*aE-ZA|2)LWeW&Vrpvr_*wdu*2%dN54m)&&Mfv2gg#WL_8iJ3P8M5DwX7+=AF6c z0l2$!6#O<+>HqjV{~M7j@JrwmQ5paM01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfy=V0K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json index 2ca8d1fb2262..04646fddb91c 100644 --- a/Resources/Textures/Structures/Power/smes.rsi/meta.json +++ b/Resources/Textures/Structures/Power/smes.rsi/meta.json @@ -1,16 +1,25 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept, advanced-smes, advanced-smes-static, advanced-smes-open modified from smes, smes-open, and static by august-sun (GitHub)", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "advancedsmes" + }, + { + "name": "advancedsmes-static" + }, + { + "name": "advancedsmes-open" + }, { "name": "smes" }, - { + { "name": "static" }, {