From 0b2e9d4fd867060d9fba71d104434b3d9a70f270 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Wed, 5 Jun 2024 21:48:05 +0300 Subject: [PATCH 1/2] added timers to ghost roles --- .../Entities/Markers/Spawners/ghost_roles.yml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index b21792579f4..72dae532344 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -19,6 +19,9 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-rat-king-rules + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 #10 hrs # Sunrise-RoleTime raffle: settings: default - type: GhostRoleMobSpawner @@ -101,6 +104,14 @@ name: ghost-role-information-loneop-name description: ghost-role-information-loneop-description rules: ghost-role-information-loneop-rules + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 #15 hrs # Sunrise-RoleTime + - !type:OverallPlaytimeRequirement + time: 90000 #25 hrs # Sunrise-RoleTime + raffle: + settings: default - type: Sprite sprite: Markers/jobs.rsi layers: @@ -116,6 +127,14 @@ - type: GhostRole name: roles-antag-nuclear-operative-commander-name description: roles-antag-nuclear-operative-commander-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10h # Sunrise-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 18000 # 5h # Sunrise-RoleTime + raffle: + settings: default - type: entity noSpawn: true @@ -125,6 +144,17 @@ - type: GhostRole name: roles-antag-nuclear-operative-agent-name description: roles-antag-nuclear-operative-agent-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10h # Sunrise-RoleTime + - !type:RoleTimeRequirement + role: JobChemist + time: 18000 # 5h # Sunrise-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 18000 # 5h # Sunrise-RoleTime + raffle: + settings: default - type: entity noSpawn: true @@ -134,6 +164,14 @@ - type: GhostRole name: roles-antag-nuclear-operative-name description: roles-antag-nuclear-operative-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10h # Sunrise-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 7200 # 2h # Sunrise-RoleTime + raffle: + settings: default - type: entity noSpawn: true @@ -144,6 +182,11 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-component-default-rules + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 #10 hrs # Sunrise-RoleTime + raffle: + settings: default - type: Sprite layers: - state: green @@ -160,6 +203,12 @@ name: ghost-role-information-space-ninja-name description: ghost-role-information-space-ninja-description rules: ghost-role-information-space-ninja-rules + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 18000 #5 hrs # Sunrise-RoleTime + - !type:OverallPlaytimeRequirement + time: 36000 #10 hrs # Sunrise-RoleTime raffle: settings: default - type: GhostRoleMobSpawner From 5966242986781f2c42e34c2451f4f87887661657 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Wed, 5 Jun 2024 21:51:11 +0300 Subject: [PATCH 2/2] changelog --- Resources/Changelog/ChangelogSunrise.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index d59b61cc59d..a4c0414f83a 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -247,3 +247,11 @@ Entries: type: Tweak id: 21 time: '2024-06-05T16:26:42.210195+00:00' +- author: pacable + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0442\u0430\u0439\u043C\u0435\ + \u0440\u044B \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u043C \u0433\u043E\ + \u0441\u0442 \u0440\u043E\u043B\u044F\u043C" + type: Add + id: 22 + time: '2024-06-05T18:51:04.319862+00:00'