From f5f9e1a43182e0995fb65824b48a4da43174cedd Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Sun, 15 Dec 2024 12:38:40 -0700 Subject: [PATCH 1/8] Specalist (English Minipatch) (#752) --- .../_Nuclear14/Special/character-examine.ftl | 2 +- .../Locale/en-US/_Nuclear14/job-names.ftl | 24 +++++++++---------- .../Consumable/Drinks/drinks_bottles.yml | 2 +- .../Guidebooks/Factions/factions.xml | 10 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl b/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl index e5508b90e09..4c21dbc7557 100644 --- a/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl +++ b/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl @@ -2,7 +2,7 @@ special-appearance-component-examine-charisma-very-low = { CAPITALIZE(SUBJECT($user)) } seems repulsive. special-appearance-component-examine-charisma-low = { CAPITALIZE(SUBJECT($user)) } seems awkward. special-appearance-component-examine-charisma-medium = { CAPITALIZE(SUBJECT($user)) } seems normal. -special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seem approachable. +special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seems approachable. special-appearance-component-examine-charisma-very-high = { CAPITALIZE(SUBJECT($user)) } seems suave. # Examine all special modifiers diff --git a/Resources/Locale/en-US/_Nuclear14/job-names.ftl b/Resources/Locale/en-US/_Nuclear14/job-names.ftl index 2c1b11d4f47..28219a1594f 100644 --- a/Resources/Locale/en-US/_Nuclear14/job-names.ftl +++ b/Resources/Locale/en-US/_Nuclear14/job-names.ftl @@ -28,17 +28,17 @@ job-description-caravan-leader = Coordinate the caravan company in the area and job-name-caravan-trader = Caravan Trader job-description-caravan-trader = Conduct trade missions and travel caravan routes to generate profit for the company. job-name-caravan-guard = Caravan Guard -job-description-caravan-guard = Protect the caravan company traders, their livestock and their inventory. +job-description-caravan-guard = Protect the caravan company traders, their livestock, and their inventory. # 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-description-ncr-cadet = Prove to the officers that you're ready to become a soldier of the NCR army. job-name-ncr-medic = NCR Medic -job-description-ncr-medic = Treat the troopers and offer services to the wasteland people. +job-description-ncr-medic = Treat the troops 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. +job-description-ncr-sgt = A non-commissioned officer in the NCR military. Lead a squad to protect the NCR interests in the region. 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-description-ncr-lt = The local leader of the NCR military. Fulfill your mission 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 a Sergeant on missions. job-name-ncr-engineer = NCR Engineer @@ -72,13 +72,13 @@ job-description-tribal-healer = Produce medicines and compounds for the tribe, a # Vault job-name-overseer = Vault Overseer -job-description-overseer = Follow Vault Tec's objectives in managing your Vault and ensure everything goes to plan... +job-description-overseer = Follow Vault-Tec's objectives in managing your Vault and ensure everything goes to plan... job-name-vault-doctor = Vault Doctor job-description-vault-doctor = Maintain the health and well-being of your fellow Vault Dwellers. Conduct research where necessary. job-name-vault-dweller = Vault Dweller -job-description-vault-dweller = The general populous of the Vault. Live a comfortable life and pull your own weight where necessary. +job-description-vault-dweller = The general populace of the Vault. Live a comfortable life and pull your own weight where necessary. job-name-vault-engineer = Vault Engineer -job-description-vault-engineer = Maintain the Vault and all it's vital systems to ensure a comfortable and safe life. +job-description-vault-engineer = Maintain the Vault and all its vital systems to ensure a comfortable and safe life. job-name-vault-security = Vault Security job-description-vault-security = Keep order within the Vault and report to the Overseer. For the good of the Vault! @@ -94,13 +94,13 @@ job-description-wastelander = Survive in the wasteland and carve out your own pa # Town job-name-townsperson = Townsperson -job-description-townsperson = A member of the new world society. Follow the town rules or try run for Mayor to change them. +job-description-townsperson = A member of the post-war society. Follow the town rules or try run for Mayor to change them. job-name-towndoctor = Town Doctor job-description-towndoctor = Sell your medical knowledge as a service. Treat the injured for money and manage a doctors practice in town. job-name-townmechanic = Town Mechanic job-description-townmechanic = Maintain the towns services and infrastructure and do what you can on the side for others for money. job-name-townshopkeeper = Town Shopkeeper -job-description-townshopkeeper = Setup shop in town, organise trade partnerships and sell your wares to the wanderes of the wastes. Beware the tax man. +job-description-townshopkeeper = Setup shop in town, organise trade partnerships, and sell your wares to the wanderers of the wastes. Beware the tax man. job-name-towndeputy = Town Deputy job-description-towndeputy = Deputy peacekeeper for the town. Keep the peace and provide backup to your Sheriff. job-name-townsheriff = Town Sheriff @@ -108,9 +108,9 @@ job-description-townsheriff = Maintain law and order within the town and support job-name-townmayor = Town Mayor job-description-townmayor = Maintain civilisation in the town. Set taxes and laws and try not to be thrown out or taken over. job-name-townreporter = Town Reporter -job-description-townreporter = Interview people and spread the news across the region, or just have a talk show! +job-description-townreporter = Interview people, spread the news across the region, or just have a talk show! job-name-townbartender = Town Innkeeper -job-description-townbartender = Manage the local bar, kitchen and rooms that are there for renting. Run a business in town! +job-description-townbartender = Manage the local bar, kitchen, and rooms that are there for renting. Run a business in town! # Followers job-name-followers = Followers of the Apocalypse diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f0e29ee943e..3145501d988 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -154,7 +154,7 @@ - type: entity parent: DrinkBottleBaseFull50 id: N14DrinkIrradiatedNukaColaBottleFull - name: irratiated Nuka Cola bottle + name: irradiated Nuka Cola bottle description: An unrefreshing beverage that has a extremely sugary taste. The aftertaste is bitter and burnt. components: - type: SolutionContainerManager diff --git a/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml b/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml index c29d98970ba..20526166696 100644 --- a/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml +++ b/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml @@ -17,20 +17,20 @@ The Tribes of the local area have an important part to play in keeping the local Be it traditional or forward thinking, passive or aggressive, isolationist or ready to join the city and engage in trade. ## The Vault -The local Vault remains largely unfamiliar to the surface dwellers, just as the surface is also largely unknown to those within the Vault. The location of the Vault mostly lost to time. This underground sanctuary is lead by the Overseer who unbeknown to the Dwellers, may have an objective or experiment to carry out. +The local Vault remains largely unfamiliar to the surface dwellers, just as the surface is also largely secreted away to those within the Vault. The location of the Vault mostly lost to time. This underground sanctuary is lead by the Overseer who, unbeknownst to the Dwellers, may have an objective or experiment to carry out. ## Caravan Company -The Blue Line Co. is the main source of new resources and equipment in this region of the Wasteland. They have the supply lines setup to trade long distances which is especially useful once the local resources start to dry up. The company itself originates from Canada, but they still accept bottlecaps and NCR dollars because their caravans trade far and wide. +The Blue Line Co. is the main source of new resources and equipment in this region of the Wasteland. They have the supply lines set up to trade long distances which is especially useful once the local resources start to dry up. The company itself originates from Canada, but they still accept bottlecaps and NCR dollars because their caravans trade far and wide. If the local Blue Line station is lost or destroyed, the railway station will very likely cease to function. ## Midwestern Brotherhood -The Midwestern Brotherhood of Steel are another splinter organisation from the original Brotherhood of Steel. This land is not their home, they're here on a mission to investigate the rumors about this region's vast supplies of advanced technologies and gather intelligence on the new Washington chapter of the Brotherhood. +The Midwestern Brotherhood of Steel are another splinter organisation from the original Brotherhood of Steel. This land is not their home, but they're here on a mission to investigate the rumors about this region's vast supplies of advanced technologies and gather intelligence on the new Washington chapter of the Brotherhood. About 80 years ago, they departed from Lost Hills and established a feudal empire in their new territories. They are open to sharing its technology with their subjects if it also serves their interests. Recruiting tribals and training them is a common occurance back home, but should they continue doing that this far away? Should they trust the locals here? -### Washington Brotherhood +## Washington Brotherhood The Washington Brotherhood of Steel is a new and rising power within this region. They self-exiled from Lost Hills just a few years back. The intention of their Elder is finding the truth to the legends surrounding various advanced technologies of the former Washington state. They are an isolationist military dictatorship and came here with the intent to grow in strength while hiding in the shadows. -Their senior members sense that a storm is coming that could wipe out the entire Brotherhood - maybe humankind - and because of this they are not afraid of utalizing more dangerous & extreme technologies, knowledge that other chapters' Elders would advise to destroy. Due to this radical ideology of theirs they are no longer welcome back at Lost Hills. +Their senior members sense that a storm is coming that could wipe out the entire Brotherhood - maybe humankind - and because of this they are not afraid of utilizing more dangerous & extreme technologies, knowledge that other chapters' Elders would advise to destroy. Due to this radical ideology of theirs they are no longer welcome back at Lost Hills. From ee731467628301558a18f0e5e294ba3aa27085fa Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Sun, 15 Dec 2024 14:38:43 -0800 Subject: [PATCH 2/8] Revert "Run all drain updates together" This reverts commit c67dba1f298aafa12b40f6fc70d34803c732bed1. --- .../Fluids/EntitySystems/DrainSystem.cs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs index a1ffd866d51..19cb650db7c 100644 --- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs @@ -34,9 +34,6 @@ public sealed class DrainSystem : SharedDrainSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - private float DrainRunPeriod = 1f; // 1 second to make multiplying by DrainFrequency correct - private float Accumulator; - public override void Initialize() { base.Initialize(); @@ -111,14 +108,7 @@ private void Empty(EntityUid container, SpillableComponent spillable, EntityUid public override void Update(float frameTime) { - Accumulator += frameTime; - if (Accumulator < DrainRunPeriod) - { - return; - } - Accumulator -= DrainRunPeriod; - - base.Update(DrainRunPeriod); + base.Update(frameTime); var managerQuery = GetEntityQuery(); var xformQuery = GetEntityQuery(); var puddleQuery = GetEntityQuery(); @@ -127,6 +117,13 @@ public override void Update(float frameTime) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var drain)) { + drain.Accumulator += frameTime; + if (drain.Accumulator < drain.DrainFrequency) + { + continue; + } + drain.Accumulator -= drain.DrainFrequency; + // Disable ambient sound from emptying manually if (!drain.AutoDrain) { From 1e9efb5a74a88c50fc5d731af691ef1f20c8dbdb Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Sun, 15 Dec 2024 14:41:36 -0800 Subject: [PATCH 3/8] Spread out expensive system updates --- Content.Server/Body/Systems/MetabolizerSystem.cs | 2 +- Content.Server/Fluids/EntitySystems/DrainSystem.cs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs index 09fc85be484..547716389ef 100644 --- a/Content.Server/Body/Systems/MetabolizerSystem.cs +++ b/Content.Server/Body/Systems/MetabolizerSystem.cs @@ -43,7 +43,7 @@ public override void Initialize() private void OnMapInit(Entity ent, ref MapInitEvent args) { - ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval; + ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat()); } private void OnUnpaused(Entity ent, ref EntityUnpausedEvent args) diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs index 19cb650db7c..1683a650b68 100644 --- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs @@ -41,6 +41,13 @@ public override void Initialize() SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnInteract); SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnComponentInit); + } + + private void OnComponentInit(EntityUid uid, DrainComponent component, ComponentInit args) + { + // Randomize accumulator on init to try to spread out all drain updates as much as possible. + component.Accumulator = _random.NextFloat() * component.DrainFrequency; } private void AddEmptyVerb(Entity entity, ref GetVerbsEvent args) From d0e863116ada64d2f5c9551a14836a25656c3aa6 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Sun, 15 Dec 2024 16:48:27 -0800 Subject: [PATCH 4/8] Spread stomach system updates --- Content.Server/Body/Systems/StomachSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Body/Systems/StomachSystem.cs b/Content.Server/Body/Systems/StomachSystem.cs index a4c2e8292dd..3ad43e8b2a1 100644 --- a/Content.Server/Body/Systems/StomachSystem.cs +++ b/Content.Server/Body/Systems/StomachSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry.Components.SolutionManager; using Robust.Shared.Timing; using Robust.Shared.Utility; +using Robust.Shared.Random; namespace Content.Server.Body.Systems { @@ -12,6 +13,7 @@ public sealed class StomachSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; public const string DefaultSolutionName = "stomach"; @@ -24,7 +26,7 @@ public override void Initialize() private void OnMapInit(Entity ent, ref MapInitEvent args) { - ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval; + ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat()); } private void OnUnpaused(Entity ent, ref EntityUnpausedEvent args) From e3a5b2556a0057673523c32bbfae5c4670919a7b Mon Sep 17 00:00:00 2001 From: TheTrueRatKing Date: Mon, 16 Dec 2024 03:38:27 -0600 Subject: [PATCH 5/8] Ammo Changes (#754) Long awaited nerf for .50 BMG and the .45-70 Govt. --- .../Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml index 7c12e9775ce..d8577b7a835 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml @@ -7,5 +7,5 @@ - type: Projectile damage: types: - Piercing: 40 + Piercing: 30 Blunt: 5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml index 279eefd7cf6..b66ed40018c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 60 # 20% decrease in power for AP + Piercing: 45 # 20% decrease in power for AP ignoreResistances: true - type: entity From 21be23fba493741cd70e88aac25b02d29cf19170 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Wed, 18 Dec 2024 06:30:06 -0700 Subject: [PATCH 6/8] Caravan price fix 1 (#756) --- .../Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml | 4 ++-- Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml | 2 +- .../Entities/Objects/Consumable/Smokeables/packs.yml | 2 ++ .../_Nuclear14/Entities/Objects/Materials/materials.yml | 2 +- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml index d15a78882e9..d34f6cef6f6 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml @@ -4,7 +4,7 @@ sprite: _Nuclear14/Objects/Consumable/Food/pre-war.rsi state: porknbeans product: N14CrateBreakPlainFilledEmergencyRations - cost: 60 + cost: 150 category: Consumables group: market @@ -36,4 +36,4 @@ product: N14CrateBreakPlainFilledNukaCola cost: 80 category: Consumables - group: market \ No newline at end of file + group: market diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml index 60b439fb32c..44d325815a8 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml @@ -122,7 +122,7 @@ - type: entity parent: N14CrateBreakPlain id: N14CrateBreakPlainFilledEmergencyRations - name: Emergency rations crate + name: Premium rations crate description: Crate containing 2 Pork n' Beans, 2 BlamCo Mac & Cheese, 2 Salisbury Steak and 2 Dandy Boy Apples. components: - type: StorageFill diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml index cb044089b4c..e8a7ffc4242 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml @@ -83,6 +83,8 @@ - cig7 - cig8 - type: Appearance + - type: StaticPrice + price: 5 # - type: entity # parent: N14CigPackBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index b1f4cf06c17..01b3aae79c6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -435,7 +435,7 @@ - type: Item size: Small - type: StaticPrice - price: 0 + price: 3 - type: Tag tags: - Scrap diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 078442ccf41..6aa6585a7b0 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -116,7 +116,7 @@ zeroVisible: true - type: Appearance - type: StaticPrice - price: 500 + price: 5 - type: FollowDistance backStrength: 6 From c54fd618dea0820fbbe57aeb95c505d9a0b05858 Mon Sep 17 00:00:00 2001 From: HungryCuban Date: Wed, 18 Dec 2024 08:30:37 -0500 Subject: [PATCH 7/8] Minor loadout options (#753) --- Resources/Prototypes/_Nuclear14/Loadouts/neck.yml | 10 ++++++++++ .../Prototypes/_Nuclear14/Loadouts/outerClothing.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/neck.yml b/Resources/Prototypes/_Nuclear14/Loadouts/neck.yml index 608bdbfe680..790363ff2e0 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/neck.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/neck.yml @@ -17,3 +17,13 @@ group: N14LoadoutNeck items: - N14ClothingNeckMantleLeather + +- type: loadout + id: N14LoadoutNeckCloakDarkCloak + category: Accessories + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: N14LoadoutNeck + items: + - N14ClothingNeckCloakDarkCloak \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml index a58c2bc51a4..909bf84e348 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml @@ -227,3 +227,13 @@ group: N14LoadoutOuter items: - N14ClothingOuterRaiderBlastmaster + +- type: loadout + id: N14LoadoutOuterHarperCoat + category: Outer + cost: 3 + requirements: + - !type:CharacterItemGroupRequirement + group: N14LoadoutOuter + items: + - N14ClothingOuterHarperCoat From 6b30b0670ee0e13d966ce38c8a92f02db00df816 Mon Sep 17 00:00:00 2001 From: TheDoktorZ <87537952+TheDoktorZ@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:39:38 +0100 Subject: [PATCH 8/8] Z's Big Balance (#755) --- .../Entities/Clothing/Head/helmets.yml | 10 +- .../Clothing/Head/powerarmorhelmet.yml | 92 +++- .../Entities/Clothing/Mask/gasmasks.yml | 8 +- .../Entities/Clothing/Mask/masks.yml | 12 +- .../OuterClothing/coats_and_outer.yml | 111 ++-- .../Clothing/OuterClothing/falloutarmor.yml | 479 ++++++++++-------- .../Clothing/OuterClothing/powerarmor.yml | 280 +++++----- .../Clothing/Shoes/falloutbootsbasic.yml | 2 + .../_Nuclear14/Entities/Mobs/NPCs/animals.yml | 19 +- .../_Nuclear14/Entities/Mobs/NPCs/ghouls.yml | 10 +- .../Guns/Ammunition/Projectiles/44.yml | 2 +- .../Guns/Ammunition/Projectiles/45-70.yml | 2 +- .../Guns/Ammunition/Projectiles/50.yml | 3 +- .../Guns/Ammunition/Projectiles/explosive.yml | 20 +- .../Weapons/Guns/Battery/battery_guns.yml | 12 +- .../Objects/Weapons/Guns/Heavy/minigun.yml | 7 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 9 + .../Objects/Weapons/Melee/longblades.yml | 1 - .../Prototypes/_Nuclear14/Reagents/chems.yml | 25 +- 20 files changed, 642 insertions(+), 464 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index 769af72a0f1..080e760b0b7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -135,12 +135,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.75 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.85 + Heat: 0.85 - type: ExplosionResistance - damageCoefficient: 0.85 + damageCoefficient: 0.9 # Brotherhood of Steel - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/powerarmorhelmet.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/powerarmorhelmet.yml index 1f85c5c397a..9d36910ccac 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/powerarmorhelmet.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/powerarmorhelmet.yml @@ -26,6 +26,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -39,7 +46,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -73,6 +83,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -86,7 +103,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -120,6 +140,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -133,7 +160,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -167,6 +197,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -181,6 +218,9 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.8 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -209,7 +249,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -237,8 +280,11 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 + Piercing: 0.85 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -272,6 +318,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -285,7 +338,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -319,6 +375,13 @@ clothingVisuals: head: - state: on-equipped-HELMET + - type: PointLight + enabled: false + radius: 6 + energy: 1 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false - type: Clothing quickEquip: true clothingVisuals: @@ -332,7 +395,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -361,7 +427,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair @@ -390,7 +459,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Tag tags: - HidesHair diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml index b87fca85967..bd86e952753 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml @@ -16,8 +16,8 @@ coefficients: Blunt: 0.9 Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskGas @@ -36,6 +36,7 @@ coefficients: Blunt: 0.95 Slash: 0.95 + Piercing: 0.95 Heat: 0.9 - type: entity @@ -55,7 +56,8 @@ coefficients: Blunt: 0.95 Slash: 0.95 - Radiation: 0.9 + Heat: 0.95 + Radiation: 0.95 # NCR Rangers, Vets diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml index 042969ea45c..a54e92da032 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml @@ -35,8 +35,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 + Blunt: 0.95 + Slash: 0.95 Piercing: 0.95 - type: Tag tags: @@ -57,8 +57,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 + Blunt: 0.95 + Slash: 0.95 Piercing: 0.95 - type: Tag tags: @@ -111,8 +111,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 + Blunt: 0.95 + Slash: 0.95 Piercing: 0.95 - type: Tag tags: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml index acb596e0a0b..a5b1c6cad41 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -143,8 +143,8 @@ coefficients: Blunt: 0.9 Slash: 0.95 - Piercing: 0.9 - Heat: 0.85 + Piercing: 0.95 + Heat: 0.9 - type: Butcherable butcheringType: Knife spawned: @@ -166,10 +166,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.95 + Blunt: 0.95 + Slash: 0.9 Piercing: 0.9 - Heat: 0.85 + Heat: 0.95 - type: Butcherable butcheringType: Knife spawned: @@ -191,7 +191,7 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 + Blunt: 0.95 Slash: 0.95 Piercing: 0.95 Heat: 0.9 @@ -219,9 +219,9 @@ modifiers: coefficients: Blunt: 0.9 - Slash: 0.95 + Slash: 0.9 Piercing: 0.9 - Heat: 0.85 + Heat: 0.95 - type: Butcherable butcheringType: Knife spawned: @@ -241,7 +241,7 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 + Blunt: 0.9 Slash: 0.9 Piercing: 0.9 Heat: 0.9 @@ -259,8 +259,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.9 Heat: 0.9 @@ -277,8 +277,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.9 Heat: 0.9 @@ -295,8 +295,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.9 Heat: 0.9 @@ -313,6 +313,10 @@ - type: Armor modifiers: coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.9 Caustic: 0.75 - type: entity @@ -336,8 +340,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.80 - Slash: 0.80 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.85 Heat: 0.85 @@ -356,8 +360,11 @@ coefficients: Blunt: 0.85 Slash: 0.85 - Piercing: 0.9 - Heat: 0.9 + Piercing: 0.8 + Heat: 0.85 + - type: ClothingSpecialModifier + charismaModifier: 1 + enduranceModifier: 1 - type: Butcherable butcheringType: Knife spawned: @@ -389,10 +396,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.65 - Heat: 0.65 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.8 #MARK: Brotherhood - type: entity @@ -405,9 +412,6 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodeldercoat.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodeldercoat.rsi - - type: ClothingSpecialModifier - strengthModifier: 1 - charismaModifier: 1 - type: entity parent: N14ClothingOuterCoatWinterArmored @@ -518,8 +522,6 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutoverseercoat.rsi - type: TemperatureProtection coefficient: 0.1 - - type: ClothingSpecialModifier - charismaModifier: 1 #MARK: Midwest BoS - type: entity @@ -535,10 +537,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.85 - Heat: 0.80 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.8 - type: ToggleableClothing @@ -597,7 +599,7 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/washington_bos_elder.rsi - type: entity - parent: ClothingOuterStorageBase + parent: N14ClothingOuterBrotherhoodMidwestMedicalScribeRobes id: N14ClothingOuterBrotherhoodMedicalScribeRobes name: Washington Brotherhood medical Scribe coat description: A finely made robe affixed with leather worn by medical Scribes, a symbol of the Brotherhood emblazoned across the chest and back. @@ -606,13 +608,6 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodmedicalscribe.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodmedicalscribe.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.80 - Slash: 0.85 - Piercing: 0.70 - Heat: 0.70 #MARK: Tribal - type: entity @@ -628,9 +623,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.6 - Piercing: 0.7 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.8 Heat: 0.8 #MARK: Town @@ -648,9 +643,9 @@ modifiers: coefficients: Blunt: 0.9 - Slash: 0.95 - Piercing: 0.9 - Heat: 0.85 + Slash: 0.9 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingOuterStorageBase @@ -665,10 +660,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.9 + Blunt: 0.8 + Slash: 0.8 Piercing: 0.85 - Heat: 0.8 + Heat: 0.85 - type: entity parent: ClothingOuterStorageBase @@ -683,10 +678,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.7 - Heat: 0.7 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.75 - type: entity parent: ClothingOuterStorageBase @@ -701,10 +696,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.65 - Heat: 0.65 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 + - type: ClothingSpecialModifier + charismaModifier: 1 #MARK: Vancouver preventor - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 419610edbf1..4a5c1699aff 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -11,12 +11,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.8 - Heat: 0.8 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.85 - type: ClothingSpecialModifier luckModifier: 1 @@ -34,23 +34,23 @@ modifiers: coefficients: Blunt: 0.7 - Slash: 0.6 - Piercing: 0.65 - Heat: 0.9 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.85 - type: Reflect reflectProb: 0.05 spread: 150 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: ClothingOuterBase id: N14ClothingOuterCoatFollowersArmored name: Followers Armored Labcoat - description: A vest used by the followers. It haves a bulletproof vest underneath + description: A vest used by the followers. It has a bulletproof vest underneath. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutfoaarmoredcoat.rsi @@ -59,10 +59,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 + Blunt: 0.85 + Slash: 0.85 Piercing: 0.8 - Heat: 0.8 + Heat: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: ClothingSpecialModifier intelligenceModifier: 1 @@ -83,6 +85,8 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: Butcherable butcheringType: Knife spawned: @@ -104,8 +108,8 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Piercing: 0.85 + Heat: 0.85 - type: ExplosionResistance damageCoefficient: 0.9 @@ -122,18 +126,18 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.6 - Piercing: 0.65 - Heat: 0.8 + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.85 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.85 - type: Reflect reflectProb: 0.05 spread: 150 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: ClothingOuterBase @@ -148,12 +152,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.7 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -168,12 +172,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.55 - Heat: 0.55 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 - type: ExplosionResistance - damageCoefficient: 0.65 + damageCoefficient: 0.75 - type: entity parent: ClothingOuterBase @@ -188,12 +192,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.55 - Slash: 0.55 - Piercing: 0.5 - Heat: 0.5 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.55 + Heat: 0.55 - type: ExplosionResistance - damageCoefficient: 0.6 + damageCoefficient: 0.75 - type: entity parent: N14ClothingOuterCombatArmorMK2 @@ -219,10 +223,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.8 Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -241,6 +247,8 @@ Slash: 0.9 Piercing: 0.4 Heat: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.8 #MARK: Tribal - type: entity @@ -256,10 +264,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.9 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.85 + Heat: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -277,12 +287,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.65 - Heat: 0.8 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.85 + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -297,12 +307,15 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.65 - Heat: 0.65 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.75 + damageCoefficient: 0.8 + - type: ClothingSpecialModifier + charismaModifier: 1 + luckModifier: 1 #MARK: Raiders - type: entity @@ -318,10 +331,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Heat: 0.85 - Piercing: 0.85 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.95 + Heat: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.9 - type: ClothingSpecialModifier strengthModifier: 1 @@ -340,10 +355,12 @@ coefficients: Blunt: 0.85 Slash: 0.85 - Heat: 0.85 - Piercing: 0.85 + Piercing: 0.9 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: ClothingSpecialModifier - strengthModifier: 1 + agilityModifier: 1 - type: entity parent: N14ClothingOuterCombatArmor @@ -369,12 +386,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.5 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.7 - type: ExplosionResistance - damageCoefficient: 0.75 + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -389,10 +406,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.7 - Heat: 0.7 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -407,12 +426,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.65 - Heat: 0.65 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance - damageCoefficient: 0.75 + damageCoefficient: 0.85 - type: entity parent: N14ClothingOuterCombatRusted @@ -449,10 +468,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 + Blunt: 0.9 Slash: 0.9 - Piercing: 0.75 - Heat: 0.8 + Piercing: 0.85 + Heat: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -491,10 +512,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.7 - Heat: 0.7 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterStorageBase @@ -511,8 +534,10 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.65 - Heat: 0.65 + Piercing: 0.75 + Heat: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 #MARK: NCR @@ -529,10 +554,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -549,10 +574,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -569,10 +594,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -589,18 +614,18 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.7 + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.8 - type: ExplosionResistance - damageCoefficient: 0.65 + damageCoefficient: 0.75 - type: Reflect reflectProb: 0.05 spread: 150 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: ClothingOuterBase @@ -615,18 +640,18 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.7 + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.8 - type: ExplosionResistance - damageCoefficient: 0.65 + damageCoefficient: 0.75 - type: Reflect reflectProb: 0.05 spread: 150 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: ClothingOuterStorageBase @@ -641,10 +666,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -661,10 +686,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -681,10 +706,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.75 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.9 @@ -725,12 +750,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.8 + damageCoefficient: 0.7 - type: entity parent: N14ClothingOuterNCRCombatArmor @@ -753,6 +778,15 @@ sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuitb.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuitb.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.7 - type: entity parent: ClothingOuterStorageBase @@ -767,12 +801,15 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 - Heat: 0.55 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.8 + damageCoefficient: 0.7 + - type: ClothingSpeedModifier + walkModifier: 1.05 + sprintModifier: 1.05 #MARK: Veteran @@ -789,12 +826,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 - Heat: 0.55 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 + Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.8 + damageCoefficient: 0.7 - type: entity parent: ClothingOuterStorageBase @@ -809,12 +846,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.55 - Heat: 0.55 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 - type: ExplosionResistance - damageCoefficient: 0.65 + damageCoefficient: 0.7 - type: entity parent: N14ClothingOuterRangerCombat @@ -862,10 +899,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.3 - Slash: 0.3 - Piercing: 0.2 - Heat: 0.3 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.7 - type: entity parent: N14ClothingOuterRangerCombat @@ -880,12 +919,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.55 - Heat: 0.55 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 - type: ExplosionResistance - damageCoefficient: 0.65 + damageCoefficient: 0.7 - type: entity parent: N14ClothingOuterRangerCombat @@ -900,10 +939,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.4 - Heat: 0.5 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.7 #MARK: washington BoS @@ -964,15 +1005,17 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.5 - Piercing: 0.5 - Heat: 0.4 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: entity parent: ClothingOuterStorageBase id: N14ClothingOuterBosScribe - name: researcher leather vest + name: technical leather vest description: A leather vest with everything a Scribe could need during a field job, theres no Don Quixote without a Sancho Panza. components: - type: Sprite @@ -982,10 +1025,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.6 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: entity parent: N14ClothingOuterCombatArmorMK2 @@ -1000,12 +1045,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.5 - Heat: 0.5 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.75 #MARK: midwest BoS @@ -1045,12 +1090,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.55 - Heat: 0.55 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 - type: ExplosionResistance - damageCoefficient: 0.6 + damageCoefficient: 0.8 #MARK: craftable armors @@ -1067,10 +1112,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.65 - Piercing: 0.65 - Heat: 0.65 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.8 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -1085,10 +1132,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.6 - Piercing: 0.8 - Heat: 0.7 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -1103,10 +1152,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.50 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.8 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -1123,8 +1174,8 @@ coefficients: Blunt: 0.85 Slash: 0.75 - Piercing: 0.75 - Heat: 0.85 + Piercing: 0.8 + Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1143,10 +1194,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.5 - Heat: 0.5 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.85 - type: entity parent: ClothingOuterBase @@ -1161,12 +1214,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0.8 #MARK: Chinese renmants @@ -1185,8 +1238,10 @@ coefficients: Blunt: 0.7 Slash: 0.7 - Piercing: 0.5 - Heat: 0.5 + Piercing: 0.65 + Heat: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: entity parent: ClothingOuterBase @@ -1201,17 +1256,19 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.85 # random other armor - type: entity parent: ClothingOuterBase id: N14ClothingOuterPressArmor name: prewar reporter armor - description: An old piece of armor once used by the Free Press before the war. Though the kevlar is worn, it will still offer some protection. + description: An old piece of armor once used by the Free Press before the war. Though the ballistic fiber is worn, it will still offer some protection. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi @@ -1220,7 +1277,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.9 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.8 + Heat: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/powerarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/powerarmor.yml index d785ff1e042..8266f579235 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/powerarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/powerarmor.yml @@ -8,33 +8,34 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: TemperatureProtection - coefficient: 0.6 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.4 - Slash: 0.4 - Piercing: 0.5 + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.55 Heat: 0.55 - Radiation: 0.4 + Radiation: 0.6 + - type: TemperatureProtection + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.6 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorT45 - type: ClothingSpecialModifier strengthModifier: 2 enduranceModifier: 2 - type: Reflect - reflectProb: 0.15 + reflectProb: 0.1 spread: 150 -# Maybe someday... -# - type: FootstepModifier -# footstepSoundCollection: -# collection: N14FootstepPowerArmor + - type: FootstepModifier + footstepSoundCollection: + collection: N14FootstepPowerArmor - type: entity parent: N14ClothingOuterPowerArmorT45 @@ -46,25 +47,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.4 - Slash: 0.3 - Piercing: 0.45 - Heat: 0.45 - Radiation: 0.3 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.6 - type: TemperatureProtection - coefficient: 0.55 + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.4 + damageCoefficient: 0.55 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorT51 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 - type: entity @@ -77,25 +80,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.925 + sprintModifier: 0.925 - type: Armor modifiers: coefficients: - Blunt: 0.35 - Slash: 0.3 - Piercing: 0.5 - Heat: 0.4 - Radiation: 0.3 + Blunt: 0.475 + Slash: 0.475 + Piercing: 0.525 + Heat: 0.525 + Radiation: 0.6 - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.35 + damageCoefficient: 0.55 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorT60 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 - type: entity @@ -108,15 +113,11 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi - - type: TemperatureProtection - coefficient: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.35 - - type: ToggleableClothing - clothingPrototype: N14ClothingHeadHelmetPowerArmorT60 + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: Reflect - reflectProb: 0.2 - spread: 150 + reflectProb: 0.3 + spread: 275 - type: entity parent: N14ClothingOuterPowerArmorT45 @@ -128,25 +129,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced1.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced1.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.875 + sprintModifier: 0.875 - type: Armor modifiers: coefficients: - Blunt: 0.3 - Slash: 0.25 - Piercing: 0.45 - Heat: 0.4 - Radiation: 0.1 + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.6 - type: TemperatureProtection - coefficient: 0.2 + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.2 + damageCoefficient: 0.5 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorX01 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.15 spread: 150 - type: entity @@ -159,25 +162,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced2.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced2.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.30 - Piercing: 0.35 - Heat: 0.45 - Radiation: 0.1 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.55 + Heat: 0.55 + Radiation: 0.6 - type: TemperatureProtection - coefficient: 0.25 + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.25 + damageCoefficient: 0.55 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorX02 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.125 spread: 150 - type: entity @@ -190,22 +195,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/hellfire.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/hellfire.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.2 - Slash: 0.2 - Piercing: 0.35 - Heat: 0.25 - Radiation: 0.1 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.5 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.15 + damageCoefficient: 0.5 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorHellfire - type: Reflect - reflectProb: 0.2 + reflectProb: 0.125 spread: 150 - type: entity @@ -218,88 +228,94 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/raider.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/raider.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.875 + sprintModifier: 0.875 - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.5 - Piercing: 0.55 - Heat: 0.65 - Radiation: 0.6 + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.6 + Heat: 0.6 + Radiation: 0.65 + - type: TemperatureProtection + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.65 - - type: ClothingSpecialModifier - strengthModifier: 10 + damageCoefficient: 0.6 - type: FootstepModifier footstepSoundCollection: collection: N14FootstepPowerArmor - type: Reflect - reflectProb: 0.10 + reflectProb: 0.075 spread: 150 - type: entity parent: N14ClothingOuterPowerArmorT45 id: N14ClothingOuterPowerArmorMidwest name: midwest power armor - description: A unknown model of power armor originated from the midwest region and adopted by the Midwest Brotherhood chapter. + description: A unknown model of power armor manufactured by the Midwest Brotherhood. It supports a lighter plating than the normal but is more ergonomic, allowing easier movement. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/midwest.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/midwest.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.925 + sprintModifier: 0.925 - type: Armor modifiers: coefficients: - Blunt: 0.4 - Slash: 0.3 - Piercing: 0.45 - Heat: 0.45 - Radiation: 0.3 + Blunt: 0.475 + Slash: 0.475 + Piercing: 0.525 + Heat: 0.525 + Radiation: 0.6 - type: TemperatureProtection - coefficient: 0.55 + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.4 + damageCoefficient: 0.6 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorMidwest - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 - type: entity parent: N14ClothingOuterPowerArmorT45 id: N14ClothingOuterPowerArmorMidwestCommander name: midwest commander power armor - description: A unknown model of power armor originated from the midwest region. This modified version is commonly used by high-ranking Midwest Brotherhood of Steel paladins. + description: A unknown model of power armor manufactured by the Midwest Brotherhood. This modified version is commonly used by high-ranking Midwest Brotherhood of Steel Paladins. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/midwestcommander.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/midwestcommander.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.925 + sprintModifier: 0.925 - type: Armor modifiers: coefficients: - Blunt: 0.35 - Slash: 0.25 - Piercing: 0.35 - Heat: 0.4 - Radiation: 0.3 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.6 - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.3 + damageCoefficient: 0.6 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorMidwestCommander - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 - type: entity @@ -312,25 +328,27 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51bc.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51bc.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.35 - Slash: 0.25 - Piercing: 0.35 - Heat: 0.4 - Radiation: 0.3 + Blunt: 0.425 + Slash: 0.425 + Piercing: 0.475 + Heat: 0.475 + Radiation: 0.6 - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.3 + damageCoefficient: 0.55 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorT51BC - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 - type: entity @@ -343,17 +361,31 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45ncr.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45ncr.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ToggleableClothing clothingPrototype: N14ClothingHeadHelmetPowerArmorT45NCR - type: ClothingSpeedModifier - walkModifier: 0.80 - sprintModifier: 0.80 + walkModifier: 0.875 + sprintModifier: 0.875 + - type: Armor + modifiers: + coefficients: + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.6 + Heat: 0.6 + Radiation: 0.65 + - type: TemperatureProtection + coefficient: 0.55 + - type: ExplosionResistance + damageCoefficient: 0.65 - type: Reflect - reflectProb: 0.10 + reflectProb: 0.075 spread: 150 - type: entity - parent: N14ClothingOuterPowerArmorT45 + parent: N14ClothingOuterPowerArmorT51 id: N14ClothingOuterPowerArmorT51Canadian name: t-51bc "the canadian shield" description: The pinnacle of pre-war technology, appropriated by the RCMP. @@ -362,21 +394,23 @@ sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/canadianshield.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/canadianshield.rsi + equipDelay: 3 # Power armour should not be easily stealable, it should take time to take off or put on. + unequipDelay: 6 - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: - Blunt: 0.35 - Slash: 0.25 - Piercing: 0.35 - Heat: 0.4 - Radiation: 0.3 + Blunt: 0.425 + Slash: 0.425 + Piercing: 0.475 + Heat: 0.475 + Radiation: 0.6 - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.3 + damageCoefficient: 0.55 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.1 spread: 150 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml index d0d8e764507..3f1bf1fc924 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml @@ -27,6 +27,7 @@ sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/combatboots.rsi - type: Clothing sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/combatboots.rsi + - type: NoSlip - type: entity parent: ClothingShoesMilitaryBase @@ -38,6 +39,7 @@ sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/combatbootsmk2.rsi - type: Clothing sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/combatbootsmk2.rsi + - type: NoSlip - type: entity parent: ClothingShoesBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index 3c05a48effc..e83301d53eb 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -726,8 +726,9 @@ critThreshold: 250 - type: SlowOnDamage speedModifierThresholds: - 250: 0.7 - 400: 0.5 + 100: 1.05 + 250: 1.1 + 400: 1.2 - type: DamageStateVisuals states: Alive: @@ -746,12 +747,12 @@ wideAnimation: WeaponArcClaw damage: types: - Slash: 15 - Structural: 5 - range: 1.75 + Slash: 20 + Structural: 15 + range: 2 - type: MovementSpeedModifier - baseWalkSpeed : 4 - baseSprintSpeed : 5.5 + baseWalkSpeed : 3 + baseSprintSpeed : 6 - type: Hands - type: Puller - type: Tool @@ -819,8 +820,8 @@ wideAnimation: WeaponArcClaw damage: types: - Slash: 22 - Structural: 10 + Slash: 25 + Structural: 20 - type: MobThresholds thresholds: 0: Alive diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/ghouls.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/ghouls.yml index f4e475dd593..01a047f5921 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/ghouls.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/ghouls.yml @@ -89,9 +89,9 @@ animation: WeaponArcFist damage: types: - Brute: 10 - Slash: 3 - range: 2.5 + Brute: 15 + Slash: 15 + range: 5 - type: Sprite drawdepth: Mobs layers: @@ -109,8 +109,8 @@ # movement: # state: sleeping - type: MovementSpeedModifier - baseWalkSpeed : 4 - baseSprintSpeed : 4 + baseWalkSpeed : 5 + baseSprintSpeed : 5 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml index f60b72f0142..3b771dc2bb7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml @@ -7,5 +7,5 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 30 Blunt: 5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml index d8577b7a835..2eac1affe66 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml @@ -7,5 +7,5 @@ - type: Projectile damage: types: - Piercing: 30 + Piercing: 35 Blunt: 5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml index b66ed40018c..7f31bd69685 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml @@ -7,7 +7,8 @@ - type: Projectile damage: types: - Piercing: 45 # 20% decrease in power for AP + Piercing: 30 + Blunt: 20 ignoreResistances: true - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/explosive.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/explosive.yml index 57f5f481234..c2dfcc17535 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/explosive.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/explosive.yml @@ -11,10 +11,10 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - maxIntensity: 2 # max 30 per tile + maxIntensity: 3 # max 30 per tile intensitySlope: 1 - totalIntensity: 1 # 60 total damage to distribute over tiles - maxTileBreak: 1 + totalIntensity: 2 # 60 total damage to distribute over tiles + maxTileBreak: 0 - type: entity id: GrenadeProjectile @@ -25,9 +25,9 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - maxIntensity: 4 # max 30 per tile + maxIntensity: 6 # max 30 per tile intensitySlope: 5 - totalIntensity: 6 # 60 total damage to distribute over tiles + totalIntensity: 9 # 60 total damage to distribute over tiles maxTileBreak: 0 @@ -42,9 +42,9 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - maxIntensity: 3 # max 30 per tile + maxIntensity: 5 # max 30 per tile intensitySlope: 3 - totalIntensity: 4 # 60 total damage to distribute over tiles + totalIntensity: 6 # 60 total damage to distribute over tiles maxTileBreak: 0 #Missiles @@ -63,7 +63,7 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - maxIntensity: 6 # max 30 per tile + maxIntensity: 9 # max 30 per tile intensitySlope: 6 - totalIntensity: 10 # 60 total damage to distribute over tiles - maxTileBreak: 5 + totalIntensity: 15 # 60 total damage to distribute over tiles + maxTileBreak: 0 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 940d25f6935..a6f42aaac81 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -848,10 +848,10 @@ - SemiAuto - type: Appearance - type: MultiHandedItem - - type: HeldSpeedModifier - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier - type: FollowDistance backStrength: 6 @@ -904,9 +904,9 @@ - FullAuto - type: Appearance - type: MultiHandedItem - - type: HeldSpeedModifier - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier - type: FollowDistance backStrength: 6 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml index 3cbf06e1660..a77d16b30ba 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml @@ -61,8 +61,9 @@ description: An extremely heavy minigun with 3 barrels, it uses 5mm ammo. # TODO: Need to create projectiles, magazines and boxes for 5.56. components: - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier - type: entity name: avenger minigun @@ -85,6 +86,6 @@ angleIncrease: 2 angleDecay: 8 fireRate: 8 - - type: ClothingSpeedModifier + - type: HeldSpeedModifier walkModifier: 0.8 sprintModifier: 0.8 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index a9be4050d07..1c522e1e1ed 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -190,7 +190,7 @@ angleDecay: 16 soundGunshot: collection: N14MarksmanGunshot - fireRate: 5 + fireRate: 4 selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 8dd79ae0e8f..88dff158d1f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -123,6 +123,9 @@ - type: Appearance - type: FollowDistance backStrength: 3 + - type: HeldSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 - type: entity name: .50 NCR rifle @@ -157,6 +160,9 @@ collection: N14AntiMaterielGunshot - type: FollowDistance backStrength: 3 + - type: HeldSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 - type: entity name: lever action carbine @@ -355,6 +361,9 @@ fireRate: 1.2 soundGunshot: collection: N14AntiMaterielGunshot + - type: HeldSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 - type: FollowDistance backStrength: 3 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 26bb9cb5388..5818a118725 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -208,7 +208,6 @@ damage: types: Slash: 25 - Pierce: 10 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item diff --git a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml index c3c405d8e8f..3d49743d922 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml @@ -25,8 +25,8 @@ # - !type:LuckModifierReagent # Nuclear 14 Example of adding modifier to Chemicals # luckModifier: 1 - !type:MovespeedModifier - walkSpeedModifier: 1.15 - sprintSpeedModifier: 1.15 + walkSpeedModifier: 1.1 + sprintSpeedModifier: 1.1 - !type:GenericStatusEffect key: SeeingRainbows component: SeeingRainbows @@ -34,12 +34,10 @@ time: 5 refresh: false - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 30 damage: types: - Asphyxiation: 1 + Poison: 0.2 + groups: - !type:Jitter - !type:GenericStatusEffect key: Stun @@ -73,16 +71,14 @@ Narcotic: effects: - !type:MovespeedModifier - walkSpeedModifier: 1.40 - sprintSpeedModifier: 1.40 + walkSpeedModifier: 1.20 + sprintSpeedModifier: 1.20 - !type:Drunk - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 10 damage: types: - Asphyxiation: 1.3 + Poison: 0.5 + groups: - !type:Jitter - !type:GenericStatusEffect key: Stun @@ -191,6 +187,11 @@ Medicine: metabolismRate: 0.2 # Effectively once every 5 seconds. effects: + - !type:HealthChange + damage: + types: + Poison: 0.2 + groups: - !type:Jitter - !type:MovespeedModifier walkSpeedModifier: 1.1