From 8f51cc3344781a9fb507dc50d20fb05bd53a593f Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Tue, 18 Jan 2022 06:21:40 +1100 Subject: [PATCH] Adds new pAI sprites (#6205) --- Resources/Prototypes/Actions/actions.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 12 +++--- Resources/Textures/Interface/Actions/midi.png | Bin 923 -> 0 bytes .../Textures/Interface/Actions/pai-midi.png | Bin 0 -> 555 bytes .../Objects/Devices/pda.rsi/meta.json | 6 --- .../Devices/pda.rsi/pai_off_overlay.png | Bin 148 -> 0 bytes .../Objects/Devices/pda.rsi/pai_overlay.png | Bin 171 -> 0 bytes .../Textures/Objects/Fun/pai.rsi/meta.json | 35 ++++++++++++++++++ .../Textures/Objects/Fun/pai.rsi/pai-base.png | Bin 0 -> 318 bytes .../Objects/Fun/pai.rsi/pai-off-overlay.png | Bin 0 -> 167 bytes .../Objects/Fun/pai.rsi/pai-on-overlay.png | Bin 0 -> 288 bytes .../Fun/pai.rsi/pai-searching-overlay.png | Bin 0 -> 347 bytes 12 files changed, 42 insertions(+), 13 deletions(-) delete mode 100644 Resources/Textures/Interface/Actions/midi.png create mode 100644 Resources/Textures/Interface/Actions/pai-midi.png delete mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png delete mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/pai-base.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/pai-on-overlay.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png diff --git a/Resources/Prototypes/Actions/actions.yml b/Resources/Prototypes/Actions/actions.yml index 12374551c9..0ad1aca925 100644 --- a/Resources/Prototypes/Actions/actions.yml +++ b/Resources/Prototypes/Actions/actions.yml @@ -68,7 +68,7 @@ - type: action actionType: PAIMidi - icon: Interface/Actions/midi.png + icon: Interface/Actions/pai-midi.png name: "Play MIDI" description: "Open your portable MIDI interface to soothe your owner." filters: diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 195ab7fec6..aab82ce023 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -17,10 +17,10 @@ type: InstrumentBoundUserInterface - type: Sprite netsync: false - sprite: Objects/Devices/pda.rsi + sprite: Objects/Fun/pai.rsi layers: - - state: pda-lawyer # nobody's using this one - - state: pai_off_overlay + - state: pai-base + - state: pai-off-overlay shader: unshaded - type: Input context: "human" @@ -43,7 +43,7 @@ key: enum.PAIVisuals.Status layer: 1 states: - enum.PAIStatus.Off: pai_off_overlay - enum.PAIStatus.Searching: pda-r - enum.PAIStatus.On: pai_overlay + enum.PAIStatus.Off: pai-off-overlay + enum.PAIStatus.Searching: pai-searching-overlay + enum.PAIStatus.On: pai-on-overlay diff --git a/Resources/Textures/Interface/Actions/midi.png b/Resources/Textures/Interface/Actions/midi.png deleted file mode 100644 index 38d89b609e366ae4bc1b7bdc38d5773abc302d04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 923 zcmV;M17!S(P)t^GvFvV;U@O>I2o|D^ zufl(ztzfGl2#O$L;~((VNLcTfK!U_sX79(DIhUC;;0kB;oYfqFT;4V#p`f-DUDn!O z@z6&rJ-A}JWlYb_h52`U-P5G%onQ6(e_zAlNhB>Dn%adYbi=fTr-Z}nwxM`ixLeP} z62eEqqoy2C_*&`l3cn~$SNKD*xe%EFm+Gmd>o{J=ddAENj|dOuvPHdm9(5CMGQT)4 zwO{4{77;=O(TG!IjVv~Psd>q)u`lrJo24KgUH%3oOmU>ih<8-fqI6A4O^KeAFH1?~ z{x?r6H9l79?hQiAv*WxELEA2rcO2*Y*m24y;C_P3e9d2woF+d-->GSXhv3_U^Q)Q` z--C-S=zTO|X6#pT%XFnu@OB2BQRupbj+IJQ)pbrEU|~a^=mz!=U|9D1R(}ARU}xK2 z-zmhU zm0IyAdcZG*oGezC1Zv>7UmkyNLql1ZT@ffHV5&w#glCgj4hP&=t(6i!U?zV+wDe}0hFooyTmqT={{ewcJ;2pjsy#}VTY@44z}2X?UBLB%P=BBbNNv<- zwpJ?8MwD9uBvzA1DTmpLQ&z7D7!t90xGo5Da2J$E)05;qee-YyptuII-CWzAq&X(ayoDU0iefgwjr~A=_r9g+k^Y@QhJT7(oXfkx(>!0t@*!sMnJHYgS z&NklKRO7>4D?5F^t^Up~@>kCi00m&63ZMY@9=U$+>O}?Mhff7iAm9P-^~`HRQ~-mh z5_+=i0qc$+-32j^V?yu%j{Cb0b~H1+~#K;$Me_tvjEfN xDxgaMiKc_&sslNuY9(pg;6CmHZ8@wq{twoOl+A+iGOqvt002ovPDHLkV1jWsr*{AV diff --git a/Resources/Textures/Interface/Actions/pai-midi.png b/Resources/Textures/Interface/Actions/pai-midi.png new file mode 100644 index 0000000000000000000000000000000000000000..d0e6e9614d66689a16578539497168b4965fd24a GIT binary patch literal 555 zcmV+`0@VG9P)~=eF&TBpATq>?h zfiBOc+;?**8Dprb%D9kH3L!+zgCGFsT@SQDx~KQydQw1aQ_*X~hyv*+5WnoX`ji||tKroB?B_r{Jw_oHdf6rQ z04OhqxJ&YN5isTY`TkIle>^R_9iRoEJQN@OE=VbylQ9DEV>=4X&PW`2KNtbk5jy?3 z*E6dK3{mon8+*(~)S^x+kz=_S(y0R>t+>(6V=IY2DI+jNp zM3hp@W;0MqdwKxKvTWQ*m}ME(>vhkNk_jQ>&H+LQgb*NvAkXt-OGeS?Z$lY|VJ&Pn t8!*OdnRAZre-{rM&+=jUUk}^=rypFv*}UxWn}PrU002ovPDHLkV1f`w0q+0+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 0762084d11..aeb6eaad2d 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -20,12 +20,6 @@ { "name": "light_overlay" }, - { - "name": "pai_off_overlay" - }, - { - "name": "pai_overlay" - }, { "name": "pda" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png deleted file mode 100644 index 7d557d092e6b1bd1491dfb73fd0b2268ac1f7d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kcie~3D(64B0Wuk1{WG8 zM*NQTn*P_^=mGQQ^RYjUFeEi+2;8_V>$=7AMMG;u>j|+#GLF0lTttI47+kCyqU_w* soz+>~WDU674r+kS;qgCk-~a=I1<%`c2FsmhrR(Ts6$n4=d_#(&aKtnsj#e~<_|NnQ4sJ7MOJ>+b~ z(s8Zh{PKHuo>(`uX0Y3|Ubs9>@yMn{C$@?)ve~e>9n^rD-pIP)_vmHB|2$zb)AR=^K2LM>t70irmXXYYnVoRJhB0@^(t%J1|F~%a5Qklrt_%{j5 z5CVo__~@gQDl&v1K7yOnF{K3W{ns6haTS$`Z8 zPN{*MAjSx-HN5xFGr-TcKs*x~V~R4*Gl;0@%#8i|kuxEFn0PN}X!tL<1Ak~;-a-6@ Qu>b%707*qoM6N<$f+XaNmH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..e376b2543562118bd6960915f23c0aab694f5867 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkch*{2@v^GQ z1E)5R>2175Oqq8qq?Z&iP9tpSvfSYj}S7llT0m*rVSw60clc z=kjdx+^@CaUtD^YGL)(AiaT_3a#!I3m5H;2KE6Efu#ZVY(n?PH!Tz1RA7uM^SG=s7 z%DC_GM#ejL@0%-Zdr-h^`=fo#*HFDihzp00i_>zopr0M_MnTmS$7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..94eb011c70e66b3508134d3995e887292aa1bb98 GIT binary patch literal 347 zcmV-h0i^zkP)?1V)h-Tz;Dz-tbl tWj_f3I6vv`AN;Sd5JCtcgb-qw`~Y#fT%{=RnWq2%002ovPDHLkV1mi1nD_ty literal 0 HcmV?d00001