sayterdarkwynd · sayterdarkwynd · Feb 27, 2024 · Feb 17, 2024 · Feb 18, 2024 · Feb 18, 2024
diff --git a/items/active/weapons/melee/abilities/shortsword/shortswordcombo2.weaponability b/items/active/weapons/melee/abilities/shortsword/shortswordcombo2.weaponability
@@ -17,7 +17,7 @@
     "comboSteps" : 3,
 
     "flashTime" : 0.25,
-    "flashDirectives" : "fade=FF0000FF=0.15",
+    "flashDirectives" : "fade=22CCFFFF=0.05",
 
     "swooshOffsetRegions" : [
       [-1.0, -0.25, 2.5, 2.0],
@@ -26,7 +26,7 @@
     ],
 
     // cooldown time multiplier for steps after the first, compounded per combo step
-    "comboSpeedFactor" : 0.17,
+    "comboSpeedFactor" : 0.3,
 
     "edgeTriggerGrace" : 0.23,
 
@@ -55,8 +55,8 @@
 
     "stances" : {
       "idle" : {
-        "armRotation" : -90,
-        "weaponRotation" : -10,
+        "armRotation" : -45,
+        "weaponRotation" : -35,
         "weaponOffset" : [0, 2.25],
 
         "allowFlip" : true,
@@ -99,14 +99,23 @@
         "allowRotate" : true
       },
       "fire2" : {
-        "duration" : 0.3,
+        "duration" : 0.2,
         "armRotation" : 0,
         "weaponRotation" : -90,
         "weaponOffset" : [0, 2.25],
         "twoHanded" : false,
         "allowFlip" : true,
         "allowRotate" : true
       },
+      "wait2" : {
+        "duration" : 0.3,
+        "armRotation" : -45,
+        "weaponRotation" : -35,
+        "weaponOffset" : [0, 2.25],
+        "twoHanded" : false,
+        "allowFlip" : true,
+        "allowRotate" : true
+      },
       "windup3" : {
         "duration" : 0.12,
         "armRotation" : -150,
@@ -118,7 +127,7 @@
         "allowFlip" : true
       },
       "fire3" : {
-        "duration" : 0.1,
+        "duration" : 0.2,
         "armRotation" : -10,
         "weaponRotation" : -90,
         "weaponOffset" : [0, 2.25],
@@ -128,7 +137,7 @@
         "allowFlip" : true
       },
       "wait3" : {
-        "duration" : 0.1,
+        "duration" : 0.2,
         "armRotation" : -15,
         "weaponRotation" : -75,
         "weaponOffset" : [0, 2.25],

diff --git a/items/active/weapons/melee/axe/irradiumaxe.activeitem b/items/active/weapons/melee/axe/irradiumaxe.activeitem
@@ -3,7 +3,8 @@
   "price" : 640,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Purified irradium weapon.",
+  "description" : "Purified irradium weapon.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Axe",
   "tooltipKind" : "sword2",
   "category" : "axe",

diff --git a/items/active/weapons/melee/axe/poweraxe.activeitem b/items/active/weapons/melee/axe/poweraxe.activeitem
@@ -3,7 +3,8 @@
   "price" : 2440,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Smile for the birdy!",
+  "description" : "Smile for the birdy!
+^cyan;Inflicts Electrified and Bouncy^reset;",
   "shortdescription" : "Tritanium Axe",
   "tooltipKind" : "sword2",
   "category" : "axe",

diff --git a/items/active/weapons/melee/broadsword/densiniumsword/densiniumsword.activeitem b/items/active/weapons/melee/broadsword/densiniumsword/densiniumsword.activeitem
@@ -4,7 +4,8 @@
   "level" : 6,
   "maxStack" : 1,
   "rarity" : "legendary",
-  "description" : "A powerful, super-dense blade.",
+  "description" : "A powerful, super-dense blade.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Broadsword",
   "tooltipKind" : "sword2",
   "category" : "broadsword",

diff --git a/items/active/weapons/melee/broadsword/irradiumsword.activeitem b/items/active/weapons/melee/broadsword/irradiumsword.activeitem
@@ -4,7 +4,8 @@
   "level" : 4,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Forged from irradium.",
+  "description" : "Forged from irradium.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Blade",
   "tooltipKind" : "sword2",
   "category" : "broadsword",

diff --git a/items/active/weapons/melee/dagger/irradiumdagger.activeitem b/items/active/weapons/melee/dagger/irradiumdagger.activeitem
@@ -3,7 +3,8 @@
   "price" : 640,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Swift and deadly.",
+  "description" : "Swift and deadly.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Dagger",
   "tooltipKind" : "sword2",
   "category" : "dagger",

diff --git a/items/active/weapons/melee/flail/flaildensinium.activeitem b/items/active/weapons/melee/flail/flaildensinium.activeitem
@@ -6,7 +6,7 @@
   "rarity" : "legendary",
   "description" : "Heavy, cumbersome and awesome.
 ^cyan;Breaks blocks^reset;
-^yellow;Stuns enemies^reset;",
+^yellow;Stuns and electrifies^reset;",
   "shortdescription" : "Densinium Striker",
   "tooltipKind" : "gun2",
   "category" : "Striker",

diff --git a/items/active/weapons/melee/greataxe/irradiumgreataxe.activeitem b/items/active/weapons/melee/greataxe/irradiumgreataxe.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "Not at all fun to be cleaved by.
+^cyan;Inflicts Rad-Burn^reset;
 ^cyan;+12% Stun chance^reset;",
   "shortdescription" : "Irradium Greataxe",
   "tooltipKind" : "hammer",

diff --git a/items/active/weapons/melee/hammer/irradiumhammer.activeitem b/items/active/weapons/melee/hammer/irradiumhammer.activeitem
@@ -3,7 +3,8 @@
   "price" : 900,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Forged from carbon and irradium. Quite dangerous.",
+  "description" : "Forged from carbon and irradium. Quite dangerous.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Hammer",
   "tooltipKind" : "hammer",
   "category" : "hammer",

diff --git a/items/active/weapons/melee/katana/densiniumkatana.activeitem b/items/active/weapons/melee/katana/densiniumkatana.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "legendary",
   "description" : "Plasma-laced goodness.
+^cyan;Inflicts Electrified^reset;
 ^yellow;8 hit combo^reset;",
   "shortdescription" : "Densinium Katana",
   "tooltipKind" : "sword2",

diff --git a/items/active/weapons/melee/katana/irradiumkatana.activeitem b/items/active/weapons/melee/katana/irradiumkatana.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "Radioactive stabby fun. Two-handed.
+^cyan;Inflicts Rad-Burn^reset;
 ^yellow;5 hit combo^reset;",
   "shortdescription" : "Irradium Katana",
   "tooltipKind" : "sword2",

diff --git a/items/active/weapons/melee/longsword/densiniumlongsword.activeitem b/items/active/weapons/melee/longsword/densiniumlongsword.activeitem
@@ -4,7 +4,8 @@
   "level" : 6,
   "maxStack" : 1,
   "rarity" : "legendary",
-  "description" : "Brutally dense metal. Super murdery fun.",
+  "description" : "Brutally dense metal. Super murdery fun.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Longsword",
   "tooltipKind" : "sword2",
   "category" : "longsword",
@@ -34,7 +35,8 @@
     "fireTime" : 0.93,
     "baseDps" : 6.8,
     "damageConfig" : {
-      "damageSourceKind": "electricshortsword"
+      "damageSourceKind": "electricshortsword",
+      "statusEffect": [ "electified" ]
     }
   },
 

diff --git a/items/active/weapons/melee/longsword/irradiumlongsword.activeitem b/items/active/weapons/melee/longsword/irradiumlongsword.activeitem
@@ -4,7 +4,8 @@
   "level" : 4,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "A honed irradium edge makes this rather...reactive.",
+  "description" : "A honed irradium edge makes this rather...reactive.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Longsword",
   "tooltipKind" : "sword2",
   "category" : "longsword",

diff --git a/items/active/weapons/melee/mace/densiniummace.activeitem b/items/active/weapons/melee/mace/densiniummace.activeitem
@@ -4,7 +4,8 @@
   "level" : 6,
   "maxStack" : 1,
   "rarity" : "legendary",
-  "description" : "Superior weapon for superior murder. Design by Gezbo.",
+  "description" : "Superior weapon for superior murder. Design by Gezbo.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Mace",
   "tooltipKind" : "hammer",
   "category" : "mace",

diff --git a/items/active/weapons/melee/mace/irradiummace.activeitem b/items/active/weapons/melee/mace/irradiummace.activeitem
@@ -4,7 +4,8 @@
   "level" : 4,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Radiation-laced for extra merriment.",
+  "description" : "Radiation-laced for extra merriment.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Mace",
   "tooltipKind" : "hammer",
   "category" : "mace",
@@ -29,7 +30,8 @@
     "fireTime":0.97,
     "baseDps":7.44,
     "damageConfig" : {
-      "damageSourceKind" : "radioactivehammer"
+      "damageSourceKind" : "radioactivehammer",
+      "statusEffects" : [ "radiationburn" ]
     }
   },
   "critChance" : 1,

