fix

space-syndicate · Dec 9, 2024 · 4300c15 · 4300c15
1 parent 4236c2a
commit 4300c15
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 64 deletions.
diff --git a/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs b/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs
@@ -109,7 +109,7 @@ private void Render(Entity<SpriteComponent, TransformComponent, BodyComponent> e
     private bool CanSee(EntityUid uid, SpriteComponent sprite, BodyComponent body)
     {
         return sprite.Visible
-               && body.ThermalVisibility
+               && !_entity.HasComponent<ThermalInvisibilityComponent>(uid)
                && (!_entity.TryGetComponent(uid, out StealthComponent? stealth)
                    || _stealth.GetVisibility(uid, stealth) > 0.5f);
     }

diff --git a/Content.Shared/Body/Components/BodyComponent.cs b/Content.Shared/Body/Components/BodyComponent.cs
@@ -41,9 +41,4 @@ public sealed partial class BodyComponent : Component
     [ViewVariables]
     [DataField, AutoNetworkedField]
     public HashSet<EntityUid> LegEntities = new();
-
-    // Corvax-Next-NightVision-Start
-    [DataField, AutoNetworkedField]
-    public bool ThermalVisibility = true;
-    // Corvax-Next-NightVision-End
 }
diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs
@@ -5,11 +5,10 @@ namespace Content.Shared._CorvaxNext.Clothing
     [RegisterComponent]
     public sealed partial class ClothingGrantComponentComponent : Component
     {
-        [DataField("component", required: true)]
+        [DataField("component")]
         [AlwaysPushInheritance]
         public ComponentRegistry Components { get; private set; } = new();
 
-        [ViewVariables(VVAccess.ReadWrite)]
         public bool IsActive = false;
     }
 }
diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs
@@ -3,9 +3,8 @@ namespace Content.Shared._CorvaxNext.Clothing;
 [RegisterComponent]
 public sealed partial class ClothingGrantTagComponent : Component
 {
-    [DataField("tag", required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField("tag")]
     public string Tag = "";
 
-    [ViewVariables(VVAccess.ReadWrite)]
     public bool IsActive = false;
 }
diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ThermalInvisibilityComponent : SwitchableOverlayComponent;
+
diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs
@@ -8,7 +8,7 @@ public sealed partial class ThermalVisionComponent : SwitchableOverlayComponent
 {
     public override string? ToggleAction { get; set; } = "ToggleThermalVision";
 
-    public override Color Color { get; set; } = Color.FromHex("#F84742");
+    public override Color Color { get; set; } = Color.FromHex("#C26E4A");
 }
 
 public sealed partial class ToggleThermalVisionEvent : InstantActionEvent;
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -76,5 +76,3 @@ research-technology-bluespace-chemistry = Bluespace Chemistry
 research-technology-advanced-treatment = Advanced Treatment
 research-technology-high-end-surgery = High End Surgical Tools
 research-technology-cybernetic-enhancements = Cybernetic Enhancements
-research-technology-night-vision = Night vision
-research-technology-thermal-vision = Thermal vision
diff --git a/Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl b/Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl
@@ -1,13 +1,13 @@
 # Night Vision Goggles
-ent-ClothingEyesNightVisionGoggles = ПНВ
+ent-ClothingEyesNightVisionGoggles = Прибор ночного видения
    .desc = Теперь ты можешь видеть в темноте!
 ent-ClothingEyesNightVisionGogglesSyndie = { ent-ClothingEyesNightVisionGoggles }
    .desc = { ent-ClothingEyesNightVisionGoggles.desc }
 ent-ClothingEyesNightVisionGogglesNukie = { ent-ClothingEyesNightVisionGoggles }
    .desc = { ent-ClothingEyesNightVisionGoggles.desc }
 
 # Thermal Vision Goggles
-ent-ClothingEyesThermalVisionGoggles = ПТВ
+ent-ClothingEyesThermalVisionGoggles = Прибор термального видения
    .desc = Теперь ты можешь видеть всех!
 ent-ClothingEyesThermalVisionGogglesSyndie = { ent-ClothingEyesThermalVisionGoggles }
    .desc = { ent-ClothingEyesThermalVisionGoggles.desc }

diff --git a/Resources/Locale/ru-RU/_corvaxnext/research/technologies.ftl b/Resources/Locale/ru-RU/_corvaxnext/research/technologies.ftl
@@ -1,3 +1 @@
 research-technology-advanced-robotics = Продвинутая робототехника
-research-technology-night-vision = Ночное видение
-research-technology-thermal-vision = Термальное видение
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -6,6 +6,7 @@
   save: false
   abstract: true
   components:
+  - type: ThermalInvisibility #Corvax-Next-ThermalVision
   - type: Reactive
     groups:
       Acidic: [Touch]
@@ -140,7 +141,6 @@
       cell_slot:
         name: power-cell-slot-component-slot-name-default
   - type: Body
-    thermalVisibility: false #Corvax-Next
   - type: StatusEffects
     allowed:
     - Stun

diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -4,6 +4,7 @@
   name: admin observer
   categories: [ HideSpawnMenu ]
   components:
+  - type: ThermalInvisibility #Corvax-Next-ThermalVision
   - type: ContentEye
     maxZoom: 8.916104, 8.916104
   - type: Tag
@@ -27,7 +28,6 @@
     bodyType: Kinematic
   - type: Body
     prototype: Aghost
-    thermalVisibility: false #Corvax-Next
   - type: Access
     groups:
     - AllAccess

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -353,8 +353,6 @@
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
       # Corvax-Next Start
-      - ClothingEyesNightVisionGoggles
-      - ClothingEyesThermalVisionGoggles
       - EnergyScalpel
       - EnergyCautery
       - AdvancedRetractor

diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/devices.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/devices.yml
@@ -1,22 +1,3 @@
-- type: latheRecipe
-  id: ClothingEyesNightVisionGoggles
-  result: ClothingEyesNightVisionGoggles
-  completetime: 2
-  materials:
-    Steel: 200
-    Glass: 100
-    Silver: 100
-    Gold: 100
-
-- type: latheRecipe
-  id: ClothingEyesThermalVisionGoggles
-  result: ClothingEyesThermalVisionGoggles
-  completetime: 2
-  materials:
-    Steel: 200
-    Glass: 100
-    Silver: 100
-
 - type: latheRecipe
   id: PlantAnalyzer
   result: PlantAnalyzerEmpty

diff --git a/Resources/Prototypes/_CorvaxNext/Research/experimental.yml b/Resources/Prototypes/_CorvaxNext/Research/experimental.yml
@@ -11,27 +11,3 @@
   cost: 10000
   recipeUnlocks:
   - MachineBluespaceHarvesterCircuitboard
-
-- type: technology
-  id: NightVisionTech
-  name: research-technology-night-vision
-  icon:
-    sprite: _CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi
-    state: icon
-  discipline: Experimental
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - ClothingEyesNightVisionGoggles
-
-- type: technology
-  id: ThermalVisionTech
-  name: research-technology-thermal-vision
-  icon:
-    sprite: _CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi
-    state: icon
-  discipline: Experimental
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - ClothingEyesThermalVisionGoggles