From 2d76c0dc1662de141fc346d698b1959f9454d8da Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:49:08 +0200 Subject: [PATCH 01/21] Updated recoil animation --- .../commonassaultrifle.activeitem.patch | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) 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 +] From 9cf60ba9b0253f437ff6bc24f3ac9906d3bcb99e Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:50:28 +0200 Subject: [PATCH 02/21] Updated recoil animation --- .../rareassaultrifle.activeitem.patch | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) 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 +] From 41f3177f4fc46b9a41d8ca8059260b6c9675e67d Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:51:42 +0200 Subject: [PATCH 03/21] Updated recoil animation --- .../swtjc_ewg_commonbattlerifle.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From 79a74ff8773efecd31a89d0761c248ade466b14c Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:53:01 +0200 Subject: [PATCH 04/21] Updated recoil animation --- .../swtjc_ewg_commonsaw.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From 3acec6c29f1e04b5f74b317ff1994bf0b25e9f85 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:54:22 +0200 Subject: [PATCH 05/21] Updated recoil animation --- .../swtjc_ewg_rarebattlerifle.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From a621fe9a9a0265883f32f767f7c29f13d17b25b5 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:55:03 +0200 Subject: [PATCH 06/21] Updated recoil animation --- .../assaultrifle/swtjc_ewg_raresaw.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From 3f33ed6fd3ea6b54ec862383b852cf243ed75e32 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:55:59 +0200 Subject: [PATCH 07/21] Updated recoil animation --- .../swtjc_ewg_uncommonbattlerifle.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From a6bb0da9618ba8a1b4054a90854886d6b963fdf4 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:56:39 +0200 Subject: [PATCH 08/21] Updated recoil animation --- .../swtjc_ewg_uncommonsaw.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } }, From 104f8e72ac2ceb86cf3b2a108f8c45b468c17c98 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:57:48 +0200 Subject: [PATCH 09/21] Updated recoil animation --- .../uncommonassaultrifle.activeitem.patch | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) 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 +] From bdd77e8bb6885a8f4b069d70d73fe788109ccbea Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 21:59:34 +0200 Subject: [PATCH 10/21] Updated recoil animation --- .../commonmachinepistol.activeitem.patch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 +] From 4794caf65ad75ff5cc45dacef6c134a9ea2dd703 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:00:10 +0200 Subject: [PATCH 11/21] Updated recoil animation --- .../raremachinepistol.activeitem.patch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 +] From 1e16c58f8685a0800ba11bb9cd70a346c0d13714 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:00:48 +0200 Subject: [PATCH 12/21] Updated recoil animation --- .../swtjc_ewg_commonsubmachinegun.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } From aed1036c24f5677b86591f7e728a8c75a1e166dd Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:01:24 +0200 Subject: [PATCH 13/21] Updated recoil animation --- .../swtjc_ewg_raresubmachinegun.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } From f93a843e472c70e4d42184c3961e9ba19564e0ff Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:02:25 +0200 Subject: [PATCH 14/21] Updated recoil animation --- ...swtjc_ewg_uncommonsubmachinegun.activeitem | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 } } From d499d3ac2ea2ebcd693673233385e3e1abe29605 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:03:15 +0200 Subject: [PATCH 15/21] Updated recoil animation --- .../uncommonmachinepistol.activeitem.patch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 +] From 64e2185c6406f26dba50c302a2fa1f632814f830 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:05:49 +0200 Subject: [PATCH 16/21] Updated recoil animation --- .../ranged/shotgun/swtjc_ewg_commonautoshotgun.activeitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 2cf7e2c5209b01fd3b9433c080df8c798a096f58 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:06:52 +0200 Subject: [PATCH 17/21] Updated recoil animation --- .../weapons/ranged/shotgun/swtjc_ewg_rareautoshotgun.activeitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 3419c42a4c8d72cb5ed20c5df0e54bbbde876758 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:07:37 +0200 Subject: [PATCH 18/21] Updated recoil animation --- .../ranged/shotgun/swtjc_ewg_uncommonautoshotgun.activeitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 204cfa062094d1a32a975ae7565becd20e3e9e61 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:17:49 +0200 Subject: [PATCH 19/21] increased cooldown duration of some combo steps --- .../abilities/katana/katanacombo.weaponability | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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, From 9fd6d16ee8a8c537db400ab95c48cde49c185650 Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:18:34 +0200 Subject: [PATCH 20/21] increased cooldown duration of some combo steps --- .../katana/katanacombo2h.weaponability | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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, From fd4e28bdc233ac4d3dac097620cb83335c9bbc1b Mon Sep 17 00:00:00 2001 From: MaxDreyko <160330584+MaxDreyko@users.noreply.github.com> Date: Mon, 13 May 2024 22:21:17 +0200 Subject: [PATCH 21/21] Fixed another typo --- .../weapons/melee/longsword/densiniumlongsword.activeitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" ] } },