Merge remote-tracking branch 'upstream/master' into up30102024

Resources/Locale/en-US/_Nuclear14/construction.ftl

@@ -12,4 +12,5 @@ lathe-category-shields = Shields
 lathe-category-weapons-melee = Melee
 lathe-category-weapons-pistols = Pistols
 lathe-category-weapons-rifles = Rifles
-lathe-category-weapons-smgs = Smgs
+lathe-category-weapons-smgs = Smgs
+lathe-category-identification = Identification

Resources/Locale/en-US/_Nuclear14/job-names.ftl

@@ -33,18 +33,18 @@ job-description-caravan-guard = Protect the caravan company traders, their lives
 # NCR
 job-name-ncr-cadet = NCR Cadet
 job-description-ncr-cadet = Show your officers that youre ready to become a private of the NCR army.
-job-name-ncr-doctor = NCR Doctor
-job-description-ncr-doctor = Treat the troopers and offer services to the wasteland people.
-job-name-ncr-mp = NCR Military Police
-job-description-ncr-mp = Protect the camp and make sure the soldiers behave correctly.
-job-name-ncr-qm = NCR Quartermaster
-job-description-ncr-qm = Protect the armory and trade looted equipment with any wastelander.
-job-name-ncr-nco = NCR NCO
-job-description-ncr-nco = A non commissioned officer in the NCR military. Lead a squad to protect the NCRs interests in the region.
-job-name-ncr-officer = NCR Officer
-job-description-ncr-officer = A local leader in the NCR military. Fulfil your missions by coordinating your military forces in the area.
+job-name-ncr-medic = NCR Medic
+job-description-ncr-medic = Treat the troopers and offer services to the wasteland people.
+job-name-ncr-sgt = NCR Sergeant
+job-description-ncr-sgt = A non commissioned officer in the NCR military. Lead a squad to protect the NCRs interests in the region. In the absence of a lieutenant, lead the base.
+job-name-ncr-lt = NCR Lieutenant
+job-description-ncr-lt = The local leader of the NCR military. Fulfil your missions by coordinating your military forces in the area. Organise your Sergeants.
 job-name-ncr-soldier = NCR Soldier
-job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow an NCO on missions.
+job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow a SGT on missions.
+job-name-ncr-engineer = NCR Engineer
+job-description-ncr-soldier = The backbone of any squad. Repair equipment, establish defenses, and follow a SGT on missions.
+job-name-ncr-ws = NCR Weapon Specalist
+job-description-ncr-ws = The fire support of any squad. Lay down supportive fire and use special weapons inaccessible to others. Follow a SGT on missions.
 job-name-ncr-ranger = NCR Ranger
 job-description-ncr-ranger = The most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic.
 job-name-ncr-ranger-veteran = NCR Ranger Veteran

Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl

@@ -50,6 +50,12 @@ undecided-loadout-category-medic-description =
     Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG,
     4 9mm SMG magazines, 1 combat knife, and a C ration MRE.
 
+undecided-loadout-category-engineer-name = Engineer Kit
+undecided-loadout-category-engineer-description =
+    A crate containing all a NCR pointman needs to patrol on the wasteland.
+    Includes 1 NCR leather vest, 1 Filled Toolbelt, 1 shotgun, 1 box of 12 gauge,
+    1 9mm pistol, 2 9mm magazines, 1 combat knife, and a C ration MRE.
+
 undecided-loadout-category-special-rifleman-name = Special Rifleman Kit
 undecided-loadout-category-special-rifleman-description =
     A crate containing advance weaponry for high rank troops and veterans.

Resources/Migrations/N14Migrations.yml

@@ -81,4 +81,10 @@ N14IDBrotherhoodWashingtonHolotagCaptain: N14IDBrotherhoodWashingtonHolotagPalad
 N14SpawnPointBoSWashingtonRecruit: N14SpawnPointBoSWashingtonInitiate
 N14SpawnPointBoSWashingtonResearcher: N14SpawnPointBoSWashingtonScribe
 N14SpawnPointBoSWashingtonSoldier: N14SpawnPointBoSWashingtonKnight
-N14SpawnPointBoSWashingtonCaptain: N14SpawnPointBoSWashingtonPaladin
+N14SpawnPointBoSWashingtonCaptain: N14SpawnPointBoSWashingtonPaladin
+
+# NCR Renamed Spawner Fixes
+N14SpawnPointNCRMP: null
+N14SpawnPointNCRQM: null
+N14SpawnPointNCROfficer: N14SpawnPointNCRLT
+N14SpawnPointNCRNCO: N14SpawnPointNCRSGT

