From ba69f9d1e0d977145b590372d2e2bca0aa5e8881 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 11:23:55 -0600 Subject: [PATCH 01/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index a5864a8c56..a70222ef1d 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -317,6 +317,29 @@ # effectively means 50% more overall DPS, same DPS bonus as before (1 * 1.25 * 1.2 = 1.5) # but the extra attack rate makes it visually apparent that it's Martial Artist. + +- type: trait + id: PreciseStrikes + category: Physical + points: -3 + functions: + - !type:TraitReplaceComponent + components: + - type: PresciseStrikesDamageModifier + modifiers: + coefficients: + Blunt: 1.15 + Slash: 1.15 + Piercing: 1.15 + Heat: 1.15 + Poison: 1.15 + Asphyxiation: 1.15 + Radiation: 1.15 + Cold: 1.15 + # More Damages added in later, when melee have those damage types + + + - type: trait id: Small category: Physical From 174d40825a776c1904e50890ade464116df9c808 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 11:39:53 -0600 Subject: [PATCH 02/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 44 ++++++++++++++++++------ 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index a70222ef1d..45aa8d7984 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -321,25 +321,49 @@ - type: trait id: PreciseStrikes category: Physical - points: -3 + points: -2 + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Oni functions: - !type:TraitReplaceComponent components: - - type: PresciseStrikesDamageModifier + - type: OniDamageModifier #Placeholder Until I find the Id for melee damage modifiers: coefficients: - Blunt: 1.15 - Slash: 1.15 - Piercing: 1.15 - Heat: 1.15 - Poison: 1.15 - Asphyxiation: 1.15 - Radiation: 1.15 - Cold: 1.15 + Blunt: 1.1 + Slash: 1.1 + Piercing: 1.1 + Heat: 1.1 + Poison: 1.1 + Asphyxiation: 1.1 + Radiation: 1.1 + Cold: 1.1 # More Damages added in later, when melee have those damage types + +- type: trait + id: FleetFoot + category: Physical + points: -8 + requirements: + - !type:CharacterTraitRequirement + inverted: true + traits: + - Sluggish + - SnailPaced + functions: + - !type:TraitAddComponent + components: + - type: TraitSpeedModifier + sprintModifier: 1.15 + walkModifier: 1.15 + requiredTriggeredSpeedModifier: 1.15 #Will Only Slip When Sprinting, hopefully + - type: trait id: Small category: Physical From 25f5e05ed465326def0ed1266a4179528b1771ab Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 11:40:01 -0600 Subject: [PATCH 03/11] Update traits.ftl --- Resources/Locale/en-US/traits/traits.ftl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 6747e2e1a5..055b726fb3 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -279,6 +279,11 @@ trait-description-SnailPaced = You walk at a snail's pace, perhaps due to a medical condition, mobility impairment, or age. Your movement speed is decreased by [color=yellow]32%[/color]. +trait-name-FleetFoot = Fleet Footed +trait-description-Fleet = + You are faster than most and more agile on your feet. + Your movement speed is increased by [color=yellow]15%[/color]. + trait-name-LightStep = Light Step trait-description-LightStep = You move with a gentle step, which makes your footsteps quieter. @@ -298,6 +303,10 @@ trait-description-WeaponsGeneralist = You are a jack of all trades with melee weapons, enabling you to be versatile with your weapon arsenal. Your melee damage bonus for all Brute damage types (Blunt, Slash, Piercing) becomes 25%. +trait-name-PreciseStrikes = Precise Strikes +trait-description-PreciseStrikes = + When you attack, you aim for their weak point. Your melee damage bonus for all damage types becomes 10%. + trait-name-Singer = Singer trait-description-Singer = You are naturally capable of singing simple melodies with your voice. From 8358ab731aa9c5332c7ec5d8a5806c6e852d1b0a Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 12:03:31 -0600 Subject: [PATCH 04/11] Update traits.ftl --- Resources/Locale/en-US/traits/traits.ftl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 055b726fb3..43888af79d 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -288,6 +288,11 @@ trait-name-LightStep = Light Step trait-description-LightStep = You move with a gentle step, which makes your footsteps quieter. +trait-name-Grippers = Grippers +trait-description-Grippers = + I can't do this, I can't believe I am doing this. + Your "Grippers" are so strong you can not be slipped, only works if you are unbounded. + trait-name-Swashbuckler = Swashbuckler trait-description-Swashbuckler = You are an expert in swordsmanship, wielding swords, knives, and other blades with unrivaled finesse. @@ -307,6 +312,10 @@ trait-name-PreciseStrikes = Precise Strikes trait-description-PreciseStrikes = When you attack, you aim for their weak point. Your melee damage bonus for all damage types becomes 10%. +trait-name-PerfectAim = Perfect Aim +trait-description-PerfectAim = + You never miss a shot. Your guns now have no spread, except for shotguns. + trait-name-Singer = Singer trait-description-Singer = You are naturally capable of singing simple melodies with your voice. From de48b79328032d01013bd8edfb320cb3bbc36ddc Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 13:51:52 -0600 Subject: [PATCH 05/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 45aa8d7984..133404929a 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -321,7 +321,7 @@ - type: trait id: PreciseStrikes category: Physical - points: -2 + points: -4 requirements: - !type:CharacterSpeciesRequirement inverted: true @@ -333,14 +333,14 @@ - type: OniDamageModifier #Placeholder Until I find the Id for melee damage modifiers: coefficients: - Blunt: 1.1 - Slash: 1.1 - Piercing: 1.1 - Heat: 1.1 - Poison: 1.1 - Asphyxiation: 1.1 - Radiation: 1.1 - Cold: 1.1 + Blunt: 1.15 + Slash: 1.15 + Piercing: 1.15 + Heat: 1.15 + Poison: 1.15 + Asphyxiation: 1.15 + Radiation: 1.15 + Cold: 1.15 # More Damages added in later, when melee have those damage types From 4e1afe44547e02799d883afc8ee5352882855cf3 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Tue, 11 Feb 2025 15:07:53 -0600 Subject: [PATCH 06/11] Update traits.ftl --- Resources/Locale/en-US/traits/traits.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 43888af79d..3dabcd6829 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -310,7 +310,7 @@ trait-description-WeaponsGeneralist = trait-name-PreciseStrikes = Precise Strikes trait-description-PreciseStrikes = - When you attack, you aim for their weak point. Your melee damage bonus for all damage types becomes 10%. + When you attack, you aim for their weak point. Your melee damage bonus for all damage types becomes 15%. trait-name-PerfectAim = Perfect Aim trait-description-PerfectAim = From 68a49a51471b3e8161fe1acd8d7a0c6ceb296628 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Wed, 12 Feb 2025 11:45:08 -0600 Subject: [PATCH 07/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 133404929a..5149205cbe 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -330,7 +330,7 @@ functions: - !type:TraitReplaceComponent components: - - type: OniDamageModifier #Placeholder Until I find the Id for melee damage + - type: DamageModifier #Placeholder Until I find the Id for melee damage(I think I found it!) modifiers: coefficients: Blunt: 1.15 @@ -344,8 +344,6 @@ # More Damages added in later, when melee have those damage types - - - type: trait id: FleetFoot category: Physical @@ -362,7 +360,8 @@ - type: TraitSpeedModifier sprintModifier: 1.15 walkModifier: 1.15 - requiredTriggeredSpeedModifier: 1.15 #Will Only Slip When Sprinting, hopefully + requiredTriggeredSpeedModifier: 1.15 + #Will Only Slip When Sprinting, hopefully - type: trait id: Small From d2e833d38d222c59aa27cb4b65ce4630a427dbf1 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Wed, 12 Feb 2025 12:19:28 -0600 Subject: [PATCH 08/11] Update traits.ftl --- Resources/Locale/en-US/traits/traits.ftl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 3dabcd6829..6ff0511eb9 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -288,11 +288,6 @@ trait-name-LightStep = Light Step trait-description-LightStep = You move with a gentle step, which makes your footsteps quieter. -trait-name-Grippers = Grippers -trait-description-Grippers = - I can't do this, I can't believe I am doing this. - Your "Grippers" are so strong you can not be slipped, only works if you are unbounded. - trait-name-Swashbuckler = Swashbuckler trait-description-Swashbuckler = You are an expert in swordsmanship, wielding swords, knives, and other blades with unrivaled finesse. @@ -312,10 +307,6 @@ trait-name-PreciseStrikes = Precise Strikes trait-description-PreciseStrikes = When you attack, you aim for their weak point. Your melee damage bonus for all damage types becomes 15%. -trait-name-PerfectAim = Perfect Aim -trait-description-PerfectAim = - You never miss a shot. Your guns now have no spread, except for shotguns. - trait-name-Singer = Singer trait-description-Singer = You are naturally capable of singing simple melodies with your voice. From 0c2d57ce1f9dbf726bae9c118c652bc6974ec605 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Wed, 12 Feb 2025 12:21:05 -0600 Subject: [PATCH 09/11] Update traits.ftl --- Resources/Locale/en-US/traits/traits.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 6ff0511eb9..779e58f41f 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -280,7 +280,7 @@ trait-description-SnailPaced = Your movement speed is decreased by [color=yellow]32%[/color]. trait-name-FleetFoot = Fleet Footed -trait-description-Fleet = +trait-description-FleetFoot= You are faster than most and more agile on your feet. Your movement speed is increased by [color=yellow]15%[/color]. From ef79af4984643de8495e4646c6daca858a6c98b8 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 13 Feb 2025 10:19:33 -0600 Subject: [PATCH 10/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 5149205cbe..ccb51a2112 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -354,6 +354,12 @@ traits: - Sluggish - SnailPaced + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Felinid # They already have speed in their base stats, cant let them get to 1.35 base speed can we? + - Tajaran + - Diona # Doesn't make sense for the tree people to be fast, plus the added speed basically means they have base speed and no slip. functions: - !type:TraitAddComponent components: From 343f880a29a201127f3cac108be5d46799262b3c Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 13 Feb 2025 10:29:44 -0600 Subject: [PATCH 11/11] Update physical.yml --- Resources/Prototypes/Traits/physical.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index ccb51a2112..02994df461 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -354,12 +354,14 @@ traits: - Sluggish - SnailPaced - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Felinid # They already have speed in their base stats, cant let them get to 1.35 base speed can we? - - Tajaran - - Diona # Doesn't make sense for the tree people to be fast, plus the added speed basically means they have base speed and no slip. + #Currently Disabled Species idea, so if we need to nerf it, I already have a solution to prevent speedy races going rapant + #- !type:CharacterSpeciesRequirement + #inverted: true + #species: + #- Felinid # They already have speed in their base stats, cant let them get to 1.35 base speed can we? + #- Tajaran + #- Diona # Doesn't make sense for the tree people to be fast, plus the added speed basically means they have base speed and no slip. + #- Harpy # They also have a base speed increase functions: - !type:TraitAddComponent components: