Фикс стейтов коробочек патронов (#2517)

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl

@@ -19,3 +19,25 @@ ent-MagazineBoxHeavyRifleIncendiary = ammunition box (7,62ммR incendiary)
     .desc = Cardboard box full of 7.62x54mmR full-power rifle rounds. Dated, but still widely used by marksman rifles and medium machine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
 ent-MagazineBoxHeavyRifleUranium = ammunition box (7,62ммR uranium)
     .desc = Cardboard box full of 7.62x54mmR full-power rifle rounds. Dated, but still widely used by marksman rifles and medium machine guns. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+
+## Magazines
+ent-BaseMagazineDragunov = magazine (7,62mmR)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineDragunov = magazine (7,62mmR)
+    .suffix = Sunrise
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovExtended = extended magazine (7,62mmR)
+    .suffix = Sunrise
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovEmpty = magazine (7,62mmR any)
+    .suffix = Sunrise, empty
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovIncendiary = magazine (7,62mmR incendiary)
+    .suffix = Sunrise
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovPractice = magazine (7,62mmR practice)
+    .suffix = Sunrise
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovUranium = magazine (7,62mmR uranium)
+    .suffix = Sunrise
+    .desc = { ent-MagazineDragunov.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl

@@ -1,10 +1,6 @@
-ent-MagazineDragunov = Dragunov magazine
-    .desc = Standart USSP type of heavy magazines.
 ent-MagazineBR64 = BR64 magazine
     .desc = Standart EarthGov type of heavy magazines.
 ent-MagazineBauer127 = Bauer127 magazine
     .desc = Standart EarthGov type of heavy magazines.
-ent-MagazineDragunovExtended = { ent-MagazineDragunov }
-    .desc = { ent-MagazineDragunov.desc }
 ent-MagazineBR64Extended = { ent-MagazineBR64 }
     .desc = { ent-MagazineBR64.desc }

Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl

@@ -33,3 +33,7 @@ ent-BaseUplinkRadio0TC = { ent-BaseUplinkRadio }
 ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio }
     .suffix = DEBUG
     .desc = { ent-BaseUplinkRadio.desc }
+ent-BaseUplinkRadioDebug999 = { ent-BaseUplinkRadio }
+    .suffix = DEBUG, NukeOps
+    .desc = { ent-BaseUplinkRadio.desc }
+

Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl

@@ -15,7 +15,8 @@ uplink-grenade-blast-name = Фугасная граната
 uplink-grenade-blast-desc = Фугасная граната. Совместима с "China-Lake".
 uplink-magazine-siar52-name = Магазин ПП (.25 безгильзовый)
 uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Совместим с SIAR-52.
-
+uplink-magazine-bulldog-uraniumslug-desc = Shotgun magazine with 8 shells filled with uranium slugs. Compatible with the Bulldog.
+uplink-magazine-bulldog-uranium-desc = Shotgun magazine with 8 shells filled with uranium pellet. Compatible with the Bulldog.
 ## Misc
 
 uplink-music-boombox-name = Музыкальный набор синдиката

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl

@@ -19,3 +19,24 @@ ent-MagazineBoxHeavyRifleIncendiary = коробка патронов (7,62ммR
     .desc = Картонная коробка, полная полноразмерных винтовочных патронов 7.62x54ммR. Устаревшие, но всё ещё широко используемые стрелковыми винтовками и средними пулемётами. Зажигательные патроны содержат самовоспламеняющееся вещество, которое поджигает цель.
 ent-MagazineBoxHeavyRifleUranium = коробка патронов (7,62ммR урановые)
     .desc = Картонная коробка, полная полноразмерных винтовочных патронов 7.62x54ммR. Устаревшие, но всё ещё широко используемые стрелковыми винтовками и средними пулемётами. Урановые патроны заменяют свинцовый сердечник пули делящимся материалом, облучая цель изнутри.
+
+## Magazines
+ent-BaseMagazineDragunov = магазин (7,62ммR)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineDragunov = магазин (7,62ммR)
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovExtended = расширеный магазин (7,62ммR)
+    .suffix = Санрайз
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovEmpty = магазин (7,62ммR)
+    .suffix = Санрайз, Пустой
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovIncendiary = магазин (7,62ммR зажигательный)
+    .suffix = Санрайз
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovPractice = магазин (7,62ммR учебный)
+    .suffix = Санрайз
+    .desc = { ent-MagazineDragunov.desc }
+ent-MagazineDragunovUranium = магазин (7,62ммR урановый)
+    .suffix = Санрайз
+    .desc = { ent-MagazineDragunov.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl

@@ -1,10 +1,6 @@
-ent-MagazineDragunov = магазин винтовки Драгунов
-    .desc = Использует патроны калибра 7.62x54R.
 ent-MagazineBR64 = магазин винтовки BR-64
     .desc = Использует патроны калибра 7,62х51 NT
 ent-MagazineBauer127 = магазин Bauer-127
     .desc = Использует патроны калибра .60 антиматериальные.
-ent-MagazineDragunovExtended = Увеличеный магазин Dragunov
-    .desc = { ent-MagazineDragunov.desc }
 ent-MagazineBR64Extended = расширенный магазин BR64
     .desc = { ent-MagazineBR64.desc }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl

@@ -33,3 +33,6 @@ ent-BaseUplinkRadio0TC = { ent-BaseUplinkRadio }
 ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio }
     .suffix = ДЕБАГ
     .desc = { ent-BaseUplinkRadio.desc }
+ent-BaseUplinkRadioDebug999 = { ent-BaseUplinkRadio }
+    .suffix = ДЕБАГ, Ядерные оперативники
+    .desc = { ent-BaseUplinkRadio.desc }

Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl

@@ -26,6 +26,8 @@ uplink-magazine-dl6902-name = Короб-магазин DL6902 (7,62мм)
 uplink-magazine-dl6902-desc = Магазин для Dl6902. Содержит 200 патронов калибра 7,62х39мм.
 uplink-magazine-dragunov-desc = Магазин для Драгунова. Содержит 10 патронов калибра 7,62х54R.
 uplink-magazine-dragunov-extended-desc = Магазин для Драгунова. Содержит 20 патронов калибра 7,62х54R.
+uplink-magazine-bulldog-uraniumslug-desc = Барабанный магазин на 8 урановых пулевых патронов. Совместим с "Бульдогом".
+uplink-magazine-bulldog-uranium-desc = Барабанный магазин на 8 патронов урановой дроби. Совместим с "Бульдогом".
 ## Misc
 
 uplink-music-boombox-name = Музыкальный набор синдиката

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -132,6 +132,12 @@
         amount: 1
       - id: LMGKit # Sunrise-edit
         amount: 1
+      - id: MedkitCombatFilled # Sunrise-edit
+        amount: 1
+      - id: MagazineRifle  # Sunrise-edit
+        amount: 2
+      - id: MagazineDragunov  # Sunrise-edit
+        amount: 2
 # Sunrise-Start
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
@@ -149,6 +155,10 @@
         amount: 1
       - id: MedkitBurnFilled
         amount: 1
+      - id: MagazineRifleIncendiary
+        amount: 2
+      - id: MagazineDragunovIncendiary
+        amount: 2
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
@@ -166,6 +176,10 @@
         amount: 1
       - id: MedkitRadiationFilled
         amount: 1
+      - id: MagazineRifleUranium
+        amount: 2
+      - id: MagazineDragunovUranium
+        amount: 2
 # Sunrise-End
 - type: entity
   parent: ClothingBackpackDuffelClown

Resources/Prototypes/Entities/Objects/Specific/syndicate.yml

@@ -174,3 +174,18 @@
   - type: Store
     balance:
       Telecrystal: 99999
+
+# Sunrise-Start
+- type: entity
+  parent: BaseUplinkRadio
+  id: BaseUplinkRadioDebug999
+  suffix: DEBUG, NukeOps
+  categories: [ Debug ] # Sunrise added
+  components:
+  - type: Store
+    balance:
+      Telecrystal: 999
+  - type: Tag
+    tags:
+    - NukeOpsUplink
+# Sunrise-Start

Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml

@@ -44,6 +44,10 @@
   id: CaselessAmmoKit
   name: Siar52 ammo kit
   components:
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,2,1
   - type: Storage
     grid:
     - 0,0,2,3
@@ -57,7 +61,7 @@
     - id: MagazinePistolSubMachineGunSIAR52
   - type: Sprite
     layers:
-    - state: box_of_doom_big
+    - state: box_of_doom
     - state: smg_base
 
 - type: entity
@@ -166,10 +170,10 @@
     - id: MagazineShotgunUranium
     - id: MagazineShotgunUranium
     - id: MagazineShotgunUranium
-    - id: MagazineShotgunUranium
-    - id: MagazineShotgunUranium
-    - id: MagazineShotgunUranium
-    - id: MagazineShotgunUranium
+    - id: MagazineShotgunUraniumSlug
+    - id: MagazineShotgunUraniumSlug
+    - id: MagazineShotgunUraniumSlug
+    - id: MagazineShotgunUraniumSlug
   - type: Sprite
     layers:
     - state: box_of_doom_big
@@ -180,9 +184,13 @@
   id: LMGKit
   name: L6 Saw ammo kit
   components:
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,2,1
   - type: Storage
     grid:
-    - 0,0,3,3
+    - 0,0,3,2
   - type: StorageFill
     contents:
     - id: MagazineLightRifleBox
@@ -195,13 +203,13 @@
     - state: l6_base
 
 - type: entity
-  parent: [BoxCardboard, BaseSyndicateContraband]
+  parent: LMGKit
   id: LMGIncendiaryKit
   name: L6 Saw Incendiary ammo kit
   components:
   - type: Storage
     grid:
-    - 0,0,3,3
+    - 0,0,3,2
   - type: StorageFill
     contents:
     - id: MagazineLightRifleBoxIncendiary
@@ -214,13 +222,13 @@
     - state: l6_red
 
 - type: entity
-  parent: [BoxCardboard, BaseSyndicateContraband]
+  parent: LMGKit
   id: LMGUraniumKit
   name: L6 Saw Uranium ammo kit
   components:
   - type: Storage
     grid:
-    - 0,0,3,3
+    - 0,0,3,2
   - type: StorageFill
     contents:
     - id: MagazineLightRifleBoxUranium

Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml

@@ -130,8 +130,7 @@
 
 - type: listing
   id: UplinkMagazineShotgunUranium
-  name: uplink-magazine-shotgun-name
-  description: uplink-magazine-shotgun-desc
+  description: uplink-magazine-bulldog-uranium-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: uranium }
   productEntity: MagazineShotgunUranium
   cost:
@@ -147,11 +146,11 @@
 
 - type: listing
   id: UplinkMagazineShotgunUraniumSlug
-  description: uplink-magazine-shotgun-desc
+  description: uplink-magazine-bulldog-uraniumslug-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: uranium }
   productEntity: MagazineShotgunUraniumSlug
   cost:
