Merge pull request #448 from Avali-Triage-Team/MeleeDamageUpdate

update all melee damage types to aerotech
Avali-Triage-Team · Jun 17, 2021 · c90ef8d · c90ef8d
2 parents 886c54a + 16ce99b
commit c90ef8d
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 40 deletions.
diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier1broadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier1broadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier2broadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier2broadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier3broadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier3broadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier4broadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier4broadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier5abroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier5abroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
 
       "knockback" : 20,
       "knockbackMode" : "facing",

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier5mbroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier5mbroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier5sbroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier5sbroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 12.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier6abroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier6abroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier6mbroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier6mbroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/broadsword/avali/avalitier6sbroadsword.activeitem b/items/active/weapons/melee/tiered/broadsword/avali/avalitier6sbroadsword.activeitem
@@ -42,7 +42,7 @@
     "fireTime" : 0.83,
     "baseDps" : 12.5,
     "damageConfig" : {
-      "damageSourceKind" : "broadsword",
+      "damageSourceKind" : "aerotech",
       "knockback" : 20,
       "knockbackMode" : "facing",
       "timeoutGroup" : "primary"

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier1dagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier1dagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier2dagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier2dagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier3dagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier3dagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier4dagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier4dagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier5adagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier5adagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier5mdagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier5mdagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier5sdagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier5sdagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 10,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier6adagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier6adagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier6mdagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier6mdagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 9,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/dagger/avali/avalitier6sdagger.activeitem b/items/active/weapons/melee/tiered/dagger/avali/avalitier6sdagger.activeitem
@@ -56,7 +56,7 @@
     "fireTime" : 0.333,
     "baseDps" : 10,
     "damageConfig" : {
-      "damageSourceKind" : "dagger",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [],
       "knockbackMode" : "aim",
       "knockback" : 10,

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier1hammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier1hammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier2hammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier2hammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
        "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier3hammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier3hammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier4hammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier4hammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
        "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier5ahammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier5ahammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier5mhammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier5mhammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier5shammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier5shammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 12.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
         "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier6ahammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier6ahammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier6mhammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier6mhammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",
       "stances" : {

diff --git a/items/active/weapons/melee/tiered/hammer/avali/avalitier6shammer.activeitem b/items/active/weapons/melee/tiered/hammer/avali/avalitier6shammer.activeitem
@@ -29,7 +29,7 @@
     "fireTime" : 1.3,
     "baseDps" : 12.5,
     "damageConfig" : {
-      "damageSourceKind" : "hammer",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "facing",   
   "stances" : {

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier1spear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier1spear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier2spear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier2spear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier3spear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier3spear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier4spear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier4spear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier5aspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier5aspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier5mspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier5mspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier5sspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier5sspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier6aspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier6aspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier6mspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier6mspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 10.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,

diff --git a/items/active/weapons/melee/tiered/spear/avali/avalitier6sspear.activeitem b/items/active/weapons/melee/tiered/spear/avali/avalitier6sspear.activeitem
@@ -35,7 +35,7 @@
     "fireTime" : 0.9,
     "baseDps" : 11.5,
     "damageConfig" : {
-      "damageSourceKind" : "spear",
+      "damageSourceKind" : "aerotech",
       "statusEffects" : [ ],
       "knockbackMode" : "aim",
       "knockback" : 30,