Термалки (#466)

* - add: Rewrite night vision. * - add: Thermals. * - remove: Remove stuff from maps. * - fix: Descriptions.
2024-07-19 16:27:01 +00:00
parent 42b4aa4cef
commit 781e266fc2
36 changed files with 514 additions and 138 deletions
--- a/Resources/Locale/ru-RU/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -70,4 +70,5 @@ research-technology-advanced-spray = Продвинутые спреи
 research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов
 research-technology-quantum-fiber-weaving = Плетение квантового волокна
 research-technology-night-vision = Технологии ночного видения
+research-technology-thermal-vision = Технологии термального видения
 research-technology-bluespace-chemistry = Блюспейс химия
--- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -444,6 +444,9 @@ uplink-blood-dagger-desc = Критическая жажда: Кинжал Жа
 uplink-night-vision-name = ПНВ [Хамелеон]
 uplink-night-vision-desc = Теперь ты видишь во тьме!

+uplink-thermal-vision-name = Оптический термальный сканер [Хамелеон]
+uplink-thermal-vision-desc = Позволяет вам видеть существ через стены.
+
 uplink-betrayal-knife-name = Предательский нож
 uplink-betrayal-knife-desc = Предательский нож позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения, пробивая броню противника, при ударе в спину.

--- a/Resources/Locale/ru-RU/white/actions/thermal-vision.ftl
+++ b/Resources/Locale/ru-RU/white/actions/thermal-vision.ftl
@@ -0,0 +1,2 @@
+ent-ToggleThermalVision = Переключить термальное зрение.
+    .desc = Переключает термальное зрение.
--- a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl
+++ b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl
@@ -5,7 +5,7 @@ changeling-ability-biodegrade = Биоразложение
 changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы. Стоит 30 химикатов.

 changeling-ability-eyesight = Аугментация зрения
-changeling-ability-eyesight-desc = Развивает переключаемое ночное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки.
+changeling-ability-eyesight-desc = Развивает переключаемое ночное и термальное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки.

 changeling-ability-dissonant-shriek = Диссонирующий вопль
 changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг. Стоит 20 химикатов.
--- a/Resources/Maps/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -7034,13 +7034,6 @@ entities:
    - type: Transform
      pos: 10.480986,45.607067
      parent: 1653
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 800
-    components:
-    - type: Transform
-      pos: 6.5116234,25.568321
-      parent: 1653
 - proto: ClothingHandsGlovesLeather
  entities:
  - uid: 719
@@ -10731,14 +10724,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 52.5,14.5
      parent: 1653
- proto: MagicalLamp
-  entities:
-  - uid: 1204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5085075,47.438328
-      parent: 1653
 - proto: MaintenanceFluffSpawner
  entities:
  - uid: 1245
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -18251,15 +18251,6 @@ entities:
      parent: 30
    - type: Physics
      canCollide: False
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 7267
-    components:
-    - type: Transform
-      pos: -31.624142,-1.1191435
-      parent: 30
-    - type: Physics
-      canCollide: False
 - proto: ClothingHandsGlovesColorYellow
  entities:
  - uid: 1668
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -58677,23 +58677,6 @@ entities:
    - type: Transform
      pos: 14.470102,-43.56056
      parent: 60
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 15400
-    components:
-    - type: Transform
-      pos: -17.455568,32.420967
-      parent: 60
-  - uid: 15402
-    components:
-    - type: Transform
-      pos: -17.455568,32.624092
-      parent: 60
-  - uid: 23570
-    components:
-    - type: Transform
-      pos: -62.52358,41.396984
-      parent: 60
 - proto: ClothingHandsGlovesBoxingBlue
  entities:
  - uid: 19920
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -93553,28 +93553,6 @@ entities:
    - type: Transform
      pos: 102.52885,13.515509
      parent: 13329
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 31732
-    components:
-    - type: Transform
-      pos: 65.539406,-14.949457
-      parent: 13329
-  - uid: 31733
-    components:
-    - type: Transform
-      pos: 70.49054,-5.808993
-      parent: 13329
-  - uid: 31734
-    components:
-    - type: Transform
-      pos: 70.47884,-26.373547
-      parent: 13329
-  - uid: 31735
-    components:
-    - type: Transform
-      pos: 70.57259,-26.498547
-      parent: 13329
 - proto: ClothingEyesHudBeer
  entities:
  - uid: 31731
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -51820,18 +51820,6 @@ entities:
    - type: Transform
      pos: 47.465996,44.649086
      parent: 30
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 9441
-    components:
-    - type: Transform
-      pos: 5.522977,-23.530071
-      parent: 30
-  - uid: 10010
-    components:
-    - type: Transform
-      pos: -13.542964,-45.170254
-      parent: 30
 - proto: ClothingEyesHudDiagnostic
  entities:
  - uid: 11291
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -60170,18 +60170,6 @@ entities:
    - type: Transform
      pos: 66.56803,33.64219
      parent: 5350
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 23947
-    components:
-    - type: Transform
-      pos: 55.407906,-5.421943
-      parent: 5350
-  - uid: 23948
-    components:
-    - type: Transform
-      pos: 55.501656,-5.562568
-      parent: 5350
 - proto: ClothingEyesHudMedical
  entities:
  - uid: 14922
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -32339,13 +32339,6 @@ entities:
    - type: Transform
      pos: 86.49675,1.6024053
      parent: 2
- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 12673
-    components:
-    - type: Transform
-      pos: 32.51945,-30.628448
-      parent: 2
 - proto: ClothingEyesHudDiagnostic
  entities:
  - uid: 11439
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -235,11 +235,30 @@
    sprite: Clothing/Eyes/Glasses/thermal.rsi
  - type: Clothing
    sprite: Clothing/Eyes/Glasses/thermal.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Heat: 0.95
-  - type: GroupExamine
+  - type: ClothingGrantComponent
+    component:
+    - type: ThermalVision
+
+- type: entity
+  parent: ClothingEyesGlassesThermal
+  id: ClothingEyesGlassesThermalSyndie
+  suffix: "Хамелеон"
+  components:
+  - type: ChameleonClothing
+    slot: [ eyes ]
+    default: ClothingEyesGlassesSunglasses
+  - type: UserInterface
+    interfaces:
+    - key: enum.ChameleonUiKey.Key
+      type: ChameleonBoundUserInterface
+
+- type: entity
+  parent: ClothingEyesGlassesThermalSyndie
+  id: ClothingEyesGlassesThermalNukie
+  suffix: "Хамелеон, Ядерные Оперативники"
+  components:
+  - type: ShowSyndicateIcons
+  - type: ShowSecurityIcons

 - type: entity
  parent: ClothingEyesBase
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -798,6 +798,7 @@
  - type: ClothingGrantComponent
    component:
    - type: NightVision
+    - type: ThermalVision

 #MISC. HARDSUITS
 #Clown Hardsuit
--- a/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml
@@ -601,6 +601,7 @@
        - ExGrenade
        - SyndieMiniBomb
        - ClothingEyesNightVisionGogglesSyndie
+        - ClothingEyesGlassesThermalSyndie
        - ClothingOuterVestWeb
        - ClothingBackpackChameleonFill
        - CigPackSyndicate
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -343,6 +343,7 @@
      - FauxTileAstroSnow
      - OreBagOfHolding
      - ClothingEyesNightVisionGoggles # WD EDIT
+      - ClothingEyesGlassesThermal # WD EDIT
      - KitchenKnife # WD EDIT
      - ButchCleaver # WD EDIT
      - WeaponTempGun # WD EDIT
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -153,6 +153,8 @@
          prob: 0.5
        - proto: ClothingEyesNightVisionGoggles
          cost: 8
+        - proto: ClothingEyesGlassesThermal
+          cost: 8
        - proto: ClothingHandsGlovesCombat
          cost: 3
        - proto: Katana
--- a/Resources/Prototypes/_White/Actions/types.yml
+++ b/Resources/Prototypes/_White/Actions/types.yml
@@ -42,6 +42,20 @@
      state: icon
    event: !type:ToggleNightVisionEvent

+- type: entity
+  id: ToggleThermalVision
+  name: Toggle thermal vision.
+  description: Toggles thermal vision.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    itemIconStyle: BigAction
+    priority: -20
+    icon:
+      sprite: Clothing/Eyes/Glasses/thermal.rsi
+      state: icon
+    event: !type:ToggleThermalVisionEvent
+
 - type: entity
  id: ToggleBodyCamera
  name: Toggle body camera.
--- a/Resources/Prototypes/_White/Catalog/uplink.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink.yml
@@ -135,6 +135,38 @@
      tags:
      - NukeOpsUplink

+- type: listing
+  id: UplinkThermalGoggles
+  name: uplink-thermal-vision-name
+  description: uplink-thermal-vision-desc
+  productEntity: ClothingEyesGlassesThermalSyndie
+  icon: { sprite: Clothing/Eyes/Glasses/thermal.rsi, state: icon }
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkThermalGogglesNukie
+  name: uplink-thermal-vision-name
+  description: uplink-thermal-vision-desc
+  productEntity: ClothingEyesGlassesThermalNukie
+  icon: { sprite: Clothing/Eyes/Glasses/thermal.rsi, state: icon }
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 #- type: listing
 #  id: UplinkBattleAxe
 #  name: Энергетической боевой топор
--- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
+++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
@@ -22,6 +22,16 @@
    Silver: 100
    Gold: 100

+- type: latheRecipe
+  id: ClothingEyesGlassesThermal
+  result: ClothingEyesGlassesThermal
+  completetime: 2
+  materials:
+    Steel: 200
+    Glass: 100
+    Silver: 100
+    Gold: 100
+
 - type: latheRecipe
  id: WeaponTempGun
  result: WeaponTempGun
--- a/Resources/Prototypes/_White/Research/experimental.yml
+++ b/Resources/Prototypes/_White/Research/experimental.yml
@@ -10,3 +10,15 @@
  cost: 10000
  recipeUnlocks:
  - ClothingEyesNightVisionGoggles
+
+- type: technology
+  id: ThermalVisionTech
+  name: research-technology-thermal-vision
+  icon:
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+    state: icon
+  discipline: Experimental
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ClothingEyesGlassesThermal