Skip to content

Commit

Permalink
[Tweak] Heavy Damage Modifier / Модификатор Урона Тяжелой Атакой (#32)
Browse files Browse the repository at this point in the history
* tweak

* test

* tweak
  • Loading branch information
Spatison authored Sep 3, 2024
1 parent 75dd8b6 commit 5dcf4b2
Show file tree
Hide file tree
Showing 26 changed files with 10 additions and 73 deletions.
9 changes: 7 additions & 2 deletions Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public sealed partial class MeleeWeaponComponent : Component
/// Weapon damage is multiplied by this amount for heavy swings
/// </summary>
[DataField, AutoNetworkedField]
public float HeavyDamageBaseModifier = 1.2f;
public float HeavyDamageBaseModifier = 1f; // WD EDIT

/// <summary>
/// Total width of the angle for wide attacks.
Expand All @@ -117,6 +117,11 @@ public sealed partial class MeleeWeaponComponent : Component
[DataField, AutoNetworkedField]
public EntProtoId WideAnimation = "WeaponArcSlash";

// WD EDIT START
[ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
public EntProtoId DisarmAnimation = "WeaponArcDisarm";
// WD EDIT END

/// <summary>
/// Rotation of the animation.
/// 0 degrees means the top faces the attacker.
Expand All @@ -128,7 +133,7 @@ public sealed partial class MeleeWeaponComponent : Component
public bool SwingLeft;

[DataField, AutoNetworkedField]
public float HeavyStaminaCost = 20f;
public float HeavyStaminaCost = 20f; // WD EDIT

[DataField, AutoNetworkedField]
public int MaxTargets = 5;
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
if (!DoDisarm(user, disarm, weaponUid, weapon, session))
return false;

animation = weapon.Animation;
animation = weapon.DisarmAnimation; // WD EDIT
break;
case HeavyAttackEvent heavy:
if (!DoHeavyAttack(user, heavy, weaponUid, weapon, session))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
Shock: 1
bluntStaminaDamageFactor: 1.5
heavyRateModifier: 0.75
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 10
angle: 75
- type: Item
size: Normal
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
Blunt: 3.5
heavyRateModifier: 0.8
heavyRangeModifier: 0.8
heavyDamageBaseModifier: 2
heavyStaminaCost: 5
maxTargets: 8
- type: Tag
tags:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
Slash: 4
heavyRateModifier: 0.8
heavyRangeModifier: 0.8
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
maxTargets: 3
angle: 75
soundHit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
types:
Blunt: 8
heavyRateModifier: 0.8
heavyDamageBaseModifier: 2
heavyStaminaCost: 15
maxTargets: 8
soundHit:
path: /Audio/Weapons/smash.ogg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
Blunt: 4
Holy: 20
heavyRateModifier: 0.8
heavyDamageBaseModifier: 1
heavyStaminaCost: 5
maxTargets: 3
- type: Tag
tags:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
Blunt: 3
heavyRateModifier: 1
heavyRangeModifier: 1
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
maxTargets: 5
angle: 100
- type: Item
Expand All @@ -47,8 +45,6 @@
Pierce: 7
heavyRateModifier: 0.9
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
maxTargets: 1
angle: 20
- type: Item
Expand All @@ -73,8 +69,6 @@
Slash: 7
heavyRateModifier: 0.8
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
maxTargets: 1
angle: 120
- type: Item
Expand Down Expand Up @@ -107,8 +101,6 @@
damage:
types:
Slash: 10
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
- type: Item
sprite: Objects/Tools/Hydroponics/hatchet.rsi

Expand All @@ -132,8 +124,6 @@
Slash: 2 # I guess you can stab it into them?
heavyRateModifier: 0.8
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
angle: 80
soundHit:
collection: MetalThud
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
bluntStaminaDamageFactor: 3
heavyRateModifier: 0.8
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 10
maxTargets: 2
angle: 180
soundHit:
Expand Down Expand Up @@ -63,8 +61,6 @@
bluntStaminaDamageFactor: 3
heavyRateModifier: 0.8
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 10
maxTargets: 2
angle: 180
soundHit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
damage:
types:
Piercing: 8
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
maxTargets: 1
angle: 20
soundHit:
Expand Down Expand Up @@ -92,8 +90,6 @@
types:
Slash: 7.5
heavyRateModifier: 0.8
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 5
maxTargets: 1
angle: 20
soundHit:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
Blunt: 8
bluntStaminaDamageFactor: 2.5
heavyRateModifier: 0.8
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 15
maxTargets: 1
angle: 140
- type: PhysicalComposition
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
Slash: 2
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.8
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 10
maxTargets: 1
angle: 20
soundHit:
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/Entities/Objects/Tools/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
types:
Blunt: 6.5
heavyRateModifier: 0.9
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
maxTargets: 4
angle: 60
soundHit:
Expand Down Expand Up @@ -102,8 +100,6 @@
types:
Piercing: 6
heavyRateModifier: 0.75
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
maxTargets: 1
angle: 20
soundHit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
Structural: 5
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.5
heavyDamageBaseModifier: 1.75
heavyStaminaCost: 15
maxTargets: 2
angle: 120
soundHit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
Blunt: 2
Structural: 4
heavyRateModifier: 0.5
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 15
maxTargets: 20
angle: 160
soundHit:
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
types:
Slash: 8
heavyRateModifier: 0.9
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
- type: Item
size: Normal
- type: Clothing
Expand All @@ -43,8 +41,6 @@
damage:
types:
Slash: 12
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 10
maxTargets: 6
angle: 90
- type: Item
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,15 @@
Blunt: 4
Slash: 6
Structural: 10
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 10
angle: 100
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2
Slash: 5
Blunt: 2.5 # WD EDIT
Slash: 7.5 # WD EDIT
Structural: 40
- type: Item
size: Ginormous
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
Blunt: 11
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.5
heavyDamageBaseModifier: 1.75
heavyStaminaCost: 25
maxTargets: 2
angle: 120
soundHit:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
types:
Slash: 8
heavyRateModifier: 0.8
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
maxTargets: 3
angle: 40
soundHit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
Slash: 4
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.75
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 10
angle: 120
soundHit:
collection: MetalThud
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
Blunt: 6
Pierce: 3
bluntStaminaDamageFactor: 2.0
heavyDamageBaseModifier: 1.75
heavyStaminaCost: 5
maxTargets: 2
angle: 60
- type: Wieldable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
Structural: 10
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.75
heavyDamageBaseModifier: 1.75
heavyStaminaCost: 15
maxTargets: 10
angle: 120
soundHit:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
Slash: 1
heavyRateModifier: 0.75
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 5
maxTargets: 3
angle: 20
animation: WeaponArcThrust
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
Slash: 17 #cmon, it has to be at least BETTER than the rest.
heavyRateModifier: 0.8
heavyRangeModifier: 1
heavyDamageBaseModifier: 1
heavyStaminaCost: 5
maxTargets: 7
angle: 80
- type: Reflect
Expand Down Expand Up @@ -60,8 +58,6 @@
Slash: 12
heavyRateModifier: 0.5
heavyRangeModifier: 3 #Superior Japanese folded steel
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 10
maxTargets: 1
angle: 20
- type: Item
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
bluntStaminaDamageFactor: 2.5
heavyRateModifier: 0.5
heavyRangeModifier: 1.75
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 0
maxTargets: 1
angle: 20
- type: Wieldable
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/Entities/Objects/Weapons/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
Blunt: 7
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.75
heavyDamageBaseModifier: 1.75
heavyStaminaCost: 5
maxTargets: 3
angle: 60
animation: WeaponArcSlash
Expand Down Expand Up @@ -105,8 +103,6 @@
collection: MetalThud
bluntStaminaDamageFactor: 2
heavyRateModifier: 1
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 10
- type: Item
size: Normal
- type: Clothing
Expand Down

0 comments on commit 5dcf4b2

Please sign in to comment.