diff --git a/items/active/weapons/melee/quarterstaff/densiniumquarterstaff.activeitem b/items/active/weapons/melee/quarterstaff/densiniumquarterstaff.activeitem
@@ -4,7 +4,8 @@
   "maxStack" : 1,
   "level" : 6,
   "rarity" : "legendary",
-  "description" : "An extremely dense, heavy staff.",
+  "description" : "An extremely dense, heavy staff.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Quarterstaff",
   "tooltipKind" : "sword2",
   "category" : "Quarterstaff",
@@ -33,7 +34,8 @@
     "baseDps" : 6.56,
     "damageConfig":{
       "knockback":10,
-      "damageSourceKind" : "electric"
+      "damageSourceKind" : "electric",
+      "statusEffects" : [ "electrified" ]
       },
       "comboSteps":6,
       "swooshOffsetRegions":[

diff --git a/items/active/weapons/melee/quarterstaff/irradiumquarterstaff.activeitem b/items/active/weapons/melee/quarterstaff/irradiumquarterstaff.activeitem
@@ -4,7 +4,8 @@
   "maxStack" : 1,
   "level" : 4,
   "rarity" : "rare",
-  "description" : "A radioactive staff designed to fracture bone.",
+  "description" : "A radioactive staff designed to fracture bone.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Quarterstaff",
   "tooltipKind" : "sword2",
   "category" : "Quarterstaff",

diff --git a/items/active/weapons/melee/rapier/irradiumrapier.activeitem b/items/active/weapons/melee/rapier/irradiumrapier.activeitem
@@ -5,7 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "A swift and dangerous radioactive blade.
-^cyan;Causes Radiation Burn^reset;",
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Rapier",
   "tooltipKind" : "sword2",
   "category" : "Rapier",

diff --git a/items/active/weapons/melee/scythe/densiniumscythe.activeitem b/items/active/weapons/melee/scythe/densiniumscythe.activeitem
@@ -4,7 +4,8 @@
   "level" : 6,
   "maxStack" : 1,
   "rarity" : "legendary",
-  "description" : "Perhaps the deadliest curved blade around.",
+  "description" : "Perhaps the deadliest curved blade around.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Scythe",
   "tooltipKind" : "sword2",
   "category" : "scythe",
@@ -29,7 +30,8 @@
     "fireTime" : 0.83,
     "baseDps" : 12,
     "damageConfig" : {
-      "damageSourceKind" : "electric"
+      "damageSourceKind" : "electric",
+      "statusEffects" : [ "electrified" ]
     },
     "stances" : {
       "idle" : {

diff --git a/items/active/weapons/melee/scythe/irradiumscythe.activeitem b/items/active/weapons/melee/scythe/irradiumscythe.activeitem
@@ -4,7 +4,8 @@
   "level" : 4,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Unsure if meant for farming or murder. Fun either way.",
+  "description" : "Unsure if meant for farming or murder. Fun either way.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium Scythe",
   "tooltipKind" : "sword2",
   "category" : "scythe",
@@ -135,4 +136,4 @@
   "critChance" : 2,
   "critBonus" : 11,
   "builder" : "/items/buildscripts/buildunrandweapon.lua"
-}
+}
diff --git a/items/active/weapons/melee/shortspear/densiniumshortspear.activeitem b/items/active/weapons/melee/shortspear/densiniumshortspear.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "legendary",
   "description" : "Deadly edge, full of purple menace.
+^cyan;Inflicts Electrified^reset;
 ^cyan;Hunting weapon^reset;",
   "shortdescription" : "Densinium Shortspear",
   "tooltipKind" : "sword2",

diff --git a/items/active/weapons/melee/shortspear/irradiumshortspear.activeitem b/items/active/weapons/melee/shortspear/irradiumshortspear.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "Light and brutally radioactive. Guaranteed to cause death.
+^cyan;Inflicts Rad-Burn^reset;
 ^cyan;Hunting weapon^reset;",
   "shortdescription" : "Irradium Shortspear",
   "tooltipKind" : "sword2",

diff --git a/items/active/weapons/melee/shortspear/tritaniumshortspear.activeitem b/items/active/weapons/melee/shortspear/tritaniumshortspear.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "A marvelously stabby device.
+^cyan;Inflicts Electrified^reset;
 ^cyan;Hunting weapon^reset;",
   "shortdescription" : "Tritanium Shortspear",
   "tooltipKind" : "sword2",
@@ -39,6 +40,7 @@
     "baseDps" : 6.4,
     "damageConfig" : {
       "damageSourceKind" : "electricbow",
+      "statusEffects" : [ "electrified" ],
       "knockback" : 7
     },
     "stances" : {

diff --git a/items/active/weapons/melee/shortsword/densiniumshortsword.activeitem b/items/active/weapons/melee/shortsword/densiniumshortsword.activeitem
@@ -4,7 +4,8 @@
   "level" : 6,
   "maxStack" : 1,
   "rarity" : "legendary",
-  "description" : "Superior craftsmanship. Nearly unbreakable.",
+  "description" : "Superior craftsmanship. Nearly unbreakable.
+^cyan;Inflicts Electrified^reset;",
   "shortdescription" : "Densinium Shortsword",
   "tooltipKind" : "sword2",
   "category" : "shortsword",
@@ -40,4 +41,4 @@
 
   "builder" : "/items/buildscripts/buildunrandweapon.lua"
 
-}
+}
diff --git a/items/active/weapons/melee/shortsword/irradiumblade.activeitem b/items/active/weapons/melee/shortsword/irradiumblade.activeitem
@@ -4,7 +4,8 @@
   "level" : 4,
   "maxStack" : 1,
   "rarity" : "rare",
-  "description" : "Built for conquest.",
+  "description" : "Built for conquest.
+^cyan;Inflicts Rad-Burn^reset;",
   "shortdescription" : "Irradium War Knife",
   "tooltipKind" : "sword2",
   "category" : "shortsword",

diff --git a/items/active/weapons/melee/spear/irradiumspear.activeitem b/items/active/weapons/melee/spear/irradiumspear.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "Infused with toxic Irradium radiation. That's kind of you.
+^cyan;Inflicts Rad-Burn^reset;
 ^cyan;Hunting weapon^reset;",
   "shortdescription" : "Irradium Spear",
   "tooltipKind" : "sword2",

diff --git a/items/active/weapons/melee/spear/tritaniumspear.activeitem b/items/active/weapons/melee/spear/tritaniumspear.activeitem
@@ -5,6 +5,7 @@
   "maxStack" : 1,
   "rarity" : "rare",
   "description" : "You should shove this in a foe. For science!
+^cyan;Inflicts Electrified^reset;
 ^cyan;Hunting weapon^reset;",
   "shortdescription" : "Tritanium Spear",
   "tooltipKind" : "sword2",