From 54101714b99d5c32022f78ed1ec70f2a864b15cc Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Mon, 11 Nov 2024 20:03:58 -0500 Subject: [PATCH] changed sprite names to reflect states better, attempt at power lights, not working --- .../Entities/Structures/Misc/radio.yml | 28 +++++++++++++++--- .../{radiomicrophone.png => base.png} | Bin .../radiostation/microphones.rsi/meta.json | 10 ++++--- .../Misc/radiostation/microphones.rsi/off.png | Bin 0 -> 107 bytes .../Misc/radiostation/microphones.rsi/on.png | Bin 0 -> 107 bytes .../base.png} | Bin .../standmicrophones.rsi/meta.json | 21 +++++++++++++ .../radiostation/standmicrophones.rsi/off.png | Bin 0 -> 129 bytes .../radiostation/standmicrophones.rsi/on.png | Bin 0 -> 129 bytes 9 files changed, 51 insertions(+), 8 deletions(-) rename Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/{radiomicrophone.png => base.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/on.png rename Resources/Textures/_Nuclear14/Structures/Misc/radiostation/{microphones.rsi/radiomicrophonestand.png => standmicrophones.rsi/base.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index 58e75fbf49..bd88b07863 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -28,15 +28,33 @@ components: - type: Sprite sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi - state: radiomicrophone + layers: + - state: base + - state: on + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - state: off + map: [ "disabled"] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: {visible: true} + False: {visible: false} + - type: ApcPowerReceiver + - type: Electrified + enabled: false + usesApcPower: true + - type: ExtensionCableReceiver - type: RadioMicrophone + powerRequired: true broadcastChannel: PBS toggleOnInteract: true frequency: 1667 listenRange: 2 - type: Clickable - type: InteractionOutline - - type: Appearance - type: WiresVisuals - type: Transform noRot: false @@ -72,6 +90,7 @@ map: [ "base" ] - state: on map: [ "enabled" ] + shader: unshaded - state: off map: [ "disabled" ] - type: RadioSpeaker @@ -101,8 +120,8 @@ id: N14MicrophoneStand components: - type: Sprite - sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi - state: radiomicrophonestand + sprite: _Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi + state: base - type: RadioMicrophone broadcastChannel: PBS toggleOnInteract: true @@ -133,6 +152,7 @@ - state: off - state: on map: ["enum.PoweredLightLayers.Base"] + - type: WallMount - type: PointLight radius: 7 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/base.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png rename to Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/base.png diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json index eca60f5b51..95cea345b7 100644 --- a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json @@ -8,11 +8,13 @@ }, "states": [ { - "name": "radiomicrophone" + "name": "base" }, { - "name": "radiomicrophonestand", - "directions": 4 - } + "name": "on" + }, + { + "name": "off" + } ] } \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad55390fda0cd04bb9687d67d5322fddbf4c164 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_ z&lxf@FmNy{cZ;oTKn)C@u6{1-oD!M< DMeH7u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophonestand.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/base.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophonestand.png rename to Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/base.png diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json new file mode 100644 index 0000000000..cbc2e354d9 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by maxxorion for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "on" + }, + { + "name": "off" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..85dc17102ab822f1cd1d8429ef17241466fcc54f GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUX;ELn`LH zy=f>2RK@J*qrmmQNsjwWK+VB*joFt}nG#kS-EUO`ssw@bohyHyW?}@hXJqavVLfTg RJbN;T>*?y}vd$@?2>=qDBUu0d literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png new file mode 100644 index 0000000000000000000000000000000000000000..56fe971c19b992b4add6f9f2189fcf7cbb8cea56 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUX;ELn`LH zy}3{jsEXN9