From 340c833273f944ba02448c315e4f38ad75546212 Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Sun, 10 Nov 2024 09:59:21 -0700 Subject: [PATCH 1/2] First Commit --- .../Entities/Clothing/Head/helmets.yml | 2 +- .../Clothing/OuterClothing/falloutarmor.yml | 10 +++--- .../Loadouts/Roles/loadouts_ranger.yml | 32 ++++++++++++++++++- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index c46d1b0d6e5..d8003342119 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -368,7 +368,7 @@ parent: N14ClothingHeadHatBaseHelmetMK2 id: N14ClothingHeadHatRangerHelmetEliteOld name: worn elite ranger combat helmet - description: An old combat helmet seen in the Divide, repurposed for higher-ranking Rangers. + description: Worn riot helmet from before the war. Faded by time and use, this helmet still sees use as a form of protection for the law bringers of the New California Republic. components: - type: Sprite sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 6f12ba8ddfb..fb687847bc8 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -783,7 +783,7 @@ parent: N14ClothingOuterRangerCombat id: N14ClothingOuterRangerEliteOld name: worn elite ranger combat armor - description: A customized and well-worn suit of riot gear with parts of the suit reinforced with leather armor and slain Centurion armor pieces by the wearer. A sniper's veil is wrapped around the neck. This one has seen some wear. + description: Worn riot gear granted to Rangers who served as law bringers for times of great unrest. This armor is a testament to the reach and power of the Republic and its will to bring peace to the lawlessness of the wasteland. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi @@ -792,10 +792,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.35 - Heat: 0.4 + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.55 + Heat: 0.55 - type: entity parent: N14ClothingOuterRangerCombat diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml index 455dc90672d..33b26e33178 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -288,4 +288,34 @@ jobs: - NCRRangerVeteran items: - - N14ClothingOuterRangerCombatDesert \ No newline at end of file + - N14ClothingOuterRangerCombatDesert + +- type: loadout + id: LoadoutNCRRangerEliteOld + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - NCRRangerVeteran + - !type:CharacterPlaytimeRequirement + tracker: NCRRangerVeteran + min: 216000 # 60 hours veterancy unlock "First Tour" + items: + - N14ClothingOuterRangerEliteOld + +- type: loadout + id: LoadoutNCRRangerHelmetEliteOld + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - NCRRangerVeteran + - !type:CharacterPlaytimeRequirement + tracker: NCRRangerVeteran + min: 216000 # 60 hours veterancy unlock "First Tour" + items: + - N14ClothingHeadHatRangerHelmetEliteOld \ No newline at end of file From 9a45a240f03f9400b18e2576a653dc4eb581a807 Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Sun, 10 Nov 2024 10:14:27 -0700 Subject: [PATCH 2/2] Fix Playtime Tracker, adjust armor stats again --- .../Entities/Clothing/OuterClothing/falloutarmor.yml | 6 ++++-- .../_Nuclear14/Loadouts/Roles/loadouts_ranger.yml | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index fb687847bc8..b3d430c288a 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -792,10 +792,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.55 - Slash: 0.55 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.55 Heat: 0.55 + - type: ExplosionResistance + damageCoefficient: 0.65 - type: entity parent: N14ClothingOuterRangerCombat diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml index 33b26e33178..37d3aa6ad82 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -300,9 +300,9 @@ jobs: - NCRRangerVeteran - !type:CharacterPlaytimeRequirement - tracker: NCRRangerVeteran + tracker: RangerVeteran min: 216000 # 60 hours veterancy unlock "First Tour" - items: + items: - N14ClothingOuterRangerEliteOld - type: loadout @@ -315,7 +315,7 @@ jobs: - NCRRangerVeteran - !type:CharacterPlaytimeRequirement - tracker: NCRRangerVeteran + tracker: RangerVeteran min: 216000 # 60 hours veterancy unlock "First Tour" - items: + items: - N14ClothingHeadHatRangerHelmetEliteOld \ No newline at end of file