-    Telecrystal: 5
+    Telecrystal: 6
   categories:
   - UplinkAmmo
   conditions:
@@ -164,7 +163,6 @@
 # For the LMG
 - type: listing
   id: UplinkMagazineLightRifleBox
-  name: uplink-magazine-lmg-name
   description: uplink-magazine-lmg-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon }
   productEntity: MagazineLightRifleBox
@@ -185,6 +183,7 @@
 
 - type: listing
   id: UplinkMagazineLightRifleBoxIncendiary
+  description: uplink-magazine-lmg-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: red }
   productEntity: MagazineLightRifleBoxIncendiary
   cost:
@@ -223,9 +222,9 @@
   productEntity: CrateAmmokitBundle
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 50
+    Telecrystal: 75
   cost:
-    Telecrystal: 95
+    Telecrystal: 115
   categories:
   - UplinkAmmo
   conditions:
@@ -234,6 +233,10 @@
       tags:
       - NukeOpsUplink
       - LoneOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
 
 # For the SIAR52
 - type: listing

Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml

@@ -140,6 +140,8 @@
       - state: active
         shader: unshaded
   - type: Store
+    refundAllowed: false
+    ownerOnly: true
     balance:
       Bluecrystal: 999
       Crystallite: 999

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_light_rifle.yml

