Тех Фаб СБ: Упрощение (#1019)

* 1st state * Split * Fix * Split * Fix Doublicate
space-sunrise · Jan 5, 2025 · 100c97a · 100c97a
1 parent 411a866
commit 100c97a
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 129 deletions.
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl
@@ -0,0 +1,19 @@
+ent-PowerCellCombat = hyper-capacity combat power cell
+    .desc = A rechargeable standardized power cell. This one hyper-capacity power cell with EMP immune.
+    .suffix = Full
+ent-PowerCellCombatPrinted = { ent-PowerCellCombat }
+    .suffix = Empty
+    .desc = { ent-PowerCellCombat.desc }
+ent-PowerCellNanoTrasen = hyper-capacity NanoTrasen power cell
+    .desc = { ent-PowerCellCombat.desc }
+    .suffix = Full
+ent-PowerCellSyndicate = hyper-capacity Syndicate power cell
+    .desc = { ent-PowerCellCombat.desc }
+    .suffix = Full
+
+ent-PowerCageCombat = hyper-capacity combat power cage
+    .desc = A rechargeable power cage for big devices. Increased capacity for increased power levels. Has EMP immune.
+ent-PowerCageERT = hyper-capacity NanoTrasen power cage
+    .desc = { ent-PowerCageCombat.desc }
+ent-PowerCageSyndicate = hyper-capacity Syndicate power cage
+    .desc = { ent-PowerCageCombat.desc }
diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -10,3 +10,5 @@ ent-WeaponPistolMk58 = mk 58
     .desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo.
 ent-WeaponPistolN1984 = N1984
     .desc = The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
+ent-WeaponFlareGunSecurity = security shell gun
+    .desc = A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk.
diff --git a/Resources/Locale/en-US/_strings/research/technologies.ftl b/Resources/Locale/en-US/_strings/research/technologies.ftl
@@ -45,6 +45,7 @@ research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
 research-technology-advance-laser = Military-grade energy weaponry
 research-technology-explosive-mech-ammunition = Explosive Mech Ammunition
 research-technology-combat-equipment = Combat equipment
+research-technology-combat-powercells = Combat Super Powercells
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research

diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl
@@ -0,0 +1,22 @@
+ent-PowerCellCombat = военная батарея гипер ёмкости
+    .desc = Стандартизированный перезаряжаемый элемент питания. накопитель гипер ёмкости военного типа, имеет встроенную ЭМИ защиту.
+    .suffix = Полный
+ent-PowerCellCombatPrinted = { ent-PowerCellCombat }
+    .suffix = Пустой
+    .desc = { ent-PowerCellCombat.desc }
+ent-PowerCellNanoTrasen = батарея гипер ёмкости NanoTrasen
+    .desc = { ent-PowerCellCombat.desc }
+    .suffix = Полный
+ent-PowerCellSyndicate = батарея гипер ёмкости Syndicate
+    .desc = { ent-PowerCellCombat.desc }
+    .suffix = Полный
+
+ent-PowerCageCombat = военная энергоячейка гипер ёмкости 
+    .desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Встроенная ЭМИ защита.
+    .suffix = Полный
+ent-PowerCageERT = энергоячейка гипер ёмкости NanoTrasen
+    .desc = { ent-PowerCageCombat.desc }
+    .suffix = Полный
+ent-PowerCageSyndicate = энергоячейка гипер ёмкости Syndicate
+    .desc = { ent-PowerCageCombat.desc }
+    .suffix = Полный
diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -13,3 +13,5 @@ ent-WeaponPistolMk58 = МК 58
     .suffix = Пистолет
 ent-WeaponPistolN1984 = N1984
     .desc = Запасное оружие любого уважающего себя офицера. Выпускается в калибре .45 магнум, самом богоугодном калибре.
+ent-WeaponFlareGunSecurity = сигнальный пистолет СБ
+    .desc = Компактный, однозарядный пистолет модифицированный под стрельбу ружейными летальными патронами без риска взорваться.
diff --git a/Resources/Locale/ru-RU/_strings/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/research/technologies.ftl
@@ -43,6 +43,7 @@ research-technology-experimental-battery-ammo =  Батарейные боепр
 research-technology-advance-laser = Военное энергетическое вооружение
 research-technology-energy_barriers = Энергетические барьеры
 research-technology-combat-equipment = Боевое снаряжение
+research-technology-combat-powercells = Боевые Супербатареи
 research-technology-basic-shuttle-armament = Базовое корабельное вооружение
 research-technology-advanced-shuttle-weapon = Продвинутое корабельное оружие
 research-technology-explosive-mech-ammunition = Взрывоопасные боеприпасы для меха

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -172,6 +172,7 @@
       - Mousetrap
       - LightReplacer
       - TrashBag
+      - BoxShotgunFlare
       - PowerCellSmall
       - PowerCellMedium
       - RollerBedSpawnFolded
@@ -230,6 +231,7 @@
       - WeaponEnergyGunMini   # Sunrise - Miniature Energy Gun
       - WeaponLaserSvalinn # Sunrise - Svalin shit weapon
       - ClothingHeadHelmetPubg # Sunrise - cheap if u have EMAG
+      - MagazineLightRifleBox #Sunrise - For Nukies
   - type: BlueprintReceiver
     whitelist:
       tags:
@@ -364,6 +366,7 @@
       - DeviceQuantumSpinInverter
       - EnergyDomeDirectionalTurtle
       # Sunrise-start
+      - PowerCellHyper
       - ClothingHeadHelmetPubgMore
       - MechPhasicScanningModule
       - HandCraftedNVD
@@ -379,10 +382,15 @@
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       # Sunrise-Start
-      - CartridgePistolRubber
-      - CartridgeMagnumRubber
-      - CartridgeRifleRubber
-      - CartridgeLightRifleRubber
+      - BaseMagazinePistolCaselessRifleExtended
+      - PowerCellCombat
+      - MagazineLightRifleBoxIncendiary
+      - MagazineLightRifleBoxUranium
+      - MagazineMagnumUranium
+      - MagazineShotgunUranium
+      - MagazineLightRifleRubber
+      - MagazineRifleRubber
+      - MagazinePistolSubMachineGunRubber
       - MagazineBoxPistolRubber
       - MagazineBoxMagnumRubber
       - MagazineBoxRifleRubber
@@ -793,6 +801,7 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - BoxShotgunFlare
       - BoxLethalshot
       - BoxShotgunPractice
       - BoxShotgunSlug
@@ -811,8 +820,8 @@
       - MagazineBoxRiflePractice
       - MagazineLightRifle
       - MagazineLightRifleEmpty
-      - MagazinePistol
-      - MagazinePistolEmpty
+      #- MagazinePistol Sunrise-Edit
+      #- MagazinePistolEmpty Sunrise-Edit
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunEmpty
       - MagazinePistolSubMachineGunTopMounted
@@ -834,29 +843,14 @@
       - WeaponLaserCarbinePractice
       - Zipties
     # Sunrise-start
-      - MagazineM16A4
-      - MagazineLightMachineGunMG60
-      - MagazinePPSH41
-      - MagazineRPD
-      - MagazineNewVector
-      - MagazineMP38
-      - MagazineMP5
-      - MagazineMP7
+      - SpeedLoaderMagnumRubber
+      - MagazineMagnumEmpty
+      - MagazineMagnum
       - MagazineP90
-      - MagazineScorpion
-      - MagazineAK
-      - MagazineAR18
-      - MagazineG36
-      - MagazineM28
-      - MagazineFamas
       - MagazineBR64
-      - MagazineDragunov
-      - MagazineV31
-      - MagazineACP14
-      - MagazineGlock22
-      - MagazineVP70
-      - MagazineHIBrowning
-      - MagazineDeagle
+      - MagazinePistolHighCapacity
+      - MagazinePistolHighCapacityEmpty
+      - MagazineMagnum
       - ClothingHeadHelmetPubg
     # Sunrise-end
     dynamicRecipes:
@@ -912,14 +906,20 @@
       - WeaponLaserCarbine
       - WeaponXrayCannon
     # Sunrise-Start
-      - CartridgePistolRubber
-      - CartridgeMagnumRubber
-      - CartridgeRifleRubber
-      - CartridgeLightRifleRubber
+      - PowerCellCombat
+      - PowerCellHyper
+      - MagazinePistolSubMachineGunIncendiary
+      - MagazinePistolSubMachineGunUranium
+      - MagazineMagnumUranium
+      - MagazineShotgunUranium
+      - MagazineLightRifleRubber
+      - MagazineRifleRubber
+      - MagazinePistolSubMachineGunRubber
       - MagazineBoxPistolRubber
       - MagazineBoxMagnumRubber
       - MagazineBoxRifleRubber
       - MagazineBoxLightRifleRubber
+      - PowerCageCombat
       - WeaponMechCombatImmolationGun # Sunrise - Mechs
       - WeaponMechCombatSolarisLaser # Sunrise - Mechs
       - WeaponMechCombatFiredartLaser # Sunrise - Mechs
@@ -934,20 +934,13 @@
       - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol
       - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine
       - ClothingShoesBootsMagCombat # Sunrise - Combat Magboots
-      - BaseMagazinePistolCaselessRifleExtended
-      - MagazinePPSH41Extended
       - MagazineMP5Extended
       - MagazineMP7Extended
       - MagazineP90Extended
       - MagazineM16A4Extended
-      - MagazineAR18Extended
-      - MagazineM28Extended
       - MagazineG36Extended
       - MagazineFamasExtended
-      - MagazineV31Extended
-      - MagazineBauer127Extended
       - MagazineBR64Extended
-      - MagazineDragunovExtended
     # Sunrise-End
   - type: MaterialStorage
     whitelist:

diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -28,6 +28,30 @@
     Glass: 400
     Plastic: 200
     Gold: 50
+#sunrise-start
+
+- type: latheRecipe
+  id: PowerCellHyper
+  result: PowerCellHyperPrinted
+  category: Parts
+  completetime: 15
+  materials:
+    Steel: 300
+    Glass: 400
+    Plastic: 250
+    Gold: 100
+
+- type: latheRecipe 
+  id: PowerCellCombat
+  result: PowerCellCombatPrinted
+  category: Parts
+  completetime: 25
+  materials:
+    Steel: 400
+    Glass: 500
+    Plastic: 350
+    Gold: 150
+#sunrise-end
 
 - type: latheRecipe
   id: PowerCellMicroreactor
@@ -68,7 +92,7 @@
     Plastic: 400
     Gold: 100
 
-- type: latheRecipe
+- type: latheRecipe #sunrise
   id: PowerCageCombat
   result: PowerCageCombat
   completetime: 15

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -501,13 +501,13 @@
   materials:
     Plastic: 750
 
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunFlare
-  result: BoxShotgunFlare
-  materials:
-    Steel: 80
-    Plastic: 80
+#- type: latheRecipe Sunrise-edit
+#  parent: BaseAmmoRecipe
+#  id: BoxShotgunFlare
+#  result: BoxShotgunFlare
+#  materials:
+#    Steel: 80
+#    Plastic: 80
 
 - type: latheRecipe
   parent: BaseAmmoRecipe

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -28,13 +28,15 @@
   - BoxShotgunIncendiary
   - MagazineRifleIncendiary
   - MagazinePistolIncendiary
+  - MagazinePistolSubMachineGunIncendiary #sunrise-edit
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
+  - MagazineLightRifleBoxIncendiary #sunrise-edit
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -67,10 +69,10 @@
   - WeaponDisabler
   # Sunrise-Start
   - WeaponMechCombatDisabler
-  - CartridgePistolRubber
-  - CartridgeMagnumRubber
-  - CartridgeLightRifleRubber
-  - CartridgeRifleRubber
+  - MagazinePistolSubMachineGunRubber
+  - MagazineMagnumRubber
+  - MagazineLightRifleRubber
+  - MagazineRifleRubber
   - MagazineBoxPistolRubber
   - MagazineBoxMagnumRubber
   - MagazineBoxLightRifleRubber
@@ -96,6 +98,10 @@
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
   - BoxShotgunUranium
+  - MagazineShotgunUranium # Sunrise-edit
+  - MagazineLightRifleBoxUranium # Sunrise-edit
+  - MagazineMagnumUranium # Sunrise-edit
+  - MagazinePistolSubMachineGunUranium  # Sunrise-edit
 
 - type: technology
   id: AdvancedRiotControl

diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -383,7 +383,7 @@
     back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsMagCombat
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesHudMedical
+    eyes: ClothingEyesHudMedSec # Sunrise-edit
     gloves: ClothingHandsGlovesCombat # Sunrise-edit
     outerClothing: ClothingOuterHardsuitERTMedical
     id: ERTMedicPDA

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
@@ -13,8 +13,8 @@
       state: o2
       shader: unshaded
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 1800
+    startingCharge: 1800
   - type: EmpImmune
 
 - type: entity
@@ -32,8 +32,8 @@
       state: o2
       shader: unshaded
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 1800
+    startingCharge: 1800
   - type: EmpImmune
 
 - type: entity
@@ -51,6 +51,23 @@
       state: o2
       shader: unshaded
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 1800
+    startingCharge: 1800
   - type: EmpImmune
+
+- type: entity
+  id: PowerCellCombatPrinted
+  suffix: Empty
+  parent: PowerCellCombat
+  components:
+  - type: Sprite
+    layers:
+      - map: [ "enum.PowerCellVisualLayers.Base" ]
+        state: combat
+      - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+        state: o2
+        shader: unshaded
+        visible: false
+  - type: Battery
+    maxCharge: 1800
+    startingCharge: 0