From 67a34fd13ba29ee428ae989e911c85e8fc713b67 Mon Sep 17 00:00:00 2001
From: ninruB <38016303+asperger-sind@users.noreply.github.com>
Date: Wed, 16 Nov 2022 16:41:47 +0200
Subject: [PATCH] Strong revolvers no way (#12538)

---
 .../Prototypes/Catalog/uplink_catalog.yml     |  2 +-
 .../Guns/Ammunition/Cartridges/magnum.yml     | 16 ++++++++
 .../Guns/Ammunition/Projectiles/magnum.yml    | 22 ++++++++++
 .../Guns/Ammunition/SpeedLoaders/magnum.yml   | 40 +++++++++++++++++++
 .../Weapons/Guns/Revolvers/revolvers.yml      | 16 ++++----
 Resources/Prototypes/tags.yml                 |  6 +++
 6 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 933f792e62..ffab605f7d 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -13,7 +13,7 @@
 - type: listing
   id: UplinkRevolverPython
   name: Python
-  description: A loud and deadly revolver. Uses .40 Magnum.
+  description: A loud and deadly revolver. Uses .45 Magnum.
   productEntity: WeaponRevolverPython
   cost:
     Telecrystal: 8
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index aa82621138..ecdf03a550 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -37,6 +37,22 @@
   - type: CartridgeAmmo
     proto: BulletMagnumHighVelocity
 
+- type: entity
+  id: CartridgeMagnumHC
+  name: cartridge (.45 magnum)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumHC
+
+- type: entity
+  id: CartridgeMagnumHCHighVelocity
+  name: cartridge (.45 magnum high-velocity)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumHCHighVelocity
+
 - type: entity
   id: CartridgeMagnumPractice
   name: cartridge (.40 magnum practice)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 3781df4017..2e7dd4c8ab 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -20,6 +20,28 @@
       types:
         Piercing: 24
 
+- type: entity
+  id: BulletMagnumHC
+  name: bullet (.45 magnum)
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 34
+
+- type: entity
+  id: BulletMagnumHCHighVelocity
+  name: bullet (.45 magnum high-velocity)
+  parent: BaseBulletHighVelocity
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 36
+
 - type: entity
   id: BulletMagnumPractice
   name: bullet (.40 magnum practice)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
index 5abb3761a5..fece77f312 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -59,6 +59,46 @@
     zeroVisible: false
   - type: Appearance
 
+- type: entity
+  id: SpeedLoaderMagnumHC
+  name: "speed loader (.45 magnum)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: BulletMagnumHC
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: base
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderMagnumHCHighVelocity
+  name: "speed loader (.45 magnum high-velocity)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: BulletMagnumHCHighVelocity
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: high-velocity-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: high-velocity
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
 - type: entity
   id: SpeedLoaderMagnumPractice
   name: "speed loader (.40 magnum practice)"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 3d76916e56..759bedefce 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -29,9 +29,9 @@
   - type: RevolverAmmoProvider
     whitelist:
       tags:
-        - CartridgeMagnum
-        - SpeedLoaderMagnum
-    proto: CartridgeMagnum
+        - CartridgeMagnumHC
+        - SpeedLoaderMagnumHC
+    proto: CartridgeMagnumHC
     capacity: 7
     chambers: [ True, True, True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null, null, null ]
@@ -46,7 +46,7 @@
   name: Deckard
   parent: BaseWeaponRevolver
   id: WeaponRevolverDeckard
-  description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .40 magnum ammo.
+  description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
@@ -70,7 +70,7 @@
   name: Inspector
   parent: BaseWeaponRevolver
   id: WeaponRevolverInspector
-  description: A detective's best friend. Uses .40 magnum ammo.
+  description: A detective's best friend. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
@@ -85,7 +85,7 @@
   name: Mateba
   parent: BaseWeaponRevolver
   id: WeaponRevolverMateba
-  description: The iconic sidearm of the dreaded death squads. Uses .40 magnum ammo.
+  description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
@@ -99,7 +99,7 @@
   name: Predator
   parent: BaseWeaponRevolver
   id: WeaponRevolverPython
-  description: A robust revolver favoured by Syndicate agents. Uses .40 magnum ammo.
+  description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
@@ -110,7 +110,7 @@
   name: pirate revolver
   parent: BaseWeaponRevolver
   id: WeaponRevolverPirate
-  description: An odd, muzzle-loading revolver, favoured by pirate crews. Uses .40 magnum ammo.
+  description: An odd, muzzle-loading revolver, favoured by pirate crews. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 745aa26fb9..fb1bab7c11 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -96,6 +96,9 @@
 - type: Tag
   id: CartridgeMagnum
 
+- type: Tag
+  id: CartridgeMagnumHC
+
 - type: Tag
   id: CartridgePistol
 
@@ -504,6 +507,9 @@
 - type: Tag
   id: SpeedLoaderMagnum
 
+- type: Tag
+  id: SpeedLoaderMagnumHC
+
 - type: Tag
   id: SpeedLoaderPistol