From a5facaee78a162a4c82c1bd74582c8cd1bea4bb0 Mon Sep 17 00:00:00 2001
From: Peptide90 <User94636@protonmail.com>
Date: Sun, 30 Jun 2024 11:21:41 +0100
Subject: [PATCH] adds two new safe loot tables and spawns

---
 .../Catalog/Fills/storage_fills_rp.yml        | 95 +++++++++++++++++++
 .../Entities/Objects/Misc/currency.yml        | 33 +++++++
 .../Entities/Structures/Storage/furniture.yml | 10 ++
 3 files changed, 138 insertions(+)

diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/storage_fills_rp.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/storage_fills_rp.yml
index cd2548f9de4..3e72ee36cf3 100644
--- a/Resources/Prototypes/Nuclear14/Catalog/Fills/storage_fills_rp.yml
+++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/storage_fills_rp.yml
@@ -1850,3 +1850,98 @@
           prob: 0.05
         - id: N14FloraWildXanderRootClippingSeed
           prob: 0.05
+
+- type: entity
+  abstract: true
+  id: N14StorageFillCurrency
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14CurrencyCap10
+          prob: 0.4
+          orGroup: Currency
+        - id: N14CurrencyCap50
+          prob: 0.3
+          orGroup: Currency
+        - id: N14CurrencyCap100
+          prob: 0.2
+          orGroup: Currency
+        - id: N14CurrencyCap500
+          prob: 0.05
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney10
+          prob: 0.4
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney50
+          prob: 0.3
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney100
+          prob: 0.2
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney500
+          prob: 0.05
+          orGroup: Currency
+        - id:  N14CurrencyNCRDollar10
+          prob: 0.4
+          orGroup: Currency
+        - id:  N14CurrencyNCRDollar50
+          prob: 0.3
+          orGroup: Currency
+        - id:  N14CurrencyNCRDollar100
+          prob: 0.2
+          orGroup: Currency
+        - id:  N14CurrencyNCRDollar500
+          prob: 0.05
+          orGroup: Currency
+        - id:  N14CurrencyLegionAureus10
+          prob: 0.4
+          orGroup: Currency
+        - id:  N14CurrencyLegionAureus50
+          prob: 0.3
+          orGroup: Currency
+        - id:  N14CurrencyLegionAureus100
+          prob: 0.2
+          orGroup: Currency
+        - id:  N14CurrencyLegionDenarius10
+          prob: 0.4
+          orGroup: Currency
+        - id:  N14CurrencyLegionDenarius50
+          prob: 0.3
+          orGroup: Currency
+        - id:  N14CurrencyLegionDenarius100
+          prob: 0.2
+          orGroup: Currency
+          
+- type: entity
+  abstract: true
+  id: N14StorageFillSafePrewar
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14CurrencyCap10
+          prob: 0.4
+          orGroup: Currency
+        - id: N14CurrencyCap50
+          prob: 0.3
+          orGroup: Currency
+        - id: N14CurrencyCap100
+          prob: 0.2
+          orGroup: Currency
+        - id: N14CurrencyCap500
+          prob: 0.05
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney10
+          prob: 0.4
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney50
+          prob: 0.3
+          orGroup: Currency
+        - id: N14CurrencyPrewarMoney100
+          prob: 0.2
+          orGroup: Currency
+        - id: N14IDPassport
+          prob: 0.2
+        - id: N14IDDoctor
+          prob: 0.2
+        - id: IngotGold1
+          prob: 0.2
\ No newline at end of file
diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml
index b77f723e0d8..af7cb09a12f 100644
--- a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml
+++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml
@@ -110,6 +110,17 @@
     state: moneybag
   - type: Stack
     count: 100
+    
+- type: entity
+  parent: N14CurrencyCap
+  id: N14CurrencyCap500
+  suffix: 500
+  components:
+  - type: Icon
+    sprite: Nuclear14/Objects/Misc/storage.rsi
+    state: moneybag
+  - type: Stack
+    count: 500
 
 # Pre-War
 - type: entity
@@ -173,6 +184,17 @@
   - type: Stack
     count: 100
     
+- type: entity
+  parent: N14CurrencyPrewar
+  id: N14CurrencyPrewarMoney500
+  suffix: 500
+  components:
+  - type: Icon
+    sprite: Nuclear14/Objects/Misc/currency.rsi
+    state: prewar3
+  - type: Stack
+    count: 500
+    
 # NCR Dollars
 - type: entity
   parent: N14CurrencyCap
@@ -235,6 +257,17 @@
   - type: Stack
     count: 100
     
+- type: entity
+  parent: N14CurrencyNCRDollar
+  id: N14CurrencyNCRDollar500
+  suffix: 500
+  components:
+  - type: Icon
+    sprite: Nuclear14/Objects/Misc/currency.rsi
+    state: ncr3
+  - type: Stack
+    count: 500
+    
 # Legion Aureus
 - type: entity
   parent: N14CurrencyCap
diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/furniture.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/furniture.yml
index fbe453a5fec..e4a6f3adf02 100644
--- a/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/furniture.yml
+++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/furniture.yml
@@ -42,6 +42,16 @@
   parent: [ N14ClosetSafe, N14BaseMilitaryStorageFill ]
   id: N14LootClosetSafe
   suffix: Loot, Random Military
+  
+- type: entity
+  parent: [ N14ClosetSafe, N14StorageFillCurrency ]
+  id: N14LootClosetSafeCurrency
+  suffix: Loot, Currency one stack random
+  
+- type: entity
+  parent: [ N14ClosetSafe, N14StorageFillSafePrewar ]
+  id: N14LootClosetSafePrewar
+  suffix: Loot, safe pre-war
     
 - type: entity
   parent: N14ClosetSafe