Фикс и добавлений категорий

AdventureTimeSS14 · Aug 8, 2024 · 71a69c7 · 71a69c7
1 parent 7557606
commit 71a69c7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/Content.Server/ADT/SizeAttribute/SizeAttributeComponent.cs b/Content.Server/ADT/SizeAttribute/SizeAttributeComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Cloning;
 
-namespace Content.Server.SizeAttribute
+namespace Content.Server.ADT.SizeAttribute
 {
     [RegisterComponent]
     public sealed partial class SizeAttributeComponent : Component, ITransferredByCloning

diff --git a/Content.Server/ADT/SizeAttribute/SizeAttributeSystem.cs b/Content.Server/ADT/SizeAttribute/SizeAttributeSystem.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Physics.Systems;
 using Content.Shared.Item.PseudoItem;
 
-namespace Content.Server.SizeAttribute
+namespace Content.Server.ADT.SizeAttribute
 {
     public sealed class SizeAttributeSystem : EntitySystem
     {

diff --git a/Content.Server/ADT/SizeAttribute/SizeAttributeWhitelistComponent.cs b/Content.Server/ADT/SizeAttribute/SizeAttributeWhitelistComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Physics.Collision.Shapes;
 
-namespace Content.Server.SizeAttribute
+namespace Content.Server.ADT.SizeAttribute
 {
     [RegisterComponent]
     public sealed partial class SizeAttributeWhitelistComponent : Component

diff --git a/Resources/Locale/ru-RU/ADT/traits/categories.ftl b/Resources/Locale/ru-RU/ADT/traits/categories.ftl
@@ -0,0 +1 @@
+trait-category-height = Рост
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/Drask.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/Drask.yml
@@ -38,7 +38,7 @@
       understands:
       - GalacticCommon
       - Drask
-    - type: SizeAttributeWhitelist # Frontier TODO: нет такого компонента..
+    - type: SizeAttributeWhitelist # Frontier
       tall: true
       tallscale: 1.15
       short: true

diff --git a/Resources/Prototypes/ADT/Traits/categories.yml b/Resources/Prototypes/ADT/Traits/categories.yml
@@ -0,0 +1,4 @@
+- type: traitCategory
+  id: Height
+  name: trait-category-height
+  maxTraitPoints: 1
diff --git a/Resources/Prototypes/ADT/Traits/neutral.yml b/Resources/Prototypes/ADT/Traits/neutral.yml
@@ -2,6 +2,8 @@
   id: Tall
   name: trait-tall-name
   description: trait-tall-desc
+  category: Height
+  cost: 1
   whitelist:
     components:
       - SizeAttributeWhitelist
@@ -16,6 +18,8 @@
   id: Short
   name: trait-short-name
   description: trait-short-desc
+  category: Height
+  cost: 1
   whitelist:
     components:
       - SizeAttributeWhitelist