Merge pull request #3564 from MaxDreyko/master

Fire rate throttle fix for rng full auto weapons
sayterdarkwynd · May 14, 2024 · a79bbd0 · a79bbd0
2 parents 15d4c0a + fd4e28b
commit a79bbd0
Show file tree

Hide file tree

Showing 21 changed files with 301 additions and 109 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
   }
-]
+]
diff --git 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"
   }
-]
+]
diff --git 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
@@ -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
@@ -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
       }
     }
   },