Expedition Loots Balance Pass (Again)

Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml

@@ -44,7 +44,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice # Frontier
-    price: 200 # Frontier
+    price: 400 # Frontier
 
 - type: entity
   parent: BaseVendingMachineRestock

Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml

@@ -1,7 +1,7 @@
 # Registered (legal) weapon crates
 - type: entity
   id: CrateArmoryRifleGestio
-  parent: CrateWeaponSecure
+  parent: CrateFirearmsSecure
   name: gestio rifle crate
   description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open.
   components:
@@ -15,7 +15,7 @@
 # Contraband (unregistered) weaponry crates for expeditions
 - type: entity
   id: CrateArmorySMGExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: SMG crate
   description: Contains two high-powered, SMGs with four mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -29,7 +29,7 @@
 
 - type: entity
   id: CrateArmoryShotgunExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: shotgun crate
   description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -43,7 +43,7 @@
 
 - type: entity
   id: CrateArmoryLaserExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: lasers crate
   description: Contains three standard-issue laser carbines. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -55,7 +55,7 @@
 
 - type: entity
   id: CrateArmoryEnergyGunExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: energy guns crate
   description: Contains three energy guns. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -67,7 +67,7 @@
 
 - type: entity
   id: CrateArmoryPistolsExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: pistols crate
   description: Contains two standard NT pistols with four mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -81,7 +81,7 @@
 
 - type: entity
   id: CrateArmoryRifleGestioExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: gestio rifle crate
   description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -95,7 +95,7 @@
 
 - type: entity
   id: CrateArmoryRifleNovaliteC1Expedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: novalite rifle crate
   description: Contains two civilian grade rifles with six low capacity clips. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -106,3 +106,262 @@
         amount: 2
       - id: MagazineNovaliteC1
         amount: 6
+
+# Ammo crates
+## .20 rifle
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal20
+  id: CrateAmmoBoxLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal20
+  id: CrateAmmoBoxBigLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber20
+  id: CrateAmmoBoxRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigRubber20
+  id: CrateAmmoBoxBigRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice20
+  id: CrateAmmoBoxPractice20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary20
+  id: CrateAmmoBoxIncendiary20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium20
+  id: CrateAmmoBoxUranium20
+  noSpawn: true
+
+## .30 rifle
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal30
+  id: CrateAmmoBoxLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal30
+  id: CrateAmmoBoxBigLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber30
+  id: CrateAmmoBoxRubber30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice30
+  id: CrateAmmoBoxPractice30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary30
+  id: CrateAmmoBoxIncendiary30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium30
+  id: CrateAmmoBoxUranium30
+  noSpawn: true
+
+## .35 pistol
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal35
+  id: CrateAmmoBoxLethal35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber35
+  id: CrateAmmoBoxRubber35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice35
+  id: CrateAmmoBoxPractice35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary35
+  id: CrateAmmoBoxIncendiary35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium35
+  id: CrateAmmoBoxUranium35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxEmp35
+  id: CrateAmmoBoxEmp35
+  noSpawn: true
+
+## .25 caseless
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal25
+  id: CrateAmmoBoxLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal25
+  id: CrateAmmoBoxBigLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber25
+  id: CrateAmmoBoxRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigRubber25
+  id: CrateAmmoBoxBigRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice25
+  id: CrateAmmoBoxPractice25
+  noSpawn: true
+
+## Shotgun
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethalShotgun
+  id: CrateAmmoBoxLethalShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubberShotgun
+  id: CrateAmmoBoxRubberShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPracticeShotgun
+  id: CrateAmmoBoxPracticeShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiaryShotgun
+  id: CrateAmmoBoxIncendiaryShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUraniumShotgun
+  id: CrateAmmoBoxUraniumShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxSlugShotgun
+  id: CrateAmmoBoxSlugShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxFlareShotgun
+  id: CrateAmmoBoxFlareShotgun
+  noSpawn: true
+
+## .45 ammo
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal45
+  id: CrateAmmoBoxLethal45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber45
+  id: CrateAmmoBoxRubber45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice45
+  id: CrateAmmoBoxPractice45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary45
+  id: CrateAmmoBoxIncendiary45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium45
+  id: CrateAmmoBoxUranium45
+  noSpawn: true