Cull high-velocity ammo (#18656)

Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml

@@ -22,17 +22,6 @@
       - id: MagazinePistolCaselessRifle
         amount: 6
 
-- type: entity
-  name: box of .25 caseless (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazinePistolCaselessRifleHighVelocity
-  description: A box full of .25 caseless high-velocity magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolCaselessRifleHighVelocity
-        amount: 6
-
 - type: entity
   name: box of .25 caseless (practice) magazines
   parent: BoxMagazine
@@ -67,17 +56,6 @@
       - id: MagazineLightRifle
         amount: 6
 
-- type: entity
-  name: box of .30 rifle (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazineLightRifleHighVelocity
-  description: A box full of .30 rifle (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineLightRifleHighVelocity
-        amount: 6
-
 - type: entity
   name: box of .30 rifle (practice) magazines
   parent: BoxMagazine
@@ -126,17 +104,6 @@
       - state: box_science
       - state: omegacart
 
-- type: entity
-  name: box of Vector (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazineMagnumSubMachineGunHighVelocity
-  description: A box full of Vector (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumSubMachineGunHighVelocity
-        amount: 3
-
 - type: entity
   name: box of Vector (practice) magazines
   parent: BoxMagazine
@@ -182,17 +149,6 @@
       - id: MagazinePistol
         amount: 6
 
-- type: entity
-  name: box of pistol .35 auto (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazinePistolHighVelocity
-  description: A box full of pistol .35 auto (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolHighVelocity
-        amount: 6
-
 - type: entity
   name: box of pistol .35 auto (practice) magazines
   parent: BoxMagazine
@@ -226,17 +182,6 @@
       - id: MagazinePistolHighCapacity
         amount: 6
 
-- type: entity
-  name: box of machine pistol .35 auto (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazinePistolHighCapacityHighVelocity
-  description: A box full of machine pistol .35 auto (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolHighCapacityHighVelocity
-        amount: 6
-
 - type: entity
   name: box of machine pistol .35 auto (practice) magazines
   parent: BoxMagazine
@@ -271,17 +216,6 @@
       - id: MagazinePistolSubMachineGun
         amount: 3
 
-- type: entity
-  name: box of SMG .35 auto (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazinePistolSubMachineGunHighVelocity
-  description: A box full of SMG .35 auto (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolSubMachineGunHighVelocity
-        amount: 3
-
 - type: entity
   name: box of SMG .35 auto (practice) magazines
   parent: BoxMagazine
@@ -479,17 +413,6 @@
       - id: MagazineRifle
         amount: 6
 
-- type: entity
-  name: box of .20 rifle (high-velocity) magazines
-  parent: BoxMagazine
-  id: BoxMagazineRifleHighVelocity
-  description: A box full of .20 rifle (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineRifleHighVelocity
-        amount: 6
-
 - type: entity
   name: box of .20 rifle (practice) magazines
   parent: BoxMagazine

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -1,27 +1,22 @@
-- type: vendingMachineInventory
+- type: vendingMachineInventory
   id: AmmoVendInventory
   startingInventory:
     MagazineBoxCaselessRifle: 3
-    MagazineBoxCaselessRifleHighVelocity: 3
     MagazineBoxCaselessRiflePractice: 3
     MagazineBoxCaselessRifleRubber: 3
 
     MagazineBoxLightRifleBig: 3
-    MagazineBoxLightRifleHighVelocity: 3
     MagazineBoxLightRiflePractice: 3
     MagazineBoxLightRifleRubber: 3
 
     MagazineBoxMagnum: 3
-    MagazineBoxMagnumHighVelocity: 3
     MagazineBoxMagnumPractice: 3
     MagazineBoxMagnumRubber: 3
 
     MagazineBoxPistol: 3
-    MagazineBoxPistolHighVelocity: 3
     MagazineBoxPistolPractice: 3
     MagazineBoxPistolRubber: 3
 
     MagazineBoxRifle: 3
-    MagazineBoxRifleHighVelocity: 3
     MagazineBoxRiflePractice: 3
     MagazineBoxRifleRubber: 3

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -100,21 +100,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleHighVelocity
-  name: ammunition box (.25 caseless high-velocity)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hv
-
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRiflePractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml

@@ -59,21 +59,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxLightRifle
-  id: MagazineBoxLightRifleHighVelocity
-  name: ammunition box (.30 rifle high-velocity)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hv
-
 - type: entity
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRiflePractice

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

@@ -38,21 +38,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxMagnum
-  id: MagazineBoxMagnumHighVelocity
-  name: ammunition box (.45 magnum high-velocity)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumHighVelocity
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hv
-
 - type: entity
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnumPractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml

@@ -39,21 +39,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxPistol
-  id: MagazineBoxPistolHighVelocity
-  name: ammunition box (.35 auto high-velocity)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolHighVelocity
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hv
-
 - type: entity
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistolPractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml

@@ -79,21 +79,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxRifle
-  id: MagazineBoxRifleHighVelocity
-  name: ammunition box (.20 rifle high-velocity)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hv
-
 - type: entity
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRiflePractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml

@@ -29,14 +29,6 @@
   - type: CartridgeAmmo
     proto: BulletCaselessRifle
 
-- type: entity
-  id: CartridgeCaselessRifleHighVelocity
-  name: cartridge (.25 caseless high-velocity)
-  parent: BaseCartridgeCaselessRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletCaselessRifleHighVelocity
-
 - type: entity
   id: CartridgeCaselessRiflePractice
   name: cartridge (.25 caseless practice)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml

@@ -28,14 +28,6 @@
   - type: CartridgeAmmo
     proto: BulletLightRifle
 
-- type: entity
-  id: CartridgeLightRifleHighVelocity
-  name: cartridge (.30 rifle high-velocity)
-  parent: BaseCartridgeLightRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletLightRifleHighVelocity
-
 - type: entity
   id: CartridgeLightRiflePractice
   name: cartridge (.30 rifle practice)

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

@@ -28,14 +28,6 @@
   - type: CartridgeAmmo
     proto: BulletMagnum
 
-- type: entity
-  id: CartridgeMagnumHighVelocity
-  name: cartridge (.45 magnum high-velocity)
-  parent: BaseCartridgeMagnum
-  components:
-  - type: CartridgeAmmo
-    proto: BulletMagnumHighVelocity
-
 - type: entity
   id: CartridgeMagnumPractice
   name: cartridge (.45 magnum practice)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

@@ -28,14 +28,6 @@
   - type: CartridgeAmmo
     proto: BulletPistol
 
-- type: entity
-  id: CartridgePistolHighVelocity
-  name: cartridge (.35 auto high-velocity)
-  parent: BaseCartridgePistol
-  components:
-  - type: CartridgeAmmo
-    proto: BulletPistolHighVelocity
-
 - type: entity
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)

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

@@ -28,14 +28,6 @@
   - type: CartridgeAmmo
     proto: BulletRifle
 
-- type: entity
-  id: CartridgeRifleHighVelocity
-  name: cartridge (.20 rifle high-velocity)
-  parent: BaseCartridgeRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletRifleHighVelocity
-
 - type: entity
   id: CartridgeRiflePractice
   name: cartridge (.20 rifle practice)

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

@@ -112,26 +112,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: MagazinePistolCaselessRifleHighVelocity
-  name: "pistol magazine (.25 caseless high-velocity)"
-  parent: BaseMagazinePistolCaselessRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleHighVelocity
-    capacity: 10
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 6
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: MagazinePistolCaselessRiflePractice
   name: "pistol magazine (.25 caseless practice)"
@@ -186,20 +166,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineCaselessRifleHighVelocity
-  name: "magazine (.25 caseless high-velocity)"
-  parent: BaseMagazineCaselessRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineCaselessRiflePractice
   name: "magazine (.25 caseless practice)"
@@ -243,21 +209,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineCaselessRifleShortHighVelocity
-  name: "short magazine (.25 caseless high-velocity)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleHighVelocity
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineCaselessRifleShortPractice
   name: "short magazine (.25 caseless practice)"

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

@@ -68,20 +68,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineLightRifleHighVelocity
-  name: "magazine (.30 rifle high-velocity)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineLightRiflePractice
   name: "magazine (.30 rifle practice)"

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

@@ -45,20 +45,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineMagnumSubMachineGunHighVelocity
-  name: "Vector magazine (.45 magnum High-Velocity)"
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineMagnumSubMachineGunPractice
   name: "Vector magazine (.45 magnum practice)"

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

@@ -142,20 +142,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolHighVelocity
-  name: pistol magazine (.35 auto high-velocity)
-  parent: BaseMagazinePistol
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolPractice
   name: pistol magazine (.35 auto practice)
@@ -198,20 +184,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolHighCapacityHighVelocity
-  name: machine pistol magazine (.35 auto high-velocity)
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolHighCapacityPractice
   name: machine pistol magazine (.35 auto practice)
@@ -260,20 +232,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolSubMachineGunHighVelocity
-  name: SMG magazine (.35 auto high-velocity)
-  parent: BaseMagazinePistolSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolSubMachineGunPractice
   name: SMG magazine (.35 auto practice)

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

@@ -47,20 +47,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineRifleHighVelocity
-  name: "magazine (.20 rifle high-velocity)"
-  parent: BaseMagazineRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineRiflePractice
   name: "magazine (.20 rifle practice)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml

@@ -1,6 +1,6 @@
 - type: entity
   noSpawn: true
-  parent: BaseBulletHighVelocity
+  parent: BaseBullet
   id: BulletAntiMateriel
   name: bullet (.60 anti-materiel)
   components:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 19
 
-- type: entity
-  id: BulletCaselessRifleHighVelocity
-  name: bullet (.25 caseless high-velocity)
-  parent: BaseBulletHighVelocity
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 22
-
 - type: entity
   id: BulletCaselessRiflePractice
   name: bullet (.25 caseless practice)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 19
 
-- type: entity
-  id: BulletLightRifleHighVelocity
-  name: bullet (.20 rifle high-velocity)
-  parent: BaseBulletHighVelocity
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 21
-
 - type: entity
   id: BulletLightRiflePractice
   name: bullet (.20 rifle practice)

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

@@ -9,17 +9,6 @@
       types:
         Piercing: 35
 
-- type: entity
-  id: BulletMagnumHighVelocity
-  name: bullet (.45 magnum high-velocity)
-  parent: BaseBulletHighVelocity
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 44 # 25% increase
-
 - type: entity
   id: BulletMagnumPractice
   name: bullet (.45 magnum practice)
@@ -65,4 +54,4 @@
     damage:
       types:
         Piercing: 26 # 20% decrease
-    ignoreResistances: true
+    ignoreResistances: true

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 16
 
-- type: entity
-  id: BulletPistolHighVelocity
-  name: bullet (.35 auto high-velocity)
-  parent: BaseBulletHighVelocity
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 19
-
 - type: entity
   id: BulletPistolPractice
   name: bullet (.35 auto practice)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 17
 
-- type: entity
-  id: BulletRifleHighVelocity
-  name: bullet (0.20 rifle high-velocity)
-  parent: BaseBulletHighVelocity
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 21
-
 - type: entity
   id: BulletRiflePractice
   name: bullet (0.20 rifle practice)

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

@@ -39,26 +39,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: SpeedLoaderMagnumHighVelocity
-  name: "speed loader (.45 magnum high-velocity)"
-  parent: BaseSpeedLoaderMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumHighVelocity
-  - 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 (.45 magnum practice)"
@@ -117,4 +97,4 @@
     magState: base
     steps: 7
     zeroVisible: false
-  - type: Appearance
+  - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml

@@ -39,25 +39,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: SpeedLoaderPistolHighVelocity
-  name: "speed loader (.35 auto high-velocity)"
-  parent: BaseSpeedLoaderPistol
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolHighVelocity
-  - type: Sprite
-    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: SpeedLoaderPistolPractice
   name: "speed loader (.35 auto practice)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml

@@ -102,7 +102,7 @@
 - type: entity
   id: BulletInstakillMagic
   name: magical lead cylinder
-  parent: BaseBulletHighVelocity
+  parent: BaseBullet
   noSpawn: true
   description: This looks familiar.
   components:
@@ -127,7 +127,7 @@
 
 - type: entity
   id: ProjectileIcicle
-  parent: BaseBulletHighVelocity
+  parent: BaseBullet
   name: Icicle
   description: Brrrrr.
   noSpawn: true

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -89,17 +89,6 @@
         - BulletImpassable
       fly-by: *flybyfixture
 
-- type: entity
-  id: BaseBulletHighVelocity
-  name: base bullet high-velocity
-  parent: BaseBullet
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 17
-
 - type: entity
   id: BaseBulletPractice
   name: base bullet practice
@@ -321,7 +310,7 @@
 - type: entity
   id: BulletKinetic
   name: kinetic bolt
-  parent: BaseBulletHighVelocity
+  parent: BaseBullet
   noSpawn: true
   description: Not too bad, but you still don't want to get hit by it.
   components:
@@ -347,7 +336,7 @@
 - type: entity
   id: BulletCharge
   name: charge bolt
-  parent: BaseBulletHighVelocity
+  parent: BaseBullet
   noSpawn: true
   description: Marks a target for additional damage.
   components:

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

@@ -483,14 +483,6 @@
       - MagazineBoxMagnumRubber
       - MagazineBoxRifleRubber
       - MagazineBoxLightRifleRubber
-      - CartridgePistolHighVelocity
-      - CartridgeMagnumHighVelocity
-      - CartridgeLightRifleHighVelocity
-      - CartridgeRifleHighVelocity
-      - MagazineBoxPistolHighVelocity
-      - MagazineBoxMagnumHighVelocity
-      - MagazineBoxLightRifleHighVelocity
-      - MagazineBoxRifleHighVelocity
       - ShellShotgunIncendiary
       - CartridgePistolIncendiary
       - CartridgeMagnumIncendiary

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -304,62 +304,6 @@
     Steel: 350
     Plastic: 600
 
-- type: latheRecipe
-  id: CartridgePistolHighVelocity
-  result: CartridgePistolHighVelocity
-  completetime: 2
-  materials:
-    Steel: 20
-
-- type: latheRecipe
-  id: CartridgeMagnumHighVelocity
-  result: CartridgeMagnumHighVelocity
-  completetime: 2
-  materials:
-    Steel: 40
-
-- type: latheRecipe
-  id: CartridgeLightRifleHighVelocity
-  result: CartridgeLightRifleHighVelocity
-  completetime: 2
-  materials:
-    Steel: 40
-
-- type: latheRecipe
-  id: CartridgeRifleHighVelocity
-  result: CartridgeRifleHighVelocity
-  completetime: 2
-  materials:
-    Steel: 30
-
-- type: latheRecipe
-  id: MagazineBoxPistolHighVelocity
-  result: MagazineBoxPistolHighVelocity
-  completetime: 5
-  materials:
-    Steel: 1250
-
-- type: latheRecipe
-  id: MagazineBoxMagnumHighVelocity
-  result: MagazineBoxMagnumHighVelocity
-  completetime: 5
-  materials:
-    Steel: 2450
-
-- type: latheRecipe
-  id: MagazineBoxLightRifleHighVelocity
-  result: MagazineBoxLightRifleHighVelocity
-  completetime: 5
-  materials:
-    Steel: 2050
-
-- type: latheRecipe
-  id: MagazineBoxRifleHighVelocity
-  result: MagazineBoxRifleHighVelocity
-  completetime: 5
-  materials:
-    Steel: 1850
-
 - type: latheRecipe
   id: ShellShotgunIncendiary
   result: ShellShotgunIncendiary

Resources/Prototypes/Research/arsenal.yml

@@ -87,25 +87,6 @@
 
 # Tier 2
 
-- type: technology
-  id: OptimizedBallistics
-  name: research-technology-optimized-ballistics
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
-    state: hvdisplay
-  discipline: Arsenal
-  tier: 2
-  cost: 7500
-  recipeUnlocks:
-  - CartridgePistolHighVelocity
-  - CartridgeMagnumHighVelocity
-  - CartridgeLightRifleHighVelocity
-  - CartridgeRifleHighVelocity
-  - MagazineBoxPistolHighVelocity
-  - MagazineBoxMagnumHighVelocity
-  - MagazineBoxLightRifleHighVelocity
-  - MagazineBoxRifleHighVelocity
-
 - type: technology
   id: ConcentratedLaserWeaponry
   name: research-technology-concentrated-laser-weaponry

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json

@@ -25,9 +25,6 @@
     {
       "name": "mag10-1"
     },
-    {
-      "name": "hv"
-    },
     {
       "name": "practice"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json

@@ -19,9 +19,6 @@
     {
       "name": "magb-1"
     },
-    {
-      "name": "hv"
-    },
     {
       "name": "incendiary"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json

@@ -19,9 +19,6 @@
     {
       "name": "cap"
     },
-    {
-      "name": "hv"
-    },
     {
       "name": "incendiary"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json

@@ -13,12 +13,6 @@
     {
       "name": "mag-1"
     },
-    {
-      "name": "hv"
-    },
-    {
-      "name": "hvdisplay"
-    },
     {
       "name": "incendiarydisplay"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json

@@ -19,9 +19,6 @@
     {
       "name": "magb-1"
     },
-    {
-      "name": "hv"
-    },
     {
       "name": "incendiary"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },
@@ -26,4 +23,4 @@
             "name": "mag-1"
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },
@@ -26,4 +23,4 @@
             "name": "mag-1"
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

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

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

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

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

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

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "high_velocity"
-        },
         {
             "name": "practice"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json

@@ -31,24 +31,6 @@
         {
             "name": "base-6"
         },
-        {
-            "name": "high-velocity-1"
-        },
-        {
-            "name": "high-velocity-2"
-        },
-        {
-            "name": "high-velocity-3"
-        },
-        {
-            "name": "high-velocity-4"
-        },
-        {
-            "name": "high-velocity-5"
-        },
-        {
-            "name": "high-velocity-6"
-        },
         {
             "name": "practice-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json

@@ -28,24 +28,6 @@
         {
             "name": "base-6"
         },
-        {
-            "name": "high-velocity-1"
-        },
-        {
-            "name": "high-velocity-2"
-        },
-        {
-            "name": "high-velocity-3"
-        },
-        {
-            "name": "high-velocity-4"
-        },
-        {
-            "name": "high-velocity-5"
-        },
-        {
-            "name": "high-velocity-6"
-        },
         {
             "name": "practice-1"
         },
@@ -83,4 +65,4 @@
             "name": "rubber-6"
         }
     ]
-}
+}

Resources/migration.yml

@@ -1,4 +1,4 @@
-# basic dictionary that maps old entity ids to new entity ids.
+# basic dictionary that maps old entity ids to new entity ids.
 # an empty or "null" string results in the entity getting deleted.
 
 # e.g., you can swap all walls with windows and delete all tables by adding lines like:
@@ -38,7 +38,6 @@ BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice
 BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber
 
 MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun
-MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity
 MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice
 MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber
 WeaponSubMachineGunVector: WeaponSubMachineGunDrozd
@@ -118,3 +117,38 @@ ClothingEyesGlassesBeer: ClothingEyesHudBeer
 # 2023-08-01
 lantern: Lantern
 lanternextrabright: LanternFlash
+
+# 2023-08-04
+BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle
+BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun
+BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle
+BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity
+BoxMagazinePistolHighVelocity: BoxMagazinePistol
+BoxMagazinePistolSubMachineGunHighVelocity: BoxMagazinePistolSubMachineGun
+BoxMagazineRifleHighVelocity: BoxMagazineRifle
+BulletCaselessRifleHighVelocity: BulletCaselessRifle
+BulletLightRifleHighVelocity: BulletLightRifle
+BulletMagnumHighVelocity: BulletMagnum
+BulletPistolHighVelocity: BulletPistol
+BulletRifleHighVelocity: BulletRifle
+CartridgeCaselessRifleHighVelocity: CartridgeCaselessRifle
+CartridgeLightRifleHighVelocity: CartridgeLightRifle
+CartridgeMagnumHighVelocity: CartridgeMagnum
+CartridgePistolHighVelocity: CartridgePistol
+CartridgeRifleHighVelocity: CartridgeRifle
+MagazineBoxCaselessRifleHighVelocity: MagazineBoxCaselessRifle
+MagazineBoxLightRifleHighVelocity: MagazineBoxLightRifle
+MagazineBoxMagnumHighVelocity: MagazineBoxMagnum
+MagazineBoxPistolHighVelocity: MagazineBoxPistol
+MagazineBoxRifleHighVelocity: MagazineBoxRifle
+MagazineCaselessRifleHighVelocity: MagazineCaselessRifle
+MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort
+MagazineLightRifleHighVelocity: MagazineLightRifle
+MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun
+MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle
+MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity
+MagazinePistolHighVelocity: MagazinePistol
+MagazinePistolSubMachineGunHighVelocity: MagazinePistolSubMachineGun
+MagazineRifleHighVelocity: MagazineRifle
+SpeedLoaderMagnumHighVelocity: SpeedLoaderMagnum
+SpeedLoaderPistolHighVelocity: SpeedLoaderPistol