Малая балансировка вооружения, Лазерные Мечи для Оперативников

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -72,6 +72,7 @@
       tags:
       - AssaultOpsUplink
       - SubdermalImplant
+      - NukeOpsUplink
   - !type:ListingLimitedStockCondition
     stock: 1
   #Sunrise-end
@@ -1623,9 +1624,9 @@
   productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 8
+    Telecrystal: 9
   cost:
-    Telecrystal: 12
+    Telecrystal: 15
   categories:
   - UplinkWearables
 

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

Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml

@@ -779,6 +779,27 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkEswordNuke
+  name: uplink-esword-name
+  description: uplink-esword-desc
+  icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
+  productEntity: EnergySwordBiocode
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 4
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 - type: listing
   id: UplinkPolytrinicAcidChemistryBottle
   name: uplink-polytrinic-acid-chemistry-bottle-name
@@ -1073,14 +1094,9 @@
   discountDownTo:
     Telecrystal: 2
   cost:
-    Telecrystal: 4
+    Telecrystal: 5
   categories:
   - UplinkWearables
-  conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - NukeOpsUplink
 
 - type: listing
   id: UplinkEnergyDomePersonalSyndie

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -166,7 +166,9 @@
     startingCharge: 1000
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 20
+    autoRechargeRate: 25
+    autoRechargePause: true
+    autoRechargePauseTime: 30
   - type: EnergyGunFireModes
     fireModes:
     - hitscanProto: BulletDisabler
@@ -330,9 +332,9 @@
     angleIncrease: 1.5
     angleDecay: 8
     selectedMode: Burst
-    shotsPerBurst: 4
+    shotsPerBurst: 3
     burstCooldown: 0.3
-    burstFireRate: 5
+    burstFireRate: 4.4
     availableModes:
     - Burst
   - type: Item
@@ -426,20 +428,22 @@
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
     selectedMode: SemiAuto
-    fireRate: 2.2
+    fireRate: 2.1
     availableModes:
         - SemiAuto
         - FullAuto
   - type: Battery
-    maxCharge: 1800
-    startingCharge: 1800
+    maxCharge: 1500
+    startingCharge: 1500
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 6 # 5 minute
+    autoRechargeRate: 15 # ~3 minute
+    autoRechargePause: true
+    autoRechargePauseTime: 60
   - type: EnergyGunFireModes
     fireModes:
     - hitscanProto: BulletDisabler
-      fireCost: 50
+      fireCost: 75
       name: energy-gun-disable
       state: disabler
       shotType: Hitscan
@@ -486,9 +490,14 @@
   - type: Battery
     maxCharge: 4000
     startingCharge: 4000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 40 #100sec+60Sec Pause
+    autoRechargePause: true
+    autoRechargePauseTime: 60
   - type: ProjectileBatteryAmmoProvider
     proto: BulletEMP
-    fireCost: 500
+    fireCost: 1000
   - type: MagazineVisuals
     magState: mag
     steps: 5

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -59,7 +59,6 @@
   - type: Gun
     selectedMode: FullAuto
     availableModes:
-    - SemiAuto
     - FullAuto
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Pistols/vp70_shot.ogg
@@ -77,6 +76,7 @@
           tags:
           - MagazinePistol
           - MagazineVP70
+          - MagazinePistolHighCapacity
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
@@ -105,7 +105,7 @@
   - type: Item
     sprite: _Sunrise/Objects/Weapons/Guns/Pistols/glock22/tiny.rsi
   - type: Gun
-    selectedMode: SemiAuto
+    selectedMode: FullAuto
     availableModes:
     - SemiAuto
     - FullAuto
@@ -122,6 +122,7 @@
         whitelist:
           tags:
           - MagazinePistol
+          - MagazinePistolHighCapacity
           - MagazineGlock22
       gun_chamber:
         name: Chamber
@@ -159,6 +160,7 @@
         whitelist:
           tags:
           - MagazinePistol
+          - MagazinePistolHighCapacity
           - MagazineGlock22
       gun_chamber:
         name: Chamber
@@ -198,6 +200,7 @@
         whitelist:
           tags:
           - MagazinePistol
+          - MagazinePistolHighCapacity
           - MagazineHIBrowning
       gun_chamber:
         name: Chamber
@@ -243,6 +246,7 @@
         whitelist:
           tags:
           - MagazinePistol
+          - MagazinePistolHighCapacity
           - MagazineACP14
       gun_chamber:
         name: Chamber

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -45,7 +45,7 @@
   - type: Gun
     minAngle: 24
     maxAngle: 45
-    fireRate: 6.5  # 10 в секунду - реалистично. 5, так как сс14
+    fireRate: 6  # 10 в секунду - реалистично. 5, так как сс14
     soundGunshot:
       collection: ak47
   - type: ItemSlots
@@ -102,7 +102,7 @@
   - type: Gun
     minAngle: 24
     maxAngle: 45
-    fireRate: 7
+    fireRate: 6.5
     soundGunshot:
       collection: ak47
   - type: ChamberMagazineAmmoProvider
@@ -159,7 +159,7 @@
   - type: Gun
     minAngle: 24
     maxAngle: 45
-    fireRate: 7.5  # 10 в секунду - реалистично. 5, так как сс14
+    fireRate: 7  # 10 в секунду - реалистично. 5, так как сс14
     soundGunshot:
       collection: ak47
   - type: ItemSlots
@@ -216,14 +216,22 @@
   - type: Item
     sprite: _Sunrise/Objects/Weapons/Guns/Rifles/famas/tiny.rsi
   - type: GunWieldBonus
-    minAngle: -23
-    maxAngle: -43
+    minAngle: -16
+    maxAngle: -30
   - type: Gun
-    minAngle: 26
-    maxAngle: 48
-    fireRate: 6.9
+    minAngle: 21
+    maxAngle: 40
+    fireRate: 8
+    burstFireRate: 8
+    selectedMode: Burst
     soundGunshot:
-      collection: famas
+      collection: famas # Sunrise-Edit
+      params:
+        volume: 10
+    availableModes:
+      - Burst
+    shotsPerBurst: 5
+    burstCooldown: 0.25
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -453,7 +461,7 @@
   - type: Gun
     minAngle: 25
     maxAngle: 45
-    fireRate: 6
+    fireRate: 5.5
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Rifles/m16a4/m16a4_shot.ogg
   - type: ItemSlots
@@ -466,15 +474,15 @@
         priority: 2
         whitelist:
           tags:
-          - MagazineLightRifle
+          - MagazineRifle
           - MagazineM16A4
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLightRifle  # 556
+        startingItem: CartridgeRifle  # 556
         priority: 1
         whitelist:
           tags:
-          - CartridgeLightRifle  # 556
+          - CartridgeRifle  # 556
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -230,7 +230,7 @@
   - type: Gun
     minAngle: 24
     maxAngle: 45
-    fireRate: 6.5
+    fireRate: 6
     soundGunshot:
       collection: mp5
       params:
@@ -239,14 +239,15 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineMP5
+        startingItem: MagazinePistolSubMachineGun
         insertSound: /Audio/_Sunrise/Weapons/Guns/SMGs/mp5/mp5_reload.ogg
         ejectSound: /Audio/_Sunrise/Weapons/Guns/SMGs/mp5/mp5_unload.ogg
         priority: 2
         whitelist:
           tags:
           - MagazineMP5
           - MagazinePistolSubMachineGun
+          - MagazinePistolHighCapacity
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol