Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Melee Weapon Attack Speed #1330

Merged
merged 60 commits into from
Dec 10, 2024
Merged

Fix Melee Weapon Attack Speed #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
901ef6b
Update knife.yml
dge21 Dec 9, 2024
8b3f088
Update baseball_bat.yml
dge21 Dec 9, 2024
f60830f
Update knife.yml
dge21 Dec 9, 2024
db27022
Update armblade.yml
dge21 Dec 9, 2024
81bcdf1
Update cane.yml
dge21 Dec 9, 2024
61db853
Update chainsaw.yml
dge21 Dec 9, 2024
2ff23df
Update cult.yml
dge21 Dec 9, 2024
587baa9
Update cult.yml
dge21 Dec 9, 2024
53f637a
Update cult.yml
dge21 Dec 9, 2024
ca9ac13
Update e_sword.yml
dge21 Dec 9, 2024
2aba25f
Update fireaxe.yml
dge21 Dec 9, 2024
f580be7
Update pickaxe.yml
dge21 Dec 9, 2024
4a610d3
Update sledgehammer.yml
dge21 Dec 9, 2024
e9345b6
Update spear.yml
dge21 Dec 9, 2024
fc13973
Update stunprod.yml
dge21 Dec 9, 2024
10c6624
Update sword.yml
dge21 Dec 9, 2024
a57796c
Update telescopic_baton.yml
dge21 Dec 9, 2024
e678af2
Update white_cane.yml
dge21 Dec 9, 2024
fb7fac4
Update weapon_toolbox.yml
dge21 Dec 9, 2024
dc76709
Update cowtools.yml
dge21 Dec 9, 2024
aa822b9
Update flashlights.yml
dge21 Dec 9, 2024
00a599a
Update gas_tanks.yml
dge21 Dec 9, 2024
4ebad43
Update jaws_of_life.yml
dge21 Dec 9, 2024
7272b97
Update toolbox.yml
dge21 Dec 9, 2024
17b5866
Update tools.yml
dge21 Dec 9, 2024
88dad4c
Update anomaly.yml
dge21 Dec 9, 2024
539e373
Update surgery.yml
dge21 Dec 9, 2024
653770f
Update mechs.yml
dge21 Dec 9, 2024
3d7982c
Update janitor.yml
dge21 Dec 9, 2024
1eab9a1
Update tools.yml
dge21 Dec 9, 2024
739e2b9
Update bibles.yml
dge21 Dec 9, 2024
67191d4
Update broken_bottle.yml
dge21 Dec 9, 2024
fa435db
Update fire_extinguisher.yml
dge21 Dec 9, 2024
1fc9025
Update utensils.yml
dge21 Dec 9, 2024
67ccc2c
Update crystal_shard.yml
dge21 Dec 9, 2024
00a8353
Update toys.yml
dge21 Dec 9, 2024
4d62567
Update instruments_string.yml
dge21 Dec 9, 2024
d61a85b
Merge branch 'master' into melee-speed
sleepyyapril Dec 9, 2024
9d58e04
Apply suggestions from code review
dge21 Dec 9, 2024
0210064
Update instruments.yml
dge21 Dec 9, 2024
51cd76d
Update blunt.yml
dge21 Dec 9, 2024
f53ea1d
Update breaching_hammer.yml
dge21 Dec 9, 2024
b2e3218
Update dulled.yml
dge21 Dec 9, 2024
4f079ab
Update knives.yml
dge21 Dec 9, 2024
fbd7951
Update sword.yml
dge21 Dec 9, 2024
2247d11
Update cult.yml
dge21 Dec 9, 2024
e8d9f56
Update toys.yml
dge21 Dec 9, 2024
ac0e495
Update utensils.yml
dge21 Dec 9, 2024
175e370
Update mechs.yml
dge21 Dec 9, 2024
d837269
Update surgery.yml
dge21 Dec 9, 2024
daf7b81
Update cowtools.yml
dge21 Dec 9, 2024
58275c6
Update tools.yml
dge21 Dec 9, 2024
7c9b36d
Update armblade.yml
dge21 Dec 9, 2024
fa581f5
Update cane.yml
dge21 Dec 9, 2024
844ce72
Update e_sword.yml
dge21 Dec 9, 2024
efbfee1
Update fireaxe.yml
dge21 Dec 9, 2024
89d1b71
Update knife.yml
dge21 Dec 9, 2024
c75460a
Update sledgehammer.yml
dge21 Dec 9, 2024
eab7ee8
Update sword.yml
dge21 Dec 9, 2024
da95e08
Merge branch 'master' into melee-speed
sleepyyapril Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Blunt: 6
Shock: 1
bluntStaminaDamageFactor: 1.5
heavyRateModifier: 0.75
heavyRateModifier: 1.3333
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 7.5
angle: 75
Expand Down Expand Up @@ -105,7 +105,7 @@
soundHit:
path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
range: 1.85
attackRate: 1.25
attackRate: .8
wideAnimationRotation: 45
damage:
types:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
sprite: Objects/Fun/ducky.rsi
state: icon
- type: MeleeWeapon
attackRate: 1.5
attackRate: .6666
range: 1.5
damage:
types:
Expand Down Expand Up @@ -1387,7 +1387,7 @@
sprite: Objects/Fun/toys.rsi
state: foamblade
- type: MeleeWeapon
attackRate: 1.5
attackRate: .6666
angle: 0
animation: WeaponArcThrust
wideAnimationRotation: 90
Expand Down Expand Up @@ -1673,7 +1673,7 @@
sprite: Objects/Weapons/Melee/cutlass.rsi
state: foam_icon
- type: MeleeWeapon
attackRate: 1.5
attackRate: .6666
range: 2.0
angle: 0
animation: WeaponArcThrust
Expand Down Expand Up @@ -1943,7 +1943,7 @@
damage: 0.8
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 10
attackRate: .1
damage:
types:
Blunt: 0
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- type: SpaceGarbage
- type: MeleeWeapon
wideAnimationRotation: -22.5
attackRate: 1.5
attackRate: .6666
damage:
types:
Slash: 3.5
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
components:
- type: Sharp
- type: MeleeWeapon
attackRate: 1.4
attackRate: .71
range: 1.4
damage:
types:
Slash: 4
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyRangeModifier: 0.8
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
hasSafety: true
- type: MeleeWeapon
wideAnimationRotation: 180
attackRate: 0.8
attackRate: 1.25
bluntStaminaDamageFactor: 2.5
range: 1.75
damage:
types:
Blunt: 8
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 2
heavyStaminaCost: 7.5
maxTargets: 6
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Objects/Misc/utensils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- Trash
- type: MeleeWeapon
wideAnimationRotation: 180
attackRate: 1.5
attackRate: .6666
damage:
types:
Blunt: 0
Expand All @@ -53,7 +53,7 @@
- Fork
- type: MeleeWeapon
wideAnimationRotation: 180
attackRate: 1.5
attackRate: .6666
damage:
types:
Piercing: 5
Expand Down Expand Up @@ -100,7 +100,7 @@
- Spoon
- type: MeleeWeapon
wideAnimationRotation: 180
attackRate: 1.5
attackRate: .6666
damage:
types:
Blunt: 1
Expand Down Expand Up @@ -161,7 +161,7 @@
- Spoon
- type: MeleeWeapon
wideAnimationRotation: 180
attackRate: 2
attackRate: .5
damage:
types:
Blunt: 2
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
types:
Blunt: 4
Holy: 20
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1
heavyStaminaCost: 5
maxTargets: 4
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
state: icon
- type: MeleeWeapon
wideAnimationRotation: 90
attackRate: 0.8
attackRate: 1.25
damage:
types:
Piercing: 7
heavyRateModifier: 0.9
heavyRateModifier: 1.1
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.2
maxTargets: 1
Expand Down Expand Up @@ -84,7 +84,7 @@
damage:
types:
Slash: 7
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
Expand Down Expand Up @@ -122,7 +122,7 @@
- type: MeleeWeapon
wideAnimationRotation: 135
swingLeft: true
attackRate: 1.25
attackRate: .8
range: 1.4
damage:
types:
Expand Down Expand Up @@ -161,7 +161,7 @@
types:
Blunt: 6
Slash: 2 # I guess you can stab it into them?
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.2
heavyStaminaCost: 5
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
types:
Blunt: 2
bluntStaminaDamageFactor: 3
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 7.5
Expand Down Expand Up @@ -69,7 +69,7 @@
types:
Blunt: 2
bluntStaminaDamageFactor: 3
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyRangeModifier: 1.25
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 7.5
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
type: MechBoundUserInterface
- type: MeleeWeapon
hidden: true
attackRate: 0.75
attackRate: 1.3333
damage:
types:
Blunt: 25 #thwack
Expand Down Expand Up @@ -204,7 +204,7 @@
- Hamster
- type: MeleeWeapon
hidden: true
attackRate: 0.8
attackRate: 1.25
damage:
types:
Blunt: 10 #thwack
Expand Down Expand Up @@ -267,7 +267,7 @@
- VimPilot
- type: MeleeWeapon
hidden: true
attackRate: 0.8
attackRate: 1.25
damage:
types:
Blunt: 10 #thwack
Expand Down
22 changes: 11 additions & 11 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
- 0,0,1,0
- 1,1,1,1
- type: MeleeWeapon
attackRate: 0.75
attackRate: 1.3333
range: 1.4
damage:
types:
Expand Down Expand Up @@ -142,12 +142,12 @@
- type: MeleeWeapon
wideAnimationRotation: 90
swingLeft: true
attackRate: 1.25
attackRate: .8
range: 1.4
damage:
types:
Slash: 7.5
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 5
maxTargets: 1
Expand Down Expand Up @@ -423,13 +423,13 @@
- Sawing
speed: 1.0
- type: MeleeWeapon
attackRate: 0.75
attackRate: 1.3333
range: 1.35
damage:
types:
Blunt: 2.5
Slash: 6.5
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 20
maxTargets: 8
Expand Down Expand Up @@ -457,13 +457,13 @@
- type: Item
heldPrefix: improv
- type: MeleeWeapon
attackRate: 0.85
attackRate: 1.17
damage:
types:
Blunt: 3
Slash: 7
bluntStaminaDamageFactor: 3
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 20
maxTargets: 8
Expand Down Expand Up @@ -492,14 +492,14 @@
sprite: Objects/Specific/Medical/Surgery/circular-saw.rsi
storedRotation: 90
- type: MeleeWeapon
attackRate: 1.15
attackRate: .86
range: 1.5
bluntStaminaDamageFactor: 3.0
damage:
types:
Blunt: 4.5
Slash: 5.5
heavyRateModifier: 0.5
heavyRateModifier: 2
heavyDamageBaseModifier: 1
heavyStaminaCost: 10
maxTargets: 8
Expand Down Expand Up @@ -535,14 +535,14 @@
heldPrefix: advanced
storedRotation: 90
- type: MeleeWeapon
attackRate: 1.15
attackRate: .86
range: 1.5
bluntStaminaDamageFactor: 5.0
damage:
types:
Blunt: 4.5
Slash: 7.5
heavyRateModifier: 0.5
heavyRateModifier: 2
heavyDamageBaseModifier: 1
heavyStaminaCost: 10
maxTargets: 8
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
- type: Item
size: Large
- type: MeleeWeapon
attackRate: 0.5
attackRate: 2
angle: 0
animation: WeaponArcFist
wideAnimationRotation: -135
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
- type: Item
sprite: Objects/Tools/Cowtools/moodriver.rsi
- type: MeleeWeapon
attackRate: 1.5
attackRate: .6666
damage:
types:
Blunt: 0.1 #poke poke poke
Expand All @@ -60,7 +60,7 @@
- type: Item
sprite: Objects/Tools/Cowtools/wronch.rsi
- type: MeleeWeapon
attackRate: 1.5
attackRate: .6666
damage:
types:
Blunt: 0.1
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
visible: false
map: [ "light" ]
- type: MeleeWeapon
attackRate: 0.8
attackRate: 1.25
bluntStaminaDamageFactor: 1.5
damage:
types:
Expand Down Expand Up @@ -119,7 +119,7 @@
map: [ "light" ]
- type: MeleeWeapon
wideAnimationRotation: 90
attackRate: 0.8
attackRate: 1.25
damage:
types:
Blunt: 6.5
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
maxIntensity: 20
- type: MeleeWeapon
wideAnimationRotation: 45
attackRate: 0.8
attackRate: 1.25
range: 1.75
damage:
types:
Blunt: 8
bluntStaminaDamageFactor: 2.5
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 10
maxTargets: 3
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
changeSound: /Audio/Items/change_jaws.ogg
- type: MeleeWeapon
wideAnimationRotation: 90
attackRate: 0.85
attackRate: 1.17
range: 1.65
damage:
types:
Blunt: 10
Slash: 2
bluntStaminaDamageFactor: 2.0
heavyRateModifier: 0.8
heavyRateModifier: 1.25
heavyDamageBaseModifier: 1.5
heavyStaminaCost: 5
maxTargets: 1
Expand Down
Loading
Loading