Resources/Prototypes/Access/misc.yml

@@ -48,10 +48,9 @@
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
   - Corpsman # DeltaV - Add Corpsman access
-  - NCROfficer # N14 - Adds access
+  - NCRLT # N14 - Adds access
   - NCRRanger # N14 - Adds access
-  - NCRNCO # N14 - Adds access
-  - NCRMP # N14 - Adds access
+  - NCRSGT # N14 - Adds access
   - NCRMedic # N14 - Adds access
   - NCR # N14 - Adds access
   - PaladinCommander # N14 - Adds access

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -36,23 +36,23 @@
             TownMechanic: [ 2, 2 ]
             TownShopkeeper: [ 2, 2 ]
             Townsperson: [ 5, 5 ]
-            NCROfficer: [ 1, 1 ]
+            NCRLT: [ 1, 1 ]
             NCRRangerVeteran: [ 1, 1 ]
             NCRRanger: [ 2, 3 ]
-            NCRNCO: [ 1, 2 ]
-            NCRQM: [ 1, 1 ]
-            NCRMP: [ 1, 2 ]
-            NCRDoctor: [ 1, 2 ]
+            NCRSGT: [ 2, 3 ]
+            NCRWS: [ 2, 2 ]
+            NCREngineer: [ 2, 2 ]
+            NCRMedic: [ 1, 2 ]
             NCRSoldier: [ 3, 6 ]
             NCRCadet: [ 2, 5 ]
             CaravanLeader: [ 1, 1 ]
             CaravanTrader: [ 1, 1 ]
             CaravanGuard: [ 2, 2 ]
-            #BoSWashingtonCommander: [ 1, 1 ]
-            #BoSWashingtonCaptain: [ 1, 1 ]
-            #BoSWashingtonResearcher: [ 2, 2 ]
-            #BoSWashingtonSoldier: [ 2, 2 ]
-            #BoSWashingtonRecruit: [ 2, 2 ]
+            # BoSWashingtonCommander: [ 1, 0 ]
+            # BoSWashingtonPaladin: [ 1, 0 ]
+            # BoSWashingtonScribe: [ 2, 0 ]
+            # BoSWashingtonKnight: [ 2, 2 ]
+            # BoSWashingtonInitiate: [ 0, 2 ]
             BoSMidPaladinCommander: [ 1, 1 ]
             BoSMidPaladin: [ 1, 1 ]
             BoSMidKnight: [ 2, 3 ]

Resources/Prototypes/_Nuclear14/Access/ncr.yml

@@ -1,18 +1,14 @@
 - type: accessLevel
-  id: NCROfficer
-  name: id-card-access-level-ncr-officer
+  id: NCRLT
+  name: id-card-access-level-ncr-lt
 
 - type: accessLevel
   id: NCRRanger
   name: id-card-access-level-ncr-ranger
 
 - type: accessLevel
-  id: NCRNCO
-  name: id-card-access-level-ncr-nco
-
-- type: accessLevel
-  id: NCRMP
-  name: id-card-access-level-ncr-mp
+  id: NCRSGT
+  name: id-card-access-level-ncr-sgt
 
 - type: accessLevel
   id: NCRMedic
@@ -25,9 +21,8 @@
 - type: accessGroup
   id: NCR
   tags:
-  - NCROfficer
+  - NCRLT
   - NCRRanger
-  - NCRNCO
-  - NCRMP
+  - NCRSGT
   - NCRMedic
   - NCR

Resources/Prototypes/_Nuclear14/Damage/modifier_sets.yml

@@ -58,3 +58,15 @@
     Poison: 0.9
   flatReductions:
     Radiation: 5
+
+- type: damageModifierSet
+  id: N14ScaleFireresist
+  coefficients:
+    Blunt: 1.1
+    Slash: 0.9
+    Cold: 1.5
+    Heat: 0
+    Poison: 0.9
+  flatReductions:
+    Radiation: 5
+    Heat: 10

Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml

@@ -914,7 +914,7 @@
   parent: N14ClothingOuterCombatArmorMK2
   id: N14ClothingOuterMidwestArmorMK2
   name: veteran midwest BoS combat armor
-  description: A suit of combat armor modified with multiple well=polished metal plates and orange lines, a more robust version.
+  description: A suit of combat armor modified with multiple well-polished metal plates and vibrant orange lines, a more robust version.
   components:
   - type: Sprite
     sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutmidbosarmorV2.rsi

Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml

@@ -18,6 +18,46 @@
       intervalSeconds: 2400
       minimumEntitiesSpawned: 1
       maximumEntitiesSpawned: 3
+
+- type: entity
+  name: Pigrat Timed Spawner
+  id: N14TimedSpawnerPigrat
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: _Nuclear14/Mobs/Animals/pigrat.rsi
+          state: pigrat
+        - state: timed
+    - type: Timer
+    - type: TimedSpawner
+      prototypes:
+        - N14MobPigrat
+      chance: 0.65
+      intervalSeconds: 2400
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 3
+
+- type: entity
+  name: Radhog Timed Spawner
+  id: N14TimedSpawnerRadhog
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: _Nuclear14/Mobs/Animals/radhog.rsi
+          state: radhog
+        - state: timed
+    - type: Timer
+    - type: TimedSpawner
+      prototypes:
+        - N14MobRadhog
+      chance: 0.65
+      intervalSeconds: 2400
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 3
 
 - type: entity
   parent: N14TimedSpawnerMolerat
@@ -58,6 +98,46 @@
       intervalSeconds: 2400
       minimumEntitiesSpawned: 1
       maximumEntitiesSpawned: 3
+
+- type: entity
+  parent: N14TimedSpawnerMolerat
+  id: N14TimedSpawnerGeckoFire
+  name: Fire Gecko Timed Spawner
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: _Nuclear14/Mobs/Animals/firegecko.rsi
+          state: gecko
+        - state: timed
+    - type: Timer
+    - type: TimedSpawner
+      prototypes:
+        - N14MobGeckoFire
+      chance: 0.65
+      intervalSeconds: 2400
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 3
+
+- type: entity
+  parent: N14TimedSpawnerMolerat
+  id: N14TimedSpawnerGeckoGolden
+  name: Golden Gecko Timed Spawner
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: _Nuclear14/Mobs/Animals/goldengecko.rsi
+          state: gecko
+        - state: timed
+    - type: Timer
+    - type: TimedSpawner
+      prototypes:
+        - N14MobGeckoGolden
+      chance: 0.65
+      intervalSeconds: 2400
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 3
 
 - type: entity
   parent: N14TimedSpawnerMolerat

Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/jobs.yml

@@ -183,62 +183,62 @@
     layers:
       - state: green
       - state: passenger # TODO make new icons
-
+  
 - type: entity
-  id: N14SpawnPointNCRQM
+  id: N14SpawnPointNCRMedic
   parent: N14SpawnPointWastelander
-  name: NCR quartermaster
+  name: NCR doctor
   components:
   - type: SpawnPoint
-    job_id: NCRQM
+    job_id: NCRMedic
   - type: Sprite
     layers:
       - state: green
       - state: passenger # TODO make new icons
-  
+
 - type: entity
-  id: N14SpawnPointNCRDoctor
+  id: N14SpawnPointNCRSGT
   parent: N14SpawnPointWastelander
-  name: NCR doctor
+  name: NCR SGT
   components:
   - type: SpawnPoint
-    job_id: NCRDoctor
+    job_id: NCRSGT
   - type: Sprite
     layers:
       - state: green
       - state: passenger # TODO make new icons
 
 - type: entity
-  id: N14SpawnPointNCRMP
+  id: N14SpawnPointNCRLT
   parent: N14SpawnPointWastelander
-  name: NCR military police
+  name: NCR LT
   components:
   - type: SpawnPoint
-    job_id: NCRMP
+    job_id: NCRLT
   - type: Sprite
     layers:
       - state: green
       - state: passenger # TODO make new icons
 
 - type: entity
-  id: N14SpawnPointNCRNCO
+  id: N14SpawnPointNCRWS
   parent: N14SpawnPointWastelander
-  name: NCR NCO
+  name: NCR WS
   components:
   - type: SpawnPoint
-    job_id: NCRNCO
+    job_id: NCRWS
   - type: Sprite
     layers:
       - state: green
       - state: passenger # TODO make new icons
 
 - type: entity
-  id: N14SpawnPointNCROfficer
+  id: N14SpawnPointNCREngineer
   parent: N14SpawnPointWastelander
-  name: NCR officer
+  name: NCR Engineer
   components:
   - type: SpawnPoint
-    job_id: NCROfficer
+    job_id: NCREngineer
   - type: Sprite
     layers:
       - state: green