diff --git a/items/active/weapons/melee/abilities/katana/katanacombo.weaponability b/items/active/weapons/melee/abilities/katana/katanacombo.weaponability index 35f17fc7032..aa6c00f6f56 100644 --- a/items/active/weapons/melee/abilities/katana/katanacombo.weaponability +++ b/items/active/weapons/melee/abilities/katana/katanacombo.weaponability @@ -131,7 +131,7 @@ "allowFlip":false }, "wait1":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -170,7 +170,7 @@ "allowFlip":false }, "wait2":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -229,7 +229,7 @@ "allowFlip":true }, "wait4":{ - "duration":0.075, + "duration":0.1, "armRotation":-20, "weaponRotation":140, "twoHanded":false, @@ -389,7 +389,7 @@ "twoHanded": false }, "wait9":{ - "duration":0.05, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -427,7 +427,7 @@ "allowFlip":true }, "wait10":{ - "duration":0.05, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -457,7 +457,7 @@ "allowFlip":true }, "wait11":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -486,7 +486,7 @@ "allowFlip":true }, "wait12":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -516,7 +516,7 @@ "allowFlip":true }, "wait13":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -545,7 +545,7 @@ "allowFlip":true }, "wait14":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, diff --git a/items/active/weapons/melee/abilities/katana/katanacombo2h.weaponability b/items/active/weapons/melee/abilities/katana/katanacombo2h.weaponability index a3054d69969..484cf1b5ef9 100644 --- a/items/active/weapons/melee/abilities/katana/katanacombo2h.weaponability +++ b/items/active/weapons/melee/abilities/katana/katanacombo2h.weaponability @@ -131,7 +131,7 @@ "allowFlip":false }, "wait1":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -170,7 +170,7 @@ "allowFlip":false }, "wait2":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -229,7 +229,7 @@ "allowFlip":true }, "wait4":{ - "duration":0.075, + "duration":0.1, "armRotation":-20, "weaponRotation":140, "twoHanded":true, @@ -392,7 +392,7 @@ "twoHanded": true }, "wait9":{ - "duration":0.05, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -430,7 +430,7 @@ "allowFlip":true }, "wait10":{ - "duration":0.05, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -460,7 +460,7 @@ "allowFlip":true }, "wait11":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -489,7 +489,7 @@ "allowFlip":true }, "wait12":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -519,7 +519,7 @@ "allowFlip":true }, "wait13":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, @@ -548,7 +548,7 @@ "allowFlip":true }, "wait14":{ - "duration":0.08, + "duration":0.1, "armRotation":-85, "weaponRotation":-5, "allowRotate":false, diff --git a/items/active/weapons/melee/longsword/densiniumlongsword.activeitem b/items/active/weapons/melee/longsword/densiniumlongsword.activeitem index 9dfd6c8876f..0717ae30a09 100644 --- a/items/active/weapons/melee/longsword/densiniumlongsword.activeitem +++ b/items/active/weapons/melee/longsword/densiniumlongsword.activeitem @@ -36,7 +36,7 @@ "baseDps" : 6.8, "damageConfig" : { "damageSourceKind": "electricshortsword", - "statusEffect": [ "electrified" ] + "statusEffects": [ "electrified" ] } }, diff --git a/items/active/weapons/ranged/assaultrifle/commonassaultrifle.activeitem.patch b/items/active/weapons/ranged/assaultrifle/commonassaultrifle.activeitem.patch index 41c631990da..d7e412d02f8 100644 --- a/items/active/weapons/ranged/assaultrifle/commonassaultrifle.activeitem.patch +++ b/items/active/weapons/ranged/assaultrifle/commonassaultrifle.activeitem.patch @@ -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", @@ -203,4 +243,4 @@ "path": "/builderConfig/0/altAbilities/-", "value": "forcebubble" } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/assaultrifle/rareassaultrifle.activeitem.patch b/items/active/weapons/ranged/assaultrifle/rareassaultrifle.activeitem.patch index 781725e8f92..c5cf8830ce4 100644 --- a/items/active/weapons/ranged/assaultrifle/rareassaultrifle.activeitem.patch +++ b/items/active/weapons/ranged/assaultrifle/rareassaultrifle.activeitem.patch @@ -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/-", @@ -416,4 +456,4 @@ "path": "/builderConfig/0/altAbilities/-", "value": "forcebubble" } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonbattlerifle.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonbattlerifle.activeitem index c2c1114ebf9..0e95975d13f 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonbattlerifle.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonbattlerifle.activeitem @@ -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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonsaw.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonsaw.activeitem index aa776352d0a..e03f119aa0e 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonsaw.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_commonsaw.activeitem @@ -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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_rarebattlerifle.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_rarebattlerifle.activeitem index 4f73ab70a13..14558c68937 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_rarebattlerifle.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_rarebattlerifle.activeitem @@ -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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_raresaw.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_raresaw.activeitem index a0fdf6fb5cc..642970ea41b 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_raresaw.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_raresaw.activeitem @@ -49,27 +49,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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonbattlerifle.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonbattlerifle.activeitem index 8ba110211c4..c56c0eec0ae 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonbattlerifle.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonbattlerifle.activeitem @@ -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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonsaw.activeitem b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonsaw.activeitem index 0a03a76b1ee..b3ea5e4139f 100644 --- a/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonsaw.activeitem +++ b/items/active/weapons/ranged/assaultrifle/swtjc_ewg_uncommonsaw.activeitem @@ -49,27 +49,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 } } }, diff --git a/items/active/weapons/ranged/assaultrifle/uncommonassaultrifle.activeitem.patch b/items/active/weapons/ranged/assaultrifle/uncommonassaultrifle.activeitem.patch index c295012f6b7..6a14a84a01e 100644 --- a/items/active/weapons/ranged/assaultrifle/uncommonassaultrifle.activeitem.patch +++ b/items/active/weapons/ranged/assaultrifle/uncommonassaultrifle.activeitem.patch @@ -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/-", @@ -586,4 +626,4 @@ "path": "/builderConfig/0/altAbilities/-", "value": "forcebubble" } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/machinepistol/commonmachinepistol.activeitem.patch b/items/active/weapons/ranged/machinepistol/commonmachinepistol.activeitem.patch index 5d53fd1769e..73047042a70 100644 --- a/items/active/weapons/ranged/machinepistol/commonmachinepistol.activeitem.patch +++ b/items/active/weapons/ranged/machinepistol/commonmachinepistol.activeitem.patch @@ -61,6 +61,21 @@ "path": "/primaryAbility/fireTime/1", "value": 0.12 }, + { + "op": "replace", + "path": "/primaryAbility/stances/fire/allowRotate", + "value": true + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/duration", + "value": 0.02 + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/allowRotate", + "value": true + }, { "op": "add", "path": "/fireSounds/-", @@ -81,4 +96,4 @@ "path": "/builderConfig/0/animationParts/barrel/variants", "value": 27 } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/machinepistol/raremachinepistol.activeitem.patch b/items/active/weapons/ranged/machinepistol/raremachinepistol.activeitem.patch index 9bb33ed0481..2c6d8104598 100644 --- a/items/active/weapons/ranged/machinepistol/raremachinepistol.activeitem.patch +++ b/items/active/weapons/ranged/machinepistol/raremachinepistol.activeitem.patch @@ -56,6 +56,21 @@ "path": "/primaryAbility/fireTime/0", "value": 0.04 }, + { + "op": "replace", + "path": "/primaryAbility/stances/fire/allowRotate", + "value": true + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/duration", + "value": 0.02 + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/allowRotate", + "value": true + }, { "op": "add", "path": "/builderConfig/0/elementalType/-", @@ -202,4 +217,4 @@ "path": "/builderConfig/0/animationParts/barrel/variants", "value": 27 } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/machinepistol/swtjc_ewg_commonsubmachinegun.activeitem b/items/active/weapons/ranged/machinepistol/swtjc_ewg_commonsubmachinegun.activeitem index 64c677e457c..fcc4a1fe531 100644 --- a/items/active/weapons/ranged/machinepistol/swtjc_ewg_commonsubmachinegun.activeitem +++ b/items/active/weapons/ranged/machinepistol/swtjc_ewg_commonsubmachinegun.activeitem @@ -24,9 +24,9 @@ "class" : "GunFire", "fireTime" : [0.09, 0.15], - "baseDps" : [5.5, 7], + "baseDps" : [6.4, 7.5], "energyUsage" : [24, 27], - "inaccuracy" : 0.02, + "inaccuracy" : 0.06, "burstTime" : 0.075, "burstCount" : [2,4], @@ -42,26 +42,29 @@ "armRotation" : 0, "weaponRotation" : 0, "twoHanded" : false, + "weaponOffset" : [0, 0], "allowRotate" : true, "allowFlip" : true }, "fire" : { "duration" : 0, - "armRotation" : 5, - "weaponRotation" : 5, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true }, "cooldown" : { - "duration" : 0.11, - "armRotation" : 5, - "weaponRotation" : 5, + "duration" : 0.05, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true } } diff --git a/items/active/weapons/ranged/machinepistol/swtjc_ewg_raresubmachinegun.activeitem b/items/active/weapons/ranged/machinepistol/swtjc_ewg_raresubmachinegun.activeitem index cd3f2831461..206aec5dd7f 100644 --- a/items/active/weapons/ranged/machinepistol/swtjc_ewg_raresubmachinegun.activeitem +++ b/items/active/weapons/ranged/machinepistol/swtjc_ewg_raresubmachinegun.activeitem @@ -24,9 +24,9 @@ "class" : "GunFire", "fireTime" : [0.08, 0.15], - "baseDps" : [5.7, 7.5], + "baseDps" : [6.4, 8.0], "energyUsage" : [25.5, 28.5], - "inaccuracy" : 0.02, + "inaccuracy" : 0.06, "burstTime" : 0.075, "burstCount" : [2,4], @@ -41,26 +41,29 @@ "armRotation" : 0, "weaponRotation" : 0, "twoHanded" : false, + "weaponOffset" : [0, 0], "allowRotate" : true, "allowFlip" : true }, "fire" : { "duration" : 0, - "armRotation" : 5, - "weaponRotation" : 5, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true }, "cooldown" : { - "duration" : 0.11, - "armRotation" : 5, - "weaponRotation" : 5, + "duration" : 0.04, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true } } diff --git a/items/active/weapons/ranged/machinepistol/swtjc_ewg_uncommonsubmachinegun.activeitem b/items/active/weapons/ranged/machinepistol/swtjc_ewg_uncommonsubmachinegun.activeitem index 3c9daf933ba..ddc40cf1daf 100644 --- a/items/active/weapons/ranged/machinepistol/swtjc_ewg_uncommonsubmachinegun.activeitem +++ b/items/active/weapons/ranged/machinepistol/swtjc_ewg_uncommonsubmachinegun.activeitem @@ -24,9 +24,9 @@ "class" : "GunFire", "fireTime" : [0.08, 0.15], - "baseDps" : [5.5, 7.2], + "baseDps" : [6.4, 8.0], "energyUsage" : [25.5, 28.5], - "inaccuracy" : 0.02, + "inaccuracy" : 0.06, "burstTime" : 0.075, "burstCount" : [2,4], @@ -41,26 +41,29 @@ "armRotation" : 0, "weaponRotation" : 0, "twoHanded" : false, + "weaponOffset" : [0, 0], "allowRotate" : true, "allowFlip" : true }, "fire" : { "duration" : 0, - "armRotation" : 5, - "weaponRotation" : 5, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true }, "cooldown" : { - "duration" : 0.11, - "armRotation" : 5, - "weaponRotation" : 5, + "duration" : 0.04, + "armRotation" : 3, + "weaponRotation" : 3, "twoHanded" : false, + "weaponOffset" : [-0.1, 0], - "allowRotate" : false, + "allowRotate" : true, "allowFlip" : true } } diff --git a/items/active/weapons/ranged/machinepistol/uncommonmachinepistol.activeitem.patch b/items/active/weapons/ranged/machinepistol/uncommonmachinepistol.activeitem.patch index 84f69345f48..698be05f2a6 100644 --- a/items/active/weapons/ranged/machinepistol/uncommonmachinepistol.activeitem.patch +++ b/items/active/weapons/ranged/machinepistol/uncommonmachinepistol.activeitem.patch @@ -61,6 +61,21 @@ "path": "/primaryAbility/fireTime/1", "value": 0.12 }, + { + "op": "replace", + "path": "/primaryAbility/stances/fire/allowRotate", + "value": true + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/duration", + "value": 0.02 + }, + { + "op": "replace", + "path": "/primaryAbility/stances/cooldown/allowRotate", + "value": true + }, { "op": "add", "path": "/builderConfig/0/elementalType/-", @@ -252,4 +267,4 @@ "path": "/builderConfig/0/animationParts/barrel/variants", "value": 27 } -] \ No newline at end of file +] diff --git a/items/active/weapons/ranged/shotgun/swtjc_ewg_commonautoshotgun.activeitem b/items/active/weapons/ranged/shotgun/swtjc_ewg_commonautoshotgun.activeitem index d369b583ea4..8e160daf77b 100644 --- a/items/active/weapons/ranged/shotgun/swtjc_ewg_commonautoshotgun.activeitem +++ b/items/active/weapons/ranged/shotgun/swtjc_ewg_commonautoshotgun.activeitem @@ -64,7 +64,7 @@ "allowFlip" : false }, "cooldown" : { - "duration" : 0.20, + "duration" : 0.1, "armRotation" : 5, "weaponRotation" : 5, "twoHanded" : true, diff --git a/items/active/weapons/ranged/shotgun/swtjc_ewg_rareautoshotgun.activeitem b/items/active/weapons/ranged/shotgun/swtjc_ewg_rareautoshotgun.activeitem index c4d30679909..e4f4b4f796a 100644 --- a/items/active/weapons/ranged/shotgun/swtjc_ewg_rareautoshotgun.activeitem +++ b/items/active/weapons/ranged/shotgun/swtjc_ewg_rareautoshotgun.activeitem @@ -60,7 +60,7 @@ "allowFlip" : false }, "cooldown" : { - "duration" : 0.2, + "duration" : 0.1, "armRotation" : 5, "weaponRotation" : 5, "twoHanded" : true, diff --git a/items/active/weapons/ranged/shotgun/swtjc_ewg_uncommonautoshotgun.activeitem b/items/active/weapons/ranged/shotgun/swtjc_ewg_uncommonautoshotgun.activeitem index ea19a860445..d07dbc40099 100644 --- a/items/active/weapons/ranged/shotgun/swtjc_ewg_uncommonautoshotgun.activeitem +++ b/items/active/weapons/ranged/shotgun/swtjc_ewg_uncommonautoshotgun.activeitem @@ -60,7 +60,7 @@ "allowFlip" : false }, "cooldown" : { - "duration" : 0.2, + "duration" : 0.1, "armRotation" : 5, "weaponRotation" : 5, "twoHanded" : true,