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

Fire rate throttle fix for rng full auto weapons #3564

Merged
merged 21 commits into from
May 14, 2024
Merged

Fire rate throttle fix for rng full auto weapons #3564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2d76c0d
Updated recoil animation
MaxDreyko May 13, 2024
9cf60ba
Updated recoil animation
MaxDreyko May 13, 2024
41f3177
Updated recoil animation
MaxDreyko May 13, 2024
79a74ff
Updated recoil animation
MaxDreyko May 13, 2024
3acec6c
Updated recoil animation
MaxDreyko May 13, 2024
a621fe9
Updated recoil animation
MaxDreyko May 13, 2024
3f33ed6
Updated recoil animation
MaxDreyko May 13, 2024
a6bb0da
Updated recoil animation
MaxDreyko May 13, 2024
104f8e7
Updated recoil animation
MaxDreyko May 13, 2024
bdd77e8
Updated recoil animation
MaxDreyko May 13, 2024
4794caf
Updated recoil animation
MaxDreyko May 13, 2024
1e16c58
Updated recoil animation
MaxDreyko May 13, 2024
aed1036
Updated recoil animation
MaxDreyko May 13, 2024
f93a843
Updated recoil animation
MaxDreyko May 13, 2024
d499d3a
Updated recoil animation
MaxDreyko May 13, 2024
64e2185
Updated recoil animation
MaxDreyko May 13, 2024
2cf7e2c
Updated recoil animation
MaxDreyko May 13, 2024
3419c42
Updated recoil animation
MaxDreyko May 13, 2024
204cfa0
increased cooldown duration of some combo steps
MaxDreyko May 13, 2024
9fd6d16
increased cooldown duration of some combo steps
MaxDreyko May 13, 2024
fd4e28b
Fixed another typo
MaxDreyko May 13, 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
18 changes: 9 additions & 9 deletions items/active/weapons/melee/abilities/katana/katanacombo.weaponability
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"allowFlip":false
},
"wait1":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -170,7 +170,7 @@
"allowFlip":false
},
"wait2":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -229,7 +229,7 @@
"allowFlip":true
},
"wait4":{
"duration":0.075,
"duration":0.1,
"armRotation":-20,
"weaponRotation":140,
"twoHanded":false,
Expand Down Expand Up @@ -389,7 +389,7 @@
"twoHanded": false
},
"wait9":{
"duration":0.05,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -427,7 +427,7 @@
"allowFlip":true
},
"wait10":{
"duration":0.05,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -457,7 +457,7 @@
"allowFlip":true
},
"wait11":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -486,7 +486,7 @@
"allowFlip":true
},
"wait12":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -516,7 +516,7 @@
"allowFlip":true
},
"wait13":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -545,7 +545,7 @@
"allowFlip":true
},
"wait14":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down
18 changes: 9 additions & 9 deletions items/active/weapons/melee/abilities/katana/katanacombo2h.weaponability
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"allowFlip":false
},
"wait1":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -170,7 +170,7 @@
"allowFlip":false
},
"wait2":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -229,7 +229,7 @@
"allowFlip":true
},
"wait4":{
"duration":0.075,
"duration":0.1,
"armRotation":-20,
"weaponRotation":140,
"twoHanded":true,
Expand Down Expand Up @@ -392,7 +392,7 @@
"twoHanded": true
},
"wait9":{
"duration":0.05,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -430,7 +430,7 @@
"allowFlip":true
},
"wait10":{
"duration":0.05,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -460,7 +460,7 @@
"allowFlip":true
},
"wait11":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -489,7 +489,7 @@
"allowFlip":true
},
"wait12":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -519,7 +519,7 @@
"allowFlip":true
},
"wait13":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down Expand Up @@ -548,7 +548,7 @@
"allowFlip":true
},
"wait14":{
"duration":0.08,
"duration":0.1,
"armRotation":-85,
"weaponRotation":-5,
"allowRotate":false,
Expand Down
2 changes: 1 addition & 1 deletion items/active/weapons/melee/longsword/densiniumlongsword.activeitem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"baseDps" : 6.8,
"damageConfig" : {
"damageSourceKind": "electricshortsword",
"statusEffect": [ "electrified" ]
"statusEffects": [ "electrified" ]
}
},

