aww yis.

sayterdarkwynd · Nov 12, 2018 · 7bc18e9 · 7bc18e9
1 parent 54f630b
commit 7bc18e9
Show file tree

Hide file tree

Showing 51 changed files with 209 additions and 671 deletions.
diff --git a/_FUversioning.config b/_FUversioning.config
@@ -7,6 +7,13 @@ ____________________________________________________
 
   * NANOFABRICATOR/TINKER TABLE no longer does Armor. The armors have been moved to their relevant station (Sewing or Armory). It was counter-intutive.
 
+  * corrected hammer swing range for FU hammers.
+
+  * Phase Armor now has less HP but more Energy
+
+  * fixed some weapon Fullbright settings
+
+  * added Fullbright layer for fist weapons
 
 ____________________________________________________
   ^cyan;New in version 5.6.2692^reset;
@@ -40,7 +47,7 @@ ____________________________________________________
 
   * Quietus General is now a Longsword
 
-  * added Wraithwind spear, Aetherium Spear
+  * added Wraithwind spear, Aetherium Speard
 
   * added Yin Yang blade
 

diff --git a/items/active/weapons/bow/cutebow/cutebow.activeitem b/items/active/weapons/bow/cutebow/cutebow.activeitem
@@ -17,9 +17,10 @@
 
   "level" : 4,
 
-  "animation" : "/items/active/weapons/bow/bow.animation",
+  "animation" : "/items/active/weapons/bow/bowglow.animation",
   "animationParts" : {
-    "bow" : "cutebow.png"
+    "bow" : "cutebow.png",
+    "bowfullbright" : "penumbrabowfullfullbright.png"
   },
   "animationCustom" : {
     "animatedParts" : { "parts" : { "bow" : { "properties" : {

diff --git a/items/active/weapons/bow/cutebow/cutebowfullbright.frames b/items/active/weapons/bow/cutebow/cutebowfullbright.frames
@@ -0,0 +1,6 @@
+{
+  "frameGrid" : {
+    "size" : [26, 40],
+    "dimensions" : [5, 1]
+  }
+}
diff --git a/items/active/weapons/fist/aetherium_fistfullbright.png b/items/active/weapons/fist/aetherium_fistfullbright.png
diff --git a/items/active/weapons/fist/aetheriumfists.activeitem b/items/active/weapons/fist/aetheriumfists.activeitem
@@ -13,9 +13,10 @@
   "itemTags" : ["weapon","fist","energy","aether","upgradeableWeapon"],
 
   "inventoryIcon" : "aetherium_fist_ashey.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "aetherium_fist_ashey.png",
+    "weaponfullbright" : "aetherium_fist_fullbright.png",
     "swoosh" : "swoosh/clawswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/cultivatorsgauntlets.activeitem b/items/active/weapons/fist/cultivatorsgauntlets.activeitem
@@ -13,9 +13,10 @@
   "itemTags" : ["weapon","fist","upgradeableWeapon"],
 
   "inventoryIcon" : "cultivatorsgauntlets.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "cultivatorsgauntlets.png",
+    "weaponfullbright" : "cultivatorsgauntletsfullbright.png",
     "swoosh" : "swoosh/cuteswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/cultivatorsgauntletsfullbright.png b/items/active/weapons/fist/cultivatorsgauntletsfullbright.png
diff --git a/items/active/weapons/fist/cutecestus.activeitem b/items/active/weapons/fist/cutecestus.activeitem
@@ -13,9 +13,10 @@
   "itemTags" : ["weapon","fist","energy","upgradeableWeapon"],
 
   "inventoryIcon" : "cutecestus.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "cutecestus.png",
+    "weaponfullbright" : "cutecestusfullbright.png",
     "swoosh" : "swoosh/cuteswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/cutecestusfullbright.png b/items/active/weapons/fist/cutecestusfullbright.png
diff --git a/items/active/weapons/fist/extraclawglove.activeitem b/items/active/weapons/fist/extraclawglove.activeitem
@@ -12,9 +12,10 @@
   "itemTags" : ["weapon", "fist", "upgradeableWeapon"],
 
   "inventoryIcon" : "extraclawglove.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "extraclawglove.png",
+    "weaponfullbright" : "extraclawglovefullbright.png",
     "swoosh" : "swoosh/extraclawswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/extraclawglovefullbright.frames b/items/active/weapons/fist/extraclawglovefullbright.frames
@@ -0,0 +1,10 @@
+{
+  "frameGrid" : {
+    "size" : [23, 16],
+    "dimensions" : [2, 1],
+
+    "names" : [
+      [ "front", "back" ]
+    ]
+  }
+}
diff --git a/items/active/weapons/fist/extraclawglovefullbright.png b/items/active/weapons/fist/extraclawglovefullbright.png
diff --git a/items/active/weapons/fist/fistweaponglow.animation b/items/active/weapons/fist/fistweaponglow.animation
@@ -0,0 +1,81 @@
+{
+  "animatedParts" : {
+    "stateTypes" : {
+      "attack" : {
+        "default" : "idle",
+        "states" : {
+          "idle" : { 
+            "properties" : {
+              "particleEmittersOff" : ["swoosh"]
+            }
+          },
+          "fire" : {
+            "frames" : 3,
+            "cycle" : 0.095,
+            "mode" : "transition",
+            "transition" : "idle",
+            "properties" : {
+              "particleEmittersOn" : ["swoosh"]
+            }
+          }
+        }
+      }
+    },
+
+    "parts" : {
+      "weapon" : {
+        "properties" : {
+          "transformationGroups" : ["weapon"],
+          "rotationCenter" : [-1, 0],
+          "centered" : true,
+          "zLevel" : 0,
+          "image" : "<partImage>:<hand>"
+        }
+      },
+      "weaponfullbright" : {
+        "properties" : {
+          "transformationGroups" : ["weapon"],
+          "rotationCenter" : [-1, 0],
+          "centered" : true,
+          "fullbright": true,
+          "zLevel" : 1,
+          "image" : "<partImage>:<hand>"
+        }
+      },      
+      "swoosh" : {
+        "properties" : {
+          "transformationGroups" : ["weapon","swoosh"],
+          "centered" : true,
+          "offset" : [0.5, 0.125],
+          "zLevel" : 1
+        },
+
+        "partStates" : {
+          "attack" : {
+            "idle" : { },
+            "fire" : {
+              "properties" : {
+                "image" : "<partImage>:<frame>",
+                "damageArea" : [[-1, -1.1], [1.0, -0.6], [1.0, 0.8], [-1, 1.3]]
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+
+  "transformationGroups" : {
+    "weapon" : {},
+    "swoosh" : {}
+  },
+
+  "particleEmitters" : {
+    "swoosh" : {
+      "particles" : [] 
+    }
+  },
+  "sounds" : {
+    "fire" : [ ]
+  }
+}
diff --git a/items/active/weapons/fist/hellclaw.activeitem b/items/active/weapons/fist/hellclaw.activeitem
@@ -12,9 +12,10 @@
   "twoHanded" : false,
   "itemTags" : ["weapon","fist", "upgradeableWeapon"],
   "inventoryIcon" : "hellclaw.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "hellclaw.png",
+    "weaponfullbright" : "hellclawfullbright.png",
     "swoosh" : "swoosh/clawswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/hellclawfullbright.png b/items/active/weapons/fist/hellclawfullbright.png
diff --git a/items/active/weapons/fist/precursorfist.activeitem b/items/active/weapons/fist/precursorfist.activeitem
@@ -12,15 +12,16 @@
   "itemTags" : ["weapon", "fist", "upgradeableWeapon", "precursor", "energy"],
 
   "inventoryIcon" : "precursorfist.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "precursorfist.png",
+    "weaponfullbright" : "precursorfistfullbright.png",
     "swoosh" : "swoosh/precursorswoosh.png"
   },
   "animationCustom" : {
-    "animatedParts" : { "parts" : { "swoosh" : { "partStates" : { "attack" : { "fire" : { "properties" : {
-      "damageArea" : [[-3.5, -1.1], [4.5, -0.6], [4.5, 0.8], [-3.5, 1.3]]
-    }}}}}}},
+    "animatedParts" : { 
+      "parts" : { 
+      "swoosh" : { "partStates" : { "attack" : { "fire" : { "properties" : {"damageArea" : [[-3.5, -1.1], [4.5, -0.6], [4.5, 0.8], [-3.5, 1.3]]}}}}}}},
     "sounds" : {
       "fire" : [ "/sfx/melee/swing_dagger.ogg" ]
     }
@@ -35,7 +36,7 @@
   "comboCooldown" : 0.3,
   "comboFinisherSource" : "/items/active/weapons/fist/combofinishers/supernovarush.combofinisher",
 
-  "freezeLimit" : 0,
+  "freezeLimit" : 1.4,
   "elementalType" : "radioactive",
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/fist/punch.lua"],

diff --git a/items/active/weapons/fist/precursorfistfullbright.frames b/items/active/weapons/fist/precursorfistfullbright.frames
@@ -0,0 +1,10 @@
+{
+  "frameGrid" : {
+    "size" : [23, 16],
+    "dimensions" : [2, 1],
+
+    "names" : [
+      [ "front", "back" ]
+    ]
+  }
+}
diff --git a/items/active/weapons/fist/precursorfistfullbright.png b/items/active/weapons/fist/precursorfistfullbright.png
diff --git a/items/active/weapons/fist/solariumfist.activeitem b/items/active/weapons/fist/solariumfist.activeitem
@@ -11,9 +11,10 @@
   "twoHanded" : false,
   "itemTags" : ["weapon","fist", "upgradeableWeapon"],
   "inventoryIcon" : "solariumfist.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "solariumfist.png",
+    "weaponfullbright" : "solariumfistfullbright.png",
     "swoosh" : "swoosh/clawswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/solariumfistfullbright.png b/items/active/weapons/fist/solariumfistfullbright.png
diff --git a/items/active/weapons/fist/telebriumfist.activeitem b/items/active/weapons/fist/telebriumfist.activeitem
@@ -11,9 +11,10 @@
   "twoHanded" : false,
   "itemTags" : ["weapon","fist", "upgradeableWeapon"],
   "inventoryIcon" : "telebriumfist.png:front",
-  "animation" : "fistweapon.animation",
+  "animation" : "fistweaponglow.animation",
   "animationParts" : {
     "weapon" : "telebriumfist.png",
+    "weaponfullbright" : "telebriumfistfullbright.png",
     "swoosh" : "swoosh/clawswoosh.png"
   },
   "animationCustom" : {

diff --git a/items/active/weapons/fist/telebriumfistfullbright.png b/items/active/weapons/fist/telebriumfistfullbright.png
diff --git a/items/active/weapons/melee/dagger/nightardagger.activeitem b/items/active/weapons/melee/dagger/nightardagger.activeitem
@@ -3,9 +3,9 @@
   "price" : 240,
   "maxStack" : 1,
   "rarity" : "common",
-  "description" : "Dull and nearly lifeless, but still dangerous.",
+  "description" : "Dull and nearly lifeless, but still dangerous. Upgrade for lethality.",
   "shortdescription" : "Nightarian Knife",
-  "tooltipKind" : "sword",
+  "tooltipKind" : "sword2",
   "category" : "dagger",
   "twoHanded" : false,
   "itemTags" : ["weapon","melee","dagger", "upgradeableWeapon"],
@@ -34,8 +34,8 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/melee/meleeslash.lua"],
     "class" : "MeleeSlash",
-    "fireTime" : 0.5,
-    "baseDps" : 9,
+    "fireTime" : 0.6,
+    "baseDps" : 7.5,
     "damageConfig" : {
       "knockback" : 10
     },
@@ -79,7 +79,7 @@
 	    "blade" : "nightardagger.png",
 	    "bladefullbright" : "nightardaggerfullbright.png"
 	  },  
-	  "inventoryIcon" : "nightarshortsword2.png",
+	  "inventoryIcon" : "nightardagger.png",
 	  "shortdescription" : "Peerless Nightar Knife",
 	  "description" : "The finest edge possible.",
 	  "critChance" : 2,

diff --git a/items/active/weapons/melee/hammer/effigiumhammer.activeitem b/items/active/weapons/melee/hammer/effigiumhammer.activeitem
@@ -20,7 +20,7 @@
   },
   "animationCustom" : {
     "animatedParts" : { "parts" : { "swoosh" : { "properties" : {
-      "offset" : [-3.0, 1.5]
+      "offset" : [-2.0, 1.5]
     }}}},
     "sounds" : {
       "fire" : [ "/sfx/melee/swing_hammer.ogg" ]

diff --git a/items/active/weapons/melee/hammer/elderhammer.activeitem b/items/active/weapons/melee/hammer/elderhammer.activeitem
@@ -20,7 +20,7 @@
   },
   "animationCustom" : {
     "animatedParts" : { "parts" : { "swoosh" : { "properties" : {
-      "offset" : [-3.0, 1.5]
+      "offset" : [-2.0, 1.5]
     }}}},
     "sounds" : {
       "fire" : [ "/sfx/melee/swing_hammer.ogg" ]

diff --git a/items/active/weapons/melee/hammer/fishboneheadbasher.activeitem b/items/active/weapons/melee/hammer/fishboneheadbasher.activeitem
@@ -19,7 +19,7 @@
   },
   "animationCustom" : {
     "animatedParts" : { "parts" : { "swoosh" : { "properties" : {
-      "offset" : [-3.0, 1.5]
+      "offset" : [-2.0, 1.5]
     }}}},
     "sounds" : {
       "fire" : [ "/sfx/melee/swing_hammer.ogg" ]
@@ -33,43 +33,7 @@
   "primaryAbilityType" : "hammersmash",
   "primaryAbility" : {
     "fireTime" : 0.9,
-    "baseDps" : 13.1,
-    "stances" : {
-      "idle" : {
-        "armRotation" : -10,
-        "weaponRotation" : -10,
-        "weaponOffset" : [0.5, 1.75]
-      },
-      "windup" : {
-        "duration" : 0.8,
-        "armRotation" : 90,
-        "weaponRotation" : -10,
-        "weaponOffset" : [0.4, 1.75],
-
-        // Windup animation
-        "idleHammerAngle" : -10,
-        "windupHammerAngle" : 0,
-        "dropHammerAngle" : 60,
-        "bounceHammerAngle" : 55,
-
-        "minWindup" : 0.7,
-        "windupBaseAngle" : -10,
-        "windupAngleRange" : 70
-      },
-      "preslash" : {
-        "duration" : 0.025,
-        "armRotation" : 55,
-        "weaponRotation" : -45,
-        "weaponOffset" : [0.4, 2.0]
-      },
-      "fire" : {
-        "duration" : 0.4,
-        "armRotation" : -35,
-        "weaponRotation" : -55,
-        "smashTimer" : 1.5,
-        "weaponOffset" : [0.6, 2.0]
-      }
-    }
+    "baseDps" : 13.1
   },
 
   "altAbilityType" : "blinkexplosion",

diff --git a/items/active/weapons/melee/hammer/flyingv.activeitem b/items/active/weapons/melee/hammer/flyingv.activeitem
@@ -20,7 +20,7 @@
   },
   "animationCustom" : {
     "animatedParts" : { "parts" : { "swoosh" : { "properties" : {
-      "offset" : [-3.0, 1.5]
+      "offset" : [-2.0, 1.5]
     }}}},
     "sounds" : {
       "fire" : [ "/sfx/melee/swing_hammer.ogg" ]