Фикс оружия для осщ (#472)

🆑
- add: Добавлена возможность печатать пистолетные обоймы для .45
калибра(ладно).
- tweak: После полевых испытаний, лазерный револьвер "ОСЩ" немного
облегчили позволив стрелять из одной руки.

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl

@@ -1,3 +1,5 @@
 ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата
-    .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. 
-    .suffix = { "Страйкбол" }
+    .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков.
+    .suffix = { "Страйкбол" }
+ent-ADTMagazineMagnumIncendiary = пистолетный магазин (.45 зажигательные)
+    .desc = { ent-BaseMagazinePistol.desc }

Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml

@@ -22,7 +22,7 @@
     - 3,0,6,1
   - type: StorageFill
     contents:
-      - id: ADTWeaponSaberRevBlueshield
-      - id: ADTPowerCellLasgunRevolver
-      - id: ADTPowerCellLasgunRevolver
-      - id: ADTPowerCellLasgunRevolver
+     - id: ADTWeaponSaberRevBlueshield
+     - id: ADTPowerCellLasgunRevolver
+     - id: ADTPowerCellLasgunRevolver
+     - id: ADTPowerCellLasgunRevolver

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml

@@ -0,0 +1,13 @@
+- type: entity
+  id: ADTMagazineMagnumIncendiary
+  name: pistol magazine (.45 magnum uranium)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumIncendiary
+  - type: Sprite
+    layers:
+    - state: incendiary
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

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

@@ -14,11 +14,11 @@
   - type: Clothing
     sprite: ADT/Objects/Weapons/Guns/Pistols/deser_eagle.rsi
   - type: Gun
-    minAngle: 10
-    maxAngle: 10
-    angleIncrease: 5
-    angleDecay: 5
-    fireRate: 4.1
+    minAngle: 4
+    maxAngle: 6
+    angleIncrease: 1
+    angleDecay: 1
+    fireRate: 3.2
     availableModes:
     - SemiAuto
     soundGunshot:

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml

@@ -36,16 +36,10 @@
     netsync: false
   - type: Gun
     fireRate: 1.8
+    projectileSpeed: 30
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
     useKey: false
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 5
-        Slash: 5
-        Structural: 10
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1
@@ -68,10 +62,9 @@
         variation: 0.125
     activatedDamage:
         types:
-            Slash: 5
-            Heat: 5
-            Structural: 20
-  - type: GunRequiresWield
+            Slash: 10
+            Heat: 10
+            Structural: 25
   - type: ToggleableLightVisuals
     spriteLayer: blade
     inhandVisuals:

Resources/Prototypes/ADT/Recipes/Lathes/security.yml

@@ -0,0 +1,35 @@
+- type: latheRecipe
+  id: ADTMagazineMagnumEmpty
+  result: MagazineMagnumEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: ADTMagazineMagnum
+  result: MagazineMagnum
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 170
+
+- type: latheRecipe
+  id: ADTMagazineMagnumIncendiary
+  result: ADTMagazineMagnumIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 145
+
+- type: latheRecipe
+  id: ADTMagazineMagnumUranium
+  result: MagazineMagnumUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 145
+    Uranium: 125
+

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml

@@ -7,12 +7,27 @@
   - type: Tag
     tags:
       - MagazineMagnum
+  # Start ADT tweak
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_magnum_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  # End ADT tweak
   - type: BallisticAmmoProvider
     mayTransfer: true
     whitelist:
       tags:
         - CartridgeMagnum
     capacity: 7
+  # Start Adt tweak
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  # End ADT tweak
 
 - type: entity
   id: BaseMagazineMagnumSubMachineGun

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -832,6 +832,10 @@
       - MagazineLightRifleEmpty
       - MagazinePistol
       - MagazinePistolEmpty
+      # Start ADT tweak
+      - ADTMagazineMagnum
+      - ADTMagazineMagnumEmpty
+      # End ADT tweak
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunEmpty
       - MagazinePistolSubMachineGunTopMounted
@@ -876,6 +880,10 @@
       - MagazineLightRifleUranium
       - MagazinePistolIncendiary
       - MagazinePistolUranium
+      # Start ADT tweak
+      - ADTMagazineMagnumIncendiary
+      - ADTMagazineMagnumUranium
+      # Start ADT tweak
       - MagazineRifleIncendiary
       - MagazineRifleUranium
       - MagazineShotgunBeanbag

Resources/Prototypes/Research/arsenal.yml

@@ -28,6 +28,9 @@
   - BoxShotgunIncendiary
   - MagazineRifleIncendiary
   - MagazinePistolIncendiary
+  # Start ADT tweak
+  - ADTMagazineMagnumIncendiary
+  # Start ADT tweak
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
@@ -78,6 +81,9 @@
   recipeUnlocks:
   - MagazineRifleUranium
   - MagazinePistolUranium
+  # Start ADT tweak
+  - ADTMagazineMagnumUranium
+  # Start ADT tweak
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
   - MagazineBoxPistolUranium

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_magnum_mag.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by discord:filokini",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "red-icon"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        }
+    ]
+}