From 638a1dc489342cf779a7c391dee41154c78c6e9b Mon Sep 17 00:00:00 2001 From: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:43:59 -0600 Subject: [PATCH] Fixed ghost role rules for some syndicate familiars (#32457) * fix ghost role rules for some syndicate familiars * change from monkey rules to Team Antag rules. * Resolve reviews + Fix rules for LoneOp and Xenos * ghostrole rules --------- Co-authored-by: JIPDawg Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> --- .../en-US/ghost/roles/ghost-role-component.ftl | 6 ++---- .../Entities/Markers/Spawners/ghost_roles.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml | 2 +- .../Syndicate_Gadgets/reinforcement_teleporter.yml | 10 ++++++---- .../Prototypes/Roles/Ghostroles/syndicate.yml | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 3abe86e1d7067b..ad893876e705cc 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -186,7 +186,7 @@ ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist ghost-role-information-loneop-name = Lone Operative ghost-role-information-loneop-description = You are a lone nuclear operative. Destroy the station! -ghost-role-information-loneop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you. +ghost-role-information-loneop-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color]. Covert syndicate agents are not guaranteed to help you. ghost-role-information-behonker-name = Behonker ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother. @@ -230,11 +230,9 @@ ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]T ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them. -ghost-role-information-syndicate-monkey-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you. ghost-role-information-syndicate-kobold-reinforcement-name = Syndicate Kobold Agent ghost-role-information-syndicate-kobold-reinforcement-description = Someone needs reinforcements. You, a trained kobold, will help them. -ghost-role-information-syndicate-kobold-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you. ghost-role-information-syndicate-cyborg-assault-name = Syndicate Assault Cyborg ghost-role-information-syndicate-cyborg-saboteur-name = Syndicate Saboteur Cyborg @@ -252,7 +250,7 @@ ghost-role-information-medical-description = You are a medical professional, but ghost-role-information-cargo-name = Cargo ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation... -ghost-role-information-engineering-name = Engineering +ghost-role-information-engineering-name = Engineering ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation... ghost-role-information-science-name = Science diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index b694a8cc2f2b21..54e821cbd47dd4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -100,7 +100,7 @@ - type: GhostRole name: ghost-role-information-loneop-name description: ghost-role-information-loneop-description - rules: ghost-role-information-rules-default-solo-antagonist + rules: ghost-role-information-loneop-rules - type: Sprite sprite: Markers/jobs.rsi layers: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 20c7bf043c4d1e..99cc5367d33359 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1393,7 +1393,7 @@ makeSentient: true name: ghost-role-information-monkey-name description: ghost-role-information-monkey-description - rules: ghost-role-information-syndicate-monkey-reinforcement-rules + rules: ghost-role-information-syndicate-reinforcement-rules raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index f4a79d110ee925..23d3e838e21e4b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -99,7 +99,7 @@ makeSentient: true name: ghost-role-information-xeno-name description: ghost-role-information-xeno-description - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-xeno-rules raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 71f98d81c96dbe..42d5588202c367 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -24,8 +24,8 @@ components: - type: GhostRole name: ghost-role-information-syndicate-reinforcement-spy-name - description: ghost-role-information-syndicate-reinforcement-description - rules: ghost-role-information-rules-default-solo-antagonist + description: ghost-role-information-syndicate-reinforcement-spy-description + rules: ghost-role-information-syndicate-reinforcement-rules raffle: settings: default - type: GhostRoleMobSpawner @@ -57,7 +57,7 @@ - type: GhostRole name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description - rules: ghost-role-information-rules-default-familiar + rules: ghost-role-information-syndicate-reinforcement-rules raffle: settings: default - type: GhostRoleMobSpawner @@ -69,6 +69,8 @@ id: ReinforcementRadioSyndicateAncestorNukeops # Reinforcement radio exclusive to nukeops uplink suffix: NukeOps components: + - type: GhostRole + rules: ghost-role-information-nukeop-reinforcement-rules - type: GhostRoleMobSpawner prototype: MobMonkeySyndicateAgentNukeops selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"] @@ -82,7 +84,7 @@ - type: GhostRole name: ghost-role-information-SyndiCat-name description: ghost-role-information-SyndiCat-description - rules: ghost-role-information-rules-default-familiar + rules: ghost-role-information-syndicate-reinforcement-rules raffle: settings: default - type: GhostRoleMobSpawner diff --git a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml index 5244fd6a99be51..7b4214fd092e26 100644 --- a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml +++ b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml @@ -2,35 +2,35 @@ id: SyndicateKobold name: ghost-role-information-syndicate-kobold-reinforcement-name description: ghost-role-information-syndicate-kobold-reinforcement-description - rules: ghost-role-information-rules-default-familiar + rules: ghost-role-information-syndicate-reinforcement-rules entityPrototype: MobKoboldSyndicateAgent - type: ghostRole id: SyndicateKoboldNukeops name: ghost-role-information-syndicate-kobold-reinforcement-name description: ghost-role-information-syndicate-kobold-reinforcement-description - rules: ghost-role-information-rules-default-familiar + rules: ghost-role-information-nukeop-reinforcement-rules entityPrototype: MobKoboldSyndicateAgentNukeops - type: ghostRole id: SyndicateMonkey name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description - rules: ghost-role-information-rules-default-familiar + rules: ghost-role-information-syndicate-reinforcement-rules entityPrototype: MobMonkeySyndicateAgent - type: ghostRole id: SyndicateMonkeyNukeops name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description - rules: ghost-role-information-syndicate-monkey-reinforcement-name + rules: ghost-role-information-nukeop-reinforcement-rules entityPrototype: MobMonkeySyndicateAgentNukeops - type: ghostRole id: SyndicateAgentMedic name: ghost-role-information-syndicate-reinforcement-medic-name description: ghost-role-information-syndicate-reinforcement-medic-description - rules: ghost-role-information-syndicate-monkey-reinforcement-rules + rules: ghost-role-information-syndicate-reinforcement-rules entityPrototype: MobHumanSyndicateAgentMedic iconPrototype: MedkitCombat @@ -38,7 +38,7 @@ id: SyndicateAgentSpy name: ghost-role-information-syndicate-reinforcement-spy-name description: ghost-role-information-syndicate-reinforcement-spy-description - rules: ghost-role-information-syndicate-monkey-reinforcement-rules + rules: ghost-role-information-syndicate-reinforcement-rules entityPrototype: MobHumanSyndicateAgentSpy iconPrototype: ClothingMaskGasVoiceChameleon @@ -46,6 +46,6 @@ id: SyndicateAgentThief name: ghost-role-information-syndicate-reinforcement-thief-name description: ghost-role-information-syndicate-reinforcement-thief-description - rules: ghost-role-information-syndicate-monkey-reinforcement-rules + rules: ghost-role-information-syndicate-reinforcement-rules entityPrototype: MobHumanSyndicateAgentThief iconPrototype: SyndicateJawsOfLife