From 31adfa297b711157fd95cbed2c3557cea9590933 Mon Sep 17 00:00:00 2001 From: Archee Date: Thu, 22 Jan 2026 22:27:19 +0000 Subject: [PATCH] Replaces thief beer goggles objective with stealing HUD items (#38043) * initial commit * forgot to set it back to 1 * forgot to revert difficulty from testing --- .../conditions/steal-target-groups.ftl | 2 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 42 ++++++++++++------- .../Objectives/stealTargetGroups.yml | 14 +++---- Resources/Prototypes/Objectives/thief.yml | 24 ++++++----- 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index 83e2e0c1ac..bc327c950a 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -25,6 +25,7 @@ steal-target-groups-mail = mail steal-target-groups-id-cards = ID Card steal-target-groups-officer-handguns = security officer's handgun steal-target-groups-lamps = LAMP +steal-target-groups-huds = HUD # Thief single item steal-target-groups-forensic-scanner = forensic scanner @@ -39,7 +40,6 @@ steal-target-groups-fire-axe = fireaxe steal-target-groups-ame-part-flatpack = AME flatpack steal-target-groups-salvage-expeditions-computer-circuitboard = salvage expeditions computer board steal-target-groups-cargo-shuttle-console-circuitboard = cargo shuttle console board -steal-target-groups-clothing-eyes-hud-beer = beer goggles steal-target-groups-bible = bible steal-target-groups-clothing-neck-goldmedal = gold medal of crewmanship steal-target-groups-clothing-neck-clownmedal = clown medal diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index ffff779f72..c5baa4f4ad 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -1,3 +1,12 @@ +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudBase + abstract: true + categories: [ HideSpawnMenu ] + components: + - type: StealTarget + stealGroup: ClothingEyesHuds + - type: entity id: ShowSecurityIcons abstract: true @@ -17,7 +26,7 @@ - type: ShowHealthIcons - type: entity - parent: ClothingEyesBase + parent: ClothingEyesHudBase 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. @@ -33,7 +42,7 @@ - type: ShowAccessReaderSettings - type: entity - parent: [ClothingEyesBase, ShowMedicalIcons] + parent: [ClothingEyesHudBase, 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. @@ -49,7 +58,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] + parent: [ClothingEyesHudBase, ShowSecurityIcons, BaseSecurityContraband] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -65,7 +74,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, BaseCommandContraband] + parent: [ClothingEyesHudBase, BaseCommandContraband] id: ClothingEyesHudCommand name: administration hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status. @@ -81,7 +90,7 @@ - WhitelistChameleon - type: entity - parent: ClothingEyesBase + parent: ClothingEyesHudBase id: ClothingEyesHudBeer name: beer goggles description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. @@ -91,8 +100,6 @@ - type: Clothing sprite: Clothing/Eyes/Hud/beergoggles.rsi - type: ShowThirstIcons - - type: StealTarget - stealGroup: ClothingEyesHudBeer - type: SolutionScanner - type: Tag tags: @@ -100,7 +107,7 @@ - WhitelistChameleon - type: entity - parent: ClothingEyesBase + parent: ClothingEyesHudBase id: ClothingEyesHudFriedOnion name: fried onion goggles description: Filler @@ -124,7 +131,7 @@ - greasey - type: entity - parent: ClothingEyesBase + parent: ClothingEyesHudBase id: ClothingEyesHudOnionBeer name: thungerst goggles description: Filler @@ -137,7 +144,7 @@ - type: ShowThirstIcons - type: entity - parent: [ClothingEyesBase, ShowMedicalIcons] + parent: [ClothingEyesHudBase, ShowMedicalIcons] id: ClothingEyesHudMedOnion name: medonion hud description: Filler @@ -149,7 +156,7 @@ - type: ShowHungerIcons - type: entity - parent: [ClothingEyesBase, ShowMedicalIcons] + parent: [ClothingEyesHudBase, ShowMedicalIcons] id: ClothingEyesHudMedOnionBeer name: medthungerst hud description: Filler @@ -162,7 +169,7 @@ - type: ShowThirstIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons, BaseSecurityCommandContraband] + parent: [ClothingEyesHudBase, ShowSecurityIcons, ShowMedicalIcons, BaseSecurityCommandContraband] id: ClothingEyesHudMedSec name: medsec hud description: An eye display that looks like a mixture of medical and security huds. @@ -176,7 +183,7 @@ node: medsecHud - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] + parent: [ClothingEyesHudBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudMultiversal name: multiversal hud description: Filler @@ -192,7 +199,7 @@ - type: ShowSyndicateIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] + parent: [ClothingEyesHudBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudOmni name: omni hud description: Filler @@ -210,7 +217,7 @@ - type: ShowSyndicateIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband] + parent: [ClothingEyesHudBase, ShowSecurityIcons, BaseSyndicateContraband] id: ClothingEyesHudSyndicate name: syndicate visor description: The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. @@ -226,7 +233,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband] + parent: [ClothingEyesHudBase, ShowSecurityIcons, BaseSyndicateContraband] id: ClothingEyesHudSyndicateAgent name: syndicate medical visor description: The Syndicate Corpsman's professional heads-up display, designed for quick diagnosis of their team's status. @@ -246,6 +253,9 @@ parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons] id: ClothingEyesGlassesHiddenSecurity suffix: Syndicate + components: + - type: StealTarget + stealGroup: ClothingEyesHuds - type: entity parent: [ClothingEyesHudMedical, ClothingHeadEyeBaseFlippable] diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 4a307d9d37..e5249245ca 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -163,6 +163,13 @@ sprite: Objects/Tools/lantern.rsi state: lantern +- type: stealTargetGroup + id: ClothingEyesHuds + name: steal-target-groups-huds + sprite: + sprite: Clothing/Eyes/Hud/sec.rsi + state: icon + # Thief single item - type: stealTargetGroup @@ -256,13 +263,6 @@ sprite: Objects/Misc/module.rsi state: cpuboard -- type: stealTargetGroup - id: ClothingEyesHudBeer - name: steal-target-groups-clothing-eyes-hud-beer - sprite: - sprite: Clothing/Eyes/Hud/beergoggles.rsi - state: icon - - type: stealTargetGroup id: Bible name: steal-target-groups-bible diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 3beea607d4..24bab0e055 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -167,6 +167,19 @@ - type: Objective difficulty: 0.1 # just for fun, collecting LAMP on Moth +- type: entity + parent: BaseThiefStealCollectionObjective + id: ClothingEyesHudsStealCollectionObjective + components: + - type: StealCondition + stealGroup: ClothingEyesHuds + minCollectionSize: 7 + maxCollectionSize: 12 + verifyMapExistence: false + checkStealAreas: false + - type: Objective + difficulty: 0.3 + # steal item - type: entity #Security subgroup @@ -298,17 +311,6 @@ difficulty: 0.7 - type: entity #Service subgroup - parent: BaseThiefStealObjective - id: ClothingEyesHudBeerStealObjective - components: - - type: NotJobRequirement - jobs: [ Bartender, ServiceWorker ] - - type: StealCondition - stealGroup: ClothingEyesHudBeer - - type: Objective - difficulty: 0.3 - -- type: entity parent: BaseThiefStealObjective id: BibleStealObjective components: -- 2.52.0