diff --git a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs index 7b49ca4c30..44d0644524 100644 --- a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs +++ b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs @@ -315,7 +315,7 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem var limits = new Dictionary, float> { { "Danger", (node.Level + node.AdditionalLevel) * 0.2f }, - { "GhostRoleDanger", node.Level * 0.2f }, + { "GhostRoleDanger", 1f }, { "Reward", Math.Max(node.Level * 0.2f, 0.5f) }, { "Ore", Math.Max(node.Level * 0.2f, 0.5f) }, { "Fun", 1f }, diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml index 5c6661c31f..8db6c3d617 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml @@ -139,32 +139,6 @@ - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi state: full -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonMagicalT2 - parent: MarkerBase - name: ghost role spawn point - description: A ghost role for a bloodthirsty and cunning skeleton. - suffix: skeleton random T2 - categories: [ ForkFiltered ] - components: - - type: EntityTableSpawner - table: !type:GroupSelector - children: - - !type:GroupSelector - weight: 2 - children: - - id: CP14SpawnPointGhostDemiplaneSkeletonWizardT2 - - !type:GroupSelector - weight: 1 - children: - - id: CP14SpawnPointGhostDemiplaneSkeletonBardT2 - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi - state: full - - type: entity id: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 name: ghost role spawn point diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index b92358c72e..796c7b1a4e 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -226,25 +226,4 @@ entity: CP14MobWatcherMagma count: 8 minGroupSize: 2 - maxGroupSize: 3 - -- type: cp14DemiplaneModifier - id: EnemySkeletonT2 - levels: - min: 6 - max: 10 - name: cp14-modifier-skeleton - generationWeight: 2.0 - categories: - Danger: 0.5 - layers: - - !type:OreDunGen - entity: CP14SpawnPointGhostDemiplaneSkeletonT2 - count: 1 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - entity: CP14SpawnPointGhostDemiplaneSkeletonMagicalT2 - count: 1 - minGroupSize: 0 - maxGroupSize: 1 \ No newline at end of file + maxGroupSize: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml index 4302a7491e..55016695dc 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml @@ -1,8 +1,8 @@ - type: cp14DemiplaneModifier id: EnemySkeletonT1 levels: - min: 3 - max: 5 + min: 2 + max: 3 name: cp14-modifier-skeleton generationWeight: 1.5 generationProb: 0.5 @@ -15,6 +15,22 @@ minGroupSize: 1 maxGroupSize: 3 +- type: cp14DemiplaneModifier + id: EnemySkeletonT2 + levels: + min: 4 + max: 10 + name: cp14-modifier-skeleton + generationWeight: 2.0 + categories: + GhostRoleDanger: 1 + layers: + - !type:OreDunGen + entity: CP14SpawnPointGhostDemiplaneSkeletonT2 + count: 1 + minGroupSize: 2 + maxGroupSize: 3 + - type: cp14DemiplaneModifier id: EnemyLurker levels: