Merge pull request #13 from Vault-Overseers/master

123
Vonsant · Jul 7, 2024 · 2c19586 · 2c19586
2 parents 1b9175f + cbe96c6
commit 2c19586
Show file tree

Hide file tree

Showing 809 changed files with 4,330 additions and 222 deletions.
diff --git a/Resources/Locale/en-US/_Nuclear14/department.ftl b/Resources/Locale/en-US/_Nuclear14/department.ftl
@@ -15,9 +15,10 @@ department-BrotherhoodMidwest-description = Midwest branch of the Brotherhood of
 department-BrotherhoodWashington-description = Washington branch of the Brotherhood of Steel
 department-CaravanCompany-description = The local Caravan Company responsible for import and export of goods.
 department-NCR-description = A settler detachment sent by the New California Republic
+department-NCRRanger-description = A special detachment of NCR which overtake near impossible duties to aid New California Republic in their victory over slavery and raiders.
 department-Tribe-description = A local tribal group trying to get by.
 department-Vault-description = The local Vault Dwellers
 department-Wastelander-description = Wastelanders living in the pacific northwest.
 department-Townsfolk-description = Townsfolk from a local town trying to keep it civilised.
 department-Followers-description = Followers of the Apocalypse on a humanitarian mission.
-department-Zetan-description = Zetan abductors here to probe you!
+department-Zetan-description = Zetan abductors here to probe you!
diff --git a/Resources/Prototypes/Maps/N14/sunnyvale.yml b/Resources/Prototypes/Maps/N14/sunnyvale.yml
@@ -20,26 +20,26 @@
             WastelandFarmer: [ 2, 2 ]
             WastelandChaplain: [ 3, 3 ]
             WastelandBartender: [ 3, 3 ]
-            TribalElder: [ 1, 0 ]
+            TribalElder: [ 1, 1 ]
             Tribal: [ 2, 2 ]
-            TribalFarmer: [ 2, 1 ]
-            TribalHealer: [ 2, 0 ]
-            TownMayor: [ 1, 0 ]
-            TownSheriff: [ 1, 0 ]
+            TribalFarmer: [ 2, 2 ]
+            TribalHealer: [ 2, 2 ]
+            TownMayor: [ 1, 1 ]
+            TownSheriff: [ 1, 1 ]
             TownDeputy: [ 1, 1 ]
             TownDoctor: [ 1, 1 ]
             TownMechanic: [ 1, 1 ]
             TownShopkeeper: [ 1, 1 ]
             Townsperson: [ 2, 2 ]
-            NCROfficer: [ 1, 0 ]
-            NCRRangerVeteran: [ 1, 0 ]
-            NCRRanger: [ 1, 0 ]
+            NCROfficer: [ 1, 1 ]
+            NCRRangerVeteran: [ 1, 1 ]
+            NCRRanger: [ 2, 1 ]
             NCRNCO: [ 1, 1 ]
-            NCRQM: [ 1, 0 ]
-            NCRDoctor: [ 1, 0 ] 
+            NCRQM: [ 1, 1 ]
+            NCRDoctor: [ 1, 1 ] 
             NCRSoldier: [ 2, 2 ]
-            NCRCadet: [ 2, 0 ]
-            CaravanLeader: [ 1, 0 ]
+            NCRCadet: [ 2, 2 ]
+            CaravanLeader: [ 1, 1 ]
             CaravanTrader: [ 1, 1 ]
             CaravanGuard: [ 2, 1 ]
             # BoSWashingtonCommander: [ 1, 0 ]
@@ -51,4 +51,4 @@
             # BoSMidPaladin: [ 2, 0 ]
             # BoSMidKnight: [ 2, 0 ]
             # BoSMidScribe: [ 2, 0 ]
-            # BoSMidSquire: [ 2, 1 ]
+            # BoSMidSquire: [ 2, 1 ]
diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml
@@ -1,5 +1,5 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-  - Wave1
+  #- Wave1
   - Sunnyvale
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -27,7 +27,7 @@
         - id: N14BoxPlasticFilledWastelander
         - id: AcousticGuitarInstrument
         - id: SaxophoneInstrument
-        
+
 # Caravan
 - type: entity
   noSpawn: true
@@ -64,7 +64,7 @@
         - id: Magazine45SubMachineGun
         - id: Magazine45SubMachineGun
         - id: N14Weapon45SMG
-        
+
 # Military
 - type: entity
   noSpawn: true
@@ -73,17 +73,16 @@
   components:
     - type: StorageFill
       contents:
-        - id: N14BoxPlasticFilledWastelander
-        - id: N14CombatKnife
-
+        - id: N14BoxPlasticFilledMilitary
+
 - type: entity
   noSpawn: true
   parent: N14ClothingBackpackNCR
   id: N14ClothingBackpackNCRFilled
   components:
     - type: StorageFill
       contents:
-        - id: N14BoxPlasticFilledWastelander
+        - id: N14BoxPlasticFilledMilitaryNCR
         - id: N14CombatKnife
 
 # Town people
@@ -150,15 +149,15 @@
       contents:
         - id: N14BoxPlasticFilledWastelander
         - id: N14MagazinePistol10mm
-        - id: N14MagazinePistol10mm           
-        
+        - id: N14MagazinePistol10mm
+
 - type: entity
   noSpawn: true
   parent: N14ClothingBackpackVaultBlue
   id: N14ClothingBackpackVaultSecurityFilled
   components:
     - type: StorageFill
       contents:
-        - id: N14BoxPlasticFilledWastelander
+        - id: N14BoxPlasticFilledMilitary
+        - id: N14MagazinePistol10mm
         - id: N14MagazinePistol10mm
-        - id: N14MagazinePistol10mm 
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -27,7 +27,7 @@
       - id: N14BoxPlasticFilledWastelander
       - id: AcousticGuitarInstrument
       - id: SaxophoneInstrument
-        
+
 # Caravan
 - type: entity
   noSpawn: true
@@ -37,7 +37,7 @@
   - type: StorageFill
     contents:
       - id: N14BoxPlasticFilledWastelander
-        
+
 # Military
 - type: entity
   noSpawn: true
@@ -46,9 +46,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: N14BoxPlasticFilledWastelander
-      - id: N14CombatKnife
-
+      - id: N14BoxPlasticFilledMilitary
+
 # Townsfolk
 - type: entity
   noSpawn: true
@@ -70,7 +69,7 @@
       - id: N14CombatKnife
       - id: MagazineBox44
       - id: MagazineBox308
-      
+
 - type: entity
   noSpawn: true
   parent: N14ClothingBackpackDuffelMilitary
@@ -81,4 +80,4 @@
       - id: N14BoxPlasticFilledWastelander
       - id: N14CombatKnife
       - id: MagazineBox10mm
-      - id: MagazineBox44
+      - id: MagazineBox44
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -28,7 +28,7 @@
       - id: N14BoxPlasticFilledWastelander
       - id: AcousticGuitarInstrument
       - id: SaxophoneInstrument
-        
+
 # Caravan
 - type: entity
   noSpawn: true
@@ -38,7 +38,7 @@
   - type: StorageFill
     contents:
       - id: N14BoxPlasticFilledWastelander
-        
+
 # Military
 - type: entity
   noSpawn: true
@@ -47,8 +47,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: N14BoxPlasticFilledWastelander
-      - id: N14CombatKnife
+      - id: N14BoxPlasticFilledMilitary
 
 # NCR
 - type: entity
@@ -58,9 +57,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: N14BoxPlasticFilledWastelander
+      - id: N14BoxPlasticFilledMilitaryNCR
       - id: N14CombatKnife
-        
+
 # Townsfolk
 - type: entity
   noSpawn: true
@@ -82,7 +81,7 @@
       - id: N14CombatKnife
       - id: MagazineBox10mm
       - id: MagazineBox44
-        
+
 - type: entity
   noSpawn: true
   parent: N14ClothingBackpackSatchelMilitary
@@ -94,7 +93,7 @@
       - id: N14CombatKnife
       - id: MagazineBox44
       - id: MagazineBox308
-      
+
 # Tribal
 - type: entity
   noSpawn: true
@@ -103,4 +102,4 @@
   components:
   - type: StorageFill
     contents:
-      - id: N14BoxPlasticFilledWastelander
+      - id: N14BoxPlasticFilledWastelander
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Boxes/general.yml
@@ -23,3 +23,59 @@
           amount: 1
         - id: Gauze
           amount: 1
+
+- type: entity
+  name: military box
+  parent: N14BoxPlastic
+  id: N14BoxPlasticFilledMilitary
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14Stimpak
+          prob: 0.7
+          orGroup: RandomMed
+        - id: N14ChemicalSyringeAntidote
+          prob: 0.2
+          orGroup: RandomMed
+        - id: N14SuperStimpak
+          prob: 0.1
+          orGroup: RandomMed
+        - id: Gauze
+          amount: 1
+        - id: N14RadXPill
+          amount: 1
+        - id: N14CurrencyCap
+          amount: 0
+          maxAmount: 100
+          prob: 0.5
+          orGroup: Currency
+        - id: Flare
+          amount: 2
+
+- type: entity
+  name: military box
+  parent: N14BoxPlastic
+  id: N14BoxPlasticFilledMilitaryNCR
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14Stimpak
+          prob: 0.7
+          orGroup: RandomMed
+        - id: N14ChemicalSyringeAntidote
+          prob: 0.2
+          orGroup: RandomMed
+        - id: N14SuperStimpak
+          prob: 0.1
+          orGroup: RandomMed
+        - id: Gauze
+          amount: 1
+        - id: N14RadXPill
+          amount: 1
+        - id: N14CurrencyNCRDollar
+          amount: 0
+          maxAmount: 100
+          prob: 0.5
+          orGroup: Currency
+        - id: Flare
+          amount: 2
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/misc.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: N14ClothingBootsCombatFilled
+  parent: N14ClothingBootsCombat
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - N14CombatKnife
+
+- type: entity
+  id: N14ClothingBootsCombatMK2Filled
+  parent: N14ClothingBootsCombatMK2
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - KukriKnife
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
@@ -401,6 +401,27 @@
     tags:
     - HidesHair
 
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMK2
+  id: N14ClothingHeadHatRangerHelmetEliteModif
+  name: modified ranger combat helmet
+  description: A thicker than average helmet worn by rangers out in the field. This one appears have its mask welded to helmet with some unique modifications.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.6
+        Piercing: 0.7
+        Heat: 0.6
+  - type: Tag
+    tags:
+    - HidesHair
+
 # midwest BoS
 - type: entity
   parent: N14ClothingHeadHatBaseHelmetMetal