From 1921eba2ac45f17ee4b77487591bb986d2de3737 Mon Sep 17 00:00:00 2001 From: ArZarLordOfMango Date: Tue, 17 Sep 2024 18:19:02 +0200 Subject: [PATCH 1/3] ai-glass --- .../Entities/Clothing/Eyes/glasses.yml | 38 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/robotics.yml | 9 +++++ .../Prototypes/Research/experimental.yml | 1 + .../Eyes/Glasses/camera.rsi/equipped-EYES.png | Bin 0 -> 277 bytes .../Eyes/Glasses/camera.rsi/icon-on.png | Bin 0 -> 365 bytes .../Clothing/Eyes/Glasses/camera.rsi/icon.png | Bin 0 -> 340 bytes .../Eyes/Glasses/camera.rsi/inhand-left.png | Bin 0 -> 304 bytes .../Eyes/Glasses/camera.rsi/inhand-right.png | Bin 0 -> 313 bytes .../Eyes/Glasses/camera.rsi/meta.json | 33 +++++++++++++++ .../Glasses/camera.rsi/on-equipped-EYES.png | Bin 0 -> 275 bytes 11 files changed, 82 insertions(+) create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/on-equipped-EYES.png diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 44df034ee9d32f..64e23e851a94aa 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -244,3 +244,41 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity + +- type: entity + parent: [ClothingEyesBase, BaseToggleClothing] + id: ClothingEyesVisorCamera + name: camera visor + description: Advanced glasses are designed to look like through cameras. Useful for working with Station AI. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/camera.rsi + layers: + - state: icon + map: [ "enum.ToggleVisuals.Layer" ] + - type: Clothing + sprite: Clothing/Eyes/Glasses/camera.rsi + - type: IdentityBlocker + coverage: EYES + - type: ToggleClothing + action: ActionToggleVisorCamera + disableOnUnequip: true + - type: ComponentToggler + parent: true + components: + - type: StationAiOverlay + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: icon-on} + False: {state: icon} + +- type: entity + id: ActionToggleVisorCamera + name: Toggle camera visor + description: Toggles the camera visor on and off. + components: + - type: InstantAction + event: !type:ToggleActionEvent diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 91ac7b049a4ad5..317fae14907439 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -612,6 +612,7 @@ - TorsoBorgService dynamicRecipes: - ProximitySensor + - ClothingEyesVisorCamera - BorgModuleLightReplacer - BorgModuleAdvancedCleaning - BorgModuleMining diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 44a9e2f0f244eb..4fe012eda07864 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -17,6 +17,15 @@ Plastic: 200 Steel: 100 +- type: latheRecipe + id: ClothingEyesVisorCamera + result: ClothingEyesVisorCamera + completetime: 2 + materials: + Steel: 300 + Plastic: 200 + Glass: 500 + - type: latheRecipe id: CyborgEndoskeleton result: CyborgEndoskeleton diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 34443e78f00c6e..6da326d572cbcf 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -12,6 +12,7 @@ recipeUnlocks: - ProximitySensor - ExosuitFabricatorMachineCircuitboard + - ClothingEyesVisorCamera - type: technology id: BasicAnomalousResearch diff --git a/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..3d2404ce61fca841f3e9eb2e9ebdffa0efc8bdf3 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&U?BzhE&XX zd&`=y$w8puq2b2GA2@=73YlkHw((vQVexmcX>4nXlIlx*%)4USkqRd6ES(w`RmHrJ zD^LE<@=e>cd-LUY9SjWf#M=^+h5wg2-{w6gF)>$i%OlS}^SZ3gEM9RlbgIm&T~nnk z`+8!-r)64gu)MsBQAuf&{rX`0>5K06_;0M00XhT*)UVw?+utm3OyZ_a*yiknN6*(! zzxpuE%yDwX+sb>fR;M@B?Y|JZb>bqPUvq?a+*!V=-f}7vOz*zO9DTXQF3Xm3{R9bl My85}Sb4q9e06^SplK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png b/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..79b83021df37a4b745acf92250ee6945af46aaeb GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R9J=WlCe&MP!xtg(Zr++F-nszhA2b3w&`l_#_VJ0!de&Kfkhp71;fn7 zZq!X|OoL!kpLu^|PVT<*8s+;h)&IQ*bcC=?3CKeN-N=xR1A()k=IWv8aP zuH$)Lr{1kaLWrW1b%kLVe;T5(KnPLzzE6@QoV_e?%s%c0@52C&ukUJaC)07`2KUuav?+!hT&FEr=+ffXjxV*SieJRSr$Px$4oO5oR9J=Wk}*reKp2J}MQ|w`6>e}4L=Rk?TDsp~@E|?+1&87!8M}x4 zgN%acs8lp2`tu4baBu!IJ(yzvPetH1F@cFgM&n^M@_Z0zll3xXgB0>BS}z+3*AGKItd0000@69fLCow%C z&FtyXWqTreKE^vAm$)yPb}jek{%eg(rv!U>PAb`XH#B?d7X2?Le_k)&8Wx*Z?iu9e z36y&ssk+j8#g_edOJhy@7Plo{usJXPU;9|b?QJhh?VjJs^@F$rL>^dg9a6nytMfMZ tsLY#knfC-Q{t2jJ( zcU7Gcs2>P+JlnfnkAKDX)S&8PvzqwFU{Rk zCaJtEuv&dh>*ea}YxBL2O61N`>wUapTkh22doDk-?^VzKZ0@^w-+S}xP^W;L6P9pN z_1HC?T}N)LN}n!~UAkSM^2%oKo~>1trU!+X88*beFD{t6!JBj5a*%3IS3j3^P6E9p_uvSMZx&)=VSaS4U~O{?j8{TS#97_cb(mscm#vf*0R=5wF36C_obuYA38 zHmAw+@s00)cb7y?dtA3rI@v0;)a==u15fRe&&2yJh3Rd0Z^87m!Nf#CA#DXn%+uA+ JWt~$(695X%a4i4; literal 0 HcmV?d00001 From 72851b60c339017535d6119624dd4f75af71288c Mon Sep 17 00:00:00 2001 From: ArZarLordOfMango Date: Thu, 19 Sep 2024 16:29:02 +0200 Subject: [PATCH 2/3] weh to protect against bad grammar --- Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index a5e02e7d2ee29c..ca60b67994790a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -188,7 +188,7 @@ parent: [ClothingEyesBase, BaseCommandContraband] id: ClothingEyesGlassesCommand name: administration glasses - description: Upgraded sunglasses that provide flash immunity and show ID card status. + description: Upgraded sunglasses that provide flash immunity and show ID card status. components: - type: Sprite sprite: Clothing/Eyes/Glasses/commandglasses.rsi @@ -270,7 +270,7 @@ parent: [ClothingEyesBase, BaseToggleClothing] id: ClothingEyesVisorCamera name: camera visor - description: Advanced glasses are designed to look like through cameras. Useful for working with Station AI. + description: Advanced visor which displays camera view ranges. Useful for working with the Station AI. components: - type: Sprite sprite: Clothing/Eyes/Glasses/camera.rsi From 860f24f021e8d1173df88c97d9a937277bc42a75 Mon Sep 17 00:00:00 2001 From: ArZarLordOfMango Date: Sat, 21 Sep 2024 21:36:18 +0200 Subject: [PATCH 3/3] transmutation into diagnostic hud --- .../Entities/Clothing/Eyes/glasses.yml | 38 ------------------ .../Prototypes/Entities/Clothing/Eyes/hud.yml | 21 ++++++++-- .../Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/Recipes/Lathes/robotics.yml | 10 ++--- .../Prototypes/Research/experimental.yml | 2 +- .../Eyes/Glasses/camera.rsi/equipped-EYES.png | Bin 277 -> 0 bytes .../Eyes/Glasses/camera.rsi/icon-on.png | Bin 365 -> 0 bytes .../Clothing/Eyes/Glasses/camera.rsi/icon.png | Bin 340 -> 0 bytes .../Eyes/Glasses/camera.rsi/inhand-left.png | Bin 304 -> 0 bytes .../Eyes/Glasses/camera.rsi/inhand-right.png | Bin 313 -> 0 bytes .../Eyes/Glasses/camera.rsi/meta.json | 33 --------------- .../Glasses/camera.rsi/on-equipped-EYES.png | Bin 275 -> 0 bytes 12 files changed, 25 insertions(+), 81 deletions(-) delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/on-equipped-EYES.png diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index ca60b67994790a..6e2a75ba422710 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -265,41 +265,3 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity - -- type: entity - parent: [ClothingEyesBase, BaseToggleClothing] - id: ClothingEyesVisorCamera - name: camera visor - description: Advanced visor which displays camera view ranges. Useful for working with the Station AI. - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/camera.rsi - layers: - - state: icon - map: [ "enum.ToggleVisuals.Layer" ] - - type: Clothing - sprite: Clothing/Eyes/Glasses/camera.rsi - - type: IdentityBlocker - coverage: EYES - - type: ToggleClothing - action: ActionToggleVisorCamera - disableOnUnequip: true - - type: ComponentToggler - parent: true - components: - - type: StationAiOverlay - - type: Appearance - - type: GenericVisualizer - visuals: - enum.ToggleVisuals.Toggled: - enum.ToggleVisuals.Layer: - True: {state: icon-on} - False: {state: icon} - -- type: entity - id: ActionToggleVisorCamera - name: Toggle camera visor - description: Toggles the camera visor on and off. - components: - - type: InstantAction - event: !type:ToggleActionEvent diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 9e881bf9c218c5..2f2815969afb1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -20,15 +20,22 @@ - Biological - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, BaseToggleClothing] id: ClothingEyesHudDiagnostic name: diagnostic hud - description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. + description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. Has a camera mod to work with Station AI. components: - type: Sprite sprite: Clothing/Eyes/Hud/diag.rsi - type: Clothing sprite: Clothing/Eyes/Hud/diag.rsi + - type: ToggleClothing + action: ActionToggleHudDiagnosticCamera + disableOnUnequip: true + - type: ComponentToggler + parent: true + components: + - type: StationAiOverlay - type: ShowHealthBars damageContainers: - Inorganic @@ -38,7 +45,7 @@ parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedical name: medical hud - description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. + description: A heads-up display that scans the humas in view and provides accurate data about their health status. components: - type: Sprite sprite: Clothing/Eyes/Hud/med.rsi @@ -294,3 +301,11 @@ parent: [ClothingEyesEyepatchHudDiag, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchHudDiagFlipped name: diagnostic hud eyepatch + +- type: entity + id: ActionToggleHudDiagnosticCamera + name: Toggle camera mod + description: Toggles the camera mod on and off. + components: + - type: InstantAction + event: !type:ToggleActionEvent diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index be12a9ef63f6a9..92bd13c69125eb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -613,7 +613,7 @@ - TorsoBorgService dynamicRecipes: - ProximitySensor - - ClothingEyesVisorCamera + - ClothingEyesHudDiagnostic - BorgModuleLightReplacer - BorgModuleAdvancedCleaning - BorgModuleMining diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 2ebf7cd9b4ef55..a7953036628bda 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -55,12 +55,12 @@ - type: latheRecipe parent: BaseRoboticsRecipe - id: ClothingEyesVisorCamera - result: ClothingEyesVisorCamera + id: ClothingEyesHudDiagnostic + result: ClothingEyesHudDiagnostic materials: - Steel: 300 - Plastic: 200 - Glass: 500 + Steel: 200 + Plastic: 100 + Glass: 300 - type: latheRecipe parent: BaseRoboticsRecipe diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 6da326d572cbcf..9d7f4d609d9cb0 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -12,7 +12,7 @@ recipeUnlocks: - ProximitySensor - ExosuitFabricatorMachineCircuitboard - - ClothingEyesVisorCamera + - ClothingEyesHudDiagnostic - type: technology id: BasicAnomalousResearch diff --git a/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/equipped-EYES.png deleted file mode 100644 index 3d2404ce61fca841f3e9eb2e9ebdffa0efc8bdf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&U?BzhE&XX zd&`=y$w8puq2b2GA2@=73YlkHw((vQVexmcX>4nXlIlx*%)4USkqRd6ES(w`RmHrJ zD^LE<@=e>cd-LUY9SjWf#M=^+h5wg2-{w6gF)>$i%OlS}^SZ3gEM9RlbgIm&T~nnk z`+8!-r)64gu)MsBQAuf&{rX`0>5K06_;0M00XhT*)UVw?+utm3OyZ_a*yiknN6*(! zzxpuE%yDwX+sb>fR;M@B?Y|JZb>bqPUvq?a+*!V=-f}7vOz*zO9DTXQF3Xm3{R9bl My85}Sb4q9e06^SplK=n! diff --git a/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png b/Resources/Textures/Clothing/Eyes/Glasses/camera.rsi/icon-on.png deleted file mode 100644 index 79b83021df37a4b745acf92250ee6945af46aaeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0cSP)Px$CrLy>R9J=WlCe&MP!xtg(Zr++F-nszhA2b3w&`l_#_VJ0!de&Kfkhp71;fn7 zZq!X|OoL!kpLu^|PVT<*8s+;h)&IQ*bcC=?3CKeN-N=xR1A()k=IWv8aP zuH$)Lr{1kaLWrW1b%kLVe;T5(KnPLzzE6@QoV_e?%s%c0@52C&ukUJaC)07`2KUuav?+!hT&FEr=+ffXjxV*SieJRSr$Px$4oO5oR9J=Wk}*reKp2J}MQ|w`6>e}4L=Rk?TDsp~@E|?+1&87!8M}x4 zgN%acs8lp2`tu4baBu!IJ(yzvPetH1F@cFgM&n^M@_Z0zll3xXgB0>BS}z+3*AGKItd0000@69fLCow%C z&FtyXWqTreKE^vAm$)yPb}jek{%eg(rv!U>PAb`XH#B?d7X2?Le_k)&8Wx*Z?iu9e z36y&ssk+j8#g_edOJhy@7Plo{usJXPU;9|b?QJhh?VjJs^@F$rL>^dg9a6nytMfMZ tsLY#knfC-Q{t2jJ( zcU7Gcs2>P+JlnfnkAKDX)S&8PvzqwFU{Rk zCaJtEuv&dh>*ea}YxBL2O61N`>wUapTkh22doDk-?^VzKZ0@^w-+S}xP^W;L6P9pN z_1HC?T}N)LN}n!~UAkSM^2%oKo~>1trU!+X88*beFD{t6!JBj5a*%3IS3j3^P6E9p_uvSMZx&)=VSaS4U~O{?j8{TS#97_cb(mscm#vf*0R=5wF36C_obuYA38 zHmAw+@s00)cb7y?dtA3rI@v0;)a==u15fRe&&2yJh3Rd0Z^87m!Nf#CA#DXn%+uA+ JWt~$(695X%a4i4;