Balance bugtweak (#881)

* Update CP14UniqueLootSystem.cs

* some demiplane balance

* rings undepants

* fix #870

* fix #868

* Update CP14ClientWallpaperSystem.cs

Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs

@@ -1,5 +1,6 @@
 using Content.Client.IconSmoothing;
 using Content.Shared._CP14.Wallpaper;
+using Content.Shared.IconSmoothing;
 using Robust.Client.GameObjects;
 
 namespace Content.Client._CP14.Wallpaper;
@@ -8,8 +9,8 @@ public sealed class CP14ClientWallpaperSystem : CP14SharedWallpaperSystem
 {
     public override void Initialize()
     {
-        SubscribeLocalEvent<CP14WallpaperHolderComponent, AfterAutoHandleStateEvent>(OnHandleState, after: new[] { typeof(IconSmoothSystem) });
-        SubscribeLocalEvent<CP14WallpaperHolderComponent, ComponentStartup>(OnStartup, after: new[] { typeof(IconSmoothSystem) });
+        SubscribeLocalEvent<CP14WallpaperHolderComponent, AfterAutoHandleStateEvent>(OnHandleState, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) });
+        SubscribeLocalEvent<CP14WallpaperHolderComponent, ComponentStartup>(OnStartup, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) });
     }
 
     private void OnStartup(Entity<CP14WallpaperHolderComponent> holder, ref ComponentStartup args)

Content.Shared/_CP14/Wallpaper/CP14SharedWallpaperSystem.cs

@@ -99,6 +99,9 @@ public partial class CP14SharedWallpaperSystem : EntitySystem
 
         if (TryComp<CP14WallpaperRemoverComponent>(args.Used, out var remover))
         {
+            if (holder.Comp.Layers.Count == 0)
+                return;
+
             var doAfterArgs = new DoAfterArgs(EntityManager, args.User, remover.Delay, new CP14WallpaperRemoveLayersDoAfterEvent(), holder, holder, args.Used)
             {
                 BreakOnDamage = true,

Content.Shared/_CP14/Wallpaper/CP14WallpaperComponent.cs

@@ -6,7 +6,6 @@ namespace Content.Shared._CP14.Wallpaper;
 [RegisterComponent, Access(typeof(CP14SharedWallpaperSystem))]
 public sealed partial class CP14WallpaperComponent : Component
 {
-
     [DataField]
     public float Delay = 1f;
 

Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl

@@ -12,6 +12,7 @@ cp14-modifier-explosive = explosive mines
 cp14-modifier-ruins = ancient ruins
 cp14-modifier-xeno = xenomorphs
 cp14-modifier-zombie = swarms of undead
+cp14-modifier-skeleton = sentient skeletons
 cp14-modifier-dyno = prehistoric fauna
 cp14-modifier-mole = predatory moles
 cp14-modifier-rabbits = rabbits

Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl

@@ -12,6 +12,7 @@ cp14-modifier-explosive = взрывных мин
 cp14-modifier-ruins = древних руин
 cp14-modifier-xeno = ксеноморфов
 cp14-modifier-zombie = толп нежити
+cp14-modifier-skeleton = разумные скелеты
 cp14-modifier-dyno = доисторической фауны
 cp14-modifier-mole = хищных кротов
 cp14-modifier-rabbits = кроликов

Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml

@@ -7,7 +7,7 @@
     sprite: _CP14/Effects/Magic/spells_icons.rsi
     state: rift_arrow
   - type: CP14MagicEffectManaCost
-    manaCost: 50
+    manaCost: 25
   - type: CP14MagicEffect
     magicType: Darkness
     telegraphyEffects:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml

@@ -7,7 +7,7 @@
     sprite: _CP14/Effects/Magic/spells_icons.rsi
     state: demi_arrow
   - type: CP14MagicEffectManaCost
-    manaCost: 50
+    manaCost: 25
   - type: CP14MagicEffect
     magicType: Darkness
     telegraphyEffects:

Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml

@@ -8,7 +8,6 @@
       slotFlags: RING
       uiWindowPos: 0,1
       strippingWindowPos: 0,3
-      dependsOn: pants
       displayName: Ring
     - name: mask
       slotTexture: mask

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml

@@ -53,17 +53,4 @@
       entity: CP14AstralHaze
       count: 10
       minGroupSize: 1
-      maxGroupSize: 1
-
-- type: cp14DemiplaneModifier
-  id: TimeLimit10
-  generationWeight: 0.4 
-  tiers:
-    - 1
-    - 2
-  name: cp14-modifier-time-limit-10
-  categories:
-    Danger: 0.1
-  components:
-    - type: CP14DemiplaneTimedDestruction
-      timeToDestruction: 600 # 10 minutes
+      maxGroupSize: 1

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -71,8 +71,9 @@
 - type: cp14DemiplaneModifier
   id: EnemySkeleton
   tiers:
+    - 1
     - 2
-  name: cp14-modifier-zombie
+  name: cp14-modifier-skeleton
   generationWeight: 1.5
   categories:
     Danger: 0.5
@@ -80,7 +81,7 @@
     - !type:OreDunGen
       entity: SpawnPointGhostDemiplaneSkeleton
       count: 1
-      minGroupSize: 2
+      minGroupSize: 1
       maxGroupSize: 3
 
 - type: cp14DemiplaneModifier

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml

@@ -14,20 +14,6 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-#- type: cp14DemiplaneModifier
-#  id: Ruins
-#  tier: 1
-#  name: cp14-modifier-ruins
-#  generationWeight: 2
-#  categories:
-#    Reward: 0.35
-#  layers:
-#    - !type:OreDunGen
-#      entity: ##CP14DemiplanRuinsRoomSpawner
-#      count: 5
-#      minGroupSize: 1
-#      maxGroupSize: 1
-
 - type: cp14DemiplaneModifier
   id: Rabbits
   tiers:

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml

@@ -1,11 +1,12 @@
 - type: cp14DemiplaneModifier
   id: ArtifactRoom
   tiers:
+    - 1
     - 2
     - 3
-  generationWeight: 0.05
+  generationWeight: 0.1
   categories:
-    Reward: 0.4
+    Reward: 0.3
   layers:
     - !type:OreDunGen
       entity: CP14DemiplaneArtifactRoomSpawner

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml

@@ -25,4 +25,15 @@
       entity: CP14DemiplanePassway
       count: 2
       minGroupSize: 1
-      maxGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14DemiplaneModifier
+  id: TimeLimit10
+  generationProb: 0.33
+  tiers:
+    - 1
+    - 2
+  name: cp14-modifier-time-limit-10
+  components:
+    - type: CP14DemiplaneTimedDestruction
+      timeToDestruction: 600 # 10 minutes