diff --git a/items/active/weapons/melee/abilities/broadsword/strikethrough/strikethrough.weaponability b/items/active/weapons/melee/abilities/broadsword/strikethrough/strikethrough.weaponability index f6d87d622..1a42ed4eb 100644 --- a/items/active/weapons/melee/abilities/broadsword/strikethrough/strikethrough.weaponability +++ b/items/active/weapons/melee/abilities/broadsword/strikethrough/strikethrough.weaponability @@ -23,14 +23,14 @@ "class" : "Strikethrough", "cooldownTime" : 0.4, - "energyUsage" : 120, + "energyUsage" : 70, "dashTime" : 0.1, "dashSpeed" : 200, "damageConfig" : { "damageSourceKind" : "broadsword", - "statusEffects" : [ "knightfall_bleeding", "electrified" ], + "statusEffects" : [ "knightfall_bleeding" ], "baseDamage" : 10, "knockback" : 40, "timeout" : 0.5, diff --git a/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.activeitem b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.activeitem new file mode 100644 index 000000000..37db6c7c9 --- /dev/null +++ b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.activeitem @@ -0,0 +1,123 @@ +{ + "itemName" : "knightfall_divider", + "price" : 2500, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A simple axe designed to make enemies bleed and cleave armor.", + "shortdescription" : "Divider", + "tooltipKind" : "sword", + "category" : "^grey;Axe^reset;", + "twoHanded" : false, + "itemTags" : ["weapon","melee","broadsword"], + + "inventoryIcon" : "knightfall_divider.png", + + "animation" : "knightfall_divider.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_divider.png", + "bladeFullbright" : "knightfall_dividerfullbright.png" + }, + "animationCustom" : { }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "primaryAbilityType" : "shortswordcombo", + "primaryAbility" : { + + "fireTime" : 0.7, + "baseDps" : 7, + "comboSteps" : 3, + + "swooshOffsetRegions" : [ + [-1.0, -0.25, 2.5, 2.0], + [0, -0.5, 2.5, 1.0], + [0, -0.5, 2.5, 1.0] + ], + + "damageConfig": { + "damageType" : "ignoresdef", + "statusEffects" : [ "knightfall_armorshred", "knightfall_bleeding" ] + }, + + "stepDamageConfig" : [ + { + "baseDamageFactor" : 1.2, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1.0, + "knockback" : 10 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 15 + } + ], + + "stances" : { + "idle" : { + "armRotation" : -90, + "weaponRotation" : -10, + "weaponOffset" : [-0.25, -1] + }, + "windup1" : { + "duration" : 0.15, + "armRotation" : 30, + "weaponRotation" : 0, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset" : [-0.25, -1] + }, + "fire1" : { + "duration" : 0.3, + "armRotation" : -40, + "weaponRotation" : -70, + "weaponOffset" : [-0.25, -1] + }, + "wait1" : { + "duration" : 0.3, + "armRotation" : -135, + "weaponRotation" : 30, + "weaponOffset" : [-0.25, -1] + }, + "windup2" : { + "duration" : 0.1, + "armRotation" : -15, + "weaponRotation" : -60, + "weaponOffset" : [-0.25, -1] + }, + "fire2" : { + "duration" : 0.2, + "armRotation" : -135, + "weaponRotation" : 30, + "weaponOffset" : [-0.25, -1] + }, + "wait2" : { + "duration" : 0.3, + "armRotation" : -135, + "weaponRotation" : 30, + "weaponOffset" : [-0.25, -1] + }, + "windup3" : { + "duration" : 0.15, + "armRotation" : 30, + "weaponRotation" : 0, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset" : [-0.25, -1] + }, + "fire3" : { + "duration" : 0.3, + "armRotation" : -40, + "weaponRotation" : -70, + "weaponOffset" : [-0.25, -1] + } + } + }, + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.animation b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.animation new file mode 100644 index 000000000..77a53eceb --- /dev/null +++ b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.animation @@ -0,0 +1,155 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire2" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire3" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "fullbright" : true, + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "blade" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0], + "groundSlamPoint" : [0, 1.5], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "handle" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "?", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "transformationGroups" : ["swoosh"], + "rotationCenter" : [0, 0] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/hammer/swoosh/physicalswoosh.png:", + "offset" : [1.7, 2], + "damageArea" : [ + [-5, 2], + [-2.5, 3], + [1, 3], + [4, 1.75], + [5, -0.25], + [5, -2.25], + [4, -3.25], + [0, -2.5] + ] + } + }, + "fire2" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", + "offset" : [5.0, 1.0], + "damageArea" : [ + [-4, 1], + [2.5, 1], + [2.5, -2], + [-4, -2] + ] + } + }, + "fire3" : { + "properties" : { + "image" : "/items/active/weapons/melee/hammer/swoosh/physicalswoosh.png:", + "offset" : [1.7, 2], + "damageArea" : [ + [-5, 2], + [-2.5, 3], + [1, 3], + [4, 1.75], + [5, -0.25], + [5, -2.25], + [4, -3.25], + [0, -2.5] + ] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 1, + "burstCount" : 1, + "particles" : [] + } + }, + + "sounds" : { + "fire" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire2" : [ "/sfx/melee/swing_shortsword.ogg" ], + "fire3" : [ "/sfx/melee/swing_broadsword.ogg" ] + } +} diff --git a/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.png b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.png new file mode 100644 index 000000000..7f3f47b3e Binary files /dev/null and b/items/active/weapons/melee/axe/knightfall_divider/knightfall_divider.png differ diff --git a/items/active/weapons/melee/axe/knightfall_divider/knightfall_dividerfullbright.png b/items/active/weapons/melee/axe/knightfall_divider/knightfall_dividerfullbright.png new file mode 100644 index 000000000..8f74704ea Binary files /dev/null and b/items/active/weapons/melee/axe/knightfall_divider/knightfall_dividerfullbright.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.activeitem b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.activeitem new file mode 100644 index 000000000..895253a71 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.activeitem @@ -0,0 +1,301 @@ +{ + "itemName" : "knightfall_blackthorn", + "price" : 3500, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A mass produced, standard issue longsword.", + "shortdescription" : "Blackthorn", + "tooltipKind" : "sword", + "category" : "^grey;Longsword^reset;", + "twoHanded" : true, + "itemTags" : ["weapon","melee","broadsword"], + + "inventoryIcon" : "knightfall_blackthorn.png", + + "animation" : "knightfall_blackthorn.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_blackthorn.png", + "bladeFullbright" : "knightfall_blackthornfullbright.png" + }, + "animationCustom" : { }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "primaryAbilityType" : "broadswordcombo", + "primaryAbility" : { + + "comboSteps" : 7, + + "flashTime" : 0.15, + "flashDirectives" : "fade=FFFFFFFF=0.15", + + "swooshOffsetRegions" : [ + [0.75, 0.0, 4.25, 5.0], + [1.5, -1.0, 5.5, 1.0], + [0.75, 0.0, 4.25, 5.0], + [3.0, -0.5, 6.5, 2.0], + [0.75, 0.0, 4.25, 5.0], + [1.5, -1.0, 5.5, 1.0], + [0.75, 0.0, 4.25, 5.0] + ], + + "comboSpeedFactor" : 0.8, + + "edgeTriggerGrace" : 0.25, + + "fireTime" : 0.6, + "baseDps" : 7, + + "damageConfig" : { + "damageSourceKind" : "broadsword", + "statusEffects" : [ "knightfall_bleeding" ], + "knockbackMode" : "facing", + "timeout" : 0.5 + }, + + "stepDamageConfig" : [ + { + "baseDamageFactor" : 1, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 20 + }, + { + "baseDamageFactor" : 1, + "knockback" : 15 + }, + { + "baseDamageFactor" : 0.75, + "knockback" : 10 + }, + { + "baseDamageFactor" : 1, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 20 + }, + { + "baseDamageFactor" : 2, + "knockback" : 15 + } + ], + + "stances" : { + "idle" : { + "aimAngle" : 0, + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset":[1, -1.8], + "twoHanded": false, + "allowRotate" : false, + "allowFlip" : true + }, + "windup1" : { + "duration": 0.2, + "armRotation": 90, + "weaponRotation": 10, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": true + }, + "preslash1" : { + "duration": 0.025, + "armRotation": 90, + "weaponRotation": -10, + "twoHanded": true, + "allowRotate": false, + "allowFlip": false + }, + "fire1" : { + "duration": 0.2, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + }, + "wait1" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup2" : { + "duration" : 0.15, + "armRotation" : -150, + "weaponRotation" : 55, + "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire2" : { + "duration" : 0.2, + "armRotation" : 0, + "weaponRotation" : -90, + "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : true + }, + "wait2" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup3" : { + "duration": 0.2, + "armRotation": 90, + "weaponRotation": 10, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": true + }, + "fire3" : { + "duration": 0.2, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + }, + "wait3" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup4" : { + "duration" : 0.2, + "armRotation" : -15, + "weaponRotation" : -60, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : true + }, + "fire4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : false + }, + "wait4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "allowRotate" : false, + "allowFlip" : true, + "twoHanded" : true + }, + "windup5" : { + "duration": 0.1, + "armRotation": -100, + "weaponRotation": -160, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true + }, + "fire5" : { + "duration": 0.15, + "armRotation": 70, + "weaponRotation": -150, + "twoHanded": true, + "allowRotate": false, + "allowFlip": true + }, + "wait5": { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup6" : { + "duration" : 0.15, + "armRotation" : -150, + "weaponRotation" : 55, + "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire6" : { + "duration" : 0.2, + "armRotation" : 0, + "weaponRotation" : -90, + "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : true + }, + "wait6" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup7" : { + "duration": 0.2, + "armRotation": 90, + "weaponRotation": 10, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": true + }, + "fire7" : { + "duration": 0.2, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + } + } + }, + + "altAbilityType" : "parry", + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.animation b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.animation new file mode 100644 index 000000000..4949d1cf5 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.animation @@ -0,0 +1,187 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire2" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire3" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire4" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire5" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire6" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire7" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "fullbright" : true, + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "blade" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "handle" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "?", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "transformationGroups" : ["swoosh"], + "rotationCenter" : [0, 0] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire2" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", + "offset" : [3.5, 0], + "damageArea" : [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] + } + }, + "fire3" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire4" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", + "offset" : [5.0, 1.0], + "damageArea" : [[-4, 1], [2.5, 1], [2.5, -2], [-4, -2]] + } + }, + "fire5" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:?flipy", + "offset" : [0, -2.75], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire6" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", + "offset" : [3.5, 0], + "damageArea" : [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] + } + }, + "fire7" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 1, + "burstCount" : 1, + "particles" : [] + } + }, + + "sounds" : { + "fire" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire2" : [ "/sfx/melee/swing_spear.ogg" ], + "fire3" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire4" : [ "/sfx/melee/swing_shortsword.ogg" ], + "fire5" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire6" : [ "/sfx/melee/swing_spear.ogg" ], + "fire7" : [ "/sfx/melee/swing_broadsword.ogg" ] + } +} diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.png b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.png new file mode 100644 index 000000000..e1e33e0d3 Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthorn.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.frames b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.frames new file mode 100644 index 000000000..9a95e6c7e --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.frames @@ -0,0 +1,18 @@ +{ + "frameGrid" : { + "size" : [24, 64], + "dimensions" : [14, 2], + "names" : [ + ["extend.1", "extend.2", "extend.3", "extend.4", "extend.5", null, null, null, null, null, null, null, null, null], + ["active.1", "active.2", "active.3", "active.4", "active.5", "active.6", "active.7", "active.8", "active.9", "active.10", "active.11", "active.12", "active.13", "active.14"] + ] + }, + + "aliases" : { + "retract.1" : "extend.5", + "retract.2" : "extend.4", + "retract.3" : "extend.3", + "retract.4" : "extend.2", + "retract.5" : "extend.1" + } +} diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.png b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.png new file mode 100644 index 000000000..ca65cd10b Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornempowered.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornfullbright.png b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornfullbright.png new file mode 100644 index 000000000..989af4058 Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_blackthorn/knightfall_blackthornfullbright.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.activeitem b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.activeitem new file mode 100644 index 000000000..1bafec904 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.activeitem @@ -0,0 +1,295 @@ +{ + "itemName" : "knightfall_kaladvolg", + "price" : 3500, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A mass produced, heavy weight sword built to defeat enemy armor.", + "shortdescription" : "Kaladvolg", + "tooltipKind" : "sword", + "category" : "^grey;Heavy Cleaver^reset;", + "twoHanded" : true, + "itemTags" : ["weapon","melee","broadsword"], + + "inventoryIcon" : "knightfall_kaladvolg.png", + + "animation" : "knightfall_kaladvolg.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_kaladvolg.png", + "bladeFullbright" : "knightfall_kaladvolgfullbright.png" + }, + "animationCustom" : { }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "primaryAbilityType" : "broadswordcombo", + "primaryAbility" : { + + "comboSteps" : 5, + + "flashTime" : 0.15, + "flashDirectives" : "fade=FFFFFFFF=0.15", + + "swooshOffsetRegions" : [ + [0.75, 0.0, 4.25, 5.0], + [0.75, 0.0, 4.25, 5.0], + [0.75, 0.0, 4.25, 5.0], + [3.0, -0.5, 6.5, 2.0], + [0.75, 0.0, 4.25, 5.0] + ], + + "comboSpeedFactor" : 0.8, + + "edgeTriggerGrace" : 0.25, + + "fireTime" : 1, + "baseDps" : 8, + + "damageConfig" : { + "damageSourceKind" : "hammer", + "statusEffects" : [ "knightfall_bleeding", "knightfall_armorshred", "knightfall_colorgrey" ], + "knockbackMode" : "facing", + "timeout" : 0.5 + }, + + "stepDamageConfig" : [ + { + "baseDamageFactor" : 1.2, + "knockback" : 25 + }, + { + "baseDamageFactor" : 0.75, + "knockback" : 20 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 25 + }, + { + "baseDamageFactor" : 0.5, + "knockback" : 10 + }, + { + "baseDamageFactor" : 2.5, + "knockback" : 25 + } + ], + + "stances" : { + "idle" : { + "aimAngle" : 0, + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset":[1, -1.8], + "twoHanded": false, + "allowRotate" : false, + "allowFlip" : true + }, + "windup1" : { + "duration": 0.4, + "armRotation": 90, + "weaponRotation": -10, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate" : true + }, + "preslash1" : { + "duration": 0.025, + "armRotation": 90, + "weaponRotation": -10, + "twoHanded": true, + "allowRotate": false, + "allowFlip": false + }, + "fire1" : { + "duration": 0.33, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + }, + "wait1" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowRotate": false, + "allowFlip": true + }, + "windup2" : { + "duration": 0.4, + "armRotation": -100, + "weaponRotation": -160, + "armAngularVelocity" : -60, + "weaponAngularVelocity" : -60, + "twoHanded": true, + "allowRotate" : true, + "allowFlip": true + }, + "fire2" : { + "duration": 0.3, + "armRotation": 70, + "weaponRotation": -150, + "twoHanded": true, + "allowRotate": false, + "allowFlip": true + }, + "wait2" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup3" : { + "duration": 0.4, + "armRotation": 90, + "weaponRotation": -10, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate" : true + }, + "fire3" : { + "duration": 0.33, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + }, + "wait3" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowRotate": false, + "allowFlip": true + }, + "windup4" : { + "duration" : 0.4, + "armRotation" : -15, + "weaponRotation" : -60, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : true + }, + "fire4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : false + }, + "wait4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "allowRotate" : false, + "allowFlip" : true, + "twoHanded" : true + }, + "windup5" : { + "duration": 0.4, + "armRotation": 90, + "weaponRotation": -10, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate" : true + }, + "fire5" : { + "duration": 0.33, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + } + } + }, + + "altAbility" : { + "name" : "Strikedown", + "type" : "groundslam", + "scripts" : ["/items/active/weapons/melee/abilities/hammer/groundslam/groundslam.lua"], + "class" : "GroundSlam", + + "energyUsage" : 80.0, + "cooldownTime" : 2.0, + + "damageConfig" : { + "baseDamage" : 4, + "knockback" : 20, + "timeout" : 0.6, + "timeoutGroup" : "alt" + }, + + "slamSpeed" : -75, + "maxSlamTime" : 2.0, + "spaceSlamTime" : 0.2, + "winddownTime" : 0.2, + + "projectileType" : "knightfall_furystormbullet", + "projectileParameters" : { + "timeToLive" : 0, + "power" : 8, + "onlyHitTerrain" : true + }, + + "stances" : { + "windup" : { + "duration": 0.4, + "armRotation": 90, + "weaponRotation": -10, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate" : false + }, + "slam" : { + "duration": 0.33, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + } + } + }, + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.animation b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.animation new file mode 100644 index 000000000..c7a129056 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.animation @@ -0,0 +1,162 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire2" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire3" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire4" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire5" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "fullbright" : true, + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "blade" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0], + "groundSlamPoint" : [0, 1.5], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "handle" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "?", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "transformationGroups" : ["swoosh"], + "rotationCenter" : [0, 0] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire2" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:?flipy", + "offset" : [0, -2.75], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire3" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire4" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", + "offset" : [5.0, 1.0], + "damageArea" : [[-4, 1], [2.5, 1], [2.5, -2], [-4, -2]] + } + }, + "fire5" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 1, + "burstCount" : 1, + "particles" : [] + } + }, + + "sounds" : { + "fire" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire2" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire3" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire4" : [ "/sfx/melee/swing_shortsword.ogg" ], + "fire5" : [ "/sfx/melee/swing_broadsword.ogg" ], + "groundSlamJump" : [ "/sfx/melee/hammer_hit_ground3.ogg", "/sfx/melee/hammer_hit_ground4.ogg" ], + "groundSlamFall" : [ "/sfx/tech/tech_dash.ogg" ] + } +} diff --git a/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.png b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.png new file mode 100644 index 000000000..50df84462 Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolg.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolgfullbright.png b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolgfullbright.png new file mode 100644 index 000000000..b337288f6 Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_kaladvolg/knightfall_kaladvolgfullbright.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.activeitem b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.activeitem new file mode 100644 index 000000000..e571db347 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.activeitem @@ -0,0 +1,301 @@ +{ + "itemName" : "knightfall_mockingbird", + "price" : 3500, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A mass produced saber, designed for speed and agility.", + "shortdescription" : "Mockingbird", + "tooltipKind" : "sword", + "category" : "^grey;Saber^reset;", + "twoHanded" : true, + "itemTags" : ["weapon","melee","broadsword"], + + "inventoryIcon" : "knightfall_mockingbird.png", + + "animation" : "knightfall_mockingbird.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_mockingbird.png", + "bladeFullbright" : "knightfall_mockingbirdfullbright.png" + }, + "animationCustom" : { }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "primaryAbilityType" : "broadswordcombo", + "primaryAbility" : { + + "comboSteps" : 6, + + "flashTime" : 0.15, + "flashDirectives" : "fade=FFFFFFFF=0.15", + + "swooshOffsetRegions" : [ + [0.75, 0.0, 4.25, 5.0], + [0.75, 0.0, 4.25, 5.0], + [1.5, -1.0, 5.5, 1.0], + [3.0, -0.5, 6.5, 2.0], + [1.5, -1.0, 5.5, 1.0], + [0.75, 0.0, 4.25, 5.0] + ], + + "comboSpeedFactor" : 0.8, + + "edgeTriggerGrace" : 0.25, + + "fireTime" : 0.45, + "baseDps" : 6, + + "damageConfig" : { + "damageSourceKind" : "broadsword", + "statusEffects" : [ "knightfall_bleeding" ], + "knockbackMode" : "facing", + "timeout" : 0.5 + }, + + "stepDamageConfig" : [ + { + "baseDamageFactor" : 1, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 20 + }, + { + "baseDamageFactor" : 0.75, + "knockback" : 10 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 20 + }, + { + "baseDamageFactor" : 1.5, + "knockback" : 20 + } + ], + + "stances" : { + "idle" : { + "aimAngle" : 0, + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset":[1, -1.8], + "twoHanded": false, + "allowRotate" : false, + "allowFlip" : true + }, + "windup1" : { + "duration": 0.15, + "armRotation": 90, + "weaponRotation": 10, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": true + }, + "preslash1" : { + "duration": 0.025, + "armRotation": 90, + "weaponRotation": -10, + "twoHanded": true, + "allowRotate": false, + "allowFlip": false + }, + "fire1" : { + "duration": 0.2, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + }, + "wait1" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup2" : { + "duration": 0.15, + "armRotation": -100, + "weaponRotation": -160, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true + }, + "fire2" : { + "duration": 0.15, + "armRotation": 70, + "weaponRotation": -150, + "twoHanded": true, + "allowRotate": false, + "allowFlip": true + }, + "wait2" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup3" : { + "duration" : 0.15, + "armRotation" : -150, + "weaponRotation" : 55, + "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire3" : { + "duration" : 0.2, + "armRotation" : 0, + "weaponRotation" : -90, + "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : true + }, + "wait3" : { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup4" : { + "duration" : 0.15, + "armRotation" : -15, + "weaponRotation" : -60, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : true + }, + "fire4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "twoHanded" : true, + "allowFlip" : true, + "allowRotate" : false + }, + "wait4" : { + "duration" : 0.2, + "armRotation" : -150, + "weaponRotation" : 55, + "weaponOffset" : [0, 0], + "allowRotate" : false, + "allowFlip" : true, + "twoHanded" : true + }, + "windup5" : { + "duration" : 0.15, + "armRotation" : -150, + "weaponRotation" : 55, + "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire5" : { + "duration" : 0.2, + "armRotation" : 0, + "weaponRotation" : -90, + "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : true + }, + "wait5": { + "frontArmFrame":"walk.5", + "backArmFrame":"walk.5", + "twoHanded": false, + "duration": 0.2, + "armRotation" : 0, + "weaponRotation" : -95, + "weaponOffset": [1, -1.8], + "allowFlip": true, + "allowRotate": false + }, + "windup6" : { + "duration": 0.15, + "armRotation": 90, + "weaponRotation": 10, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": true + }, + "fire6" : { + "duration": 0.2, + "armRotation": -60, + "weaponRotation": -55, + "weaponOffset": [0, 0], + "twoHanded": true, + "allowFlip": true, + "allowRotate": false + } + } + }, + + "altAbilityType" : "strikethrough", + "altAbility": { + "name" : "Lunge", + + "cooldownTime" : 0.4, + "energyUsage" : 40, + + "dashTime" : 0.1, + "dashSpeed" : 150, + + "aimable": true, + + "damageConfig" : { + "damageSourceKind" : "broadsword", + "statusEffects" : [ "knightfall_bleeding" ], + "baseDamage" : 8, + "knockback" : 60, + "timeout" : 0.5, + "timeoutGroup" : "alt" + }, + + "stances" : { + "windup": { + "allowRotate": true + }, + "dash" : { + "armRotation" : 0, + "weaponRotation" : -90, + "twoHanded" : false, + + "allowRotate" : false, + "allowFlip" : false + } + } + }, + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.animation b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.animation new file mode 100644 index 000000000..6590474f3 --- /dev/null +++ b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.animation @@ -0,0 +1,173 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire2" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire3" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire4" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire5" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire6" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "fullbright" : true, + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "blade" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "handle" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "?", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "transformationGroups" : ["swoosh"], + "rotationCenter" : [0, 0] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire2" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:?flipy", + "offset" : [0, -2.75], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + }, + "fire3" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", + "offset" : [3.5, 0], + "damageArea" : [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] + } + }, + "fire4" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", + "offset" : [5.0, 1.0], + "damageArea" : [[-4, 1], [2.5, 1], [2.5, -2], [-4, -2]] + } + }, + "fire5" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", + "offset" : [3.5, 0], + "damageArea" : [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] + } + }, + "fire6" : { + "properties" : { + "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset" : [0, 2.5], + "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 1, + "burstCount" : 1, + "particles" : [] + } + }, + + "sounds" : { + "fire" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire2" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire3" : [ "/sfx/melee/swing_spear.ogg" ], + "fire4" : [ "/sfx/melee/swing_shortsword.ogg" ], + "fire5" : [ "/sfx/melee/swing_spear.ogg" ], + "fire6" : [ "/sfx/melee/swing_broadsword.ogg" ] + } +} diff --git a/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.png b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.png new file mode 100644 index 000000000..0e8fc501e Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbird.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbirdfullbright.png b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbirdfullbright.png new file mode 100644 index 000000000..3cd59d0c6 Binary files /dev/null and b/items/active/weapons/melee/broadsword/knightfall_mockingbird/knightfall_mockingbirdfullbright.png differ diff --git a/items/active/weapons/melee/broadsword/knightfall_nightingale/knightfall_nightingalehandle.png b/items/active/weapons/melee/broadsword/knightfall_nightingale/knightfall_nightingalehandle.png index 2f65e1d68..010035707 100644 Binary files a/items/active/weapons/melee/broadsword/knightfall_nightingale/knightfall_nightingalehandle.png and b/items/active/weapons/melee/broadsword/knightfall_nightingale/knightfall_nightingalehandle.png differ diff --git a/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.activeitem b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.activeitem new file mode 100644 index 000000000..311b3311b --- /dev/null +++ b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.activeitem @@ -0,0 +1,124 @@ +{ + "itemName" : "knightfall_fracturer", + "price" : 2500, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A simple mace designed to stun enemies on hit and cleave enemy armor.", + "shortdescription" : "Fracturer", + "tooltipKind" : "sword", + "category" : "^grey;Mace^reset;", + "twoHanded" : false, + "itemTags" : ["weapon","melee","broadsword"], + + "inventoryIcon" : "knightfall_fracturer.png", + + "animation" : "knightfall_fracturer.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_fracturer.png", + "bladeFullbright" : "knightfall_fracturerfullbright.png" + }, + "animationCustom" : { }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "primaryAbilityType" : "shortswordcombo", + "primaryAbility" : { + + "fireTime" : 0.7, + "baseDps" : 6, + "comboSteps" : 3, + + "swooshOffsetRegions" : [ + [-1.0, -0.25, 2.5, 2.0], + [0, -0.5, 2.5, 1.0], + [0, -0.5, 2.5, 1.0] + ], + + "damageConfig": { + "damageSourceKind" : "hammer", + "damageType" : "ignoresdef", + "statusEffects" : [ "knightfall_armorshred", "paralysis", "knightfall_colorgrey" ] + }, + + "stepDamageConfig" : [ + { + "baseDamageFactor" : 1.2, + "knockback" : 15 + }, + { + "baseDamageFactor" : 1.0, + "knockback" : 10 + }, + { + "baseDamageFactor" : 1.2, + "knockback" : 15 + } + ], + + "stances" : { + "idle" : { + "armRotation" : -90, + "weaponRotation" : -10, + "weaponOffset" : [-0.25, -1] + }, + "windup1" : { + "duration" : 0.15, + "armRotation" : 30, + "weaponRotation" : 0, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset" : [-0.25, -1] + }, + "fire1" : { + "duration" : 0.3, + "armRotation" : -40, + "weaponRotation" : -70, + "weaponOffset" : [-0.25, -1] + }, + "wait1" : { + "duration" : 0.3, + "armRotation" : -135, + "weaponRotation" : 30, + "weaponOffset" : [-0.25, -1] + }, + "windup2" : { + "duration" : 0.15, + "armRotation": -100, + "weaponRotation": -160, + "weaponOffset" : [-0.25, -1] + }, + "fire2" : { + "duration" : 0.3, + "armRotation": 70, + "weaponRotation": -150, + "weaponOffset" : [-0.25, -1] + }, + "wait2" : { + "duration" : 0.3, + "armRotation" : -135, + "weaponRotation" : 30, + "weaponOffset" : [-0.25, -1] + }, + "windup3" : { + "duration" : 0.15, + "armRotation" : 30, + "weaponRotation" : 0, + "armAngularVelocity" : 60, + "weaponAngularVelocity" : 60, + "weaponOffset" : [-0.25, -1] + }, + "fire3" : { + "duration" : 0.3, + "armRotation" : -40, + "weaponRotation" : -70, + "weaponOffset" : [-0.25, -1] + } + } + }, + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.animation b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.animation new file mode 100644 index 000000000..5ea238eab --- /dev/null +++ b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.animation @@ -0,0 +1,159 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire2" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + }, + "fire3" : { + "frames" : 3, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "idle" + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "fullbright" : true, + "rotationCenter" : [0, 0], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "blade" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "??", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0], + "groundSlamPoint" : [0, 1.5], + "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + } + }, + "handle" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "?", + "offset" : [0, 1.875], + "transformationGroups" : ["weapon"], + "rotationCenter" : [0, 0] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "transformationGroups" : ["swoosh"], + "rotationCenter" : [0, 0] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/hammer/swoosh/physicalswoosh.png:", + "offset" : [1.7, 2], + "damageArea" : [ + [-5, 2], + [-2.5, 3], + [1, 3], + [4, 1.75], + [5, -0.25], + [5, -2.25], + [4, -3.25], + [0, -2.5] + ] + } + }, + "fire2" : { + "properties" : { + "image" : "/items/active/weapons/melee/hammer/swoosh/physicalswoosh.png:?flipy", + "offset" : [1.7, -2.2], + "damageArea" : [ + [-5, 2], + [-2.5, 3], + [1, 3], + [4, 1.75], + [5, -0.25], + [5, -2.25], + [4, -3.25], + [0, -2.5] + ] + } + }, + "fire3" : { + "properties" : { + "image" : "/items/active/weapons/melee/hammer/swoosh/physicalswoosh.png:", + "offset" : [1.7, 2], + "damageArea" : [ + [-5, 2], + [-2.5, 3], + [1, 3], + [4, 1.75], + [5, -0.25], + [5, -2.25], + [4, -3.25], + [0, -2.5] + ] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 1, + "burstCount" : 1, + "particles" : [] + } + }, + + "sounds" : { + "fire" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire2" : [ "/sfx/melee/swing_broadsword.ogg" ], + "fire3" : [ "/sfx/melee/swing_broadsword.ogg" ] + } +} diff --git a/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.png b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.png new file mode 100644 index 000000000..a2d80d5eb Binary files /dev/null and b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturer.png differ diff --git a/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturerfullbright.png b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturerfullbright.png new file mode 100644 index 000000000..0387ea09f Binary files /dev/null and b/items/active/weapons/melee/mace/knightfall_fracturer/knightfall_fracturerfullbright.png differ diff --git a/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.activeitem b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.activeitem new file mode 100644 index 000000000..8cfd27f4d --- /dev/null +++ b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.activeitem @@ -0,0 +1,104 @@ +{ + "itemName" : "knightfall_echelon", + "price" : 3250, + "level" : 6, + "maxStack" : 1, + "rarity" : "Rare", + "description" : "A mass produced spear designed to keep enemies at bay.", + "shortdescription" : "Echelon", + "tooltipKind" : "sword", + "category" : "spear", + "twoHanded" : true, + "itemTags" : ["weapon","melee","spear"], + + "inventoryIcon" : "knightfall_echelon.png", + + "animation" : "knightfall_echelon.animation", + "animationParts" : { + "handle" : "", + "blade" : "knightfall_echelon.png", + "bladeFullbright" : "knightfall_echelonfullbright.png" + }, + "animationCustom" : { + "sounds" : { + "fire" : [ "/sfx/melee/swing_spear.ogg" ], + "chargedSwing" : [ "/sfx/npc/boss/cultistboss_recharge.ogg" ] + } + }, + + "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + + "elementalType" : "physical", + + "aimOffset" : -1.0, + + "primaryAbilityType" : "spearstab", + "primaryAbility" : { + "fireTime" : 0.8, + "baseDps" : 8, + + "damageConfig": { + "statusEffects" : [ "knightfall_bleeding" ], + "knockback" : 30 + }, + + "stances" : { + "idle" : { + "weaponOffset" : [0, 1.5] + } + } + }, + + "altAbility" : { + "name" : "^red;Critical Strike^reset;", + "type" : "bladecharge", + "scripts" : ["/items/active/weapons/melee/abilities/broadsword/bladecharge/bladecharge.lua"], + "class" : "BladeCharge", + + "energyUsage" : 60.0, + + "damageConfig" : { + "damageSourceKind" : "broadsword", + "statusEffects" : [ "knightfall_missinghealthdamage_5" ], + "baseDamage" : 13, + "knockback" : 15, + "knockbackMode" : "facing", + "timeoutGroup" : "alt", + "timeout" : 0.5 + }, + + "chargeTime" : 1.2, + "cooldownTime" : 4, + "chargeBorder" : "a8000088", + + "stances" : { + "windup" : { + "duration" : 0.1, + "armRotation" : -85, + "weaponRotation" : 10, + "twoHanded" : true, + "weaponOffset" : [0, 1.5], + + "allowRotate" : true, + "allowFlip" : true + }, + + "slash" : { + "duration" : 0.3, + "armRotation" : -20, + "weaponRotation" : -70, + "twoHanded" : true, + "weaponOffset" : [0, 2.5], + + "animationStates" : { + "swoosh" : "critStrike" + }, + + "allowRotate" : false, + "allowFlip" : false + } + } + }, + + "builder" : "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.animation b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.animation new file mode 100644 index 000000000..a9d1b1d28 --- /dev/null +++ b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.animation @@ -0,0 +1,145 @@ +{ + "globalTagDefaults" : { + "paletteSwaps" : "" + }, + + "animatedParts" : { + "stateTypes" : { + "swoosh" : { + "default" : "idle", + "states" : { + "idle" : { + }, + "fire" : { + "frames" : 3, + "cycle" : 0.08, + "mode" : "transition", + "transition" : "idle" + }, + "critStrike" : { + "frames" : 3, + "cycle" : 0.08, + "mode" : "transition", + "transition" : "idle" + } + } + }, + + "bladeCharge" : { + "default" : "idle", + "states" : { + "idle" : { }, + "charge" : { + "cycle" : 1.5, + "mode" : "transition", + "transition" : "full", + "properties" : { + "persistentSound" : "/sfx/melee/charge_up13.ogg", + "persistentSoundStopTime" : 0.25 + } + }, + "full" : { + "mode" : "loop", + "properties" : { + "persistentSound" : "/sfx/melee/charge_full_hold1.ogg", + "immediateSound" : "/sfx/melee/sword_parry.ogg" + } + } + } + } + }, + + "parts" : { + "bladeFullbright" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "", + "offset" : [0.0, 0.0], + "fullbright" : true, + "transformationGroups" : ["weapon"], + "damageArea" : [[0, -0.5], [-0.75, 1.0], [-0.75, 2.75], [0, 4.25], [0.75, 2.75], [0.75, 1.0]] + } + }, + "blade" : { + "properties" : { + "zLevel" : 1, + "centered" : true, + "image" : "", + "offset" : [0.0, 0.0], + "transformationGroups" : ["weapon"], + "damageArea" : [[0, -0.5], [-0.75, 1.0], [-0.75, 2.75], [0, 4.25], [0.75, 2.75], [0.75, 1.0]] + } + }, + "handle" : { + "properties" : { + "zLevel" : 0, + "centered" : true, + "image" : "", + "offset" : [0.0, 0.0], + "transformationGroups" : ["weapon"] + } + }, + "swoosh" : { + "properties" : { + "zLevel" : -1, + "centered" : true, + "offset" : [3.0, 0.0], + "transformationGroups" : ["swoosh"] + }, + + "partStates" : { + "swoosh" : { + "idle" : { + "properties" : { + "image" : "" + } + }, + "fire" : { + "properties" : { + "image" : "/items/active/weapons/melee/spear/swoosh/swoosh.png:", + "damageArea" : [[-3.5, 0], [-1, 1], [1, 1], [4, 0], [1, -1], [-1, -1]] + } + }, + "critStrike" : { + "properties" : { + "image" : "/items/active/weapons/melee/polearm/swoosh_effects/knightfall_spear.png:", + "damageArea" : [[-3.5, 0], [-1, 1], [1, 1], [4, 0], [1, -1], [-1, -1]] + } + } + } + } + } + } + }, + + "transformationGroups" : { + "weapon" : {}, + "swoosh" : {} + }, + + "particleEmitters" : { + "physicalswoosh" : { + "active" : false, + "transformationGroups" : ["swoosh"], + "emissionRate" : 60, + "offsetRegion" : [3.5, -1.0, 7.5, 1.0], + "particles" : [ ] + }, + + "bladeCharge" : { + "active" : false, + "transformationGroups" : ["weapon"], + "emissionRate" : 30, + "offsetRegion" : [-0.625, 0.0, 0.375, 2.5], + "particles" : [ + { "particle" : "defaultred"}, + { "particle" : "kluexstaff"} + ] + } + }, + + "sounds" : { + "fire" : [ ] + } +} diff --git a/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.png b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.png new file mode 100644 index 000000000..043fad79b Binary files /dev/null and b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelon.png differ diff --git a/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelonfullbright.png b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelonfullbright.png new file mode 100644 index 000000000..ae6edf34b Binary files /dev/null and b/items/active/weapons/melee/polearm/knightfall_echelon/knightfall_echelonfullbright.png differ diff --git a/items/active/weapons/melee/polearm/swoosh_effects/default.frames b/items/active/weapons/melee/polearm/swoosh_effects/default.frames new file mode 100644 index 000000000..d24785c79 --- /dev/null +++ b/items/active/weapons/melee/polearm/swoosh_effects/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid" : { + "size" : [45, 11], + "dimensions" : [3, 1], + + "names" : [ + [ "1", "2", "3" ] + ] + } +} diff --git a/items/active/weapons/melee/polearm/swoosh_effects/knightfall_spear.png b/items/active/weapons/melee/polearm/swoosh_effects/knightfall_spear.png new file mode 100644 index 000000000..a9e37f07c Binary files /dev/null and b/items/active/weapons/melee/polearm/swoosh_effects/knightfall_spear.png differ diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_aeroscorn/knightfall_aeroscorn.activeitem b/items/active/weapons/ranged/assaultrifle/knightfall_aeroscorn/knightfall_aeroscorn.activeitem index 958fcebcd..e61e2caf4 100644 --- a/items/active/weapons/ranged/assaultrifle/knightfall_aeroscorn/knightfall_aeroscorn.activeitem +++ b/items/active/weapons/ranged/assaultrifle/knightfall_aeroscorn/knightfall_aeroscorn.activeitem @@ -100,7 +100,7 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 7 }, @@ -153,8 +153,8 @@ "scripts": ["/items/active/weapons/ranged/abilities/altfire.lua"], "class": "AltFireAttack", - "fireTime": 6, - "energyUsage": 50, + "fireTime": 3, + "energyUsage": 10, "baseDps": 0, "projectileCount": 1, "inaccuracy": 0.03, @@ -180,6 +180,11 @@ "knightfall_healingstim" ] } + }, + { + "action": "sound", + "options": ["/sfx/melee/rocketspear_stop_poison.ogg"], + "repeat": false } ] }, diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.activeitem b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.activeitem new file mode 100644 index 000000000..42045e98e --- /dev/null +++ b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.activeitem @@ -0,0 +1,307 @@ +{ + "itemName": "knightfall_avenger", + "shortdescription": "Avenger", + "category": "^blue;Plasma Assault Rifle^reset;", + "description": "A state-of-the-art assault rifle that fires explosive plasma rounds.", + + "level": 8, + "price": 12000, + "maxStack": 1, + "rarity": "Essential", + "tooltipKind": "gun", + "twoHanded": true, + "itemTags": ["weapon","ranged","assaultrifle"], + + "inventoryIcon": "knightfall_avenger.png", + + "animation": "/items/active/weapons/ranged/gun.animation", + + "animationParts": { + "butt" : "", + "middle": "knightfall_avenger.png", + "middlefullbright": "knightfall_avengerfullbright.png", + "barrel" : "", + "muzzleFlash": "muzzleflash.png", + "rocketMuzzleFlash": "muzzleflash.png" + }, + + "animationCustom": { + "animatedParts": { + "stateTypes" : { + "firing": { + "default": "off", + "states": { + "off": {}, + "fire": { + "frames": 2, + "cycle": 0.09, + "mode": "transition", + "transition": "off" + }, + "altFire": { + "frames": 2, + "cycle": 0.09, + "mode": "transition", + "transition": "off" + } + } + } + }, + + "parts": { + "middlefullbright": { + "properties": { + "centered": true, + "image" : "", + "offset": [0.9, 0.2], + "zLevel": 1, + "transformationGroups": ["weapon"], + "fullbright": true + } + }, + + "rocketMuzzleFlash": { + "properties": { + "zLevel": -1, + "centered": true, + "offset": [0.625, -0.125], + "fullbright": true, + "transformationGroups": ["muzzle"] + }, + + "partStates": { + "firing": { + "altFire": { + "properties": { + "image": ":." + } + } + } + } + } + } + }, + + "particleEmitters" : { + "muzzleFlash" : { + "transformationGroups" : ["muzzle"], + "offsetRegion" : [-0.75, -0.125, -0.75, -0.125], + "burstCount" : 2, + "particles" : [ + { "particle" : "knightfall_plasmaparticle"}, + { "particle" : "knightfall_plasmaparticle2"}, + { "particle" : "rocketbarrelpuff"}, + { "particle" : "rocketbarrelpuff"}, + { "particle" : "rocketbarrelpuff"} + ] + }, + + "rocketMuzzleFlash" : { + "transformationGroups" : ["muzzle"], + "offsetRegion" : [0, 0, 0, 0], + "particles" : [ + { "particle" : "rocketbarrelpuff"}, + { "particle" : "rocketbarrelpuff"}, + { "particle" : "rocketbarrelpuff"} + ] + }, + + "altMuzzleFlash" : { + "transformationGroups" : ["muzzle"], + "offsetRegion" : [-0.75, -0.125, -0.75, -0.125], + "burstCount" : 2, + "particles" : [ + { "particle" : "knightfall_plasmaparticle"}, + { "particle" : "knightfall_plasmaparticle2"} + ] + } + }, + + "sounds": { + "fire": ["/sfx/gun/plasma_shotgun3.ogg"], + "multiMuzzleFire" : [ "/sfx/gun/rocket1.ogg" ], + "altFire": [ "/sfx/gun/plasma_shotgun4.ogg" ] + }, + + "lights": { + "laser": { + "transformationGroups": ["weapon"], + "active": true, + "position": [2.825, -0.3], + "color": [90, 0, 0] + }, + "muzzleFlash" : { + "offset" : [4.2, 0.4], + "centered" : true, + "fullbright" : true + } + } + }, + + "animationScripts": [ + "/items/active/effects/laserbeam.lua" + ], + + "scriptedAnimationParameters": { + "beams": [{ + "offset": [2.825, -0.3], + "color": [255, 0, 0, 128], + "length": 60, + "segments": 6, + "angle": 0 + }] + }, + + "baseOffset": [0.9, 0.2], + "muzzleOffset": [4.3, 0.3], + + "cursor" : "/cursors/knightfall_crosshair_rifle.cursor", + "scripts": ["/items/active/weapons/ranged/knightfall_gun.lua"], + + "elementalType": "physical", + + "primaryAbility": { + "scripts": ["/items/active/weapons/ranged/knightfall_gunfire_multimuzzle.lua"], + "class": "MultiMuzzle", + + "muzzles": { + "muzzle": { + "fireTime": 0.11, + "baseDps": 14, + "energyUsage": 91, + "inaccuracy": 0.00, + "fireType": "auto", + + "projectileCount": 1, + "projectileType": "knightfall_explosiveplasmabullet" + }, + + "rocketMuzzle": { + "offset": [-1.1, 0.2], + + "fireTime": 0.5, + "baseDps": 5, + "energyUsage": 93.75, + "inaccuracy": 0.02, + "fireType": "auto", + + "projectileCount": 2, + "projectileType": "knightfall_RAS", + "projectileParameters" : { + "speed" : 30, + "acceleration" : 120 + } + } + }, + + "fireTime": 0.11, + "baseDps": 14, + "energyUsage": 91, + "inaccuracy": 0.00, + "fireType": "auto", + + "projectileCount": 1, + "projectileType": "knightfall_explosiveplasmabullet", + + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": 0, + + "twoHanded": true, + + "allowRotate": true, + "allowFlip": true + }, + + "fire": { + "duration": 0, + + "armRotation": 0, + "weaponRotation": 0, + "weaponOffset" : [-0.12, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": true + }, + + "cooldown": { + "duration": 0.1, + + "armRotation": 0, + "weaponRotation": 0, + "weaponOffset" : [-0.12, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": true + } + } + }, + + "altAbility": { + "name": "Super Shot Barrage", + "scripts": ["/items/active/weapons/ranged/abilities/altfire.lua"], + "class": "AltFireAttack", + + "fireTime" : 1.2, + "baseDps" : 15, + "energyUsage" : 31.5, + "inaccuracy" : 0.15, + + "projectileCount" : 6, + + "burstCount" : 3, + "burstTime" : 0.2, + "fireType": "burst", + + "projectileType" : "knightfall_explosiveplasmabullet", + "projectileParameters" : { + "knockback" : 7, + "timeToLive" : 0.1 + }, + + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": 0, + + "twoHanded": true, + + "allowRotate": true, + "allowFlip": true + }, + + "fire": { + "duration": 0, + + "armRotation": 0, + "weaponRotation": 0, + "weaponOffset" : [-0.12, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": true + }, + + "cooldown": { + "duration": 0.11, + + "armRotation": 0, + "weaponRotation": 0, + "weaponOffset" : [-0.12, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": true + } + } + }, + + "builder": "/items/buildscripts/buildunrandweapon.lua" +} \ No newline at end of file diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.png b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.png new file mode 100644 index 000000000..ed8b1fbde Binary files /dev/null and b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avenger.png differ diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avengerfullbright.png b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avengerfullbright.png new file mode 100644 index 000000000..80fa2be72 Binary files /dev/null and b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/knightfall_avengerfullbright.png differ diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.frames b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.frames new file mode 100644 index 000000000..c618b18f5 --- /dev/null +++ b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.frames @@ -0,0 +1,12 @@ +{ + "frameGrid" : { + "size" : [44, 23], + "dimensions" : [2, 3], + + "names" : [ + [ "1.1", "1.2" ], + [ "2.1", "2.2" ], + [ "3.1", "3.2" ] + ] + } +} diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.png b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.png new file mode 100644 index 000000000..941d96749 Binary files /dev/null and b/items/active/weapons/ranged/assaultrifle/knightfall_avenger/muzzleflash.png differ diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_blitzhunter/knightfall_blitzhunter.activeitem b/items/active/weapons/ranged/assaultrifle/knightfall_blitzhunter/knightfall_blitzhunter.activeitem index 3e264832f..e65af71e8 100644 --- a/items/active/weapons/ranged/assaultrifle/knightfall_blitzhunter/knightfall_blitzhunter.activeitem +++ b/items/active/weapons/ranged/assaultrifle/knightfall_blitzhunter/knightfall_blitzhunter.activeitem @@ -100,7 +100,7 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 5 }, diff --git a/items/active/weapons/ranged/assaultrifle/knightfall_foxhound/knightfall_foxhound.activeitem b/items/active/weapons/ranged/assaultrifle/knightfall_foxhound/knightfall_foxhound.activeitem index b93b37155..49ef94868 100644 --- a/items/active/weapons/ranged/assaultrifle/knightfall_foxhound/knightfall_foxhound.activeitem +++ b/items/active/weapons/ranged/assaultrifle/knightfall_foxhound/knightfall_foxhound.activeitem @@ -102,7 +102,7 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 5 }, diff --git a/items/active/weapons/ranged/cannons/knightfall_thumper/knightfall_thumper.activeitem b/items/active/weapons/ranged/cannons/knightfall_thumper/knightfall_thumper.activeitem index d7d5b72f8..582e70fc7 100644 --- a/items/active/weapons/ranged/cannons/knightfall_thumper/knightfall_thumper.activeitem +++ b/items/active/weapons/ranged/cannons/knightfall_thumper/knightfall_thumper.activeitem @@ -41,7 +41,7 @@ "aim" : ["/sfx/interface/ship_confirm1.ogg"], "fire" : { "pitchMultiplier" : 1, - "volume" : 0.85, + "volume" : 0.60, "pool" : ["/sfx/gun/railgun.ogg"] } } diff --git a/items/active/weapons/ranged/machineguns/knightfall_razor/knightfall_razor.activeitem b/items/active/weapons/ranged/machineguns/knightfall_razor/knightfall_razor.activeitem index 6d5e81adb..10622fa2e 100644 --- a/items/active/weapons/ranged/machineguns/knightfall_razor/knightfall_razor.activeitem +++ b/items/active/weapons/ranged/machineguns/knightfall_razor/knightfall_razor.activeitem @@ -72,15 +72,15 @@ "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "fireTime": 0.01, - "baseDps": 100, - "energyUsage": 300, + "fireTime": 0.03, + "baseDps": 32, + "energyUsage": 100, "inaccuracy": 0.05, "fireType": "auto", "projectileCount": 1, - "projectileType": [ "knightfall_standardbullet", "knightfall_piercingstandardbullet" ], + "projectileType": [ "knightfall_standardbullet", "knightfall_piercingstandardbullet", "knightfall_standardbullet_unlit", "knightfall_piercingstandardbullet_unlit" ], "projectileParameters": { "knockback" : 5 }, diff --git a/items/active/weapons/ranged/machineguns/knightfall_skyross/knightfall_skyross.activeitem b/items/active/weapons/ranged/machineguns/knightfall_skyross/knightfall_skyross.activeitem index 3e74a756a..3ddc9f550 100644 --- a/items/active/weapons/ranged/machineguns/knightfall_skyross/knightfall_skyross.activeitem +++ b/items/active/weapons/ranged/machineguns/knightfall_skyross/knightfall_skyross.activeitem @@ -82,7 +82,7 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": [ "knightfall_standardbullet", "knightfall_piercingstandardbullet", "knightfall_standardbullet_unlit", "knightfall_piercingstandardbullet_unlit" ], "projectileParameters": { "knockback" : 6 }, @@ -141,8 +141,9 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { + "speed": 500, "knockback" : 10 }, diff --git a/items/active/weapons/ranged/pistols/knightfall_bishop/knightfall_bishop.activeitem b/items/active/weapons/ranged/pistols/knightfall_bishop/knightfall_bishop.activeitem index b766df0fd..800071a1a 100644 --- a/items/active/weapons/ranged/pistols/knightfall_bishop/knightfall_bishop.activeitem +++ b/items/active/weapons/ranged/pistols/knightfall_bishop/knightfall_bishop.activeitem @@ -66,7 +66,7 @@ "fireType": "auto", "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 15 }, @@ -113,7 +113,7 @@ "scripts": ["/items/active/weapons/ranged/abilities/altfire.lua"], "class": "AltFireAttack", - "fireTime": 6, + "fireTime": 3, "baseDps": 0, "energyUsage": 10, "inaccuracy": 0.02, diff --git a/items/active/weapons/ranged/pistols/knightfall_comet/knightfall_comet.animation b/items/active/weapons/ranged/pistols/knightfall_comet/knightfall_comet.animation index 903fea755..d19a163b5 100644 --- a/items/active/weapons/ranged/pistols/knightfall_comet/knightfall_comet.animation +++ b/items/active/weapons/ranged/pistols/knightfall_comet/knightfall_comet.animation @@ -106,7 +106,7 @@ }, "sounds" : { - "fire" : [ "/sfx/gun/pulsecannon2.ogg" ], + "fire" : [ "/sfx/gun/plasma_gun14.ogg" ], "fire2" : [ "/sfx/gun/plasma_shotgun3.ogg" ] } } diff --git a/items/active/weapons/ranged/pistols/knightfall_striker/knightfall_striker.activeitem b/items/active/weapons/ranged/pistols/knightfall_striker/knightfall_striker.activeitem index 5c6c531da..ff03780a2 100644 --- a/items/active/weapons/ranged/pistols/knightfall_striker/knightfall_striker.activeitem +++ b/items/active/weapons/ranged/pistols/knightfall_striker/knightfall_striker.activeitem @@ -57,7 +57,7 @@ "fireType": "auto", "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 5 }, diff --git a/items/active/weapons/ranged/prism/knightfall_pulsar/knightfall_pulsar.activeitem b/items/active/weapons/ranged/prism/knightfall_pulsar/knightfall_pulsar.activeitem index f51511600..f788a0a14 100644 --- a/items/active/weapons/ranged/prism/knightfall_pulsar/knightfall_pulsar.activeitem +++ b/items/active/weapons/ranged/prism/knightfall_pulsar/knightfall_pulsar.activeitem @@ -2,7 +2,7 @@ "itemName": "knightfall_pulsar", "shortdescription": "Pulsar", "category": "^white;Prism Rifle^reset;", - "description": "A state-of-the-art prism rifle capable of firing long range, damaging beams of light.", + "description": "A state-of-the-art prism rifle capable of firing long ranged, damaging beams of light.", "level": 7, "price": 5000, @@ -25,6 +25,25 @@ }, "animationCustom" : { + "particleEmitters" : { + "muzzleFlash" : { + "transformationGroups" : ["muzzle"], + "offsetRegion" : [-0.75, -0.125, -0.75, -0.125], + "burstCount" : 2, + "particles" : [] + }, + + "altMuzzleFlash" : { + "transformationGroups" : ["muzzle"], + "offsetRegion" : [0, 0, 0, 0], + "particles" : [ + { "particle" : "rocketbarrelpuff", "offset" : [-1.2, -1.0]}, + { "particle" : "rocketbarrelpuff", "offset" : [-1.2, -1.0]}, + { "particle" : "rocketbarrelpuff", "offset" : [-1.2, -1.0]} + ] + } + }, + "sounds" : { "fireStart" : [ ], "fireLoop" : [ "/sfx/gun/laser-fire-blast-start.ogg" ], @@ -139,6 +158,63 @@ } } }, + + "altAbility": { + "name": "X Grenade", + "scripts": ["/items/active/weapons/ranged/abilities/altfire.lua"], + "class": "AltFireAttack", + + "fireTime": 1.2, + "energyUsage": 50, + "projectileCount": 1, + "baseDps": 8, + "inaccuracy": 0.02, + "fireType": "auto", + + "hidePrimaryMuzzleFlash" : true, + "usePrimaryFireSound" : false, + "useParticleEmitter": true, + + "projectileType": "knightfall_prismgrenade_launched", + + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": 0, + + "twoHanded": true, + + "allowRotate": true, + "allowFlip": true + }, + + "fire": { + "duration": 0, + + "armRotation": 6, + "weaponRotation": 6, + "weaponOffset" : [-0.3, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": false + }, + + "cooldown": { + "duration": 0.2, + + "armRotation": 6, + "weaponRotation": 6, + "weaponOffset" : [-0.3, 0], + + "twoHanded": true, + + "allowRotate": false, + "allowFlip": false + } + } + }, "builder": "/items/buildscripts/buildunrandweapon.lua" } \ No newline at end of file diff --git a/items/active/weapons/ranged/shotgun/knightfall_executor/knightfall_executor.activeitem b/items/active/weapons/ranged/shotgun/knightfall_executor/knightfall_executor.activeitem index 2d28e25cb..492d8605a 100644 --- a/items/active/weapons/ranged/shotgun/knightfall_executor/knightfall_executor.activeitem +++ b/items/active/weapons/ranged/shotgun/knightfall_executor/knightfall_executor.activeitem @@ -65,7 +65,7 @@ "projectileCount" : 4, "fireType" : "auto", - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "damageKind" : "shotgunbullet", "knockback" : 7 diff --git a/items/active/weapons/ranged/shotgun/knightfall_havoc/knightfall_havoc.activeitem b/items/active/weapons/ranged/shotgun/knightfall_havoc/knightfall_havoc.activeitem index d85a6fbe3..d76ba8807 100644 --- a/items/active/weapons/ranged/shotgun/knightfall_havoc/knightfall_havoc.activeitem +++ b/items/active/weapons/ranged/shotgun/knightfall_havoc/knightfall_havoc.activeitem @@ -73,7 +73,7 @@ "projectileCount" : 5, "fireType" : "auto", - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "damageKind" : "shotgunbullet", "knockback" : 7 diff --git a/items/active/weapons/ranged/shotgun/knightfall_nebulizer/knightfall_nebulizer.activeitem b/items/active/weapons/ranged/shotgun/knightfall_nebulizer/knightfall_nebulizer.activeitem index 19b6b9c49..c3215c7eb 100644 --- a/items/active/weapons/ranged/shotgun/knightfall_nebulizer/knightfall_nebulizer.activeitem +++ b/items/active/weapons/ranged/shotgun/knightfall_nebulizer/knightfall_nebulizer.activeitem @@ -68,7 +68,7 @@ "projectileCount" : 6, "fireType" : "auto", - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "damageKind" : "shotgunbullet", "knockback" : 20 @@ -124,8 +124,8 @@ "scripts": ["/items/active/weapons/ranged/abilities/altfire.lua"], "class": "AltFireAttack", - "fireTime": 6, - "energyUsage": 50, + "fireTime": 3, + "energyUsage": 10, "baseDps": 0, "projectileCount": 1, "inaccuracy": 0, @@ -151,6 +151,11 @@ "knightfall_healingstim" ] } + }, + { + "action": "sound", + "options": ["/sfx/melee/rocketspear_stop_poison.ogg"], + "repeat": false } ] }, diff --git a/items/active/weapons/ranged/shotgun/knightfall_scatterwarp/knightfall_scatterwarp.activeitem b/items/active/weapons/ranged/shotgun/knightfall_scatterwarp/knightfall_scatterwarp.activeitem index b51e5cd11..5becc5d33 100644 --- a/items/active/weapons/ranged/shotgun/knightfall_scatterwarp/knightfall_scatterwarp.activeitem +++ b/items/active/weapons/ranged/shotgun/knightfall_scatterwarp/knightfall_scatterwarp.activeitem @@ -68,7 +68,7 @@ "projectileCount" : 6, "fireType" : "auto", - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "damageKind" : "shotgunbullet", "knockback" : 7 diff --git a/items/active/weapons/ranged/shotgun/knightfall_shellbourne/knightfall_shellbourne.activeitem b/items/active/weapons/ranged/shotgun/knightfall_shellbourne/knightfall_shellbourne.activeitem index 56b4478b0..14f4dd578 100644 --- a/items/active/weapons/ranged/shotgun/knightfall_shellbourne/knightfall_shellbourne.activeitem +++ b/items/active/weapons/ranged/shotgun/knightfall_shellbourne/knightfall_shellbourne.activeitem @@ -63,7 +63,7 @@ "projectileCount" : 7, "fireType" : "auto", - "projectileType" : "knightfall_standardbullet", + "projectileType" : "knightfall_standardbullet_unlit", "projectileParameters" : { "damageKind" : "shotgunbullet", "knockback" : 4 diff --git a/items/active/weapons/ranged/sniperrifle/knightfall_infiltrator/knightfall_infiltrator.activeitem b/items/active/weapons/ranged/sniperrifle/knightfall_infiltrator/knightfall_infiltrator.activeitem index 363c4028f..3619d4c82 100644 --- a/items/active/weapons/ranged/sniperrifle/knightfall_infiltrator/knightfall_infiltrator.activeitem +++ b/items/active/weapons/ranged/sniperrifle/knightfall_infiltrator/knightfall_infiltrator.activeitem @@ -108,7 +108,7 @@ "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": "knightfall_standardbullet_unlit", "projectileParameters": { "knockback" : 10 }, diff --git a/items/active/weapons/ranged/sniperrifle/knightfall_inflictor/knightfall_inflictor.activeitem b/items/active/weapons/ranged/sniperrifle/knightfall_inflictor/knightfall_inflictor.activeitem index e50af823e..37294347a 100644 --- a/items/active/weapons/ranged/sniperrifle/knightfall_inflictor/knightfall_inflictor.activeitem +++ b/items/active/weapons/ranged/sniperrifle/knightfall_inflictor/knightfall_inflictor.activeitem @@ -88,7 +88,7 @@ "inaccuracy" : 0, "fireType" : "auto", - "projectileType" : "knightfall_standardbullet", + "projectileType" : "knightfall_standardbullet_unlit", "projectileParameters" : { "speed": 500, "knockback": 30 diff --git a/items/active/weapons/ranged/submachineguns/knightfall_hornet/knightfall_hornet.activeitem b/items/active/weapons/ranged/submachineguns/knightfall_hornet/knightfall_hornet.activeitem index 53a2f24d2..2aa67b277 100644 --- a/items/active/weapons/ranged/submachineguns/knightfall_hornet/knightfall_hornet.activeitem +++ b/items/active/weapons/ranged/submachineguns/knightfall_hornet/knightfall_hornet.activeitem @@ -41,7 +41,7 @@ }, "sounds": { - "fire": ["/sfx/gun/plasma_pistol1.ogg"] + "fire": ["/sfx/gun/plasma_ar1.ogg"] }, "particleEmitters" : { diff --git a/items/active/weapons/ranged/submachineguns/knightfall_stinger/knightfall_stinger.activeitem b/items/active/weapons/ranged/submachineguns/knightfall_stinger/knightfall_stinger.activeitem index 93329c61c..0a38e1fd4 100644 --- a/items/active/weapons/ranged/submachineguns/knightfall_stinger/knightfall_stinger.activeitem +++ b/items/active/weapons/ranged/submachineguns/knightfall_stinger/knightfall_stinger.activeitem @@ -76,7 +76,7 @@ "fireType": "auto", "projectileCount": 1, - "projectileType": "knightfall_standardbullet", + "projectileType": [ "knightfall_standardbullet", "knightfall_piercingstandardbullet", "knightfall_standardbullet_unlit", "knightfall_piercingstandardbullet_unlit" ], "projectileParameters": { "knockback" : 5 }, diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/head.png b/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/head.png deleted file mode 100644 index 2f713eafc..000000000 Binary files a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/head.png and /dev/null differ diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/icons.png b/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/icons.png deleted file mode 100644 index 8ebf382a5..000000000 Binary files a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/icons.png and /dev/null differ diff --git a/items/armor/Knightframe Armor/armor/armor/bsleeve.frames b/items/armor/knightframe/armor/armor/bsleeve.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/bsleeve.frames rename to items/armor/knightframe/armor/armor/bsleeve.frames diff --git a/items/armor/Knightframe Armor/armor/armor/bsleeve.png b/items/armor/knightframe/armor/armor/bsleeve.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/bsleeve.png rename to items/armor/knightframe/armor/armor/bsleeve.png diff --git a/items/armor/Knightframe Armor/armor/armor/chestf.frames b/items/armor/knightframe/armor/armor/chestf.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/chestf.frames rename to items/armor/knightframe/armor/armor/chestf.frames diff --git a/items/armor/Knightframe Armor/armor/armor/chestf.png b/items/armor/knightframe/armor/armor/chestf.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/chestf.png rename to items/armor/knightframe/armor/armor/chestf.png diff --git a/items/armor/Knightframe Armor/armor/armor/chestm.frames b/items/armor/knightframe/armor/armor/chestm.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/chestm.frames rename to items/armor/knightframe/armor/armor/chestm.frames diff --git a/items/armor/Knightframe Armor/armor/armor/chestm.png b/items/armor/knightframe/armor/armor/chestm.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/chestm.png rename to items/armor/knightframe/armor/armor/chestm.png diff --git a/items/armor/Knightframe Armor/armor/armor/fsleeve.frames b/items/armor/knightframe/armor/armor/fsleeve.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/fsleeve.frames rename to items/armor/knightframe/armor/armor/fsleeve.frames diff --git a/items/armor/Knightframe Armor/armor/armor/fsleeve.png b/items/armor/knightframe/armor/armor/fsleeve.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/fsleeve.png rename to items/armor/knightframe/armor/armor/fsleeve.png diff --git a/items/armor/Knightframe Armor/armor/armor/head.frames b/items/armor/knightframe/armor/armor/head.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/head.frames rename to items/armor/knightframe/armor/armor/head.frames diff --git a/items/armor/Knightframe Armor/armor/armor/head.png b/items/armor/knightframe/armor/armor/head.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/head.png rename to items/armor/knightframe/armor/armor/head.png diff --git a/items/armor/Knightframe Armor/armor/armor/icons.frames b/items/armor/knightframe/armor/armor/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/icons.frames rename to items/armor/knightframe/armor/armor/icons.frames diff --git a/items/armor/Knightframe Armor/armor/armor/icons.png b/items/armor/knightframe/armor/armor/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/icons.png rename to items/armor/knightframe/armor/armor/icons.png diff --git a/items/armor/Knightframe Armor/armor/armor/knightframe_chest.chest b/items/armor/knightframe/armor/armor/knightframe_chest.chest similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/knightframe_chest.chest rename to items/armor/knightframe/armor/armor/knightframe_chest.chest diff --git a/items/armor/Knightframe Armor/armor/armor/knightframe_head.head b/items/armor/knightframe/armor/armor/knightframe_head.head similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/knightframe_head.head rename to items/armor/knightframe/armor/armor/knightframe_head.head diff --git a/items/armor/Knightframe Armor/armor/armor/knightframe_legs.legs b/items/armor/knightframe/armor/armor/knightframe_legs.legs similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/knightframe_legs.legs rename to items/armor/knightframe/armor/armor/knightframe_legs.legs diff --git a/items/armor/Knightframe Armor/armor/armor/legs.frames b/items/armor/knightframe/armor/armor/legs.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/legs.frames rename to items/armor/knightframe/armor/armor/legs.frames diff --git a/items/armor/Knightframe Armor/armor/armor/legs.png b/items/armor/knightframe/armor/armor/legs.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/legs.png rename to items/armor/knightframe/armor/armor/legs.png diff --git a/items/armor/Knightframe Armor/armor/armor/mask.png b/items/armor/knightframe/armor/armor/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/armor/mask.png rename to items/armor/knightframe/armor/armor/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/head.frames b/items/armor/knightframe/armor/helmets/knightframe_commander/head.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/head.frames rename to items/armor/knightframe/armor/helmets/knightframe_commander/head.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/head.png b/items/armor/knightframe/armor/helmets/knightframe_commander/head.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/head.png rename to items/armor/knightframe/armor/helmets/knightframe_commander/head.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_commander/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_commander/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/icons.png b/items/armor/knightframe/armor/helmets/knightframe_commander/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_commander/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/knightframe_commander.head b/items/armor/knightframe/armor/helmets/knightframe_commander/knightframe_commander.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/knightframe_commander.head rename to items/armor/knightframe/armor/helmets/knightframe_commander/knightframe_commander.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_commander/mask.png b/items/armor/knightframe/armor/helmets/knightframe_commander/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_commander/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_commander/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/head.frames b/items/armor/knightframe/armor/helmets/knightframe_explorer/head.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/head.frames rename to items/armor/knightframe/armor/helmets/knightframe_explorer/head.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/head.png b/items/armor/knightframe/armor/helmets/knightframe_explorer/head.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/head.png rename to items/armor/knightframe/armor/helmets/knightframe_explorer/head.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_explorer/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_explorer/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/icons.png b/items/armor/knightframe/armor/helmets/knightframe_explorer/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_explorer/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/knightframe_explorer.head b/items/armor/knightframe/armor/helmets/knightframe_explorer/knightframe_explorer.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/knightframe_explorer.head rename to items/armor/knightframe/armor/helmets/knightframe_explorer/knightframe_explorer.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/mask.png b/items/armor/knightframe/armor/helmets/knightframe_explorer/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_explorer/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_explorer/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/head.frames b/items/armor/knightframe/armor/helmets/knightframe_guardian/head.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/head.frames rename to items/armor/knightframe/armor/helmets/knightframe_guardian/head.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/head.png b/items/armor/knightframe/armor/helmets/knightframe_guardian/head.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/head.png rename to items/armor/knightframe/armor/helmets/knightframe_guardian/head.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_guardian/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_guardian/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/icons.png b/items/armor/knightframe/armor/helmets/knightframe_guardian/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_guardian/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/knightframe_guardian.head b/items/armor/knightframe/armor/helmets/knightframe_guardian/knightframe_guardian.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/knightframe_guardian.head rename to items/armor/knightframe/armor/helmets/knightframe_guardian/knightframe_guardian.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/mask.png b/items/armor/knightframe/armor/helmets/knightframe_guardian/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_guardian/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_guardian/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/head.frames b/items/armor/knightframe/armor/helmets/knightframe_hunter/head.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/head.frames rename to items/armor/knightframe/armor/helmets/knightframe_hunter/head.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/head.png b/items/armor/knightframe/armor/helmets/knightframe_hunter/head.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/head.png rename to items/armor/knightframe/armor/helmets/knightframe_hunter/head.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_hunter/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_hunter/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/icons.png b/items/armor/knightframe/armor/helmets/knightframe_hunter/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_hunter/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/knightframe_hunter.head b/items/armor/knightframe/armor/helmets/knightframe_hunter/knightframe_hunter.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/knightframe_hunter.head rename to items/armor/knightframe/armor/helmets/knightframe_hunter/knightframe_hunter.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/mask.png b/items/armor/knightframe/armor/helmets/knightframe_hunter/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_hunter/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_hunter/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_scouter/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_scouter/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/icons.png b/items/armor/knightframe/armor/helmets/knightframe_scouter/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_scouter/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.frames b/items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.frames rename to items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.head b/items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.head rename to items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.png b/items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/knightframe_scouter.png rename to items/armor/knightframe/armor/helmets/knightframe_scouter/knightframe_scouter.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/mask.png b/items/armor/knightframe/armor/helmets/knightframe_scouter/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_scouter/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_scouter/mask.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/icons.frames b/items/armor/knightframe/armor/helmets/knightframe_visor/icons.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/icons.frames rename to items/armor/knightframe/armor/helmets/knightframe_visor/icons.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/icons.png b/items/armor/knightframe/armor/helmets/knightframe_visor/icons.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/icons.png rename to items/armor/knightframe/armor/helmets/knightframe_visor/icons.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.frames b/items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.frames similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.frames rename to items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.frames diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.head b/items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.head similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.head rename to items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.head diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.png b/items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/knightframe_visor.png rename to items/armor/knightframe/armor/helmets/knightframe_visor/knightframe_visor.png diff --git a/items/armor/Knightframe Armor/armor/helmets/knightframe_visor/mask.png b/items/armor/knightframe/armor/helmets/knightframe_visor/mask.png similarity index 100% rename from items/armor/Knightframe Armor/armor/helmets/knightframe_visor/mask.png rename to items/armor/knightframe/armor/helmets/knightframe_visor/mask.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_booster/back.frames b/items/armor/knightframe/backitems/knightframe_booster/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_booster/back.frames rename to items/armor/knightframe/backitems/knightframe_booster/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_booster/back.png b/items/armor/knightframe/backitems/knightframe_booster/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_booster/back.png rename to items/armor/knightframe/backitems/knightframe_booster/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_booster/icon.png b/items/armor/knightframe/backitems/knightframe_booster/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_booster/icon.png rename to items/armor/knightframe/backitems/knightframe_booster/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_booster/knightframe_booster.back b/items/armor/knightframe/backitems/knightframe_booster/knightframe_booster.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_booster/knightframe_booster.back rename to items/armor/knightframe/backitems/knightframe_booster/knightframe_booster.back diff --git a/items/armor/Knightframe Armor/backitems/knightframe_cape/back.frames b/items/armor/knightframe/backitems/knightframe_cape/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_cape/back.frames rename to items/armor/knightframe/backitems/knightframe_cape/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_cape/back.png b/items/armor/knightframe/backitems/knightframe_cape/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_cape/back.png rename to items/armor/knightframe/backitems/knightframe_cape/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_cape/icon.png b/items/armor/knightframe/backitems/knightframe_cape/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_cape/icon.png rename to items/armor/knightframe/backitems/knightframe_cape/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_cape/knightframe_cape.back b/items/armor/knightframe/backitems/knightframe_cape/knightframe_cape.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_cape/knightframe_cape.back rename to items/armor/knightframe/backitems/knightframe_cape/knightframe_cape.back diff --git a/items/armor/Knightframe Armor/backitems/knightframe_chronosentry/back.frames b/items/armor/knightframe/backitems/knightframe_chronosentry/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_chronosentry/back.frames rename to items/armor/knightframe/backitems/knightframe_chronosentry/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_chronosentry/back.png b/items/armor/knightframe/backitems/knightframe_chronosentry/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_chronosentry/back.png rename to items/armor/knightframe/backitems/knightframe_chronosentry/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_chronosentry/icon.png b/items/armor/knightframe/backitems/knightframe_chronosentry/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_chronosentry/icon.png rename to items/armor/knightframe/backitems/knightframe_chronosentry/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_chronosentry/knightframe_chronosentry.back b/items/armor/knightframe/backitems/knightframe_chronosentry/knightframe_chronosentry.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_chronosentry/knightframe_chronosentry.back rename to items/armor/knightframe/backitems/knightframe_chronosentry/knightframe_chronosentry.back diff --git a/items/armor/Knightframe Armor/backitems/knightframe_fueltanks/back.frames b/items/armor/knightframe/backitems/knightframe_fueltanks/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_fueltanks/back.frames rename to items/armor/knightframe/backitems/knightframe_fueltanks/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_fueltanks/back.png b/items/armor/knightframe/backitems/knightframe_fueltanks/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_fueltanks/back.png rename to items/armor/knightframe/backitems/knightframe_fueltanks/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_fueltanks/icon.png b/items/armor/knightframe/backitems/knightframe_fueltanks/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_fueltanks/icon.png rename to items/armor/knightframe/backitems/knightframe_fueltanks/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_fueltanks/knightframe_fueltanks.back b/items/armor/knightframe/backitems/knightframe_fueltanks/knightframe_fueltanks.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_fueltanks/knightframe_fueltanks.back rename to items/armor/knightframe/backitems/knightframe_fueltanks/knightframe_fueltanks.back diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/back - Copy.png b/items/armor/knightframe/backitems/knightframe_jetpack/back - Copy.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/back - Copy.png rename to items/armor/knightframe/backitems/knightframe_jetpack/back - Copy.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/back-unused.png b/items/armor/knightframe/backitems/knightframe_jetpack/back-unused.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/back-unused.png rename to items/armor/knightframe/backitems/knightframe_jetpack/back-unused.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/back.frames b/items/armor/knightframe/backitems/knightframe_jetpack/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/back.frames rename to items/armor/knightframe/backitems/knightframe_jetpack/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/back.png b/items/armor/knightframe/backitems/knightframe_jetpack/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/back.png rename to items/armor/knightframe/backitems/knightframe_jetpack/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/icon.png b/items/armor/knightframe/backitems/knightframe_jetpack/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/icon.png rename to items/armor/knightframe/backitems/knightframe_jetpack/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_jetpack/knightframe_jetpack.back b/items/armor/knightframe/backitems/knightframe_jetpack/knightframe_jetpack.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_jetpack/knightframe_jetpack.back rename to items/armor/knightframe/backitems/knightframe_jetpack/knightframe_jetpack.back diff --git a/items/armor/Knightframe Armor/backitems/knightframe_starstreak/back-unused.png b/items/armor/knightframe/backitems/knightframe_starstreak/back-unused.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_starstreak/back-unused.png rename to items/armor/knightframe/backitems/knightframe_starstreak/back-unused.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_starstreak/back.frames b/items/armor/knightframe/backitems/knightframe_starstreak/back.frames similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_starstreak/back.frames rename to items/armor/knightframe/backitems/knightframe_starstreak/back.frames diff --git a/items/armor/Knightframe Armor/backitems/knightframe_starstreak/back.png b/items/armor/knightframe/backitems/knightframe_starstreak/back.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_starstreak/back.png rename to items/armor/knightframe/backitems/knightframe_starstreak/back.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_starstreak/icon.png b/items/armor/knightframe/backitems/knightframe_starstreak/icon.png similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_starstreak/icon.png rename to items/armor/knightframe/backitems/knightframe_starstreak/icon.png diff --git a/items/armor/Knightframe Armor/backitems/knightframe_starstreak/knightframe_starstreak.back b/items/armor/knightframe/backitems/knightframe_starstreak/knightframe_starstreak.back similarity index 100% rename from items/armor/Knightframe Armor/backitems/knightframe_starstreak/knightframe_starstreak.back rename to items/armor/knightframe/backitems/knightframe_starstreak/knightframe_starstreak.back diff --git a/items/armor/Medicframe Armor/armor/armor/bsleeve.frames b/items/armor/medicframe/armor/armor/bsleeve.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/bsleeve.frames rename to items/armor/medicframe/armor/armor/bsleeve.frames diff --git a/items/armor/Medicframe Armor/armor/armor/bsleeve.png b/items/armor/medicframe/armor/armor/bsleeve.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/bsleeve.png rename to items/armor/medicframe/armor/armor/bsleeve.png diff --git a/items/armor/Medicframe Armor/armor/armor/chestf.frames b/items/armor/medicframe/armor/armor/chestf.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/chestf.frames rename to items/armor/medicframe/armor/armor/chestf.frames diff --git a/items/armor/Medicframe Armor/armor/armor/chestf.png b/items/armor/medicframe/armor/armor/chestf.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/chestf.png rename to items/armor/medicframe/armor/armor/chestf.png diff --git a/items/armor/Medicframe Armor/armor/armor/chestm.frames b/items/armor/medicframe/armor/armor/chestm.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/chestm.frames rename to items/armor/medicframe/armor/armor/chestm.frames diff --git a/items/armor/Medicframe Armor/armor/armor/chestm.png b/items/armor/medicframe/armor/armor/chestm.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/chestm.png rename to items/armor/medicframe/armor/armor/chestm.png diff --git a/items/armor/Medicframe Armor/armor/armor/fsleeve.frames b/items/armor/medicframe/armor/armor/fsleeve.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/fsleeve.frames rename to items/armor/medicframe/armor/armor/fsleeve.frames diff --git a/items/armor/Medicframe Armor/armor/armor/fsleeve.png b/items/armor/medicframe/armor/armor/fsleeve.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/fsleeve.png rename to items/armor/medicframe/armor/armor/fsleeve.png diff --git a/items/armor/Medicframe Armor/armor/armor/head.frames b/items/armor/medicframe/armor/armor/head.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/head.frames rename to items/armor/medicframe/armor/armor/head.frames diff --git a/items/armor/Medicframe Armor/armor/armor/head.png b/items/armor/medicframe/armor/armor/head.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/head.png rename to items/armor/medicframe/armor/armor/head.png diff --git a/items/armor/Medicframe Armor/armor/armor/icons.frames b/items/armor/medicframe/armor/armor/icons.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/icons.frames rename to items/armor/medicframe/armor/armor/icons.frames diff --git a/items/armor/Medicframe Armor/armor/armor/icons.png b/items/armor/medicframe/armor/armor/icons.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/icons.png rename to items/armor/medicframe/armor/armor/icons.png diff --git a/items/armor/Medicframe Armor/armor/armor/legs.ase b/items/armor/medicframe/armor/armor/legs.ase similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/legs.ase rename to items/armor/medicframe/armor/armor/legs.ase diff --git a/items/armor/Medicframe Armor/armor/armor/legs.frames b/items/armor/medicframe/armor/armor/legs.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/legs.frames rename to items/armor/medicframe/armor/armor/legs.frames diff --git a/items/armor/Medicframe Armor/armor/armor/legs.png b/items/armor/medicframe/armor/armor/legs.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/legs.png rename to items/armor/medicframe/armor/armor/legs.png diff --git a/items/armor/Medicframe Armor/armor/armor/mask.png b/items/armor/medicframe/armor/armor/mask.png similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/mask.png rename to items/armor/medicframe/armor/armor/mask.png diff --git a/items/armor/Medicframe Armor/armor/armor/medicframe_chest.chest b/items/armor/medicframe/armor/armor/medicframe_chest.chest similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/medicframe_chest.chest rename to items/armor/medicframe/armor/armor/medicframe_chest.chest diff --git a/items/armor/Medicframe Armor/armor/armor/medicframe_head.head b/items/armor/medicframe/armor/armor/medicframe_head.head similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/medicframe_head.head rename to items/armor/medicframe/armor/armor/medicframe_head.head diff --git a/items/armor/Medicframe Armor/armor/armor/medicframe_legs.legs b/items/armor/medicframe/armor/armor/medicframe_legs.legs similarity index 100% rename from items/armor/Medicframe Armor/armor/armor/medicframe_legs.legs rename to items/armor/medicframe/armor/armor/medicframe_legs.legs diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/head.frames b/items/armor/medicframe/armor/helmets/medicframe_healer/head.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/head.frames rename to items/armor/medicframe/armor/helmets/medicframe_healer/head.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/head.png b/items/armor/medicframe/armor/helmets/medicframe_healer/head.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/head.png rename to items/armor/medicframe/armor/helmets/medicframe_healer/head.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/icons.frames b/items/armor/medicframe/armor/helmets/medicframe_healer/icons.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/icons.frames rename to items/armor/medicframe/armor/helmets/medicframe_healer/icons.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/icons.png b/items/armor/medicframe/armor/helmets/medicframe_healer/icons.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/icons.png rename to items/armor/medicframe/armor/helmets/medicframe_healer/icons.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/mask.png b/items/armor/medicframe/armor/helmets/medicframe_healer/mask.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/mask.png rename to items/armor/medicframe/armor/helmets/medicframe_healer/mask.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_healer/medicframe_healer.head b/items/armor/medicframe/armor/helmets/medicframe_healer/medicframe_healer.head similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_healer/medicframe_healer.head rename to items/armor/medicframe/armor/helmets/medicframe_healer/medicframe_healer.head diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/head.frames b/items/armor/medicframe/armor/helmets/medicframe_rescuer/head.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/head.frames rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/head.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/head.png b/items/armor/medicframe/armor/helmets/medicframe_rescuer/head.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/head.png rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/head.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/icons.frames b/items/armor/medicframe/armor/helmets/medicframe_rescuer/icons.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/icons.frames rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/icons.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/icons.png b/items/armor/medicframe/armor/helmets/medicframe_rescuer/icons.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/icons.png rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/icons.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/mask.png b/items/armor/medicframe/armor/helmets/medicframe_rescuer/mask.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/mask.png rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/mask.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/medicframe_rescuer.head b/items/armor/medicframe/armor/helmets/medicframe_rescuer/medicframe_rescuer.head similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_rescuer/medicframe_rescuer.head rename to items/armor/medicframe/armor/helmets/medicframe_rescuer/medicframe_rescuer.head diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/head.frames b/items/armor/medicframe/armor/helmets/medicframe_supporter/head.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/head.frames rename to items/armor/medicframe/armor/helmets/medicframe_supporter/head.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/head.png b/items/armor/medicframe/armor/helmets/medicframe_supporter/head.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/head.png rename to items/armor/medicframe/armor/helmets/medicframe_supporter/head.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/icons.frames b/items/armor/medicframe/armor/helmets/medicframe_supporter/icons.frames similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/icons.frames rename to items/armor/medicframe/armor/helmets/medicframe_supporter/icons.frames diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/icons.png b/items/armor/medicframe/armor/helmets/medicframe_supporter/icons.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/icons.png rename to items/armor/medicframe/armor/helmets/medicframe_supporter/icons.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/mask.png b/items/armor/medicframe/armor/helmets/medicframe_supporter/mask.png similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/mask.png rename to items/armor/medicframe/armor/helmets/medicframe_supporter/mask.png diff --git a/items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/medicframe_supporter.head b/items/armor/medicframe/armor/helmets/medicframe_supporter/medicframe_supporter.head similarity index 100% rename from items/armor/Medicframe Armor/armor/helmets/medicframe_supporter/medicframe_supporter.head rename to items/armor/medicframe/armor/helmets/medicframe_supporter/medicframe_supporter.head diff --git a/items/armor/Medicframe Armor/backitems/medicframe_backpack/back.frames b/items/armor/medicframe/backitems/medicframe_backpack/back.frames similarity index 100% rename from items/armor/Medicframe Armor/backitems/medicframe_backpack/back.frames rename to items/armor/medicframe/backitems/medicframe_backpack/back.frames diff --git a/items/armor/Medicframe Armor/backitems/medicframe_backpack/back.png b/items/armor/medicframe/backitems/medicframe_backpack/back.png similarity index 100% rename from items/armor/Medicframe Armor/backitems/medicframe_backpack/back.png rename to items/armor/medicframe/backitems/medicframe_backpack/back.png diff --git a/items/armor/Medicframe Armor/backitems/medicframe_backpack/icon.png b/items/armor/medicframe/backitems/medicframe_backpack/icon.png similarity index 100% rename from items/armor/Medicframe Armor/backitems/medicframe_backpack/icon.png rename to items/armor/medicframe/backitems/medicframe_backpack/icon.png diff --git a/items/armor/Medicframe Armor/backitems/medicframe_backpack/medicframe_backpack.back b/items/armor/medicframe/backitems/medicframe_backpack/medicframe_backpack.back similarity index 100% rename from items/armor/Medicframe Armor/backitems/medicframe_backpack/medicframe_backpack.back rename to items/armor/medicframe/backitems/medicframe_backpack/medicframe_backpack.back diff --git a/items/armor/Mightframe Armor/armor/armor/animation.ase b/items/armor/mightframe/armor/armor/animation.ase similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/animation.ase rename to items/armor/mightframe/armor/armor/animation.ase diff --git a/items/armor/Mightframe Armor/armor/armor/bsleeve.ase b/items/armor/mightframe/armor/armor/bsleeve.ase similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/bsleeve.ase rename to items/armor/mightframe/armor/armor/bsleeve.ase diff --git a/items/armor/Mightframe Armor/armor/armor/bsleeve.frames b/items/armor/mightframe/armor/armor/bsleeve.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/bsleeve.frames rename to items/armor/mightframe/armor/armor/bsleeve.frames diff --git a/items/armor/Mightframe Armor/armor/armor/bsleeve.png b/items/armor/mightframe/armor/armor/bsleeve.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/bsleeve.png rename to items/armor/mightframe/armor/armor/bsleeve.png diff --git a/items/armor/Mightframe Armor/armor/armor/chestf.frames b/items/armor/mightframe/armor/armor/chestf.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/chestf.frames rename to items/armor/mightframe/armor/armor/chestf.frames diff --git a/items/armor/Mightframe Armor/armor/armor/chestf.png b/items/armor/mightframe/armor/armor/chestf.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/chestf.png rename to items/armor/mightframe/armor/armor/chestf.png diff --git a/items/armor/Mightframe Armor/armor/armor/chestm.frames b/items/armor/mightframe/armor/armor/chestm.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/chestm.frames rename to items/armor/mightframe/armor/armor/chestm.frames diff --git a/items/armor/Mightframe Armor/armor/armor/chestm.png b/items/armor/mightframe/armor/armor/chestm.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/chestm.png rename to items/armor/mightframe/armor/armor/chestm.png diff --git a/items/armor/Mightframe Armor/armor/armor/fsleeve.ase b/items/armor/mightframe/armor/armor/fsleeve.ase similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/fsleeve.ase rename to items/armor/mightframe/armor/armor/fsleeve.ase diff --git a/items/armor/Mightframe Armor/armor/armor/fsleeve.frames b/items/armor/mightframe/armor/armor/fsleeve.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/fsleeve.frames rename to items/armor/mightframe/armor/armor/fsleeve.frames diff --git a/items/armor/Mightframe Armor/armor/armor/fsleeve.png b/items/armor/mightframe/armor/armor/fsleeve.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/fsleeve.png rename to items/armor/mightframe/armor/armor/fsleeve.png diff --git a/items/armor/Mightframe Armor/armor/armor/head.frames b/items/armor/mightframe/armor/armor/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/head.frames rename to items/armor/mightframe/armor/armor/head.frames diff --git a/items/armor/Mightframe Armor/armor/armor/head.png b/items/armor/mightframe/armor/armor/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/head.png rename to items/armor/mightframe/armor/armor/head.png diff --git a/items/armor/Mightframe Armor/armor/armor/icons.frames b/items/armor/mightframe/armor/armor/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/icons.frames rename to items/armor/mightframe/armor/armor/icons.frames diff --git a/items/armor/Mightframe Armor/armor/armor/icons.png b/items/armor/mightframe/armor/armor/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/icons.png rename to items/armor/mightframe/armor/armor/icons.png diff --git a/items/armor/Mightframe Armor/armor/armor/legs.ase b/items/armor/mightframe/armor/armor/legs.ase similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/legs.ase rename to items/armor/mightframe/armor/armor/legs.ase diff --git a/items/armor/Mightframe Armor/armor/armor/legs.frames b/items/armor/mightframe/armor/armor/legs.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/legs.frames rename to items/armor/mightframe/armor/armor/legs.frames diff --git a/items/armor/Mightframe Armor/armor/armor/legs.png b/items/armor/mightframe/armor/armor/legs.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/legs.png rename to items/armor/mightframe/armor/armor/legs.png diff --git a/items/armor/Mightframe Armor/armor/armor/mask.png b/items/armor/mightframe/armor/armor/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/mask.png rename to items/armor/mightframe/armor/armor/mask.png diff --git a/items/armor/Mightframe Armor/armor/armor/mightframe_chest.chest b/items/armor/mightframe/armor/armor/mightframe_chest.chest similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/mightframe_chest.chest rename to items/armor/mightframe/armor/armor/mightframe_chest.chest diff --git a/items/armor/Mightframe Armor/armor/armor/mightframe_head.head b/items/armor/mightframe/armor/armor/mightframe_head.head similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/mightframe_head.head rename to items/armor/mightframe/armor/armor/mightframe_head.head diff --git a/items/armor/Mightframe Armor/armor/armor/mightframe_legs.legs b/items/armor/mightframe/armor/armor/mightframe_legs.legs similarity index 100% rename from items/armor/Mightframe Armor/armor/armor/mightframe_legs.legs rename to items/armor/mightframe/armor/armor/mightframe_legs.legs diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/head.frames b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/head.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/head.png b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/head.png rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/head.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/icons.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/icons.png b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/icons.png rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/icons.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/mask.png b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/mightframe_juggernaut.head b/items/armor/mightframe/armor/helmets/mightframe_juggernaut/mightframe_juggernaut.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_juggernaut/mightframe_juggernaut.head rename to items/armor/mightframe/armor/helmets/mightframe_juggernaut/mightframe_juggernaut.head diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/head.frames b/items/armor/mightframe/armor/helmets/mightframe_praetor/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_praetor/head.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/head.png b/items/armor/mightframe/armor/helmets/mightframe_praetor/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/head.png rename to items/armor/mightframe/armor/helmets/mightframe_praetor/head.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_praetor/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_praetor/icons.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/icons.png b/items/armor/mightframe/armor/helmets/mightframe_praetor/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/icons.png rename to items/armor/mightframe/armor/helmets/mightframe_praetor/icons.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/mask.png b/items/armor/mightframe/armor/helmets/mightframe_praetor/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_praetor/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/mightframe_praetor.head b/items/armor/mightframe/armor/helmets/mightframe_praetor/mightframe_praetor.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_praetor/mightframe_praetor.head rename to items/armor/mightframe/armor/helmets/mightframe_praetor/mightframe_praetor.head diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/head.frames b/items/armor/mightframe/armor/helmets/mightframe_ranger/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_ranger/head.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/head.png b/items/armor/mightframe/armor/helmets/mightframe_ranger/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/head.png rename to items/armor/mightframe/armor/helmets/mightframe_ranger/head.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_ranger/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_ranger/icons.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/icons.png b/items/armor/mightframe/armor/helmets/mightframe_ranger/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/icons.png rename to items/armor/mightframe/armor/helmets/mightframe_ranger/icons.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/mask.png b/items/armor/mightframe/armor/helmets/mightframe_ranger/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_ranger/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/mightframe_ranger.head b/items/armor/mightframe/armor/helmets/mightframe_ranger/mightframe_ranger.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_ranger/mightframe_ranger.head rename to items/armor/mightframe/armor/helmets/mightframe_ranger/mightframe_ranger.head diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/head.frames b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/head.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/head.png b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/head.png rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/head.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/icons.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/icons.png b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/icons.png rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/icons.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/mask.png b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/mightframe_shocktrooper.head b/items/armor/mightframe/armor/helmets/mightframe_shocktrooper/mightframe_shocktrooper.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_shocktrooper/mightframe_shocktrooper.head rename to items/armor/mightframe/armor/helmets/mightframe_shocktrooper/mightframe_shocktrooper.head diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/head.frames b/items/armor/mightframe/armor/helmets/mightframe_terminator/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_terminator/head.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/head.png b/items/armor/mightframe/armor/helmets/mightframe_terminator/head.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/head.png rename to items/armor/mightframe/armor/helmets/mightframe_terminator/head.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_terminator/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_terminator/icons.frames diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/icons.png b/items/armor/mightframe/armor/helmets/mightframe_terminator/icons.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/icons.png rename to items/armor/mightframe/armor/helmets/mightframe_terminator/icons.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/mask.png b/items/armor/mightframe/armor/helmets/mightframe_terminator/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_terminator/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/mightframe_terminator.head b/items/armor/mightframe/armor/helmets/mightframe_terminator/mightframe_terminator.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_terminator/mightframe_terminator.head rename to items/armor/mightframe/armor/helmets/mightframe_terminator/mightframe_terminator.head diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/head.frames b/items/armor/mightframe/armor/helmets/mightframe_visor/head.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_visor/head.frames rename to items/armor/mightframe/armor/helmets/mightframe_visor/head.frames diff --git a/items/armor/mightframe/armor/helmets/mightframe_visor/head.png b/items/armor/mightframe/armor/helmets/mightframe_visor/head.png new file mode 100644 index 000000000..a5bfa629e Binary files /dev/null and b/items/armor/mightframe/armor/helmets/mightframe_visor/head.png differ diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/icons.frames b/items/armor/mightframe/armor/helmets/mightframe_visor/icons.frames similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_visor/icons.frames rename to items/armor/mightframe/armor/helmets/mightframe_visor/icons.frames diff --git a/items/armor/mightframe/armor/helmets/mightframe_visor/icons.png b/items/armor/mightframe/armor/helmets/mightframe_visor/icons.png new file mode 100644 index 000000000..928b0de7b Binary files /dev/null and b/items/armor/mightframe/armor/helmets/mightframe_visor/icons.png differ diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/mask.png b/items/armor/mightframe/armor/helmets/mightframe_visor/mask.png similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_visor/mask.png rename to items/armor/mightframe/armor/helmets/mightframe_visor/mask.png diff --git a/items/armor/Mightframe Armor/armor/helmets/mightframe_visor/mightframe_visor.head b/items/armor/mightframe/armor/helmets/mightframe_visor/mightframe_visor.head similarity index 100% rename from items/armor/Mightframe Armor/armor/helmets/mightframe_visor/mightframe_visor.head rename to items/armor/mightframe/armor/helmets/mightframe_visor/mightframe_visor.head diff --git a/items/armor/Mightframe Armor/backitems/mightframe_furcape/back.ase b/items/armor/mightframe/backitems/mightframe_furcape/back.ase similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_furcape/back.ase rename to items/armor/mightframe/backitems/mightframe_furcape/back.ase diff --git a/items/armor/Mightframe Armor/backitems/mightframe_furcape/back.frames b/items/armor/mightframe/backitems/mightframe_furcape/back.frames similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_furcape/back.frames rename to items/armor/mightframe/backitems/mightframe_furcape/back.frames diff --git a/items/armor/Mightframe Armor/backitems/mightframe_furcape/back.png b/items/armor/mightframe/backitems/mightframe_furcape/back.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_furcape/back.png rename to items/armor/mightframe/backitems/mightframe_furcape/back.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_furcape/icon.png b/items/armor/mightframe/backitems/mightframe_furcape/icon.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_furcape/icon.png rename to items/armor/mightframe/backitems/mightframe_furcape/icon.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_furcape/mightframe_furcape.back b/items/armor/mightframe/backitems/mightframe_furcape/mightframe_furcape.back similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_furcape/mightframe_furcape.back rename to items/armor/mightframe/backitems/mightframe_furcape/mightframe_furcape.back diff --git a/items/armor/Mightframe Armor/backitems/mightframe_shellshock/back.frames b/items/armor/mightframe/backitems/mightframe_shellshock/back.frames similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_shellshock/back.frames rename to items/armor/mightframe/backitems/mightframe_shellshock/back.frames diff --git a/items/armor/Mightframe Armor/backitems/mightframe_shellshock/back.png b/items/armor/mightframe/backitems/mightframe_shellshock/back.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_shellshock/back.png rename to items/armor/mightframe/backitems/mightframe_shellshock/back.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_shellshock/icon.png b/items/armor/mightframe/backitems/mightframe_shellshock/icon.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_shellshock/icon.png rename to items/armor/mightframe/backitems/mightframe_shellshock/icon.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_shellshock/mightframe_shellshock.back b/items/armor/mightframe/backitems/mightframe_shellshock/mightframe_shellshock.back similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_shellshock/mightframe_shellshock.back rename to items/armor/mightframe/backitems/mightframe_shellshock/mightframe_shellshock.back diff --git a/items/armor/Mightframe Armor/backitems/mightframe_strafer/back.frames b/items/armor/mightframe/backitems/mightframe_strafer/back.frames similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_strafer/back.frames rename to items/armor/mightframe/backitems/mightframe_strafer/back.frames diff --git a/items/armor/Mightframe Armor/backitems/mightframe_strafer/back.png b/items/armor/mightframe/backitems/mightframe_strafer/back.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_strafer/back.png rename to items/armor/mightframe/backitems/mightframe_strafer/back.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_strafer/icon.png b/items/armor/mightframe/backitems/mightframe_strafer/icon.png similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_strafer/icon.png rename to items/armor/mightframe/backitems/mightframe_strafer/icon.png diff --git a/items/armor/Mightframe Armor/backitems/mightframe_strafer/mightframe_strafer.back b/items/armor/mightframe/backitems/mightframe_strafer/mightframe_strafer.back similarity index 100% rename from items/armor/Mightframe Armor/backitems/mightframe_strafer/mightframe_strafer.back rename to items/armor/mightframe/backitems/mightframe_strafer/mightframe_strafer.back diff --git a/items/armor/Trooperframe Armor/armor/armor/bsleeve.ase b/items/armor/trooperframe/armor/armor/bsleeve.ase similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/bsleeve.ase rename to items/armor/trooperframe/armor/armor/bsleeve.ase diff --git a/items/armor/Trooperframe Armor/armor/armor/bsleeve.frames b/items/armor/trooperframe/armor/armor/bsleeve.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/bsleeve.frames rename to items/armor/trooperframe/armor/armor/bsleeve.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/bsleeve.png b/items/armor/trooperframe/armor/armor/bsleeve.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/bsleeve.png rename to items/armor/trooperframe/armor/armor/bsleeve.png diff --git a/items/armor/Trooperframe Armor/armor/armor/chestf.frames b/items/armor/trooperframe/armor/armor/chestf.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/chestf.frames rename to items/armor/trooperframe/armor/armor/chestf.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/chestf.png b/items/armor/trooperframe/armor/armor/chestf.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/chestf.png rename to items/armor/trooperframe/armor/armor/chestf.png diff --git a/items/armor/Trooperframe Armor/armor/armor/chestm.frames b/items/armor/trooperframe/armor/armor/chestm.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/chestm.frames rename to items/armor/trooperframe/armor/armor/chestm.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/chestm.png b/items/armor/trooperframe/armor/armor/chestm.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/chestm.png rename to items/armor/trooperframe/armor/armor/chestm.png diff --git a/items/armor/Trooperframe Armor/armor/armor/fsleeve.ase b/items/armor/trooperframe/armor/armor/fsleeve.ase similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/fsleeve.ase rename to items/armor/trooperframe/armor/armor/fsleeve.ase diff --git a/items/armor/Trooperframe Armor/armor/armor/fsleeve.frames b/items/armor/trooperframe/armor/armor/fsleeve.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/fsleeve.frames rename to items/armor/trooperframe/armor/armor/fsleeve.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/fsleeve.png b/items/armor/trooperframe/armor/armor/fsleeve.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/fsleeve.png rename to items/armor/trooperframe/armor/armor/fsleeve.png diff --git a/items/armor/Trooperframe Armor/armor/armor/head.frames b/items/armor/trooperframe/armor/armor/head.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/head.frames rename to items/armor/trooperframe/armor/armor/head.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/head.png b/items/armor/trooperframe/armor/armor/head.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/head.png rename to items/armor/trooperframe/armor/armor/head.png diff --git a/items/armor/Trooperframe Armor/armor/armor/icons.frames b/items/armor/trooperframe/armor/armor/icons.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/icons.frames rename to items/armor/trooperframe/armor/armor/icons.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/icons.png b/items/armor/trooperframe/armor/armor/icons.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/icons.png rename to items/armor/trooperframe/armor/armor/icons.png diff --git a/items/armor/Trooperframe Armor/armor/armor/legs.frames b/items/armor/trooperframe/armor/armor/legs.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/legs.frames rename to items/armor/trooperframe/armor/armor/legs.frames diff --git a/items/armor/Trooperframe Armor/armor/armor/legs.png b/items/armor/trooperframe/armor/armor/legs.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/legs.png rename to items/armor/trooperframe/armor/armor/legs.png diff --git a/items/armor/Trooperframe Armor/armor/armor/mask.png b/items/armor/trooperframe/armor/armor/mask.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/mask.png rename to items/armor/trooperframe/armor/armor/mask.png diff --git a/items/armor/Trooperframe Armor/armor/armor/trooperframe_chest.chest b/items/armor/trooperframe/armor/armor/trooperframe_chest.chest similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/trooperframe_chest.chest rename to items/armor/trooperframe/armor/armor/trooperframe_chest.chest diff --git a/items/armor/Trooperframe Armor/armor/armor/trooperframe_head.head b/items/armor/trooperframe/armor/armor/trooperframe_head.head similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/trooperframe_head.head rename to items/armor/trooperframe/armor/armor/trooperframe_head.head diff --git a/items/armor/Trooperframe Armor/armor/armor/trooperframe_legs.legs b/items/armor/trooperframe/armor/armor/trooperframe_legs.legs similarity index 100% rename from items/armor/Trooperframe Armor/armor/armor/trooperframe_legs.legs rename to items/armor/trooperframe/armor/armor/trooperframe_legs.legs diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/head.frames b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/head.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/head.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/head.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/head.png b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/head.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/head.png rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/head.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/icons.frames b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/icons.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/icons.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/icons.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/icons.png b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/icons.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/icons.png rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/icons.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/mask.png b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/mask.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/mask.png rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/mask.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/trooperframe_combatant.head b/items/armor/trooperframe/armor/helmets/trooperframe_combatant/trooperframe_combatant.head similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_combatant/trooperframe_combatant.head rename to items/armor/trooperframe/armor/helmets/trooperframe_combatant/trooperframe_combatant.head diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/head.frames b/items/armor/trooperframe/armor/helmets/trooperframe_defender/head.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/head.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/head.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/head.png b/items/armor/trooperframe/armor/helmets/trooperframe_defender/head.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/head.png rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/head.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/icons.frames b/items/armor/trooperframe/armor/helmets/trooperframe_defender/icons.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/icons.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/icons.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/icons.png b/items/armor/trooperframe/armor/helmets/trooperframe_defender/icons.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/icons.png rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/icons.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/mask.png b/items/armor/trooperframe/armor/helmets/trooperframe_defender/mask.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/mask.png rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/mask.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/trooperframe_defender.head b/items/armor/trooperframe/armor/helmets/trooperframe_defender/trooperframe_defender.head similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_defender/trooperframe_defender.head rename to items/armor/trooperframe/armor/helmets/trooperframe_defender/trooperframe_defender.head diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/head.frames b/items/armor/trooperframe/armor/helmets/trooperframe_locator/head.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/head.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/head.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/head.png b/items/armor/trooperframe/armor/helmets/trooperframe_locator/head.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/head.png rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/head.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/icons.frames b/items/armor/trooperframe/armor/helmets/trooperframe_locator/icons.frames similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/icons.frames rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/icons.frames diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/icons.png b/items/armor/trooperframe/armor/helmets/trooperframe_locator/icons.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/icons.png rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/icons.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/mask.png b/items/armor/trooperframe/armor/helmets/trooperframe_locator/mask.png similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/mask.png rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/mask.png diff --git a/items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/trooperframe_locator.head b/items/armor/trooperframe/armor/helmets/trooperframe_locator/trooperframe_locator.head similarity index 100% rename from items/armor/Trooperframe Armor/armor/helmets/trooperframe_locator/trooperframe_locator.head rename to items/armor/trooperframe/armor/helmets/trooperframe_locator/trooperframe_locator.head diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_backpack/back.frames b/items/armor/trooperframe/backitems/trooperframe_backpack/back.frames similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_backpack/back.frames rename to items/armor/trooperframe/backitems/trooperframe_backpack/back.frames diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_backpack/back.png b/items/armor/trooperframe/backitems/trooperframe_backpack/back.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_backpack/back.png rename to items/armor/trooperframe/backitems/trooperframe_backpack/back.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_backpack/icon.png b/items/armor/trooperframe/backitems/trooperframe_backpack/icon.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_backpack/icon.png rename to items/armor/trooperframe/backitems/trooperframe_backpack/icon.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_backpack/trooperframe_backpack.back b/items/armor/trooperframe/backitems/trooperframe_backpack/trooperframe_backpack.back similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_backpack/trooperframe_backpack.back rename to items/armor/trooperframe/backitems/trooperframe_backpack/trooperframe_backpack.back diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/back.frames b/items/armor/trooperframe/backitems/trooperframe_fueltank/back.frames similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/back.frames rename to items/armor/trooperframe/backitems/trooperframe_fueltank/back.frames diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/back.png b/items/armor/trooperframe/backitems/trooperframe_fueltank/back.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/back.png rename to items/armor/trooperframe/backitems/trooperframe_fueltank/back.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/icon.png b/items/armor/trooperframe/backitems/trooperframe_fueltank/icon.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/icon.png rename to items/armor/trooperframe/backitems/trooperframe_fueltank/icon.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/trooperframe_fueltank.back b/items/armor/trooperframe/backitems/trooperframe_fueltank/trooperframe_fueltank.back similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_fueltank/trooperframe_fueltank.back rename to items/armor/trooperframe/backitems/trooperframe_fueltank/trooperframe_fueltank.back diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_igniter/back.frames b/items/armor/trooperframe/backitems/trooperframe_igniter/back.frames similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_igniter/back.frames rename to items/armor/trooperframe/backitems/trooperframe_igniter/back.frames diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_igniter/back.png b/items/armor/trooperframe/backitems/trooperframe_igniter/back.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_igniter/back.png rename to items/armor/trooperframe/backitems/trooperframe_igniter/back.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_igniter/icon.png b/items/armor/trooperframe/backitems/trooperframe_igniter/icon.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_igniter/icon.png rename to items/armor/trooperframe/backitems/trooperframe_igniter/icon.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_igniter/trooperframe_igniter.back b/items/armor/trooperframe/backitems/trooperframe_igniter/trooperframe_igniter.back similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_igniter/trooperframe_igniter.back rename to items/armor/trooperframe/backitems/trooperframe_igniter/trooperframe_igniter.back diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/back.frames b/items/armor/trooperframe/backitems/trooperframe_lightkeeper/back.frames similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/back.frames rename to items/armor/trooperframe/backitems/trooperframe_lightkeeper/back.frames diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/back.png b/items/armor/trooperframe/backitems/trooperframe_lightkeeper/back.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/back.png rename to items/armor/trooperframe/backitems/trooperframe_lightkeeper/back.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/icon.png b/items/armor/trooperframe/backitems/trooperframe_lightkeeper/icon.png similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/icon.png rename to items/armor/trooperframe/backitems/trooperframe_lightkeeper/icon.png diff --git a/items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/trooperframe_lightkeeper.back b/items/armor/trooperframe/backitems/trooperframe_lightkeeper/trooperframe_lightkeeper.back similarity index 100% rename from items/armor/Trooperframe Armor/backitems/trooperframe_lightkeeper/trooperframe_lightkeeper.back rename to items/armor/trooperframe/backitems/trooperframe_lightkeeper/trooperframe_lightkeeper.back diff --git a/items/armor/Voidframe Armor/armor/armor/bsleeve.frames b/items/armor/voidframe/armor/armor/bsleeve.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/bsleeve.frames rename to items/armor/voidframe/armor/armor/bsleeve.frames diff --git a/items/armor/Voidframe Armor/armor/armor/bsleeve.png b/items/armor/voidframe/armor/armor/bsleeve.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/bsleeve.png rename to items/armor/voidframe/armor/armor/bsleeve.png diff --git a/items/armor/Voidframe Armor/armor/armor/chestf.frames b/items/armor/voidframe/armor/armor/chestf.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/chestf.frames rename to items/armor/voidframe/armor/armor/chestf.frames diff --git a/items/armor/Voidframe Armor/armor/armor/chestf.png b/items/armor/voidframe/armor/armor/chestf.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/chestf.png rename to items/armor/voidframe/armor/armor/chestf.png diff --git a/items/armor/Voidframe Armor/armor/armor/chestm.frames b/items/armor/voidframe/armor/armor/chestm.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/chestm.frames rename to items/armor/voidframe/armor/armor/chestm.frames diff --git a/items/armor/Voidframe Armor/armor/armor/chestm.png b/items/armor/voidframe/armor/armor/chestm.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/chestm.png rename to items/armor/voidframe/armor/armor/chestm.png diff --git a/items/armor/Voidframe Armor/armor/armor/fsleeve.frames b/items/armor/voidframe/armor/armor/fsleeve.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/fsleeve.frames rename to items/armor/voidframe/armor/armor/fsleeve.frames diff --git a/items/armor/Voidframe Armor/armor/armor/fsleeve.png b/items/armor/voidframe/armor/armor/fsleeve.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/fsleeve.png rename to items/armor/voidframe/armor/armor/fsleeve.png diff --git a/items/armor/Voidframe Armor/armor/armor/head.frames b/items/armor/voidframe/armor/armor/head.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/head.frames rename to items/armor/voidframe/armor/armor/head.frames diff --git a/items/armor/Voidframe Armor/armor/armor/head.png b/items/armor/voidframe/armor/armor/head.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/head.png rename to items/armor/voidframe/armor/armor/head.png diff --git a/items/armor/Voidframe Armor/armor/armor/icons.frames b/items/armor/voidframe/armor/armor/icons.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/icons.frames rename to items/armor/voidframe/armor/armor/icons.frames diff --git a/items/armor/Voidframe Armor/armor/armor/icons.png b/items/armor/voidframe/armor/armor/icons.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/icons.png rename to items/armor/voidframe/armor/armor/icons.png diff --git a/items/armor/Voidframe Armor/armor/armor/legs.frames b/items/armor/voidframe/armor/armor/legs.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/legs.frames rename to items/armor/voidframe/armor/armor/legs.frames diff --git a/items/armor/Voidframe Armor/armor/armor/legs.png b/items/armor/voidframe/armor/armor/legs.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/legs.png rename to items/armor/voidframe/armor/armor/legs.png diff --git a/items/armor/Voidframe Armor/armor/armor/mask.png b/items/armor/voidframe/armor/armor/mask.png similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/mask.png rename to items/armor/voidframe/armor/armor/mask.png diff --git a/items/armor/Voidframe Armor/armor/armor/voidframe_chest.chest b/items/armor/voidframe/armor/armor/voidframe_chest.chest similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/voidframe_chest.chest rename to items/armor/voidframe/armor/armor/voidframe_chest.chest diff --git a/items/armor/Voidframe Armor/armor/armor/voidframe_head.head b/items/armor/voidframe/armor/armor/voidframe_head.head similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/voidframe_head.head rename to items/armor/voidframe/armor/armor/voidframe_head.head diff --git a/items/armor/Voidframe Armor/armor/armor/voidframe_legs.legs b/items/armor/voidframe/armor/armor/voidframe_legs.legs similarity index 100% rename from items/armor/Voidframe Armor/armor/armor/voidframe_legs.legs rename to items/armor/voidframe/armor/armor/voidframe_legs.legs diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/head.frames b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/head.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/head.frames rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/head.frames diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/head.png b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/head.png similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/head.png rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/head.png diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/icons.frames b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/icons.frames similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/icons.frames rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/icons.frames diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/icons.png b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/icons.png similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/icons.png rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/icons.png diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/mask.png b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/mask.png similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/mask.png rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/mask.png diff --git a/items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/voidframe_darkdweller.head b/items/armor/voidframe/armor/helmets/voidframe_darkdweller/voidframe_darkdweller.head similarity index 100% rename from items/armor/Voidframe Armor/armor/helmets/voidframe_darkdweller/voidframe_darkdweller.head rename to items/armor/voidframe/armor/helmets/voidframe_darkdweller/voidframe_darkdweller.head diff --git a/items/generic/drinks/knightfall_devilstouch.consumable b/items/generic/drinks/knightfall_devilstouch.consumable new file mode 100644 index 000000000..b551319e3 --- /dev/null +++ b/items/generic/drinks/knightfall_devilstouch.consumable @@ -0,0 +1,35 @@ +{ + "itemName" : "knightfall_devilstouch", + "rarity" : "Rare", + "price" : 1250, + "category" : "drink", + "inventoryIcon" : "knightfall_devilstouch.png", + "description" : "A fancy, fruity drink with a burning texture and a rich aftertaste. Popular with women.", + "shortdescription" : "Devil's Touch", + "effects" : [ [ + { + "effect" : "ragefood", + "duration" : 120 + }, + { + "effect" : "maxhealthscalingboostfood", + "duration" : 120 + }, + { + "effect" : "l6doomed", + "duration" : 15 + }, + { + "effect" : "burning", + "duration" : 30 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_devilstouch.png b/items/generic/drinks/knightfall_devilstouch.png new file mode 100644 index 000000000..d805e92e3 Binary files /dev/null and b/items/generic/drinks/knightfall_devilstouch.png differ diff --git a/items/generic/drinks/knightfall_magneticbliss.consumable b/items/generic/drinks/knightfall_magneticbliss.consumable new file mode 100644 index 000000000..f3fcdd7b2 --- /dev/null +++ b/items/generic/drinks/knightfall_magneticbliss.consumable @@ -0,0 +1,27 @@ +{ + "itemName" : "knightfall_magneticbliss", + "rarity" : "Rare", + "price" : 875, + "category" : "drink", + "inventoryIcon" : "knightfall_magneticbliss.png", + "description" : "A fruity drink with a metallic aftertaste. It glows with a neon azure, and a crimson red color.", + "shortdescription" : "Magnetic Bliss", + "effects" : [ [ + { + "effect" : "electricblock", + "duration" : 180 + }, + { + "effect" : "maxenergyscalingboostfood", + "duration" : 180 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_magneticbliss.png b/items/generic/drinks/knightfall_magneticbliss.png new file mode 100644 index 000000000..16a6994a9 Binary files /dev/null and b/items/generic/drinks/knightfall_magneticbliss.png differ diff --git a/items/generic/drinks/knightfall_midastouch.consumable b/items/generic/drinks/knightfall_midastouch.consumable new file mode 100644 index 000000000..f41b69eb2 --- /dev/null +++ b/items/generic/drinks/knightfall_midastouch.consumable @@ -0,0 +1,27 @@ +{ + "itemName" : "knightfall_midastouch", + "rarity" : "Rare", + "price" : 750, + "category" : "drink", + "inventoryIcon" : "knightfall_midastouch.png", + "description" : "A strong drink with a high alcoholic content. Another popular drink for Knightfall soldiers.", + "shortdescription" : "Midas Touch", + "effects" : [ [ + { + "effect" : "l6doomed", + "duration" : 10 + }, + { + "effect" : "weakpoison", + "duration" : 30 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_midastouch.png b/items/generic/drinks/knightfall_midastouch.png new file mode 100644 index 000000000..eee0e2a23 Binary files /dev/null and b/items/generic/drinks/knightfall_midastouch.png differ diff --git a/items/generic/drinks/knightfall_novawave.consumable b/items/generic/drinks/knightfall_novawave.consumable new file mode 100644 index 000000000..7a0a8064e --- /dev/null +++ b/items/generic/drinks/knightfall_novawave.consumable @@ -0,0 +1,27 @@ +{ + "itemName" : "knightfall_novawave", + "rarity" : "Rare", + "price" : 650, + "category" : "drink", + "inventoryIcon" : "knightfall_novawave.png", + "description" : "A citrus flavored drink that inflicts a strong, burning sensation.", + "shortdescription" : "Nova Wave", + "effects" : [ [ + { + "effect" : "nova", + "duration" : 180 + }, + { + "effect" : "fireblock", + "duration" : 180 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_novawave.png b/items/generic/drinks/knightfall_novawave.png new file mode 100644 index 000000000..8edf0524c Binary files /dev/null and b/items/generic/drinks/knightfall_novawave.png differ diff --git a/items/generic/drinks/knightfall_rainbowfever.consumable b/items/generic/drinks/knightfall_rainbowfever.consumable new file mode 100644 index 000000000..e6f27747f --- /dev/null +++ b/items/generic/drinks/knightfall_rainbowfever.consumable @@ -0,0 +1,47 @@ +{ + "itemName" : "knightfall_rainbowfever", + "rarity" : "Rare", + "price" : 2500, + "category" : "drink", + "inventoryIcon" : "knightfall_rainbowfever.png", + "description" : "What do you get when you ferment Ultimate Juice? This.", + "shortdescription" : "Rainbow Fever", + "effects" : [ [ + { + "effect" : "runboostfood", + "duration" : 150 + }, + { + "effect" : "jumpboostfood", + "duration" : 150 + }, + { + "effect" : "ragefood", + "duration" : 150 + }, + { + "effect" : "maxhealthscalingboostfood", + "duration" : 150 + }, + { + "effect" : "maxenergyscalingboostfood", + "duration" : 150 + }, + { + "effect" : "l6doomed", + "duration" : 15 + }, + { + "effect" : "weakpoison", + "duration" : 30 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_rainbowfever.png b/items/generic/drinks/knightfall_rainbowfever.png new file mode 100644 index 000000000..a00d8f8c5 Binary files /dev/null and b/items/generic/drinks/knightfall_rainbowfever.png differ diff --git a/items/generic/drinks/knightfall_shortcircuit.consumable b/items/generic/drinks/knightfall_shortcircuit.consumable new file mode 100644 index 000000000..9ce653b03 --- /dev/null +++ b/items/generic/drinks/knightfall_shortcircuit.consumable @@ -0,0 +1,27 @@ +{ + "itemName" : "knightfall_shortcircuit", + "rarity" : "Rare", + "price" : 400, + "category" : "drink", + "inventoryIcon" : "knightfall_shortcircuit.png", + "description" : "A lime drink known for it's shocking taste. A popular drink for Knightfall soldiers.", + "shortdescription" : "Short Circuit", + "effects" : [ [ + { + "effect" : "electrified", + "duration" : 10 + }, + { + "effect" : "runboostfood", + "duration" : 60 + } + ] ], + "foodValue" : 10, + "tooltipKind" : "food", + "builder" : "/items/buildscripts/buildfood.lua", + "maxStack" : 1, + "blockingEffects" : [ + "wellfed" + ], + "emitters" : [ "drinking" ] +} diff --git a/items/generic/drinks/knightfall_shortcircuit.png b/items/generic/drinks/knightfall_shortcircuit.png new file mode 100644 index 000000000..50926e643 Binary files /dev/null and b/items/generic/drinks/knightfall_shortcircuit.png differ diff --git a/items/generic/usables/knightfall_healingstim.activeitem b/items/generic/usables/knightfall_healingstim.activeitem index 9140d1416..e9c2c4688 100644 --- a/items/generic/usables/knightfall_healingstim.activeitem +++ b/items/generic/usables/knightfall_healingstim.activeitem @@ -96,7 +96,7 @@ "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "fireTime": 6, + "fireTime": 3, "baseDps": 0, "energyUsage": 10, "inaccuracy": 0.02, @@ -231,7 +231,7 @@ ] }, - "fireTime": 6, + "fireTime": 3, "baseDps": 0, "baseDamageMultiplier": 0, "energyUsage": 10, diff --git a/items/thrownitems/knightfall_healinggrenade_thrown/knightfall_healinggrenade_thrown.thrownitem b/items/thrownitems/knightfall_healinggrenade_thrown/knightfall_healinggrenade_thrown.thrownitem index 82a3b4150..d16652376 100644 --- a/items/thrownitems/knightfall_healinggrenade_thrown/knightfall_healinggrenade_thrown.thrownitem +++ b/items/thrownitems/knightfall_healinggrenade_thrown/knightfall_healinggrenade_thrown.thrownitem @@ -12,7 +12,7 @@ "edgeTrigger": true, "windupTime" : 0.30, - "cooldown" : 6, + "cooldown" : 3, "projectileType": "knightfall_healinggrenade", "projectileConfig": { @@ -38,6 +38,11 @@ "knightfall_healingstim" ] } + }, + { + "action": "sound", + "options": ["/sfx/melee/rocketspear_stop_poison.ogg"], + "repeat": false } ] } diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/body/default.frames b/monsters/augmented/knightfall_augmentedmotherpoptop/body/default.frames index 68a80c2b4..1dbe2e69f 100644 --- a/monsters/augmented/knightfall_augmentedmotherpoptop/body/default.frames +++ b/monsters/augmented/knightfall_augmentedmotherpoptop/body/default.frames @@ -1,14 +1,17 @@ { "frameGrid" : { "size" : [146, 79], - "dimensions" : [8, 5], + "dimensions" : [8, 8], "names" : [ [ "idle.1", "blink.1", null, null, null, null, null, null ], [ "walk.1", "walk.2", "walk.3", "walk.4", "walk.5", "walk.6", "walk.7", "walk.8" ], [ "jump.1", "jump.2", "fall.1", "fall.2", null, null, null, null ], [ "windup.1", "windup.2", "windup.3", "charge.1", "charge.2", "charge.3", "charge.4", "charge.5" ], - [ "charge.6", "charge.7", "charge.8", "charge.9", "charge.10", "charge.11", "winddown.1", null ] + [ "charge.6", "charge.7", "charge.8", "charge.9", "charge.10", "charge.11", "winddown.1", null ], + [ "smallmissile.1", "smallmissile.2", "smallmissile.3", "smallmissile.4", "smallmissile.5", "smallmissile.6", "smallmissile.7", null ], + [ "heavymissilewindup.1", "heavymissilewindup.2", "heavymissilewindup.3", null, null, null, null, null ], + [ "heavymissile.1", "heavymissile.2", "heavymissile.3", "heavymissile.4", "heavymissile.5", "heavymissile.6", null, null] ] }, "aliases" : { @@ -24,6 +27,9 @@ "idle.11" : "idle.1", "idle.12" : "idle.1", "idle.13" : "idle.1", - "hurt.1" : "winddown.1" + "hurt.1" : "winddown.1", + "heavymissilewinddown.1" : "heavymissilewindup.3", + "heavymissilewinddown.2" : "heavymissilewindup.2", + "heavymissilewinddown.3" : "heavymissilewindup.1" } } \ No newline at end of file diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png index 8c13aef1f..e0479d13d 100644 Binary files a/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png and b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png differ diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop_2.ase b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop_2.ase new file mode 100644 index 000000000..71949eceb Binary files /dev/null and b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop_2.ase differ diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptopnobright.png b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptopnobright.png index 94404fcb7..a491d2979 100644 Binary files a/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptopnobright.png and b/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptopnobright.png differ diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.animation b/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.animation index ca40d8629..48752e296 100644 --- a/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.animation +++ b/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.animation @@ -58,7 +58,35 @@ "immediateSound" : "/sfx/melee/laser_weapon_swing1.ogg", "particleEmittersOff" : [ "spindust" ] } - } + }, + "smallmissile" : { + "frames" : 7, + "cycle" : 1, + "mode" : "transition", + "transition" : "idle", + "properties" : { + } + }, + "heavymissilewindup" : { + "frames" : 3, + "cycle" : 0.15, + "properties" : { + } + }, + "heavymissile" : { + "frames" : 6, + "cycle" : 0.3, + "mode" : "transition", + "transition" : "idle", + "properties" : { + } + }, + "heavymissilewinddown" : { + "frames" : 3, + "cycle" : 0.15, + "properties" : { + } + } } }, "damage" : { @@ -140,6 +168,26 @@ "image" : ":charge.", "damageArea" : [ [-7.5, 1.9375], [8.0, 0.5625], [8.5, -0.6875], [8.0, -1.9375], [5.5, -2.8125], [2.5, -2.8125], [-2.5, -2.1875], [-6.125, 0.3125] ] } + }, + "smallmissile" : { + "properties" : { + "image" : ":smallmissile." + } + }, + "heavymissilewindup" : { + "properties" : { + "image" : ":heavymissilewindup." + } + }, + "heavymissile" : { + "properties" : { + "image" : ":heavymissile." + } + }, + "heavymissilewinddown" : { + "properties" : { + "image" : ":heavymissilewinddown." + } } }, "damage" : { @@ -195,6 +243,26 @@ "image" : ":charge.", "damageArea" : [ [-7.5, 1.9375], [8.0, 0.5625], [8.5, -0.6875], [8.0, -1.9375], [5.5, -2.8125], [2.5, -2.8125], [-2.5, -2.1875], [-6.125, 0.3125] ] } + }, + "smallmissile" : { + "properties" : { + "image" : ":smallmissile." + } + }, + "heavymissilewindup" : { + "properties" : { + "image" : ":heavymissilewindup." + } + }, + "heavymissile" : { + "properties" : { + "image" : ":heavymissile." + } + }, + "heavymissilewinddown" : { + "properties" : { + "image" : ":heavymissilewinddown." + } } }, "damage" : { @@ -229,6 +297,7 @@ { "particle" : "mandrafloradust" } ] }, + "deathPoof" : { "particles" : [ { "particle" : "monstersplosion" }, @@ -250,6 +319,24 @@ { "particle" : "deathfizz4right" } ] }, + + "muzzleFlash" : { + "particles" : [ + { + "particle" : { + "type" : "animated", + "looping" : true, + "animation" : "/animations/knightfall_tankmuzzleflash/knightfall_tankmuzzleflash.animation", + "position" : [6.0, -0.625], + "fullbright" : true, + "layer" : "middle", + "timeToLive" : 0.8, + "rotation" : 0.2 + } + } + ] + }, + "captureParticles" : { "particles" : [ { "particle" : "monstercapture" } @@ -279,6 +366,14 @@ "sounds" : { "aggroHop" : [ "/sfx/npc/monsters/monster_surprise.ogg" ], - "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ] + "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ], + "smallmissile" : { + "pool" : [ "/sfx/gun/rocket1.ogg" ], + "rangeMultiplier" : 1.5 + }, + "heavymissile" : { + "pool" : [ "/sfx/gun/rocket1.ogg" ], + "rangeMultiplier" : 1.5 + } } } diff --git a/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.monstertype b/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.monstertype index c08851abb..c5f64a825 100644 --- a/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.monstertype +++ b/monsters/augmented/knightfall_augmentedmotherpoptop/knightfall_augmentedmotherpoptop.monstertype @@ -22,10 +22,10 @@ "behaviorConfig" : { "damageOnTouch" : true, - "targetQueryRange" : 20, + "targetQueryRange" : 75, "targetOnDamage" : true, "keepTargetInSight" : true, - "keepTargetInRange" : 50, + "keepTargetInRange" : 100, "targetOutOfSightTime" : 2.5, "hurtTime": 0.10, "hurtWaitForGround": false, @@ -36,6 +36,33 @@ "fleeActions" : [], "hostileActions" : [ + { + "name" : "action-fire", + "parameters" : { + "requireLineOfSight" : true, + "maximumRange" : 100, + "minimumRange" : 60, + "windupState" : "heavymissilewindup", + "windupTime" : 1.0, + + "projectileType" : "knightfall_shrapnelHEmissile_prelaunch", + "projectileParameters" : { + "damageRepeatTimeout" : 0.1 + }, + "projectileCount" : 2, + "projectileInterval" : 0.01, + "fireOffset" : [3.5, -1], + "aimAtTarget" : false, + "aimDirection" : [3, 0], + + "fireState" : "heavymissile", + "fireSound" : "heavymissile", + "fireParticleBurst" : "muzzleFlash", + + "winddownTime" : 1.0, + "winddownState" : "" + } + }, { "name" : "action-charge", "cooldown" : 2.0, @@ -55,6 +82,33 @@ "winddownStopForce" : 1000, "winddownState" : "chargewinddown" } + }, + { + "name" : "action-fire", + "parameters" : { + "requireLineOfSight" : true, + "maximumRange" : 80, + "minimumRange" : 0, + "windupState" : "", + "windupTime" : 0, + + "projectileType" : "knightfall_implodermissile", + "projectileParameters" : { + "damageRepeatTimeout" : 0.1 + }, + "projectileCount" : 4, + "projectileInterval" : 0.01, + "fireOffset" : [-0.625, 3.125], + "aimAtTarget" : false, + "aimDirection" : [3, 0], + + "fireState" : "smallmissile", + "fireSound" : "smallmissile", + "fireParticleBurst" : "", + + "winddownTime" : 1.5, + "winddownState" : "" + } } ], @@ -231,7 +285,7 @@ "mouthOffset" : [0, 0], "feetOffset" : [0, -8], "capturable" : true, - "captureHealthFraction" : 0.5, + "captureHealthFraction" : 0.25, "nametagColor" : [64, 200, 255], "captureCollectables" : { "monsters" : "adultpoptop" } } diff --git a/monsters/augmented/knightfall_augmentedscandroid/knightfall_augmentedscandroid.monstertype b/monsters/augmented/knightfall_augmentedscandroid/knightfall_augmentedscandroid.monstertype index 2b320edd1..37ceede50 100644 --- a/monsters/augmented/knightfall_augmentedscandroid/knightfall_augmentedscandroid.monstertype +++ b/monsters/augmented/knightfall_augmentedscandroid/knightfall_augmentedscandroid.monstertype @@ -103,7 +103,10 @@ "approachActions" : [ { - "name" : "approach-fly" + "name" : "approach-fly", + "parameters" : { + "maxRange" : 20 + } } ], diff --git a/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.animation b/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.animation index 63f04b000..a84da8ee1 100644 --- a/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.animation +++ b/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.animation @@ -256,6 +256,7 @@ { "particle" : "deathfizz4right" } ] }, + "muzzleFlash" : { "particles" : [ { @@ -272,6 +273,7 @@ } ] }, + "muzzleFlashClose" : { "particles" : [ { @@ -288,7 +290,8 @@ } ] }, - "captureParticles" : { + + "captureParticles" : { "particles" : [ { "particle" : "monstercapture" } ] diff --git a/monsters/drones/Spectre/knightfall_spectre_grenade/knightfall_spectre_grenade.monstertype b/monsters/drones/Spectre/knightfall_spectre_grenade/knightfall_spectre_grenade.monstertype index 73680e9c6..c5f748df9 100644 --- a/monsters/drones/Spectre/knightfall_spectre_grenade/knightfall_spectre_grenade.monstertype +++ b/monsters/drones/Spectre/knightfall_spectre_grenade/knightfall_spectre_grenade.monstertype @@ -77,7 +77,7 @@ "name" : "approach-fly", "parameters" : { "usePathfinding" : false, - "maxRange" : 10 + "maxRange" : 12 } } ], diff --git a/monsters/drones/Spectre/knightfall_spectre_missile/knightfall_spectre_missile.monstertype b/monsters/drones/Spectre/knightfall_spectre_missile/knightfall_spectre_missile.monstertype index 9259f7561..d796e5503 100644 --- a/monsters/drones/Spectre/knightfall_spectre_missile/knightfall_spectre_missile.monstertype +++ b/monsters/drones/Spectre/knightfall_spectre_missile/knightfall_spectre_missile.monstertype @@ -74,7 +74,7 @@ "name" : "approach-fly", "parameters" : { "usePathfinding" : false, - "maxRange" : 10 + "maxRange" : 30 } } ], diff --git a/monsters/drones/Spectre/knightfall_spectre_plasma/knightfall_spectre_plasma.monstertype b/monsters/drones/Spectre/knightfall_spectre_plasma/knightfall_spectre_plasma.monstertype index fd56edbb2..e123174a5 100644 --- a/monsters/drones/Spectre/knightfall_spectre_plasma/knightfall_spectre_plasma.monstertype +++ b/monsters/drones/Spectre/knightfall_spectre_plasma/knightfall_spectre_plasma.monstertype @@ -75,7 +75,7 @@ "name" : "approach-fly", "parameters" : { "usePathfinding" : false, - "maxRange" : 10 + "maxRange" : 12 } } ], diff --git a/monsters/drones/hammer/knightfall_hammer_assault/body/Hammer Drone.ase b/monsters/drones/hammer/knightfall_hammer_assault/body/Hammer Drone.ase new file mode 100644 index 000000000..e10d20f5b Binary files /dev/null and b/monsters/drones/hammer/knightfall_hammer_assault/body/Hammer Drone.ase differ diff --git a/monsters/drones/hammer/knightfall_hammer_assault/body/body.monsterpart b/monsters/drones/hammer/knightfall_hammer_assault/body/body.monsterpart new file mode 100644 index 000000000..43f9f1cbd --- /dev/null +++ b/monsters/drones/hammer/knightfall_hammer_assault/body/body.monsterpart @@ -0,0 +1,10 @@ +{ + "name" : "knightfall_hammer_assault", + "category" : "knightfall_hammer_assault", + "type" : "body", + + "frames" : { + "body" : "knightfall_hammer_assault.png", + "bodynobright" : "knightfall_hammer_assaultnobright.png" + } +} diff --git a/monsters/drones/hammer/knightfall_hammer_assault/body/default.frames b/monsters/drones/hammer/knightfall_hammer_assault/body/default.frames new file mode 100644 index 000000000..39034c564 --- /dev/null +++ b/monsters/drones/hammer/knightfall_hammer_assault/body/default.frames @@ -0,0 +1,11 @@ +{ + "frameGrid" : { + "size" : [47, 36], + "dimensions" : [12, 2], + + "names" : [ + [ null, "fly.1", "fly.2", "fly.3", "fly.4", "fly.5", "fly.6", null, "hurt.1", null, "windup.1", "windup.2"], + [ "windup.3", "windup.4", "windup.5", "windup.6", null, "fire.1", "fire.2", "fire.3", "fire.4", "fire.5", "fire.6"] + ] + } +} \ No newline at end of file diff --git a/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assault.png b/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assault.png new file mode 100644 index 000000000..0509ccbf8 Binary files /dev/null and b/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assault.png differ diff --git a/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assaultnobright.png b/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assaultnobright.png new file mode 100644 index 000000000..40c6f3d67 Binary files /dev/null and b/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assaultnobright.png differ diff --git a/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.animation b/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.animation new file mode 100644 index 000000000..22690386b --- /dev/null +++ b/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.animation @@ -0,0 +1,210 @@ +{ + "animatedParts" : { + "stateTypes" : { + "body" : { + "priority" : 0, + "default" : "idle", + "states" : { + "idle" : { + "frames" : 6, + "cycle" : 0.9, + "mode" : "loop" + }, + "fly" : { + "frames" : 6, + "cycle" : 0.5, + "mode" : "loop" + }, + "firewindup" : { + "frames" : 6, + "cycle" : 0.5, + "mode" : "loop" + }, + "fire" : { + "frames" : 6, + "cycle" : 1 + } + } + }, + "damage" : { + "priority" : 3, + "default" : "none", + "states" : { + "none" : { + "frames" : 1 + }, + "stunned" : { + "frames" : 1 + } + } + }, + "releaseParticles" : { + "default" : "off", + "states" : { + "off" : { + "frames" : 1, + "properties" : { + "particleEmittersOff" : [ "releaseParticles" ] + } + }, + "on" : { + "frames" : 1, + "cycle" : 0.1, + "mode" : "transition", + "transition" : "off", + "properties" : { + "particleEmittersOn" : [ "releaseParticles" ] + } + } + } + } + }, + + "parts" : { + "body" : { + "properties" : { + "zLevel" : 1, + "transformationGroups" : [ "body" ], + "offset" : [0.0, 0.125], + "fullbright" : true + }, + "partStates" : { + "body" : { + "idle" : { + "properties" : { + "image" : ":fly." + } + }, + "fly" : { + "properties" : { + "image" : ":fly." + } + }, + "firewindup" : { + "properties" : { + "image" : ":windup." + } + }, + "fire" : { + "properties" : { + "image" : ":fire." + } + } + }, + "damage" : { + "stunned" : { + "properties" : { + "image" : ":hurt." + } + } + } + } + }, + "bodynobright" : { + "properties" : { + "transformationGroups" : [ "body" ], + "zLevel" : 2, + "anchorPart" : "body" + }, + "partStates" : { + "body" : { + "idle" : { + "properties" : { + "image" : ":fly." + } + }, + "fly" : { + "properties" : { + "image" : ":fly." + } + }, + "firewindup" : { + "properties" : { + "image" : ":windup." + } + }, + "fire" : { + "properties" : { + "image" : ":fire." + } + } + }, + "damage" : { + "stunned" : { + "properties" : { + "image" : ":hurt." + } + } + } + } + } + } + }, + + "transformationGroups" : { + "body" : { "interpolated" : true } + }, + + "effects" : { + "blink" : { + "type" : "flash", + "time" : 0, + "directives" : "fade=ffffff;0.5" + } + }, + + "particleEmitters" : { + "deathPoof" : { + "particles" : [ + { "particle" : "deathfizz1left" }, + { "particle" : "deathfizz1right" }, + { "particle" : "deathfizz2left" }, + { "particle" : "deathfizz2right" }, + { "particle" : "deathfizz3left" }, + { "particle" : "deathfizz3right" }, + { "particle" : "deathfizz4left" }, + { "particle" : "deathfizz4right" } + ] + }, + "captureParticles" : { + "particles" : [ + { "particle" : "monstercapture" } + ] + }, + "releaseParticles" : { + "particles" : [ + { "particle" : "monsterrelease" } + ] + }, + "teleportOut" : { + "particles" : [ + { "particle" : "monstercapture" } + ] + }, + "teleportIn" : { + "particles" : [ + { "particle" : "monsterrelease" } + ] + }, + "levelUp" : { + "particles" : [ + { "particle" : "monsterlevelup" } + ] + } + }, + + "lights" : { + "glow" : { + "active" : true, + "position" : [0, 0], + "color" : [0, 85, 160], + "pointLight" : true + } + }, + + "sounds" : { + "aggroHop" : [ "/sfx/npc/monsters/monster_surprise.ogg" ], + "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ], + "fire" : [ "/sfx/gun/rocket1.ogg", "/sfx/gun/rocket2.ogg", "/sfx/gun/rocket3.ogg" ] + } +} diff --git a/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.monstertype b/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.monstertype new file mode 100644 index 000000000..f18ee9e75 --- /dev/null +++ b/monsters/drones/hammer/knightfall_hammer_assault/knightfall_hammer_assault.monstertype @@ -0,0 +1,244 @@ +{ + "type" : "knightfall_hammer_assault", + "shortdescription" : "Hammer Assault Drone", + "description" : "An armored drone armed with 6 high damage incendiary missiles.", + + "categories" : [ "knightfall_hammer_assault" ], + "parts" : [ "body" ], + + "animation" : "knightfall_hammer_assault.animation", + + "dropPools" : [ ], + + "baseParameters" : { + "scripts" : [ + "/monsters/monster.lua" + ], + + "behavior" : "monster", + + "renderLayer" : "foregroundEntity", + + "behaviorConfig" : { + "damageOnTouch" : true, + + "targetQueryRange" : 80, + "targetOnDamage" : true, + "keepTargetInSight" : false, + "keepTargetInRange" : 80, + "targetOutOfSightTime" : 5.0, + + "hurtTime" : 0.25, + "hurtWaitForGround" : false, + + "damageTakenActions" : [ ], + + "foundTargetActions" : [ ], + + "fleeActions" : [ ], + + "hostileActions" : [ + { + "name" : "action-fire", + "cooldown" : 1, + "parameters" : { + "requireLineOfSight" : true, + "maximumRange" : 80, + "minimumRange" : 20, + "windupStopForce" : 50, + "windupState" : "firewindup", + "windupTime" : 0.6, + + "projectileType" : "knightfall_incendiarymissile_homing", + "projectileParameters" : { + "power" : 5.0, + "timeToLive" : 0, + "damageRepeatTimeout" : 0.1, + "actionOnReap" : [ + { + "action" : "projectile", + "type" : "knightfall_incendiarymissile_homing", + "inheritDamageFactor" : 0.75, + "angleAdjust" : 5 + }, + { + "action" : "projectile", + "type" : "knightfall_incendiarymissile_homing", + "inheritDamageFactor" : 0.75, + "angleAdjust" : -5 + } + ] + }, + "projectileCount" : 3, + "projectileInterval" : 0.01, + "fireOffset" : [0.25, -0.75], + "aimAtTarget" : true, + "onGround" : false, + "fireState" : "fire", + "fireSound" : "fire", + + "winddownState" : "", + "winddownTime" : 0.6 + } + } + ], + + "periodicActions" : [ ], + + "approachActions" : [ + { + "name" : "approach-fly", + "parameters" : { + "usePathfinding" : false, + "maxRange" : 40 + } + } + ], + + "followActions" : [ + { + "name" : "approach-teleport", + "parameters" : { + } + }, + { + "name" : "approach-fly", + "parameters" : { + "usePathfinding" : false, + "maxRange" : 10 + } + } + ], + + "wanderActions" : [ + { + "name" : "emerge-fly" + } + ], + + "concurrentActions" : [ ], + + "concurrentHostileActions" : [ ] + }, + + "touchDamage" : { + "poly" : [ [1, 1], [1.375, 0.625], [1.375, -1.25], [1, -1.6], [-2.75, -1.6], [-3.15, -1.25], [-3.15, 0.624], [-2.75, 1] ], + "damage" : 4, + + "teamType" : "enemy", + "damageSourceKind" : "slash", + "knockback" : 20, + "statusEffects" : [ ] + }, + + "metaBoundBox" : [-4, -4, 4, 4], + "scale" : 1.0, + + "movementSettings" : { + "collisionEnabled" : true, + "collisionPoly" : [ [1, 1], [1.375, 0.625], [1.375, -1.25], [1, -1.6], [-2.75, -1.6], [-3.15, -1.25], [-3.15, 0.624], [-2.75, 1] ], + + "mass" : 1.0, + "walkSpeed" : 4, + "runSpeed" : 10, + "gravityEnabled" : false, + + "airFriction" : 2.0, + "airForce" : 40, + "flySpeed" : 10 + }, + + "bodyMaterialKind" : "robotic", + + "knockoutTime" : 0.3, + "knockoutAnimationStates" : { + "damage" : "stunned" + }, + "deathParticles" : "deathPoof", + "knockoutEffect" : "", + + "statusSettings" : { + "statusProperties" : { + "targetMaterialKind" : "robotic" + }, + + "appliesEnvironmentStatusEffects" : false, + "appliesWeatherStatusEffects" : true, + "minimumLiquidStatusEffectPercentage" : 0.1, + + "primaryScriptSources" : [ + "/stats/monster_primary.lua" + ], + "primaryScriptDelta" : 5, + + "stats" : { + "knockbackStunTime" : { + "baseValue" : 0.25 + }, + "knockbackThreshold" : { + "baseValue" : 30 + }, + "maxHealth" : { + "baseValue" : 200 + }, + "protection" : { + "baseValue" : 0.0 + }, + "healthRegen" : { + "baseValue" : 1.0 + }, + "powerMultiplier" : { + "baseValue" : 1.0 + }, + "physicalResistance" : { + "baseValue" : 0.0 + }, + "fireResistance" : { + "baseValue" : 1 + }, + "fireStatusImmunity" : { + "baseValue" : 1 + }, + "iceResistance" : { + "baseValue" : 1 + }, + "iceStatusImmunity" : { + "baseValue" : 0.5 + }, + "electricResistance" : { + "baseValue" : -0.5 + }, + "electricStatusImmunity" : { + "baseValue" : 0.0 + }, + "poisonResistance" : { + "baseValue" : 1 + }, + "poisonStatusImmunity" : { + "baseValue" : 1.0 + }, + "bleedingImmunity" : { + "baseValue" : 1.0 + } + }, + + "resources" : { + "stunned" : { + "deltaValue" : -1.0, + "initialValue" : 0.0 + }, + "health" : { + "maxStat" : "maxHealth", + "deltaStat" : "healthRegen", + "defaultPercentage" : 100 + } + } + }, + + "mouthOffset" : [0, 0], + "feetOffset" : [0, -8], + "capturable" : true, + "captureHealthFraction" : 0.5, + "nametagColor" : [64, 200, 255] + } +} diff --git a/objects/decorative/knightfall_bartender/interfaceicon.png b/objects/decorative/knightfall_bartender/interfaceicon.png new file mode 100644 index 000000000..7a1bba1d4 Binary files /dev/null and b/objects/decorative/knightfall_bartender/interfaceicon.png differ diff --git a/objects/decorative/knightfall_bartender/knightfall_bartender.object b/objects/decorative/knightfall_bartender/knightfall_bartender.object index b003029b0..639156062 100644 --- a/objects/decorative/knightfall_bartender/knightfall_bartender.object +++ b/objects/decorative/knightfall_bartender/knightfall_bartender.object @@ -12,6 +12,38 @@ "race": "generic", "inventoryIcon": "icon.png", + "interactAction" : "OpenCraftingInterface", + "interactData" : { + "config" : "/interface/windowconfig/knightfall_craftingmerchant.config", + "paneLayoutOverride" : { + "windowtitle" : { + "title" : "^#63a2ff;KNIGHTFALL BAR^reset;", + "subtitle" : "Purchase some flavorful and varied alcoholic drinks!", + "icon" : { + "file" : "/objects/decorative/knightfall_bartender/interfaceicon.png" + } + }, + + "imgPlayerMoneyIcon" : { + "visible" : false + }, + + "lblPlayerMoney" : { + "visible" : false + }, + + "btnCraft" : { + "type" : "button", + "base" : "/interface/styles/knightfall_button.png", + "hover" : "/interface/styles/knightfall_buttonhover.png", + "position" : [277, 43], + "caption" : "Craft" + } + }, + + "filter" : [ "knightfall_bartender" ] + }, + "orientations": [ { "imageLayers": [ { "image": "knightfall_bartender.png:default.", "fullbright": true }, { "image": "knightfall_bartenderlit.png:default." } ], diff --git a/objects/decorative/knightfall_servicepanel/icon.png b/objects/decorative/knightfall_servicepanel/icon.png new file mode 100644 index 000000000..17fa5eb35 Binary files /dev/null and b/objects/decorative/knightfall_servicepanel/icon.png differ diff --git a/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.frames b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.frames new file mode 100644 index 000000000..0212438f1 --- /dev/null +++ b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [16, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.object b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.object new file mode 100644 index 000000000..8d2092070 --- /dev/null +++ b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.object @@ -0,0 +1,33 @@ +{ + "objectName" : "knightfall_servicepanel", + "colonyTags" : ["electronic"], + "rarity" : "Rare", + "description" : "A service panel.", + "shortdescription" : "Service Panel", + "race" : "generic", + "category" : "decorative", + "price" : 50, + + "apexDescription" : "A service panel.", + "avianDescription" : "A service panel with a warning sign.", + "floranDescription" : "Sservice panel.", + "glitchDescription" : "Apprehensive. This service panel has a dire warning on it.", + "humanDescription" : "That warning sign seems vaguely serious.", + "hylotlDescription" : "A simple service panel.", + "novakidDescription" : "Just some kinda service panel.", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "dualImage" : "knightfall_servicepanel.png:", + + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "background" ] + + } + ] +} diff --git a/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.png b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.png new file mode 100644 index 000000000..9af482bde Binary files /dev/null and b/objects/decorative/knightfall_servicepanel/knightfall_servicepanel.png differ diff --git a/objects/decorative/knightfall_vent/icon.png b/objects/decorative/knightfall_vent/icon.png new file mode 100644 index 000000000..761087cfb Binary files /dev/null and b/objects/decorative/knightfall_vent/icon.png differ diff --git a/objects/decorative/knightfall_vent/knightfall_vent.frames b/objects/decorative/knightfall_vent/knightfall_vent.frames new file mode 100644 index 000000000..0212438f1 --- /dev/null +++ b/objects/decorative/knightfall_vent/knightfall_vent.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [16, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/decorative/knightfall_vent/knightfall_vent.object b/objects/decorative/knightfall_vent/knightfall_vent.object new file mode 100644 index 000000000..6e831eea8 --- /dev/null +++ b/objects/decorative/knightfall_vent/knightfall_vent.object @@ -0,0 +1,32 @@ +{ + "objectName" : "knightfall_vent", + "rarity" : "Rare", + "description" : "A vent opening.", + "shortdescription" : "Vent", + "race" : "generic", + "category" : "decorative", + "price" : 50, + + "apexDescription" : "A vent.", + "avianDescription" : "A ventilation opening.", + "floranDescription" : "Vent.", + "glitchDescription" : "Observant. A vent opening.", + "humanDescription" : "It's a vent.", + "hylotlDescription" : "A simple vent.", + "novakidDescription" : "Just a vent.", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "dualImage" : "knightfall_vent.png:", + + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "background" ] + + } + ] +} diff --git a/objects/decorative/knightfall_vent/knightfall_vent.png b/objects/decorative/knightfall_vent/knightfall_vent.png new file mode 100644 index 000000000..6ea4be267 Binary files /dev/null and b/objects/decorative/knightfall_vent/knightfall_vent.png differ diff --git a/objects/doors/knightfall_largedoor/knightfall_largedoor.frames b/objects/doors/knightfall_largedoor/knightfall_largedoor.frames new file mode 100644 index 000000000..eff119251 --- /dev/null +++ b/objects/doors/knightfall_largedoor/knightfall_largedoor.frames @@ -0,0 +1,22 @@ +{ + + "frameGrid" : { + "size" : [40, 72], + "dimensions" : [6, 1], + "names" : [ + [ "closed", "halfLeft", "left", null, "halfRight", "right" ] + ] + }, + + "aliases" : { + "default" : "closed", + "closeLeft.1" : "halfLeft", + "closeLeft.2" : "closed", + "closeRight.1" : "halfRight", + "closeRight.2" : "closed", + "openLeft.1" : "halfLeft", + "openLeft.2" : "left", + "openRight.1" : "halfRight", + "openRight.2" : "right" + } +} diff --git a/objects/doors/knightfall_largedoor/knightfall_largedoor.object b/objects/doors/knightfall_largedoor/knightfall_largedoor.object new file mode 100644 index 000000000..61293a695 --- /dev/null +++ b/objects/doors/knightfall_largedoor/knightfall_largedoor.object @@ -0,0 +1,64 @@ +{ + "objectName" : "knightfall_largedoor", + "colonyTags" : ["door"], + "rarity" : "Rare", + + "category" : "door", + "price" : 135, + "description" : "This large door is made of some sort of bulletproof material.", + "shortdescription" : "Large Metal Door", + "race" : "generic", + + "apexDescription" : "This large door looks strong enough to keep anything out... or everyone in.", + "avianDescription" : "A large and strong door. Not even the breeze could slip through.", + "floranDescription" : "Door of great ssstrength.", + "glitchDescription" : "Jealous. Such strong materials.", + "humanDescription" : "A huge, heavy security door.", + "hylotlDescription" : "This looks strong enough to hold back the ocean.", + "novakidDescription" : "A large and very thick door.", + + "inventoryIcon" : "knightfall_largedooricon.png", + "orientations" : [ + { + "image" : "knightfall_largedoor.png:default", + "flipImages" : true, + "imagePosition" : [-20, 0], + "renderLayer" : "Object+5", + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ], + "direction" : "left" + }, + { + "image" : "knightfall_largedoor.png:default", + "imagePosition" : [-20, 0], + "renderLayer" : "Object+5", + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ], + "direction" : "right" + } + ], + + "scripts" : [ "/objects/wired/door/door.lua" ], + "scriptDelta" : 5, + + "animation" : "/objects/wired/door/door.animation", + "animationCustom" : { + "sounds" : { + "open" : { + "pool" : [ "/sfx/objects/apexcooldoor_open.ogg" ], + "rangeMultiplier" : 0.5 + }, + "close" : { + "pool" : [ "/sfx/objects/apexcooldoor_close.ogg" ], + "rangeMultiplier" : 0.5 + } + } + }, + "animationParts" : { + "door" : "knightfall_largedoor.png" + }, + "animationPosition" : [-20, 0], + + "inputNodes" : [ [-1, 4] ], + "outputNodes" : [ [0, 0] ] +} diff --git a/objects/doors/knightfall_largedoor/knightfall_largedoor.png b/objects/doors/knightfall_largedoor/knightfall_largedoor.png new file mode 100644 index 000000000..3cb203cb1 Binary files /dev/null and b/objects/doors/knightfall_largedoor/knightfall_largedoor.png differ diff --git a/objects/doors/knightfall_largedoor/knightfall_largedooricon.png b/objects/doors/knightfall_largedoor/knightfall_largedooricon.png new file mode 100644 index 000000000..fb6387def Binary files /dev/null and b/objects/doors/knightfall_largedoor/knightfall_largedooricon.png differ diff --git a/objects/doors/knightfall_largereinforceddoor/default.frames b/objects/doors/knightfall_largereinforceddoor/default.frames new file mode 100644 index 000000000..eff119251 --- /dev/null +++ b/objects/doors/knightfall_largereinforceddoor/default.frames @@ -0,0 +1,22 @@ +{ + + "frameGrid" : { + "size" : [40, 72], + "dimensions" : [6, 1], + "names" : [ + [ "closed", "halfLeft", "left", null, "halfRight", "right" ] + ] + }, + + "aliases" : { + "default" : "closed", + "closeLeft.1" : "halfLeft", + "closeLeft.2" : "closed", + "closeRight.1" : "halfRight", + "closeRight.2" : "closed", + "openLeft.1" : "halfLeft", + "openLeft.2" : "left", + "openRight.1" : "halfRight", + "openRight.2" : "right" + } +} diff --git a/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.object b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.object new file mode 100644 index 000000000..0810eddcc --- /dev/null +++ b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.object @@ -0,0 +1,64 @@ +{ + "objectName" : "knightfall_largereinforceddoor", + "colonyTags" : ["door"], + "rarity" : "Rare", + + "category" : "door", + "price" : 135, + "description" : "Used to seal dangerous items in a safe area.", + "shortdescription" : "Large Reinforced Metal Door", + "race" : "generic", + + "apexDescription" : "This large door looks like it's meant to keep anything behind it from leaving.", + "avianDescription" : "A large and strong door. Hopefully nothing behind this door gets out.", + "floranDescription" : "Door of great ssstrength.", + "glitchDescription" : "Jealous. Such strong materials.", + "humanDescription" : "A huge, heavy security door. Looks like it could withstand a blast.", + "hylotlDescription" : "This looks strong enough to hold back the ocean.", + "novakidDescription" : "A large and very thick door for keeping things sealed.", + + "inventoryIcon" : "knightfall_largereinforceddooricon.png", + "orientations" : [ + { + "image" : "knightfall_largereinforceddoor.png:default", + "flipImages" : true, + "imagePosition" : [-20, 0], + "renderLayer" : "Object+5", + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ], + "direction" : "left" + }, + { + "image" : "knightfall_largereinforceddoor.png:default", + "imagePosition" : [-20, 0], + "renderLayer" : "Object+5", + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ], + "direction" : "right" + } + ], + + "scripts" : [ "/objects/wired/door/door.lua" ], + "scriptDelta" : 5, + + "animation" : "/objects/wired/door/door.animation", + "animationCustom" : { + "sounds" : { + "open" : { + "pool" : [ "/sfx/objects/apexcooldoor_open.ogg" ], + "rangeMultiplier" : 0.5 + }, + "close" : { + "pool" : [ "/sfx/objects/apexcooldoor_close.ogg" ], + "rangeMultiplier" : 0.5 + } + } + }, + "animationParts" : { + "door" : "knightfall_largereinforceddoor.png" + }, + "animationPosition" : [-20, 0], + + "inputNodes" : [ [-1, 4] ], + "outputNodes" : [ [0, 0] ] +} diff --git a/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.png b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.png new file mode 100644 index 000000000..f54cdc213 Binary files /dev/null and b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddoor.png differ diff --git a/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddooricon.png b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddooricon.png new file mode 100644 index 000000000..93f0fd03e Binary files /dev/null and b/objects/doors/knightfall_largereinforceddoor/knightfall_largereinforceddooricon.png differ diff --git a/objects/furniture/knightfall_trashcan/knightfall_trashcan.png b/objects/furniture/knightfall_trashcan/knightfall_trashcan.png index cc4c9aa6b..1e831318f 100644 Binary files a/objects/furniture/knightfall_trashcan/knightfall_trashcan.png and b/objects/furniture/knightfall_trashcan/knightfall_trashcan.png differ diff --git a/objects/furniture/knightfall_trashcan2/default.frames b/objects/furniture/knightfall_trashcan2/default.frames new file mode 100644 index 000000000..3589391b5 --- /dev/null +++ b/objects/furniture/knightfall_trashcan2/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [16, 24], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/furniture/knightfall_trashcan2/icon.png b/objects/furniture/knightfall_trashcan2/icon.png new file mode 100644 index 000000000..007b7fe47 Binary files /dev/null and b/objects/furniture/knightfall_trashcan2/icon.png differ diff --git a/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.object b/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.object new file mode 100644 index 000000000..e6a2c8769 --- /dev/null +++ b/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.object @@ -0,0 +1,63 @@ +{ + "objectName" : "knightfall_trashcan2", + "colonyTags" : ["storage"], + "rarity" : "Rare", + "objectType" : "container", + "tooltipKind" : "container", + "description" : "Trash. Just trash. Or is it? Answer: yes.", + "shortdescription" : "Trash Can", + "race" : "generic", + "category" : "storage", + "price" : 65, + "health" : 1.5, + + "apexDescription" : "Garbage day!", + "avianDescription" : "Trash.", + "floranDescription" : "Pretty rubbish.", + "glitchDescription" : "Unimpressed. Garbage.", + "humanDescription" : "Time to take out the trash!", + "hylotlDescription" : "Vile garbage.", + "novakidDescription" : "Ain't nothin' but trash.", + + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "dualImage" : "knightfall_trashcan2.png:", + + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + } + ], + + "slotCount" : 9, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600, + + "scripts" : [ "/scripts/npcToyObject.lua"], + "npcToy" : { + "influence" : [ + "trashcan", + "trashcanComplete" + ], + "defaultReactions" : { + "trashcan" : [ + [1.0, "droptrash"] + ], + "trashcanComplete" : [ + [1.0, "smile"], + [1.0, "annoyed"], + [1.0, "punch"] + ] + }, + "preciseStandPositionLeft" : [-1, 0.0], + "preciseStandPositionRight" : [1, 0.0], + "maxNpcs" : 1 + } +} diff --git a/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.png b/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.png new file mode 100644 index 000000000..3cca394fe Binary files /dev/null and b/objects/furniture/knightfall_trashcan2/knightfall_trashcan2.png differ diff --git a/objects/storage/knightfall_canister/knightfall_canister.object b/objects/storage/knightfall_canister/knightfall_canister.object index cfab7d918..03ff94fd7 100644 --- a/objects/storage/knightfall_canister/knightfall_canister.object +++ b/objects/storage/knightfall_canister/knightfall_canister.object @@ -22,13 +22,30 @@ "inventoryIcon" : "knightfall_canistericon.png", "orientations" : [ { - "dualImage" : "knightfall_canister.png:.", + "imageLayers" : [ { "image" : "knightfall_canister.png:.", "fullbright" : true }, { "image" : "knightfall_canisterlit.png:." } ], "imagePosition" : [-12, 0], + + "flipImages" : true, + "direction" : "left", + + "frames" : 3, + "animationCycle" : 1.0, "spaceScan" : 0.1, "anchors" : [ "bottom" ] - } + }, + { + "imageLayers" : [ { "image" : "knightfall_canister.png:.", "fullbright" : true }, { "image" : "knightfall_canisterlit.png:." } ], + "imagePosition" : [-12, 0], + + "direction" : "right", + + "frames" : 3, + "animationCycle" : 1.0, + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + } ], "openSounds" : [ "/sfx/objects/metaldoor_open.ogg" ], diff --git a/objects/storage/knightfall_canister/knightfall_canister.png b/objects/storage/knightfall_canister/knightfall_canister.png index c77e7a999..81820d0a8 100644 Binary files a/objects/storage/knightfall_canister/knightfall_canister.png and b/objects/storage/knightfall_canister/knightfall_canister.png differ diff --git a/objects/storage/knightfall_canister/knightfall_canistericon.png b/objects/storage/knightfall_canister/knightfall_canistericon.png index 88237a43b..9604e26f0 100644 Binary files a/objects/storage/knightfall_canister/knightfall_canistericon.png and b/objects/storage/knightfall_canister/knightfall_canistericon.png differ diff --git a/objects/storage/knightfall_canister/knightfall_canisterlit.frames b/objects/storage/knightfall_canister/knightfall_canisterlit.frames new file mode 100644 index 000000000..c027cafd0 --- /dev/null +++ b/objects/storage/knightfall_canister/knightfall_canisterlit.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 38], + "dimensions" : [3, 1], + "names" : [ + [ "default.0", "default.1", "default.2" ] + ] + }, + + "aliases" : { + "default.default" : "default.0" + } +} diff --git a/objects/storage/knightfall_canister/knightfall_canisterlit.png b/objects/storage/knightfall_canister/knightfall_canisterlit.png new file mode 100644 index 000000000..5f45c586a Binary files /dev/null and b/objects/storage/knightfall_canister/knightfall_canisterlit.png differ diff --git a/objects/storage/knightfall_canister2/knightfall_canister2.png b/objects/storage/knightfall_canister2/knightfall_canister2.png index 03e85eac9..dcbed2671 100644 Binary files a/objects/storage/knightfall_canister2/knightfall_canister2.png and b/objects/storage/knightfall_canister2/knightfall_canister2.png differ diff --git a/objects/storage/knightfall_canister2/knightfall_canister2lit.png b/objects/storage/knightfall_canister2/knightfall_canister2lit.png index 04bf737c7..4b90d2196 100644 Binary files a/objects/storage/knightfall_canister2/knightfall_canister2lit.png and b/objects/storage/knightfall_canister2/knightfall_canister2lit.png differ diff --git a/objects/storage/knightfall_canister2/knightfall_canistericon.png b/objects/storage/knightfall_canister2/knightfall_canistericon.png index 88237a43b..9604e26f0 100644 Binary files a/objects/storage/knightfall_canister2/knightfall_canistericon.png and b/objects/storage/knightfall_canister2/knightfall_canistericon.png differ diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_canister.ase b/objects/storage/knightfall_erchiuscanister/knightfall_canister.ase deleted file mode 100644 index e4699e3fa..000000000 Binary files a/objects/storage/knightfall_erchiuscanister/knightfall_canister.ase and /dev/null differ diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.object b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.object index 1f0ed0ad4..e68a58ef5 100644 --- a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.object +++ b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.object @@ -22,13 +22,30 @@ "inventoryIcon" : "knightfall_erchiuscanistericon.png", "orientations" : [ { - "dualImage" : "knightfall_erchiuscanister.png:.", + "imageLayers" : [ { "image" : "knightfall_erchiuscanister.png:.", "fullbright" : true }, { "image" : "knightfall_erchiuscanisterlit.png:." } ], "imagePosition" : [-12, 0], + + "flipImages" : true, + "direction" : "left", + + "frames" : 3, + "animationCycle" : 1.0, "spaceScan" : 0.1, "anchors" : [ "bottom" ] - } + }, + { + "imageLayers" : [ { "image" : "knightfall_erchiuscanister.png:.", "fullbright" : true }, { "image" : "knightfall_erchiuscanisterlit.png:." } ], + "imagePosition" : [-12, 0], + + "direction" : "right", + + "frames" : 3, + "animationCycle" : 1.0, + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + } ], "openSounds" : [ "/sfx/objects/metaldoor_open.ogg" ], diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.png b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.png index 24f7725b6..666456b89 100644 Binary files a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.png and b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanister.png differ diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanistericon.png b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanistericon.png index 95cf64b5c..ecc98da36 100644 Binary files a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanistericon.png and b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanistericon.png differ diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.frames b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.frames new file mode 100644 index 000000000..c027cafd0 --- /dev/null +++ b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 38], + "dimensions" : [3, 1], + "names" : [ + [ "default.0", "default.1", "default.2" ] + ] + }, + + "aliases" : { + "default.default" : "default.0" + } +} diff --git a/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.png b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.png new file mode 100644 index 000000000..ecde63780 Binary files /dev/null and b/objects/storage/knightfall_erchiuscanister/knightfall_erchiuscanisterlit.png differ diff --git a/objects/storage/knightfall_erchiuscanister2/knightfall_canister.ase b/objects/storage/knightfall_erchiuscanister2/knightfall_canister.ase deleted file mode 100644 index e4699e3fa..000000000 Binary files a/objects/storage/knightfall_erchiuscanister2/knightfall_canister.ase and /dev/null differ diff --git a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2.png b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2.png index 0cc828dd6..5d03b5c67 100644 Binary files a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2.png and b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2.png differ diff --git a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2lit.png b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2lit.png index e6f23b327..b87a8a364 100644 Binary files a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2lit.png and b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanister2lit.png differ diff --git a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanistericon.png b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanistericon.png index 95cf64b5c..ecc98da36 100644 Binary files a/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanistericon.png and b/objects/storage/knightfall_erchiuscanister2/knightfall_erchiuscanistericon.png differ diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanister.frames b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.frames new file mode 100644 index 000000000..c027cafd0 --- /dev/null +++ b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 38], + "dimensions" : [3, 1], + "names" : [ + [ "default.0", "default.1", "default.2" ] + ] + }, + + "aliases" : { + "default.default" : "default.0" + } +} diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanister.object b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.object new file mode 100644 index 000000000..c383831b4 --- /dev/null +++ b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.object @@ -0,0 +1,57 @@ +{ + "objectName" : "knightfall_generalcanister", + "colonyTags" : ["storage"], + "rarity" : "Rare", + "objectType" : "container", + "tooltipKind" : "container", + "category" : "storage", + "price" : 85, + "description" : "A sealed metal canister, that might be used to store hazardous liquids.", + "shortdescription" : "Metal Canister", + "race" : "generic", + "health" : 1.5, + + "apexDescription" : "This canister seems ideal for transporting volatile substances in.", + "avianDescription" : "What a curious canister - I wonder what is inside?", + "floranDescription" : "Black tube. Might have ssstuff inside.", + "glitchDescription" : "Observant. A short analysis concludes that this canister is built to safely store valuable liquids.", + "humanDescription" : "The sound this canister makes when opened is quite satisfying.", + "hylotlDescription" : "What a curious looking storage container. Perhaps it is built to store fuel?", + "novakidDescription" : "Is this a big ol' oil barrel? Mighty odd lookin' barrel if I say so myself.", + + "inventoryIcon" : "knightfall_generalcanistericon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "knightfall_generalcanister.png:.", "fullbright" : true }, { "image" : "knightfall_generalcanisterlit.png:." } ], + "imagePosition" : [-12, 0], + + "flipImages" : true, + "direction" : "left", + + "frames" : 3, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + }, + { + "imageLayers" : [ { "image" : "knightfall_generalcanister.png:.", "fullbright" : true }, { "image" : "knightfall_generalcanisterlit.png:." } ], + "imagePosition" : [-12, 0], + + "direction" : "right", + + "frames" : 3, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + } + ], + + "openSounds" : [ "/sfx/objects/metaldoor_open.ogg" ], + "closeSounds" : [ "/sfx/objects/metaldoor_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanister.png b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.png new file mode 100644 index 000000000..cd058dab9 Binary files /dev/null and b/objects/storage/knightfall_generalcanister/knightfall_generalcanister.png differ diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanistericon.png b/objects/storage/knightfall_generalcanister/knightfall_generalcanistericon.png new file mode 100644 index 000000000..364995dba Binary files /dev/null and b/objects/storage/knightfall_generalcanister/knightfall_generalcanistericon.png differ diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.frames b/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.frames new file mode 100644 index 000000000..c027cafd0 --- /dev/null +++ b/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 38], + "dimensions" : [3, 1], + "names" : [ + [ "default.0", "default.1", "default.2" ] + ] + }, + + "aliases" : { + "default.default" : "default.0" + } +} diff --git a/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.png b/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.png new file mode 100644 index 000000000..e6f2d4471 Binary files /dev/null and b/objects/storage/knightfall_generalcanister/knightfall_generalcanisterlit.png differ diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.frames b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.frames new file mode 100644 index 000000000..949513ba7 --- /dev/null +++ b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 32], + "dimensions" : [1, 1], + "names" : [ + [ "default.1" ] + ] + }, + + "aliases" : { + "default.default" : "default.1" + } +} diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.object b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.object new file mode 100644 index 000000000..e074b916d --- /dev/null +++ b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.object @@ -0,0 +1,57 @@ +{ + "objectName" : "knightfall_generalcanister2", + "colonyTags" : ["storage"], + "rarity" : "Rare", + "objectType" : "container", + "tooltipKind" : "container", + "category" : "storage", + "price" : 85, + "description" : "A sealed metal canister, that might be used to store hazardous liquids.", + "shortdescription" : "Metal Canister", + "race" : "generic", + "health" : 1.5, + + "apexDescription" : "This canister seems ideal for transporting volatile substances in.", + "avianDescription" : "What a curious canister - I wonder what is inside?", + "floranDescription" : "Black tube. Might have ssstuff inside.", + "glitchDescription" : "Observant. A short analysis concludes that this canister is built to safely store valuable liquids.", + "humanDescription" : "The sound this canister makes when opened is quite satisfying.", + "hylotlDescription" : "What a curious looking storage container. Perhaps it is built to store fuel?", + "novakidDescription" : "Is this a big ol' oil barrel? Mighty odd lookin' barrel if I say so myself.", + + "inventoryIcon" : "knightfall_generalcanistericon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "knightfall_generalcanister2.png", "fullbright" : true }, { "image" : "knightfall_generalcanister2lit.png" } ], + "imagePosition" : [-12, 0], + "flipImages" : true, + "direction" : "left", + + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + }, + { + "imageLayers" : [ { "image" : "knightfall_generalcanister2.png", "fullbright" : true }, { "image" : "knightfall_generalcanister2lit.png" } ], + "imagePosition" : [-12, 0], + "direction" : "right", + + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + } + ], + + "openSounds" : [ "/sfx/objects/metaldoor_open.ogg" ], + "closeSounds" : [ "/sfx/objects/metaldoor_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.png b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.png new file mode 100644 index 000000000..1d70d396e Binary files /dev/null and b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2.png differ diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.frames b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.frames new file mode 100644 index 000000000..949513ba7 --- /dev/null +++ b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.frames @@ -0,0 +1,14 @@ +{ + + "frameGrid" : { + "size" : [24, 32], + "dimensions" : [1, 1], + "names" : [ + [ "default.1" ] + ] + }, + + "aliases" : { + "default.default" : "default.1" + } +} diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.png b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.png new file mode 100644 index 000000000..92b7e2584 Binary files /dev/null and b/objects/storage/knightfall_generalcanister2/knightfall_generalcanister2lit.png differ diff --git a/objects/storage/knightfall_generalcanister2/knightfall_generalcanistericon.png b/objects/storage/knightfall_generalcanister2/knightfall_generalcanistericon.png new file mode 100644 index 000000000..364995dba Binary files /dev/null and b/objects/storage/knightfall_generalcanister2/knightfall_generalcanistericon.png differ diff --git a/objects/storage/knightfall_medicallocker/knightfall_medicallocker.png b/objects/storage/knightfall_medicallocker/knightfall_medicallocker.png index 5cc843c15..b67cc18bb 100644 Binary files a/objects/storage/knightfall_medicallocker/knightfall_medicallocker.png and b/objects/storage/knightfall_medicallocker/knightfall_medicallocker.png differ diff --git a/objects/storage/knightfall_medicallocker/knightfall_medicallockericon.png b/objects/storage/knightfall_medicallocker/knightfall_medicallockericon.png index e497fd877..922d1fb6c 100644 Binary files a/objects/storage/knightfall_medicallocker/knightfall_medicallockericon.png and b/objects/storage/knightfall_medicallocker/knightfall_medicallockericon.png differ diff --git a/objects/storage/knightfall_medicallocker/knightfall_medicallockerlit.png b/objects/storage/knightfall_medicallocker/knightfall_medicallockerlit.png index 07c29d8e2..f41010210 100644 Binary files a/objects/storage/knightfall_medicallocker/knightfall_medicallockerlit.png and b/objects/storage/knightfall_medicallocker/knightfall_medicallockerlit.png differ diff --git a/objects/storage/knightfall_reinforcedcrate/icon.png b/objects/storage/knightfall_reinforcedcrate/icon.png index 7bda95e22..f46c8b4b6 100644 Binary files a/objects/storage/knightfall_reinforcedcrate/icon.png and b/objects/storage/knightfall_reinforcedcrate/icon.png differ diff --git a/objects/storage/knightfall_reinforcedsmallcrate/icon.png b/objects/storage/knightfall_reinforcedsmallcrate/icon.png index 7bda95e22..f46c8b4b6 100644 Binary files a/objects/storage/knightfall_reinforcedsmallcrate/icon.png and b/objects/storage/knightfall_reinforcedsmallcrate/icon.png differ diff --git a/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.frames b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.frames new file mode 100644 index 000000000..2dab0ffde --- /dev/null +++ b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.frames @@ -0,0 +1,10 @@ +{ + + "frameGrid" : { + "size" : [144, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + } +} diff --git a/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.object b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.object new file mode 100644 index 000000000..a79b9bc0d --- /dev/null +++ b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.object @@ -0,0 +1,68 @@ +{ + "objectName" : "knightfall_nukemissile", + "colonyTags" : ["electronic"], + "rarity" : "Rare", + "category" : "decorative", + "printable" : false, + "price" : 12000, + "description" : "A large, cold-launched, nuclear missile launched from vertical tubes.", + "shortdescription" : "Nuclear Missile", + "race" : "human", + + "apexDescription" : "A large missile. Oh how the Miniknog threatens my race with such weapons.", + "avianDescription" : "A large missile. Where are the controls for this?", + "floranDescription" : "Floran doesss not like big long tube.", + "glitchDescription" : "Wondering. How does this missile function?", + "humanDescription" : "A large missile. This thing must pack a punch!", + "hylotlDescription" : "A large missile.", + + "inventoryIcon" : "knightfall_nukemissile.png", + "orientations" : [ + { + "image" : "knightfall_nukemissile.png:", + + "imagePosition" : [0, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "flipImages" : true, + "direction" : "left", + "anchors" : [ "background" ] + }, + { + "image" : "knightfall_nukemissile.png:", + + "imagePosition" : [0, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "direction" : "right", + "anchors" : [ "background" ] + }, + { + "image" : "knightfall_nukemissile_upright.png:", + + "imagePosition" : [0, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "flipImages" : true, + "direction" : "left", + "anchors" : [ "bottom" ] + }, + { + "image" : "knightfall_nukemissile_upright.png:", + + "imagePosition" : [0, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "direction" : "right", + "anchors" : [ "bottom" ] + } + ] +} diff --git a/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.png b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.png new file mode 100644 index 000000000..fa4fb0336 Binary files /dev/null and b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile.png differ diff --git a/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.frames b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.frames new file mode 100644 index 000000000..f72f2afef --- /dev/null +++ b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.frames @@ -0,0 +1,10 @@ +{ + + "frameGrid" : { + "size" : [16, 144], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + } +} diff --git a/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.png b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.png new file mode 100644 index 000000000..2a7b14fb1 Binary files /dev/null and b/objects/weapons/knightfall_nukemissile/knightfall_nukemissile_upright.png differ diff --git a/objects/wired/knightfall_longconsole/knightfall_longconsole.png b/objects/wired/knightfall_longconsole/knightfall_longconsole.png index 184594f79..65e2f37c3 100644 Binary files a/objects/wired/knightfall_longconsole/knightfall_longconsole.png and b/objects/wired/knightfall_longconsole/knightfall_longconsole.png differ diff --git a/objects/wired/knightfall_longconsole/knightfall_longconsolelit.png b/objects/wired/knightfall_longconsole/knightfall_longconsolelit.png index a98123fab..78f7d7cd1 100644 Binary files a/objects/wired/knightfall_longconsole/knightfall_longconsolelit.png and b/objects/wired/knightfall_longconsole/knightfall_longconsolelit.png differ diff --git a/objects/wired/knightfall_securitycamera/icon.png b/objects/wired/knightfall_securitycamera/icon.png new file mode 100644 index 000000000..307f98bb9 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/icon.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycamera.animation b/objects/wired/knightfall_securitycamera/knightfall_securitycamera.animation new file mode 100644 index 000000000..4c02a918f --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycamera.animation @@ -0,0 +1,64 @@ +{ + "animatedParts" : { + "stateTypes" : { + "light" : { + "default" : "off", + "states" : { + "off" : {}, + "on" : { + "frames" : 24, + "cycle" : 3, + "mode" : "loop" + } + } + } + }, + + "parts" : { + "bg" : { + "properties" : { + "centered" : false + }, + + "partStates" : { + "light" : { + "off" : { + "properties" : { + "image" : ":.off" + } + }, + + "on" : { + "properties" : { + "image" : ":.", + "fullbright" : true + } + } + } + } + }, + "fg" : { + "properties" : { + "centered" : false, + "zLevel" : 1 + }, + + "partStates" : { + "light" : { + "off" : { + "properties" : { + "image" : ":.off" + } + }, + + "on" : { + "properties" : { + "image" : ":." + } + } + } + } + } + } + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycamera.object b/objects/wired/knightfall_securitycamera/knightfall_securitycamera.object new file mode 100644 index 000000000..9b394de0d --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycamera.object @@ -0,0 +1,122 @@ +{ + "objectName" : "knightfall_securitycamera", + "colonyTags" : ["electronic"], + "rarity" : "Rare", + "category" : "decorative", + "price" : 90, + "description" : "A security camera. An all-seeing eye.", + "shortdescription" : "Security Camera", + + "apexDescription" : "A security camera. Is Big Ape watching?", + "avianDescription" : "A security camera.", + "floranDescription" : "Ssstaring little box with an eye. It's ssstaring at Floran!", + "glitchDescription" : "Uncomfortable. I feel like I am being watched.", + "humanDescription" : "I'm going to be a star!", + "hylotlDescription" : "Such an invasion of privacy.", + "novakidDescription" : "A security camera. Better be on my best behaviour.", + + "lightColor" : [5, 255, 63], + "lightPosition" : [0, 0], + + "flickerPeriod" : 1.5, + "flickerMinIntensity" : -1.00, + "flickerMaxIntensity" : 0.2, + "flickerPeriodVariance" : 0.0, + "flickerIntensityVariance" : 0.025, + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "image" : "knightfall_securitycameraceilingpreview.png:.", + "imagePosition" : [0, 0], + "direction" : "right", + + "animationParts" : { + "bg" : "knightfall_securitycameraceiling.png", + "fg" : "knightfall_securitycameraceilinglit.png" + }, + + "animationPosition" : [0, 0], + + "spaceScan" : 0.1, + "anchors" : [ "top" ] + }, + + { + "image" : "knightfall_securitycameraceilingleftpreview.png:.", + "imagePosition" : [0, 0], + "direction" : "right", + + "animationParts" : { + "bg" : "knightfall_securitycameraceilingleft.png", + "fg" : "knightfall_securitycameraceilingleftlit.png" + }, + + "animationPosition" : [0, 0], + + "spaceScan" : 0.1, + "anchors" : [ "top", "left" ] + }, + + { + "image" : "knightfall_securitycameraceilingrightpreview.png:.", + "imagePosition" : [0, 0], + "direction" : "right", + + "animationParts" : { + "bg" : "knightfall_securitycameraceilingright.png", + "fg" : "knightfall_securitycameraceilingrightlit.png" + }, + + "animationPosition" : [0, 0], + + "spaceScan" : 0.1, + "anchors" : [ "top", "right" ] + }, + + { + "image" : "knightfall_securitycameraceilingpreview.png:.", + "imagePosition" : [0, 0], + "direction" : "left", + "flipImages" : true, + + "animationParts" : { + "bg" : "knightfall_securitycameraceiling.png", + "fg" : "knightfall_securitycameraceilinglit.png" + }, + "animationPosition" : [0, 0], + + "spaceScan" : 0.1, + "anchors" : [ "top" ] + }, + + { + "image" : "knightfall_securitycameraceilingpreview.png:.", + "imagePosition" : [0, 0], + "direction" : "right", + + "animationParts" : { + "bg" : "knightfall_securitycameraceiling.png", + "fg" : "knightfall_securitycameraceilinglit.png" + }, + "animationPosition" : [0, 0], + + "spaceScan" : 0.1, + "anchors" : [ "top" ] + } + ], + + "animation" : "knightfall_securitycamera.animation", + "animationParts" : { + "bg" : "knightfall_securitycameraceiling.png", + "fg" : "knightfall_securitycameraceilinglit.png" + }, + + "scripts" : [ "/objects/wired/light/light.lua" ], + "scriptDelta" : 60, + + "interactive" : false, + + "frameCooldown" : 5 + +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.frames new file mode 100644 index 000000000..5845a67a3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [30, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.25", "default.26", "default.27", "default.28", "default.29", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.png new file mode 100644 index 000000000..d9de13af6 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceiling.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.png new file mode 100644 index 000000000..bc8a87ec4 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleft.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.png new file mode 100644 index 000000000..a21001b18 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftlit.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.png new file mode 100644 index 000000000..bc8a87ec4 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingleftpreview.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.frames new file mode 100644 index 000000000..5845a67a3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [30, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.25", "default.26", "default.27", "default.28", "default.29", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.png new file mode 100644 index 000000000..a6ad8b51c Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilinglit.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.frames new file mode 100644 index 000000000..5845a67a3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [30, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.25", "default.26", "default.27", "default.28", "default.29", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.png new file mode 100644 index 000000000..d9de13af6 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingpreview.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.png new file mode 100644 index 000000000..0c7e01a2e Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingright.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.png new file mode 100644 index 000000000..c753e14e5 Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightlit.png differ diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.frames b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.frames new file mode 100644 index 000000000..3d69677b3 --- /dev/null +++ b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.frames @@ -0,0 +1,13 @@ +{ + "frameGrid" : { + "size" : [8, 8], + "dimensions" : [25, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off" + } +} diff --git a/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.png b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.png new file mode 100644 index 000000000..0c7e01a2e Binary files /dev/null and b/objects/wired/knightfall_securitycamera/knightfall_securitycameraceilingrightpreview.png differ diff --git a/objects/wired/knightfall_server/knightfall_server.png b/objects/wired/knightfall_server/knightfall_server.png index 7bf1c6668..b6d2147d7 100644 Binary files a/objects/wired/knightfall_server/knightfall_server.png and b/objects/wired/knightfall_server/knightfall_server.png differ diff --git a/objects/wired/knightfall_server/knightfall_serverlit.png b/objects/wired/knightfall_server/knightfall_serverlit.png index bc3a444b3..12bef42eb 100644 Binary files a/objects/wired/knightfall_server/knightfall_serverlit.png and b/objects/wired/knightfall_server/knightfall_serverlit.png differ diff --git a/objects/wired/knightfall_serverprocessor/knightfall_serverprocessor.png b/objects/wired/knightfall_serverprocessor/knightfall_serverprocessor.png index 5d1130031..7ea250e20 100644 Binary files a/objects/wired/knightfall_serverprocessor/knightfall_serverprocessor.png and b/objects/wired/knightfall_serverprocessor/knightfall_serverprocessor.png differ diff --git a/objects/wired/knightfall_serverprocessor/knightfall_serverprocessorlit.png b/objects/wired/knightfall_serverprocessor/knightfall_serverprocessorlit.png index b90714a2f..6a3bb39c8 100644 Binary files a/objects/wired/knightfall_serverprocessor/knightfall_serverprocessorlit.png and b/objects/wired/knightfall_serverprocessor/knightfall_serverprocessorlit.png differ diff --git a/objects/wired/knightfall_smallconsole/knightfall_smallconsole.png b/objects/wired/knightfall_smallconsole/knightfall_smallconsole.png index df87ad411..156af9ccf 100644 Binary files a/objects/wired/knightfall_smallconsole/knightfall_smallconsole.png and b/objects/wired/knightfall_smallconsole/knightfall_smallconsole.png differ diff --git a/objects/wired/knightfall_smallconsole/knightfall_smallconsolelit.png b/objects/wired/knightfall_smallconsole/knightfall_smallconsolelit.png index 019b5f42d..dd4d7a2bc 100644 Binary files a/objects/wired/knightfall_smallconsole/knightfall_smallconsolelit.png and b/objects/wired/knightfall_smallconsole/knightfall_smallconsolelit.png differ diff --git a/objects/wired/knightfall_standingconsole/icon.png b/objects/wired/knightfall_standingconsole/icon.png new file mode 100644 index 000000000..109c09568 Binary files /dev/null and b/objects/wired/knightfall_standingconsole/icon.png differ diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsole.animation b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.animation new file mode 100644 index 000000000..21318d777 --- /dev/null +++ b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.animation @@ -0,0 +1,67 @@ +{ + "animatedParts" : { + "stateTypes" : { + "switchState" : { + "default" : "off", + "states" : { + "off" : { + "frames" : 1 + }, + "on" : { + "frames" : 3, + "cycle" : 0.5, + "mode" : "loop" + } + } + } + }, + + "parts" : { + "bg" : { + "properties" : { + "centered" : false + }, + + "partStates" : { + "switchState" : { + "off" : { + "properties" : { + "image" : ":.off", + "fullbright" : true + } + }, + + "on" : { + "properties" : { + "image" : ":.", + "fullbright" : true + } + } + } + } + }, + "fg" : { + "properties" : { + "centered" : false, + "zLevel" : 1 + }, + + "partStates" : { + "switchState" : { + "off" : { + "properties" : { + "image" : ":.off" + } + }, + + "on" : { + "properties" : { + "image" : ":." + } + } + } + } + } + } + } +} diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsole.frames b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.frames new file mode 100644 index 000000000..87106fe31 --- /dev/null +++ b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.frames @@ -0,0 +1,14 @@ +{ + "frameGrid" : { + "size" : [24, 32], + "dimensions" : [4, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off", + "default.on" : "default.1" + } +} diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsole.object b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.object new file mode 100644 index 000000000..d3b7ca5d7 --- /dev/null +++ b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.object @@ -0,0 +1,80 @@ +{ + "objectName" : "knightfall_standingconsole", + "colonyTags" : ["electronic"], + "rarity" : "Rare", + "description" : "A standing console.", + "shortdescription" : "Standing Console", + "race" : "generic", + "category" : "wire", + "price" : 70, + "lightColor" : [0, 70, 110], + + "apexDescription" : "A console with a holographic projector screen.", + "avianDescription" : "This console has an interactive projector screen.", + "floranDescription" : "Floran wantsss to break sssscreen.", + "glitchDescription" : "Interested. I've never seen such a console design before.", + "humanDescription" : "Gotta love them touch screen interfaces.", + "hylotlDescription" : "This console displays its screens through a projector.", + "novakidDescription" : "Where the heck are the damn buttons?", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "image" : "knightfall_standingconsole.png:.on", + "flipImages" : true, + "direction" : "left", + "lightPosition" : [0, 1], + + "imagePosition" : [-16, 0], + "frames" : 3, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + }, + { + "image" : "knightfall_standingconsole.png:.on", + "direction" : "right", + "lightPosition" : [0, 1], + + "imagePosition" : [-16, 0], + "frames" : 3, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + } + ], + + "scripts" : [ + "/objects/wired/switch/switch.lua", + "/scripts/npcToyObject.lua" + ], + "scriptDelta" : 5, + + "animation" : "knightfall_standingconsole.animation", + "animationCustom" : { + "sounds" : { + "on" : [ "/sfx/objects/console_button.ogg" ], + "off" : [ "/sfx/objects/console_button.ogg" ] + } + }, + + "animationParts" : { + "bg" : "knightfall_standingconsole.png", + "fg" : "knightfall_standingconsolelit.png" + }, + "animationPosition" : [-16, 0], + + "outputNodes" : [ [0, 0] ], + + "npcToy" : { + "influence" : [ + "console" + ], + "defaultReactions" : {}, + "preciseStandPositionLeft" : [-0.5, 0.0], + "preciseStandPositionRight" : [0.0, 0.0], + "maxNpcs" : 1 + } +} diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsole.png b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.png new file mode 100644 index 000000000..4a4dd1d43 Binary files /dev/null and b/objects/wired/knightfall_standingconsole/knightfall_standingconsole.png differ diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.frames b/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.frames new file mode 100644 index 000000000..87106fe31 --- /dev/null +++ b/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.frames @@ -0,0 +1,14 @@ +{ + "frameGrid" : { + "size" : [24, 32], + "dimensions" : [4, 1], + "names" : [ + [ "default.1", "default.2", "default.3", "default.off" ] + ] + }, + + "aliases" : { + "default.default" : "default.off", + "default.on" : "default.1" + } +} diff --git a/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.png b/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.png new file mode 100644 index 000000000..40ba76be6 Binary files /dev/null and b/objects/wired/knightfall_standingconsole/knightfall_standingconsolelit.png differ diff --git a/player.config.patch b/player.config.patch index 7e2a8e0fb..1c7808ce3 100644 --- a/player.config.patch +++ b/player.config.patch @@ -7,11 +7,15 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_requiem"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_cometfall"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_prometheus"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_blackthorn"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_mockingbird"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_kaladvolg"}}, //Axes {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_decimator"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_ravager"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_conqueror"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_divider"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_medicaxe"}}, //Daggers @@ -19,9 +23,11 @@ //Maces {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_bonecrusher"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_fracturer"}}, //Polearms {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_phalanx"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_echelon"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_banesaber"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_tsukuyomi"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_ares"}}, @@ -283,6 +289,14 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_rationkit"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_medkit"}}, +//Drinks +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_midastouch"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_rainbowfever"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_shortcircuit"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_magneticbliss"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_devilstouch"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_novawave"}}, + //Crafting Stations {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_weaponscraftingstation"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_augmentsstation"}}, @@ -377,6 +391,7 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_greeble3"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_greeble4"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_trashcan"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_trashcan2"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_aquarium"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_bar"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_bartender"}}, @@ -459,6 +474,8 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_glassbackgrounddoor"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_reinforceddoor"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_reinforcedbackgrounddoor"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_largedoor"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_largereinforceddoor"}}, //Spotlights {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_floodlights"}}, @@ -504,6 +521,8 @@ //Storage {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_canister"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_canister2"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_generalcanister"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_generalcanister2"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_erchiuscanister"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_erchiuscanister2"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_locker"}}, @@ -516,6 +535,7 @@ //Wired {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_smallconsole"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_longconsole"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_standingconsole"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_multimonitordisplay"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_hologramconsoletable"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_ceilingmonitor"}}, @@ -532,6 +552,8 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_largewallbutton"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_largewallswitch"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_largewallkeypad"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_servicepanel"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_vent"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_monitor1"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_monitor2"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_monitor3"}}, @@ -539,6 +561,7 @@ {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_tram"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_cargotram"}}, {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_turretchairtram"}}, +{"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_securitycamera"}}, //Ship {"op": "add", "path": "/defaultBlueprints/tier1/-", "value": {"item": "knightfall_captainschair"}}, diff --git a/projectiles/ranged/flames/knightfall_fireball/knightfall_fireball.projectile b/projectiles/ranged/flames/knightfall_fireball/knightfall_fireball.projectile index 37bfbe55b..91d62e1f5 100644 --- a/projectiles/ranged/flames/knightfall_fireball/knightfall_fireball.projectile +++ b/projectiles/ranged/flames/knightfall_fireball/knightfall_fireball.projectile @@ -8,6 +8,10 @@ "fullbright" : true, "actionOnReap" : [ { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion1.ogg" ] + }, + { "action" : "projectile", "type" : "spacemineexplosion", "fuzzAngle" : 0, diff --git a/projectiles/ranged/grenades/knightfall_advgravitygrenade/knightfall_advgravitygrenade.projectile b/projectiles/ranged/grenades/knightfall_advgravitygrenade/knightfall_advgravitygrenade.projectile index 5f82ce65c..5104ce232 100644 --- a/projectiles/ranged/grenades/knightfall_advgravitygrenade/knightfall_advgravitygrenade.projectile +++ b/projectiles/ranged/grenades/knightfall_advgravitygrenade/knightfall_advgravitygrenade.projectile @@ -7,6 +7,10 @@ "lightColor" : [0, 0, 0], "pointLight" : false, "actionOnReap" : [ + { + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "projectile", "type" : "knightfall_gravitygrenade_launched2", diff --git a/projectiles/ranged/grenades/knightfall_disintegratorgrenade_launched/knightfall_disintegratorgrenade_launched.projectile b/projectiles/ranged/grenades/knightfall_disintegratorgrenade_launched/knightfall_disintegratorgrenade_launched.projectile index c0e53118f..b4ea2b2f3 100644 --- a/projectiles/ranged/grenades/knightfall_disintegratorgrenade_launched/knightfall_disintegratorgrenade_launched.projectile +++ b/projectiles/ranged/grenades/knightfall_disintegratorgrenade_launched/knightfall_disintegratorgrenade_launched.projectile @@ -21,9 +21,9 @@ "type" : "knightfall_disintegratorsingularity" }, { - "action" : "sound", - "options" : [ "/sfx/projectiles/gravitymine_detonate.ogg" ] - }, + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 25, diff --git a/projectiles/ranged/grenades/knightfall_flechettegrenade/knightfall_flechettegrenade.projectile b/projectiles/ranged/grenades/knightfall_flechettegrenade/knightfall_flechettegrenade.projectile index 7db19e77d..b8456920d 100644 --- a/projectiles/ranged/grenades/knightfall_flechettegrenade/knightfall_flechettegrenade.projectile +++ b/projectiles/ranged/grenades/knightfall_flechettegrenade/knightfall_flechettegrenade.projectile @@ -2,11 +2,11 @@ "projectileName" : "knightfall_flechettegrenade", "physics" : "bullet", "bounces" : 0, - "timeToLive" : 0.2, "damageKindImage" : "knightfall_flechettegrenade.png", "image" : "knightfall_flechettegrenade.png", "animationCycle" : 0.5, "frameNumber" : 1, + "damagePoly" : [ [0, 1], [128, 40], [128, -40], [0, -1] ], "actionOnReap" : [ { "action" : "config", diff --git a/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched.projectile b/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched.projectile index 6f5b619cc..36cf1d650 100644 --- a/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched.projectile +++ b/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched.projectile @@ -21,9 +21,9 @@ "type" : "knightfall_gravitysingularity" }, { - "action" : "sound", - "options" : [ "/sfx/projectiles/gravitymine_detonate.ogg" ] - }, + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 10, diff --git a/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched2.projectile b/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched2.projectile index 2858205f6..64f046d46 100644 --- a/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched2.projectile +++ b/projectiles/ranged/grenades/knightfall_gravitygrenade_launched/knightfall_gravitygrenade_launched2.projectile @@ -55,9 +55,9 @@ "angleAdjust" : 270 }, { - "action" : "sound", - "options" : [ "/sfx/projectiles/gravitymine_detonate.ogg" ] - }, + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 10, diff --git a/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.png b/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.png index 8c550b522..f27645536 100644 Binary files a/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.png and b/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.png differ diff --git a/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.projectile b/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.projectile index abf025e73..9d94e3454 100644 --- a/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.projectile +++ b/projectiles/ranged/grenades/knightfall_prismgrenade_launched/knightfall_prismgrenade_launched.projectile @@ -7,6 +7,8 @@ "image" : "knightfall_prismgrenade_launched.png", "animationCycle" : 0.5, "frameNumber" : 1, + "lightColor" : [200, 200, 200], + "pointLight" : false, "actionOnReap" : [ { "action" : "config", @@ -57,23 +59,33 @@ ], "periodicActions" : [ { - "time" : 0.015, + "time" : 0.01, "repeat" : true, "action" : "particle", "rotate" : true, "specification" : { - "type" : "textured", - "image" : "/projectiles/ranged/trails/knightfall_arrowtrail/trail.png", - "position" : [-1, 0], + "type" : "streak", "layer" : "back", - "timeToLive" : 0.0, - "destructionTime" : 0.4, + "fullbright" : false, "destructionAction" : "shrink", - "fullbright" : true + "size" : 3, + "color" : [140, 140, 140, 140], + "collidesForeground" : false, + "length" : 20, + "position" : [0, 0], + "timeToLive" : 0.01, + "destructionTime" : 0.2, + "initialVelocity" : [0.5, 0], + "variance" : { + "size" : 0, + "initialVelocity" : [0.5, -0], + "length" : 0 + } } } ], - "power" : 30, + "power" : 20, + "statusEffects" : [ "paralyzed", "burning" ], "damageType" : "NoDamage", "damageKind" : "electricplasma" } diff --git a/projectiles/ranged/grenades/knightfall_unstablegrenade_launched/knightfall_unstablegrenade_launched.projectile b/projectiles/ranged/grenades/knightfall_unstablegrenade_launched/knightfall_unstablegrenade_launched.projectile index 3810ee258..cd8bafe04 100644 --- a/projectiles/ranged/grenades/knightfall_unstablegrenade_launched/knightfall_unstablegrenade_launched.projectile +++ b/projectiles/ranged/grenades/knightfall_unstablegrenade_launched/knightfall_unstablegrenade_launched.projectile @@ -39,6 +39,10 @@ "action" : "sound", "options" : [ "/sfx/gun/grenadeblast_electric1.ogg" ] }, + { + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 25, diff --git a/projectiles/ranged/missiles/knightfall_disintegrator_active/knightfall_disintegrator_active.projectile b/projectiles/ranged/missiles/knightfall_disintegrator_active/knightfall_disintegrator_active.projectile index ad0096a86..4078dd602 100644 --- a/projectiles/ranged/missiles/knightfall_disintegrator_active/knightfall_disintegrator_active.projectile +++ b/projectiles/ranged/missiles/knightfall_disintegrator_active/knightfall_disintegrator_active.projectile @@ -19,9 +19,9 @@ "type" : "knightfall_disintegratorsingularity" }, { - "action" : "sound", - "options" : [ "/sfx/projectiles/gravitymine_detonate.ogg" ] - }, + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 25, diff --git a/projectiles/ranged/missiles/knightfall_incendiarymissile/knightfall_incendiarymissile_homing.projectile b/projectiles/ranged/missiles/knightfall_incendiarymissile/knightfall_incendiarymissile_homing.projectile new file mode 100644 index 000000000..3beeb4e39 --- /dev/null +++ b/projectiles/ranged/missiles/knightfall_incendiarymissile/knightfall_incendiarymissile_homing.projectile @@ -0,0 +1,149 @@ +{ + "projectileName" : "knightfall_incendiarymissile_homing", + "image" : "knightfall_incendiarymissile.png", + "animationCycle" : 0.2, + "frameNumber" : 4, + "lightColor" : [230, 200, 100], + "pointLight" : false, + "actionOnReap" : [ + { + "action" : "projectile", + "type" : "fireexplosion", + "fuzzAngle" : 0, + "angleAdjust" : 0 + }, + { + "action" : "config", + "file" : "/projectiles/explosions/regularexplosion2/fireexplosionknockback.config" + }, + { + "action" : "config", + "file" : "/projectiles/explosions/rocketexplosion/rocketexplosion.config" + }, + { + "action" : "projectile", + "type" : "knightfall_regularexplosion", + "fuzzAngle" : 0, + "angleAdjust" : 0 + }, + { + "action" : "projectile", + "type" : "knightfall_cinder", + "fuzzAngle" : 0, + "inheritDamageFactor" : 0.05, + "angleAdjust" : 5 + }, + { + "action" : "projectile", + "type" : "knightfall_cinder", + "fuzzAngle" : 0, + "inheritDamageFactor" : 0.05, + "angleAdjust" : 2.5 + }, + { + "action" : "projectile", + "type" : "knightfall_cinder", + "fuzzAngle" : 0, + "inheritDamageFactor" : 0.05, + "angleAdjust" : 0 + }, + { + "action" : "projectile", + "type" : "knightfall_cinder", + "fuzzAngle" : 0, + "inheritDamageFactor" : 0.05, + "angleAdjust" : -2.5 + }, + { + "action" : "projectile", + "type" : "knightfall_cinder", + "fuzzAngle" : 0, + "inheritDamageFactor" : 0.05, + "angleAdjust" : -5 + }, + { + "action" : "config", + "file" : "/projectiles/explosions/knightfall_regularexplosion/knightfall_regularexplosion.config" + }, + { + "action" : "loop", + "count" : 8, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 1.5, + "color" : [0, 245, 164, 66], + "light" : [245, 164, 66], + "fullbright" : true, + "destructionTime" : 0.4, + "destructionAction" : "shrink", + "fade" : 0.9, + "initialVelocity" : [0, 5], + "finalVelocity" : [0.0, -50.0], + "approach" : [0, 30], + "timeToLive" : 0.2, + "layer" : "middle", + "variance" : { + "position" : [0.25, 0.25], + "size" : 0.5, + "initialVelocity" : [10, 10], + "timeToLive" : 0.2 + } + } + } + ] + } + ], + "periodicActions" : [ + { + "time" : 0, + "repeat" : true, + "action" : "particle", + "rotate" : true, + "specification" : { + "type" : "textured", + "image" : "/projectiles/ranged/trails/knightfall_thrustertrail/trail.png", + "position" : [-3, 0], + "layer" : "back", + "timeToLive" : 0.0, + "destructionTime" : 0.05, + "destructionAction" : "shrink", + "fullbright" : true + } + }, + { + "time" : 0, + "repeat" : true, + "action" : "particle", + "rotate" : true, + "specification" : { + "type" : "animated", + "image" : "/animations/dust3/dust3.animation", + "position" : [-1, 0], + "layer" : "back", + "timeToLive" : 0.1, + "destructionTime" : 0.1, + "destructionAction" : "shrink", + "fullbright" : false + } + } + ], + "statusEffects" : [ ], + "emitters" : [ "rocketsmoke" ], + "flippable" : true, + "power" : 10.0, + "speed" : 140, + "acceleration" : 30, + "physics" : "rocket", + "damageKind" : "default", + "knockback" : 20, + "knockbackDirectional" : true, + + "scripts" : [ "/scripts/projectiles/knightfall_homingmissile.lua" ], + "scriptDelta" : 3, + + "rotationRate" : 1.6, + "trackingLimit" : 300 +} diff --git a/projectiles/ranged/missiles/knightfall_shrapnelHEmissile_active/knightfall_shrapnelHEmissile_active.projectile b/projectiles/ranged/missiles/knightfall_shrapnelHEmissile_active/knightfall_shrapnelHEmissile_active.projectile index b1137ed02..81e2d31b0 100644 --- a/projectiles/ranged/missiles/knightfall_shrapnelHEmissile_active/knightfall_shrapnelHEmissile_active.projectile +++ b/projectiles/ranged/missiles/knightfall_shrapnelHEmissile_active/knightfall_shrapnelHEmissile_active.projectile @@ -7,6 +7,10 @@ "pointLight" : false, "actionOnReap" : [ { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion2.ogg" ] + }, + { "action" : "projectile", "type" : "spacemineexplosion", "fuzzAngle" : 0, diff --git a/projectiles/ranged/missiles/knightfall_supersonicmissile_active/knightfall_supersonicmissile_active.projectile b/projectiles/ranged/missiles/knightfall_supersonicmissile_active/knightfall_supersonicmissile_active.projectile index ba41f873f..05e706865 100644 --- a/projectiles/ranged/missiles/knightfall_supersonicmissile_active/knightfall_supersonicmissile_active.projectile +++ b/projectiles/ranged/missiles/knightfall_supersonicmissile_active/knightfall_supersonicmissile_active.projectile @@ -35,6 +35,10 @@ { "action" : "config", "file" : "/projectiles/explosions/knightfall_regularexplosion/knightfall_regularexplosion.config" + }, + { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion1.ogg" ] }, { "action" : "loop", diff --git a/projectiles/ranged/rockets/knightfall_centurionRPG/knightfall_centurionRPG.projectile b/projectiles/ranged/rockets/knightfall_centurionRPG/knightfall_centurionRPG.projectile index 1ae83e1eb..ec6528a81 100644 --- a/projectiles/ranged/rockets/knightfall_centurionRPG/knightfall_centurionRPG.projectile +++ b/projectiles/ranged/rockets/knightfall_centurionRPG/knightfall_centurionRPG.projectile @@ -7,6 +7,10 @@ "pointLight" : false, "actionOnReap" : [ { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion1.ogg" ] + }, + { "action" : "projectile", "type" : "spacemineexplosion", "fuzzAngle" : 0, diff --git a/projectiles/ranged/rockets/knightfall_gravityrocket/knightfall_gravityrocket.projectile b/projectiles/ranged/rockets/knightfall_gravityrocket/knightfall_gravityrocket.projectile index 56e7f5cb8..1246480fe 100644 --- a/projectiles/ranged/rockets/knightfall_gravityrocket/knightfall_gravityrocket.projectile +++ b/projectiles/ranged/rockets/knightfall_gravityrocket/knightfall_gravityrocket.projectile @@ -19,9 +19,9 @@ "type" : "knightfall_gravitysingularity" }, { - "action" : "sound", - "options" : [ "/sfx/projectiles/gravitymine_detonate.ogg" ] - }, + "action": "sound", + "options": ["/sfx/gun/gravity_explosion.ogg"] + }, { "action" : "loop", "count" : 25, diff --git a/projectiles/ranged/rockets/knightfall_hopliterocket/knightfall_hopliterocket.projectile b/projectiles/ranged/rockets/knightfall_hopliterocket/knightfall_hopliterocket.projectile index 0413ffaa6..4977a6f7a 100644 --- a/projectiles/ranged/rockets/knightfall_hopliterocket/knightfall_hopliterocket.projectile +++ b/projectiles/ranged/rockets/knightfall_hopliterocket/knightfall_hopliterocket.projectile @@ -7,6 +7,10 @@ "pointLight" : false, "actionOnReap" : [ { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion2.ogg" ] + }, + { "action" : "projectile", "type" : "spacemineexplosion", "fuzzAngle" : 0, diff --git a/projectiles/ranged/rockets/knightfall_meteorrocket/knightfall_meteorrocket.projectile b/projectiles/ranged/rockets/knightfall_meteorrocket/knightfall_meteorrocket.projectile index 60d925e28..d80cdc748 100644 --- a/projectiles/ranged/rockets/knightfall_meteorrocket/knightfall_meteorrocket.projectile +++ b/projectiles/ranged/rockets/knightfall_meteorrocket/knightfall_meteorrocket.projectile @@ -8,6 +8,10 @@ "bounces" : 0, "actionOnReap" : [ { + "action" : "sound", + "options" : [ "/sfx/gun/missile_explosion1.ogg" ] + }, + { "action" : "projectile", "type" : "spacemineexplosion", "fuzzAngle" : 0, diff --git a/projectiles/ranged/rockets/knightfall_smallplasmarocket/default.frames b/projectiles/ranged/rockets/knightfall_smallplasmarocket/default.frames new file mode 100644 index 000000000..039726aa9 --- /dev/null +++ b/projectiles/ranged/rockets/knightfall_smallplasmarocket/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid" : { + "size" : [9, 2], + "dimensions" : [4, 1], + + "names" : [ + [ "0", "1", "2", "3" ] + ] + } +} diff --git a/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.png b/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.png new file mode 100644 index 000000000..242a641dd Binary files /dev/null and b/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.png differ diff --git a/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.projectile b/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.projectile new file mode 100644 index 000000000..0c6db6317 --- /dev/null +++ b/projectiles/ranged/rockets/knightfall_smallplasmarocket/knightfall_smallplasmarocket.projectile @@ -0,0 +1,128 @@ +{ + "projectileName" : "knightfall_smallplasmarocket", + "image" : "knightfall_smallplasmarocket.png", + "animationCycle" : 0.2, + "frameNumber" : 4, + "lightColor" : [230, 200, 100], + "pointLight" : false, + "actionOnReap" : [ + { + "action" : "projectile", + "type" : "knightfall_plasmabulletexplosion", + "fuzzAngle" : 0, + "angleAdjust" : 0 + }, + { + "action" : "loop", + "count" : 1, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "animated", + "image" : "/animations/dust1/dust1.animation", + "size" : 1, + "position" : [0, 0], + "destructionAction" : "fade", + "destructionTime" : 0.5, + "fade" : 1, + "finalVelocity" : [0.0, 3.0], + "layer" : "middle", + "timeToLive" : 0.5, + "variance" : { + "initialVelocity" : [2.0, 2.0], + "position" : [0.2, 0.2] + } + } + } + ] + }, + { + "action" : "loop", + "count" : 3, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 1.0, + "color" : [65, 160, 245, 255], + "light" : [45, 115, 155], + "fullbright" : true, + "destructionTime" : 0.4, + "destructionAction" : "fade", + "fade" : 0.9, + "initialVelocity" : [0, 5], + "finalVelocity" : [0.0, -50.0], + "approach" : [0, 30], + "timeToLive" : 0.2, + "layer" : "middle", + "variance" : { + "position" : [0.25, 0.25], + "size" : 0.5, + "initialVelocity" : [10, 10], + "timeToLive" : 0.2 + } + } + } + ] + }, + { + "action" : "config", + "file" : "/projectiles/explosions/knightfall_plasmabulletexplosion/knightfall_plasmabulletexplosion.config" + } + ], + "periodicActions" : [ + { + "time" : 0.01, + "repeat" : true, + "action" : "particle", + "rotate" : true, + "specification" : { + "type" : "streak", + "layer" : "back", + "fullbright" : true, + "destructionAction" : "shrink", + "size" : 1, + "color" : [255, 210, 85, 140], + "collidesForeground" : false, + "length" : 20, + "position" : [0, 0], + "timeToLive" : 0.01, + "destructionTime" : 0.2, + "initialVelocity" : [0.5, 0], + "variance" : { + "size" : 0, + "initialVelocity" : [0.5, -0], + "length" : 0 + } + } + }, + { + "time" : 0, + "repeat" : true, + "action" : "particle", + "rotate" : true, + "specification" : { + "type" : "animated", + "image" : "/animations/dust3/dust3.animation", + "position" : [-1, 0], + "layer" : "back", + "timeToLive" : 0.1, + "destructionTime" : 0.1, + "destructionAction" : "shrink", + "fullbright" : false + } + } + ], + "statusEffects" : [ "knightfall_melting" ], + "emitters" : [ "rocketsmoke" ], + "flippable" : true, + "power" : 10.0, + "speed" : 70, + "acceleration" : 30, + "physics" : "rocket", + "damageKind" : "default", + "knockback" : 10, + "knockbackDirectional" : true +} diff --git a/projectiles/ranged/shells/knightfall_standardbullet/knightfall_piercingstandardbullet_unlit.projectile b/projectiles/ranged/shells/knightfall_standardbullet/knightfall_piercingstandardbullet_unlit.projectile new file mode 100644 index 000000000..c91ef02bc --- /dev/null +++ b/projectiles/ranged/shells/knightfall_standardbullet/knightfall_piercingstandardbullet_unlit.projectile @@ -0,0 +1,66 @@ +{ + "projectileName" : "knightfall_piercingstandardbullet_unlit", + "image" : "knightfall_standardbullet.png", + "physics" : "laser", + "animationCycle" : 0.25, + "frameNumber" : 1, + "piercing" : true, + "damageKind" : "standardbullet", + "pointLight" : false, + "flippable" : true, + "fullbright" : false, + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/bulletexplosion/bulletexplosion.config" + }, + { + "action" : "loop", + "count" : 6, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 1.0, + "color" : [245, 160, 65, 245], + "light" : [65, 55, 20], + "fullbright" : true, + "destructionTime" : 0.2, + "destructionAction" : "shrink", + "fade" : 0.9, + "initialVelocity" : [0, 5], + "finalVelocity" : [0.0, -50.0], + "approach" : [0, 30], + "timeToLive" : 0.0, + "layer" : "middle", + "variance" : { + "position" : [0.25, 0.25], + "size" : 0.5, + "initialVelocity" : [10, 10], + "timeToLive" : 0.2 + } + } + } + ] + }, + { + "action" : "projectile", + "type" : "knightfall_bulletimpactspark", + "fuzzAngle" : 90, + "inheritDamageFactor" : 0.0, + "angleAdjust" : 0 + }, + { + "action" : "projectile", + "type" : "knightfall_bulletimpactspark", + "fuzzAngle" : 90, + "inheritDamageFactor" : 0.0, + "angleAdjust" : 180 + } + ], + "statusEffects" : [ "knightfall_bleeding" ], + "power" : 7.5, + "speed" : 150, + "knockback" : 0 +} diff --git a/projectiles/ranged/shells/knightfall_standardbullet/knightfall_standardbullet_unlit.projectile b/projectiles/ranged/shells/knightfall_standardbullet/knightfall_standardbullet_unlit.projectile new file mode 100644 index 000000000..9e312024b --- /dev/null +++ b/projectiles/ranged/shells/knightfall_standardbullet/knightfall_standardbullet_unlit.projectile @@ -0,0 +1,65 @@ +{ + "projectileName" : "knightfall_standardbullet_unlit", + "image" : "knightfall_standardbullet.png", + "physics" : "laser", + "animationCycle" : 0.25, + "frameNumber" : 1, + "damageKind" : "standardbullet", + "pointLight" : false, + "flippable" : true, + "fullbright" : false, + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/bulletexplosion/bulletexplosion.config" + }, + { + "action" : "loop", + "count" : 6, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 1.0, + "color" : [245, 160, 65, 245], + "light" : [65, 55, 20], + "fullbright" : true, + "destructionTime" : 0.2, + "destructionAction" : "shrink", + "fade" : 0.9, + "initialVelocity" : [0, 5], + "finalVelocity" : [0.0, -50.0], + "approach" : [0, 30], + "timeToLive" : 0.0, + "layer" : "middle", + "variance" : { + "position" : [0.25, 0.25], + "size" : 0.5, + "initialVelocity" : [10, 10], + "timeToLive" : 0.2 + } + } + } + ] + }, + { + "action" : "projectile", + "type" : "knightfall_bulletimpactspark", + "fuzzAngle" : 90, + "inheritDamageFactor" : 0.0, + "angleAdjust" : 0 + }, + { + "action" : "projectile", + "type" : "knightfall_bulletimpactspark", + "fuzzAngle" : 90, + "inheritDamageFactor" : 0.0, + "angleAdjust" : 180 + } + ], + "statusEffects" : [ "knightfall_bleeding" ], + "power" : 7.5, + "speed" : 150, + "knockback" : 0 +} diff --git a/recipes/knightfall_augmentedvendor/knightfall_augmentedmotherpoptop.recipe b/recipes/knightfall_augmentedvendor/knightfall_augmentedmotherpoptop.recipe new file mode 100644 index 000000000..eb0b2aba1 --- /dev/null +++ b/recipes/knightfall_augmentedvendor/knightfall_augmentedmotherpoptop.recipe @@ -0,0 +1,33 @@ +{ + "input" : [ + { "item" : "money", "count" : 500000 } + ], + "output" : { + "item" : "filledcapturepod", + "count" : 1, + "parameters" : { + "shortdescription" : "Augmented A. Poptop", + "description" : "A heavily armored and heavily armed version of the Adult Poptop.", + "tooltipFields" : { + "subtitle" : "Augmented Super Monster", + "objectImage" : "/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png:idle.1" + }, + "pets" : [{ + "name" : "Scandroid", + "portrait" : [ + {"image" : "/monsters/augmented/knightfall_augmentedmotherpoptop/body/knightfall_augmentedmotherpoptop.png:idle.1"} + ], + "config" : { + "type" : "knightfall_augmentedmotherpoptop", + "parameters" : { + "level" : 7, + "aggressive" : true + } + } + } + ] + } + }, + "duration" : 0, + "groups" : [ "knightfall_augmentedvendor" ] +} diff --git a/recipes/knightfall_bartender/knightfall_devilstouch.recipe b/recipes/knightfall_bartender/knightfall_devilstouch.recipe new file mode 100644 index 000000000..9de6eb5c6 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_devilstouch.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 1250 } + ], + "output" : { "item" : "knightfall_devilstouch", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_bartender/knightfall_magneticbliss.recipe b/recipes/knightfall_bartender/knightfall_magneticbliss.recipe new file mode 100644 index 000000000..b64e56398 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_magneticbliss.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 875 } + ], + "output" : { "item" : "knightfall_magneticbliss", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_bartender/knightfall_midastouch.recipe b/recipes/knightfall_bartender/knightfall_midastouch.recipe new file mode 100644 index 000000000..534e7c083 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_midastouch.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 750 } + ], + "output" : { "item" : "knightfall_midastouch", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_bartender/knightfall_novawave.recipe b/recipes/knightfall_bartender/knightfall_novawave.recipe new file mode 100644 index 000000000..974181902 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_novawave.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 650 } + ], + "output" : { "item" : "knightfall_novawave", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_bartender/knightfall_rainbowfever.recipe b/recipes/knightfall_bartender/knightfall_rainbowfever.recipe new file mode 100644 index 000000000..f48c10173 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_rainbowfever.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 2500 } + ], + "output" : { "item" : "knightfall_rainbowfever", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_bartender/knightfall_shortcircuit.recipe b/recipes/knightfall_bartender/knightfall_shortcircuit.recipe new file mode 100644 index 000000000..6ed4e6649 --- /dev/null +++ b/recipes/knightfall_bartender/knightfall_shortcircuit.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 400 } + ], + "output" : { "item" : "knightfall_shortcircuit", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_bartender", "all" ] +} diff --git a/recipes/knightfall_dronevendor/knightfall_bulldog_cannon.recipe b/recipes/knightfall_dronevendor/knightfall_bulldog_cannon.recipe index 21d2e6531..acc8c744a 100644 --- a/recipes/knightfall_dronevendor/knightfall_bulldog_cannon.recipe +++ b/recipes/knightfall_dronevendor/knightfall_bulldog_cannon.recipe @@ -6,16 +6,16 @@ "item" : "filledcapturepod", "count" : 1, "parameters" : { - "shortdescription" : "Bulldog Cannon Drone Tank", + "shortdescription" : "Bulldog Cannon Drone", "description" : "An automated tank drone armed with a cannon and a plasma missile launcher.", "tooltipFields" : { "subtitle" : "Bulldog Drone", - "objectImage" : "/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.png:idle.1" + "objectImage" : "/monsters/drones/bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.png:idle.1" }, "pets" : [{ "name" : "Bulldog Drone", "portrait" : [ - {"image" : "/monsters/drones/Bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.png:idle.1"} + {"image" : "/monsters/drones/bulldog/knightfall_bulldog_cannon/knightfall_bulldog_cannon.png:idle.1"} ], "config" : { "type" : "knightfall_bulldog_cannon", diff --git a/recipes/knightfall_dronevendor/knightfall_bulldog_missile.recipe b/recipes/knightfall_dronevendor/knightfall_bulldog_missile.recipe index 46c267609..4bb358679 100644 --- a/recipes/knightfall_dronevendor/knightfall_bulldog_missile.recipe +++ b/recipes/knightfall_dronevendor/knightfall_bulldog_missile.recipe @@ -6,16 +6,16 @@ "item" : "filledcapturepod", "count" : 1, "parameters" : { - "shortdescription" : "Bulldog Missile Drone Tank", + "shortdescription" : "Bulldog Missile Drone", "description" : "An automated tank drone armed with dual, 6 pod plasma missile launchers.", "tooltipFields" : { "subtitle" : "Bulldog Drone", - "objectImage" : "/monsters/drones/Bulldog/knightfall_bulldog_missile/knightfall_bulldog_missile.png:idle.1" + "objectImage" : "/monsters/drones/bulldog/knightfall_bulldog_missile/knightfall_bulldog_missile.png:idle.1" }, "pets" : [{ "name" : "Bulldog Drone", "portrait" : [ - {"image" : "/monsters/drones/Bulldog/knightfall_bulldog_missile/knightfall_bulldog_missile.png:idle.1"} + {"image" : "/monsters/drones/bulldog/knightfall_bulldog_missile/knightfall_bulldog_missile.png:idle.1"} ], "config" : { "type" : "knightfall_bulldog_missile", diff --git a/recipes/knightfall_dronevendor/knightfall_hammer_assault.recipe b/recipes/knightfall_dronevendor/knightfall_hammer_assault.recipe new file mode 100644 index 000000000..df4d58886 --- /dev/null +++ b/recipes/knightfall_dronevendor/knightfall_hammer_assault.recipe @@ -0,0 +1,33 @@ +{ + "input" : [ + { "item" : "money", "count" : 12500 } + ], + "output" : { + "item" : "filledcapturepod", + "count" : 1, + "parameters" : { + "shortdescription" : "Hammer Assault Drone", + "description" : "A deployable automated drone armed with 6 incendiary homing missiles.", + "tooltipFields" : { + "subtitle" : "Hammer Drone", + "objectImage" : "/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assault.png:fly.1" + }, + "pets" : [{ + "name" : "Hammer Drone", + "portrait" : [ + {"image" : "/monsters/drones/hammer/knightfall_hammer_assault/body/knightfall_hammer_assault.png:fly.1"} + ], + "config" : { + "type" : "knightfall_hammer_assault", + "parameters" : { + "level" : 7, + "aggressive" : true + } + } + } + ] + } + }, + "duration" : 0, + "groups" : [ "knightfall_dronevendor" ] +} diff --git a/recipes/knightfall_dronevendor/knightfall_hammer_defense.recipe b/recipes/knightfall_dronevendor/knightfall_hammer_defense.recipe index 787dd2d39..4225ea3ea 100644 --- a/recipes/knightfall_dronevendor/knightfall_hammer_defense.recipe +++ b/recipes/knightfall_dronevendor/knightfall_hammer_defense.recipe @@ -10,12 +10,12 @@ "description" : "A deployable automated drone that can take a lot of damage.", "tooltipFields" : { "subtitle" : "Hammer Drone", - "objectImage" : "/monsters/drones/Hammer/knightfall_hammer_defense/body/knightfall_hammer_defense.png:fly.1" + "objectImage" : "/monsters/drones/hammer/knightfall_hammer_defense/body/knightfall_hammer_defense.png:fly.1" }, "pets" : [{ "name" : "Hammer Drone", "portrait" : [ - {"image" : "/monsters/drones/Hammer/knightfall_hammer_defense/body/knightfall_hammer_defense.png:fly.1"} + {"image" : "/monsters/drones/hammer/knightfall_hammer_defense/body/knightfall_hammer_defense.png:fly.1"} ], "config" : { "type" : "knightfall_hammer_defense", diff --git a/recipes/knightfall_dronevendor/knightfall_spectre_grenade.recipe b/recipes/knightfall_dronevendor/knightfall_spectre_grenade.recipe index 16999c059..e319d22ec 100644 --- a/recipes/knightfall_dronevendor/knightfall_spectre_grenade.recipe +++ b/recipes/knightfall_dronevendor/knightfall_spectre_grenade.recipe @@ -10,12 +10,12 @@ "description" : "A deployable automated drone that fires stasis grenades.", "tooltipFields" : { "subtitle" : "Spectre Drone", - "objectImage" : "/monsters/drones/Spectre/knightfall_spectre_grenade/body/knightfall_spectre_grenade.png:fly.1" + "objectImage" : "/monsters/drones/spectre/knightfall_spectre_grenade/body/knightfall_spectre_grenade.png:fly.1" }, "pets" : [{ "name" : "Spectre Drone", "portrait" : [ - {"image" : "/monsters/drones/Spectre/knightfall_spectre_grenade/body/knightfall_spectre_grenade.png:fly.1"} + {"image" : "/monsters/drones/spectre/knightfall_spectre_grenade/body/knightfall_spectre_grenade.png:fly.1"} ], "config" : { "type" : "knightfall_spectre_grenade", diff --git a/recipes/knightfall_dronevendor/knightfall_spectre_missile.recipe b/recipes/knightfall_dronevendor/knightfall_spectre_missile.recipe index 3711b05e3..b6ed7bae6 100644 --- a/recipes/knightfall_dronevendor/knightfall_spectre_missile.recipe +++ b/recipes/knightfall_dronevendor/knightfall_spectre_missile.recipe @@ -10,12 +10,12 @@ "description" : "A deployable automated drone that fires homing imploder missiles.", "tooltipFields" : { "subtitle" : "Spectre Drone", - "objectImage" : "/monsters/drones/Spectre/knightfall_spectre_missile/body/knightfall_spectre_missile.png:fly.1" + "objectImage" : "/monsters/drones/spectre/knightfall_spectre_missile/body/knightfall_spectre_missile.png:fly.1" }, "pets" : [{ "name" : "Spectre Drone", "portrait" : [ - {"image" : "/monsters/drones/Spectre/knightfall_spectre_missile/body/knightfall_spectre_missile.png:fly.1"} + {"image" : "/monsters/drones/spectre/knightfall_spectre_missile/body/knightfall_spectre_missile.png:fly.1"} ], "config" : { "type" : "knightfall_spectre_missile", diff --git a/recipes/knightfall_dronevendor/knightfall_spectre_plasma.recipe b/recipes/knightfall_dronevendor/knightfall_spectre_plasma.recipe index e16450499..64dd74402 100644 --- a/recipes/knightfall_dronevendor/knightfall_spectre_plasma.recipe +++ b/recipes/knightfall_dronevendor/knightfall_spectre_plasma.recipe @@ -10,12 +10,12 @@ "description" : "A deployable automated drone that fires bolts of plasma.", "tooltipFields" : { "subtitle" : "Spectre Drone", - "objectImage" : "/monsters/drones/Spectre/knightfall_spectre_plasma/body/knightfall_spectre_plasma.png:fly.1" + "objectImage" : "/monsters/drones/spectre/knightfall_spectre_plasma/body/knightfall_spectre_plasma.png:fly.1" }, "pets" : [{ "name" : "Spectre Drone", "portrait" : [ - {"image" : "/monsters/drones/Spectre/knightfall_spectre_plasma/body/knightfall_spectre_plasma.png:fly.1"} + {"image" : "/monsters/drones/spectre/knightfall_spectre_plasma/body/knightfall_spectre_plasma.png:fly.1"} ], "config" : { "type" : "knightfall_spectre_plasma", diff --git a/recipes/knightfall_furniturecatalogue/decorative/knightfall_servicepanel.recipe b/recipes/knightfall_furniturecatalogue/decorative/knightfall_servicepanel.recipe new file mode 100644 index 000000000..ef452221a --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/decorative/knightfall_servicepanel.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_servicepanel", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_decorative", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/decorative/knightfall_trashcan2.recipe b/recipes/knightfall_furniturecatalogue/decorative/knightfall_trashcan2.recipe new file mode 100644 index 000000000..983acd710 --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/decorative/knightfall_trashcan2.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_trashcan2", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_decorative", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/decorative/knightfall_vent.recipe b/recipes/knightfall_furniturecatalogue/decorative/knightfall_vent.recipe new file mode 100644 index 000000000..de98484be --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/decorative/knightfall_vent.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_vent", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_decorative", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/doors/knightfall_largedoor.recipe b/recipes/knightfall_furniturecatalogue/doors/knightfall_largedoor.recipe new file mode 100644 index 000000000..d8c2b5962 --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/doors/knightfall_largedoor.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_largedoor", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_doors", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/doors/knightfall_largereinforceddoor.recipe b/recipes/knightfall_furniturecatalogue/doors/knightfall_largereinforceddoor.recipe new file mode 100644 index 000000000..7d8b69980 --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/doors/knightfall_largereinforceddoor.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_largereinforceddoor", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_doors", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister.recipe b/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister.recipe new file mode 100644 index 000000000..da669ba76 --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_generalcanister", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_storage", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister2.recipe b/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister2.recipe new file mode 100644 index 000000000..8e46e7f57 --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/storage/knightfall_generalcanister2.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_generalcanister2", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_storage", "all" ] +} diff --git a/recipes/knightfall_furniturecatalogue/wired/knightfall_standingconsole.recipe b/recipes/knightfall_furniturecatalogue/wired/knightfall_standingconsole.recipe new file mode 100644 index 000000000..31853b49d --- /dev/null +++ b/recipes/knightfall_furniturecatalogue/wired/knightfall_standingconsole.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "money", "count" : 300 } + ], + "output" : { "item" : "knightfall_standingconsole", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_furniturecatalogue", "knightfall_wired", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/assaultrifles/knightfall_raptor - Copy.recipe b/recipes/knightfall_weaponscraftingstation/weapons/assaultrifles/knightfall_raptor - Copy.recipe new file mode 100644 index 000000000..d9751f1f2 --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/assaultrifles/knightfall_raptor - Copy.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 7 }, + { "item" : "knightfall_plasmacell", "count" : 4 }, + { "item" : "knightfall_powercore", "count" : 2 }, + { "item" : "knightfall_heatcell", "count" : 4 } + ], + "output" : { "item" : "knightfall_avenger", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponsassembler", "knightfall_assaultrifles", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_divider.recipe b/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_divider.recipe new file mode 100644 index 000000000..6c503114e --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_divider.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 4 } + ], + "output" : { "item" : "knightfall_divider", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_axe", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_ravager.recipe b/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_ravager.recipe new file mode 100644 index 000000000..b23146772 --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/axes/knightfall_ravager.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 8 }, + { "item" : "knightfall_plasmacell", "count" : 3 }, + { "item" : "knightfall_unstablecell", "count" : 1 }, + { "item" : "knightfall_powercore", "count" : 2 } + ], + "output" : { "item" : "knightfall_ravager", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponsassembler", "knightfall_axe", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/maces/knightfall_fracturer.recipe b/recipes/knightfall_weaponscraftingstation/weapons/maces/knightfall_fracturer.recipe new file mode 100644 index 000000000..799a49c52 --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/maces/knightfall_fracturer.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 4 } + ], + "output" : { "item" : "knightfall_fracturer", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_maces", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/polearms/knightfall_echelon.recipe b/recipes/knightfall_weaponscraftingstation/weapons/polearms/knightfall_echelon.recipe new file mode 100644 index 000000000..dac183e08 --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/polearms/knightfall_echelon.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 4 } + ], + "output" : { "item" : "knightfall_echelon", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_polearms", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/sniperrifles/knightfall_sunbeam.recipe b/recipes/knightfall_weaponscraftingstation/weapons/sniperrifles/knightfall_sunbeam.recipe new file mode 100644 index 000000000..d2f0e162b --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/sniperrifles/knightfall_sunbeam.recipe @@ -0,0 +1,10 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 8 }, + { "item" : "knightfall_powercore", "count" : 2 }, + { "item" : "knightfall_heatcell", "count" : 7 } + ], + "output" : { "item" : "knightfall_sunbeam", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponsassembler", "knightfall_sniperrifles", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_blackthorn.recipe b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_blackthorn.recipe new file mode 100644 index 000000000..bfc965c5b --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_blackthorn.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 4 } + ], + "output" : { "item" : "knightfall_blackthorn", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_swords", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_kaladvolg.recipe b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_kaladvolg.recipe new file mode 100644 index 000000000..bce7598cd --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_kaladvolg.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 5 } + ], + "output" : { "item" : "knightfall_kaladvolg", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_swords", "weapons", "all" ] +} diff --git a/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_mockingbird.recipe b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_mockingbird.recipe new file mode 100644 index 000000000..2ccf39828 --- /dev/null +++ b/recipes/knightfall_weaponscraftingstation/weapons/swords/knightfall_mockingbird.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "knightfall_alumeniteingot", "count" : 3 } + ], + "output" : { "item" : "knightfall_mockingbird", "count" : 1 }, + "duration" : 0, + "groups" : [ "knightfall_weaponscraftingstation", "knightfall_swords", "weapons", "all" ] +} diff --git a/resources/sandbox/Sandbox 2.ase b/resources/sandbox/Sandbox 2.ase index 4ae9c6f08..c23c90099 100644 Binary files a/resources/sandbox/Sandbox 2.ase and b/resources/sandbox/Sandbox 2.ase differ diff --git a/resources/sandbox/Sandbox.ase b/resources/sandbox/Sandbox.ase index a5cf06a99..bc02f6a33 100644 Binary files a/resources/sandbox/Sandbox.ase and b/resources/sandbox/Sandbox.ase differ diff --git a/sfx/gun/gravity_explosion.ogg b/sfx/gun/gravity_explosion.ogg new file mode 100644 index 000000000..0f37e6559 Binary files /dev/null and b/sfx/gun/gravity_explosion.ogg differ diff --git a/sfx/gun/missile_explosion1.ogg b/sfx/gun/missile_explosion1.ogg new file mode 100644 index 000000000..986396384 Binary files /dev/null and b/sfx/gun/missile_explosion1.ogg differ diff --git a/sfx/gun/missile_explosion2.ogg b/sfx/gun/missile_explosion2.ogg new file mode 100644 index 000000000..036d6ac7f Binary files /dev/null and b/sfx/gun/missile_explosion2.ogg differ diff --git a/sfx/gun/missile_explosion3.ogg b/sfx/gun/missile_explosion3.ogg new file mode 100644 index 000000000..71f0c38d8 Binary files /dev/null and b/sfx/gun/missile_explosion3.ogg differ diff --git a/sfx/gun/missile_explosion4.ogg b/sfx/gun/missile_explosion4.ogg new file mode 100644 index 000000000..2da8e8880 Binary files /dev/null and b/sfx/gun/missile_explosion4.ogg differ diff --git a/sfx/gun/plasma_gun14.ogg b/sfx/gun/plasma_gun14.ogg new file mode 100644 index 000000000..72a0ca990 Binary files /dev/null and b/sfx/gun/plasma_gun14.ogg differ diff --git a/sfx/gun/plasma_impact.ogg b/sfx/gun/plasma_impact.ogg new file mode 100644 index 000000000..6312113e4 Binary files /dev/null and b/sfx/gun/plasma_impact.ogg differ diff --git a/unused/Blackthorn.ase b/unused/Blackthorn.ase new file mode 100644 index 000000000..0bb73fdd1 Binary files /dev/null and b/unused/Blackthorn.ase differ diff --git a/unused/Blackthorn.gif b/unused/Blackthorn.gif new file mode 100644 index 000000000..1fd2bf4f5 Binary files /dev/null and b/unused/Blackthorn.gif differ diff --git a/unused/Scytheling.ase b/unused/Scytheling.ase new file mode 100644 index 000000000..013a4c637 Binary files /dev/null and b/unused/Scytheling.ase differ diff --git a/unused/Scytheling.png b/unused/Scytheling.png new file mode 100644 index 000000000..a9b3ff6a5 Binary files /dev/null and b/unused/Scytheling.png differ diff --git a/vehicles/aircraft/seraph/knightfall_seraphgunship_standard/knightfall_seraphgunship_standard.vehicle b/vehicles/aircraft/seraph/knightfall_seraphgunship_standard/knightfall_seraphgunship_standard.vehicle index 00dd7773b..540727c03 100644 --- a/vehicles/aircraft/seraph/knightfall_seraphgunship_standard/knightfall_seraphgunship_standard.vehicle +++ b/vehicles/aircraft/seraph/knightfall_seraphgunship_standard/knightfall_seraphgunship_standard.vehicle @@ -93,7 +93,7 @@ "machineGun" : { "aimMinMax" : [-60,0], "emptyAim" : 0, - "projectileType" : ["knightfall_standardbullet"], + "projectileType" : [ "knightfall_standardbullet", "knightfall_piercingstandardbullet", "knightfall_standardbullet_unlit", "knightfall_piercingstandardbullet_unlit" ], "projectileParams" : { "speed" : 200, "power" : 30