Expand Down
42 changes: 41 additions & 1 deletion items/active/weapons/ranged/assaultrifle/commonassaultrifle.activeitem.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,46 @@
"path": "/primaryAbility/inaccuracy",
"value": 0.04
},
{
"op": "add",
"path": "/primaryAbility/stances/idle/weaponOffset",
"value": [0, 0]
},
{
"op": "add",
"path": "/primaryAbility/stances/fire/weaponOffset",
"value": [-0.1, 0]
},
{
"op": "replace",
"path": "/primaryAbility/stances/fire/allowRotate",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/fire/allowFlip",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/duration",
"value": 0.04
},
{
"op": "add",
"path": "/primaryAbility/stances/cooldown/weaponOffset",
"value": [-0.1, 0]
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/allowRotate",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/allowFlip",
"value": true
},
{
"op": "add",
"path": "/fireSounds/0",
Expand Down Expand Up @@ -203,4 +243,4 @@
"path": "/builderConfig/0/altAbilities/-",
"value": "forcebubble"
}
]
]
42 changes: 41 additions & 1 deletion items/active/weapons/ranged/assaultrifle/rareassaultrifle.activeitem.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,46 @@
"path": "/primaryAbility/inaccuracy",
"value": 0.04
},
{
"op": "add",
"path": "/primaryAbility/stances/idle/weaponOffset",
"value": [0, 0]
},
{
"op": "add",
"path": "/primaryAbility/stances/fire/weaponOffset",
"value": [-0.1, 0]
},
{
"op": "replace",
"path": "/primaryAbility/stances/fire/allowRotate",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/fire/allowFlip",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/duration",
"value": 0.04
},
{
"op": "add",
"path": "/primaryAbility/stances/cooldown/weaponOffset",
"value": [-0.1, 0]
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/allowRotate",
"value": true
},
{
"op": "replace",
"path": "/primaryAbility/stances/cooldown/allowFlip",
"value": true
},
{
"op": "add",
"path": "/builderConfig/0/elementalType/-",
Expand Down Expand Up @@ -416,4 +456,4 @@
"path": "/builderConfig/0/altAbilities/-",
"value": "forcebubble"
}
]
]
21 changes: 12 additions & 9 deletions items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonbattlerifle.activeitem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,30 @@
"armRotation" : 0,
"weaponRotation" : 0,
"twoHanded" : true,
"weaponOffset" : [0, 0],

"allowRotate" : true,
"allowFlip" : true
},
"fire" : {
"duration" : 0,
"armRotation" : 4,
"weaponRotation" : 4,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
},
"cooldown" : {
"duration" : 0.16,
"armRotation" : 4,
"weaponRotation" : 4,
"duration" : 0.1,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
}
}
},
Expand Down
21 changes: 12 additions & 9 deletions items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonsaw.activeitem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,30 @@
"armRotation" : 0,
"weaponRotation" : 0,
"twoHanded" : true,
"weaponOffset" : [0, 0],

"allowRotate" : true,
"allowFlip" : true
},
"fire" : {
"duration" : 0,
"armRotation" : 5,
"weaponRotation" : 5,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
},
"cooldown" : {
"duration" : 0.1,
"armRotation" : 2,
"weaponRotation" : 2,
"duration" : 0.04,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
}
}
},
Expand Down
21 changes: 12 additions & 9 deletions items/active/weapons/ranged/assaultrifle/swtjc_ewg_rarebattlerifle.activeitem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,30 @@
"armRotation" : 0,
"weaponRotation" : 0,
"twoHanded" : true,
"weaponOffset" : [0, 0],

"allowRotate" : true,
"allowFlip" : true
},
"fire" : {
"duration" : 0,
"armRotation" : 4,
"weaponRotation" : 4,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
},
"cooldown" : {
"duration" : 0.16,
"armRotation" : 4,
"weaponRotation" : 4,
"duration" : 0.1,
"armRotation" : 3,
"weaponRotation" : 3,
"twoHanded" : true,
"weaponOffset" : [-0.1, 0],

"allowRotate" : false,
"allowFlip" : false
"allowRotate" : true,
"allowFlip" : true
}
}
},
Expand Down
Loading
Loading