@@ -173,3 +173,184 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: uranium
+
+#Magazine
+- type: entity
+  id: BaseMagazineDragunov
+  name: "magazine Dragunov (7,62mmR)"
+  parent: [ BaseItem, BaseSecurityContraband ]
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - MagazineDragunov
+  - type: Item
+    size: Small
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeHeavyRifle
+    capacity: 10
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: MagazineDragunovExtended
+  name: "magazine Dragunov (7,62mmR)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyLightRifle
+    capacity: 20
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi
+    layers:
+    - state: base-1
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineDragunov
+  name: "magazine Dragunov (7,62mmR)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyLightRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineDragunovEmpty
+  name: "magazine (7,62mmR any)"
+  suffix: Sunrise, empty
+  parent: MagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineDragunovIncendiary
+  name: "magazine (7,62mmR incendiary)"
+  suffix: Sunrise
+  parent: MagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyLightRifleIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
+
+- type: entity
+  id: MagazineDragunovPractice
+  name: "magazine (7,62mmR practice)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyLightRiflePractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#dbdbdb"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#dbdbdb"
+
+- type: entity
+  id: MagazineDragunovUranium
+  name: "magazine (7,62mmR uranium)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyLightRifleUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#00cd42"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#00cd42"
+

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml

@@ -102,7 +102,7 @@
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"
 
-#Magasines
+#Magazines
 - type: entity
   id: SunriseBaseMagazineRifle
   name: "magazine (5.56mm)"

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml

@@ -1,40 +1,3 @@
-- type: entity
-  id: MagazineDragunov
-  name: Dragunov magazine
-  description: Standart USSP type of heavy magazines.
-  parent: BaseItem
-  components:
-  - type: Tag
-    tags:
-      - MagazineDragunov
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    capacity: 10
-    proto: CartridgeHeavyLightRifle  # 762x54
-    whitelist:
-      tags:
-        - CartridgeHeavyRifle  # 762x54
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Item
-    size: Small
-    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi
-  - type: Sprite
-    netsync: false
-    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
-
 - type: entity
   id: MagazineBR64
   name: BR64 magazine
@@ -137,13 +100,6 @@
       - state: inhand-right-stripe
         color: "#9b0000"
 
-- type: entity
-  parent: MagazineDragunov
-  id: MagazineDragunovExtended
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 20
-
 - type: entity
   parent: MagazineBR64
   id: MagazineBR64Extended

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/meta.json

@@ -10,9 +10,32 @@
         {
             "name": "base"
         },
+        {
+            "name": "base-1"
+
+        },
         {
             "name": "mag-1"
 
+        },
+        {
+            "name": "stripe"
+        },
+        {
+            "name": "inhand-left-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
         }
     ]
 }