FILES ----- dungeons\undergroundmaze\mazeornate\corner1a.json dungeons\undergroundmaze\mazeornate\corner1e.json dungeons\undergroundmaze\mazeornate\corner2b.json dungeons\undergroundmaze\mazeornate\corner2c.json dungeons\undergroundmaze\mazeornate\corner3a.json dungeons\undergroundmaze\mazeornate\corner3e.json dungeons\undergroundmaze\mazeornate\corner4c.json dungeons\undergroundmaze\mazeornate\drop1a.json dungeons\undergroundmaze\mazeornate\drop1b.json dungeons\undergroundmaze\mazeornate\endleft1cchest.json dungeons\undergroundmaze\mazeornate\endright1cchest.json dungeons\undergroundmaze\mazeornate\entryleft.json dungeons\undergroundmaze\mazeornate\entryright.json dungeons\undergroundmaze\mazeornate\entrytop.json dungeons\undergroundmaze\mazeornate\hall1g.json dungeons\undergroundmaze\mazeornate\hall1i.json dungeons\undergroundmaze\mazeornate\hall2i.json dungeons\undergroundmaze\mazeornate\junction1d.json dungeons\undergroundmaze\mazeornate\junction2b.json dungeons\undergroundmaze\mazeornate\junction2d.json dungeons\undergroundmaze\mazeornate\junction3b.json dungeons\undergroundmaze\mazeornate\junction4b.json dungeons\undergroundmaze\mazeplant\corner1a.json dungeons\undergroundmaze\mazeplant\corner1e.json dungeons\undergroundmaze\mazeplant\corner2b.json dungeons\undergroundmaze\mazeplant\corner2c.json dungeons\undergroundmaze\mazeplant\corner3a.json dungeons\undergroundmaze\mazeplant\corner3e.json dungeons\undergroundmaze\mazeplant\corner4b.json dungeons\undergroundmaze\mazeplant\corner4c.json dungeons\undergroundmaze\mazeplant\drop1a.json dungeons\undergroundmaze\mazeplant\drop1b.json dungeons\undergroundmaze\mazeplant\endleft1c.json dungeons\undergroundmaze\mazeplant\endleft1cchest.json dungeons\undergroundmaze\mazeplant\endright1c.json dungeons\undergroundmaze\mazeplant\endright1cchest.json dungeons\undergroundmaze\mazeplant\entryleft.json dungeons\undergroundmaze\mazeplant\entryright.json dungeons\undergroundmaze\mazeplant\entrytop.json dungeons\undergroundmaze\mazeplant\hall1g.json dungeons\undergroundmaze\mazeplant\hall1i.json dungeons\undergroundmaze\mazeplant\hall2g.json dungeons\undergroundmaze\mazeplant\hall2i.json dungeons\undergroundmaze\mazeplant\junction1b.json dungeons\undergroundmaze\mazeplant\junction1d.json dungeons\undergroundmaze\mazeplant\junction2b.json dungeons\undergroundmaze\mazeplant\junction2d.json dungeons\undergroundmaze\mazeplant\junction3b.json dungeons\undergroundmaze\mazeplant\junction3f.json dungeons\undergroundmaze\mazeplant\junction4b.json dungeons\undergroundmaze\mazeplant\junction4f.json items\active\weapons\weapon.lua [NEW] items\active\weapons\melee\altabilities\spear\barrier\barrier.altability [NEW] items\active\weapons\melee\altabilities\spear\barrier\barrier.lua [NEW] items\active\weapons\melee\altabilities\spear\barrier\default.frames [NEW] items\active\weapons\melee\altabilities\spear\barrier\electricorb.png [NEW] items\active\weapons\melee\altabilities\spear\barrier\fireorb.png [NEW] items\active\weapons\melee\altabilities\spear\barrier\iceorb.png [NEW] items\active\weapons\melee\altabilities\spear\barrier\poisonorb.png items\active\weapons\melee\altabilities\spear\charge\charge.lua [NEW] items\active\weapons\melee\altabilities\spear\spin\spin.altability [NEW] items\active\weapons\melee\altabilities\spear\spin\spin.lua [NEW] items\active\weapons\melee\altabilities\spear\spin\spinswoosh.frames [NEW] items\active\weapons\melee\altabilities\spear\spin\spinswoosh.png items\active\weapons\melee\broadsword\broadsword.animation items\active\weapons\melee\hammer\commonhammer.activeitem items\active\weapons\melee\hammer\hammer.animation items\active\weapons\melee\hammer\hammer.lua items\active\weapons\melee\hammer\rarehammer.activeitem items\active\weapons\melee\hammer\uncommonhammer.activeitem items\active\weapons\melee\spear\commonspear.activeitem items\active\weapons\melee\spear\rarespear.activeitem items\active\weapons\melee\spear\spear.animation items\active\weapons\melee\spear\spear.lua items\active\weapons\melee\spear\uncommonspear.activeitem items\active\weapons\ranged\altabilities\bouncingshot\bouncingshot.altability items\active\weapons\ranged\altabilities\guidedrocket\guidedrocket.altability items\active\weapons\ranged\altabilities\lance\lance.altability items\active\weapons\ranged\altabilities\piercingshot\piercingshot.altability items\active\weapons\ranged\rocketlauncher\rarerocketlauncher.activeitem [NEW] npcs\dungeon\maze\guardornate.npctype [NEW] npcs\dungeon\maze\guardplant.npctype projectiles\explosions\regularexplosion2\electricexplosionfreeze.projectile projectiles\explosions\regularexplosion2\fireexplosionfreeze.projectile projectiles\explosions\regularexplosion2\iceexplosionfreeze.projectile projectiles\explosions\regularexplosion2\poisonexplosionfreeze.projectile projectiles\explosions\regularexplosion2\regularexplosion2.projectile projectiles\explosions\regularexplosion2\regularexplosionfreeze.projectile projectiles\explosions\vsmallregularexplosion\vsmallregularexplosion.projectile [NEW] projectiles\unsorted\elementalbarrier\default.frames [NEW] projectiles\unsorted\elementalbarrier\electricbarrier.png [NEW] projectiles\unsorted\elementalbarrier\electricbarrier.projectile [NEW] projectiles\unsorted\elementalbarrier\firebarrier.png [NEW] projectiles\unsorted\elementalbarrier\firebarrier.projectile [NEW] projectiles\unsorted\elementalbarrier\icebarrier.png [NEW] projectiles\unsorted\elementalbarrier\icebarrier.projectile [NEW] projectiles\unsorted\elementalbarrier\poisonbarrier.png [NEW] projectiles\unsorted\elementalbarrier\poisonbarrier.projectile scripts\vec2.lua [NEW] sfx\gun\lance_charge.wav sfx\gun\shotgun5.wav [NEW] sfx\gun\stickyblast1.wav [NEW] sfx\gun\stickyblast2.wav [NEW] sfx\gun\stickyblast3.wav [NEW] sfx\tech\forcefield_loop.wav tech\dash\dash.tech DIFFS ----- items\active\weapons\weapon.lua 27,28c27,28 < self.relativeArmRotation = util.toRadians(stance.armRotation or self.relativeArmRotation or 0) < self.relativeWeaponRotation = util.toRadians(stance.weaponRotation or self.relativeWeaponRotation or 0) --- > self.relativeArmRotation = (stance.armRotation and util.toRadians(stance.armRotation)) or self.relativeArmRotation or 0 > self.relativeWeaponRotation = (stance.weaponRotation and util.toRadians(stance.weaponRotation)) or self.relativeWeaponRotation or 0 85c85,87 < damageConfig.knockback = weapon.knockbackMomentum(damageConfig.knockback) --- > if damageConfig.knockbackDirectional ~= false then > damageConfig.knockback = weapon.knockbackMomentum(damageConfig.knockback) > end items\active\weapons\melee\altabilities\spear\charge\charge.lua 66a67,70 > > if self.attackState == "charge.dash" then > mcontroller.setVelocity({0,0}) > end items\active\weapons\melee\broadsword\broadsword.animation 151c151 < "timeToLive" : 0.25, --- > "timeToLive" : 0, 170c170 < "timeToLive" : 0.25, --- > "timeToLive" : 0, items\active\weapons\melee\hammer\commonhammer.activeitem 12c12 < "inventoryIcon" : "icon.png", // FIXME: icons : / --- > "inventoryIcon" : "icon.png", 36c36,37 < "weaponRotation" : -10 --- > "weaponRotation" : -10, > "weaponOffset" : [-0.125, 0.5] 42a44 > "weaponOffset" : [0, 1.75], 57c59,60 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 2.0] 64c67,68 < "smashTimer" : 1.5 --- > "smashTimer" : 1.5, > "weaponOffset" : [0, 2.0] items\active\weapons\melee\hammer\hammer.animation 8d7 < "windup" : {}, 40,49d38 < "idle" : { < "properties" : { < "offset" : [-0.125, 0.5] < } < }, < "windup" : { < "properties" : { < "offset" : [0, 1.75] < } < }, 52d40 < "offset" : [0, 2.0], 63c51 < "offset" : [0, 1.875], --- > "offset" : [0, 0], 69,78d56 < "idle" : { < "properties" : { < "offset" : [-0.125, 0.5] < } < }, < "windup" : { < "properties" : { < "offset" : [0, 1.75] < } < }, 81d58 < "offset" : [0, 2.0], 92c69 < "offset" : [0, 1.5], --- > "offset" : [-2.0, 1.5], 195c172 < "position" : [1.25, 3.25], --- > "position" : [1.0, 0.75], items\active\weapons\melee\hammer\hammer.lua 103d102 < animator.setAnimationState("weapon", "windup") 108c107 < animator.setAnimationState("weapon", "windup") --- > weapon.setStance(self.stances.windup) items\active\weapons\melee\hammer\rarehammer.activeitem 12c12 < "inventoryIcon" : "icon.png", // FIXME: icons : / --- > "inventoryIcon" : "icon.png", 46c46,47 < "weaponRotation" : -10 --- > "weaponRotation" : -10, > "weaponOffset" : [-0.125, 0.5] 52a54 > "weaponOffset" : [0, 1.75], 67c69,70 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 2.0] 74c77,78 < "smashTimer" : 1.5 --- > "smashTimer" : 1.5, > "weaponOffset" : [0, 2.0] items\active\weapons\melee\hammer\uncommonhammer.activeitem 12c12 < "inventoryIcon" : "icon.png", // FIXME: icons : / --- > "inventoryIcon" : "icon.png", 40c40,41 < "weaponRotation" : -10 --- > "weaponRotation" : -10, > "weaponOffset" : [-0.125, 0.5] 46a48 > "weaponOffset" : [0, 1.75], 61c63,64 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 2.0] 68c71,72 < "smashTimer" : 1.5 --- > "smashTimer" : 1.5, > "weaponOffset" : [0, 2.0] items\active\weapons\melee\spear\commonspear.activeitem 38c38,40 < "twoHanded" : false --- > "weaponRotation" : 0, > "twoHanded" : false, > "weaponOffset" : [0, 0.5] 44c46,47 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 0.5] 51c54 < "weaponOffset" : [0, 2.0] --- > "weaponOffset" : [0, 2.5] 57c60 < "weaponOffset" : [0, 1.5] --- > "weaponOffset" : [0, 2.0] 63c66,67 < "twoHanded" : false --- > "twoHanded" : false, > "weaponOffset" : [0, 0.5] 84c88,89 < "/items/active/weapons/melee/altabilities/spear/charge/charge.altability" --- > "/items/active/weapons/melee/altabilities/spear/charge/charge.altability", > "/items/active/weapons/melee/altabilities/spear/spin/spin.altability" items\active\weapons\melee\spear\rarespear.activeitem 45c45,47 < "twoHanded" : false --- > "weaponRotation" : 0, > "twoHanded" : false, > "weaponOffset" : [0, 0.5] 51c53,54 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 0.5] 58c61 < "weaponOffset" : [0, 2.0] --- > "weaponOffset" : [0, 2.5] 64c67 < "weaponOffset" : [0, 1.5] --- > "weaponOffset" : [0, 2.0] 70c73,74 < "twoHanded" : false --- > "twoHanded" : false, > "weaponOffset" : [0, 0.5] 96c100,101 < "/items/active/weapons/melee/altabilities/generic/blinkexplosion/blinkexplosion.altability" --- > //"/items/active/weapons/melee/altabilities/generic/blinkexplosion/blinkexplosion.altability", > "/items/active/weapons/melee/altabilities/spear/barrier/barrier.altability" items\active\weapons\melee\spear\spear.animation 35c35 < "offset" : [0, 0.5], --- > "offset" : [0.0, 0.0], 62c62 < "offset" : [0, 0.5], --- > "offset" : [0.0, 0.0], items\active\weapons\melee\spear\spear.lua 39d38 < 66a66,69 > end > > function uninit() > weapon.uninit() items\active\weapons\melee\spear\uncommonspear.activeitem 39c39,41 < "twoHanded" : false --- > "weaponRotation" : 0, > "twoHanded" : false, > "weaponOffset" : [0, 0.5] 45c47,48 < "twoHanded" : true --- > "twoHanded" : true, > "weaponOffset" : [0, 0.5] 52c55 < "weaponOffset" : [0, 2.0] --- > "weaponOffset" : [0, 2.5] 58c61 < "weaponOffset" : [0, 1.5] --- > "weaponOffset" : [0, 2.0] 64c67,68 < "twoHanded" : false --- > "twoHanded" : false, > "weaponOffset" : [0, 0.5] items\active\weapons\ranged\altabilities\bouncingshot\bouncingshot.altability 21c21 < "altFire" : [ "/sfx/gun/ar_bounce.wav" ] --- > "altFire" : [ "/sfx/gun/shotgun5.wav" ] items\active\weapons\ranged\altabilities\guidedrocket\guidedrocket.altability 19c19 < "altFire" : [ "/sfx/gun/grenade2.wav" ] --- > "altFire" : [ "/sfx/gun/rocket_shot.wav" ] items\active\weapons\ranged\altabilities\lance\lance.altability 17c17 < "immediateSound" : "/sfx/tech/tech_doublejump.wav" --- > "immediateSound" : "/sfx/gun/lance_charge.wav" 113c113 < "lanceFire" : [ "/sfx/tech/tech_blink1.wav" ] --- > "lanceFire" : [ "/sfx/gun/plasma_sniper4.wav" ] items\active\weapons\ranged\altabilities\piercingshot\piercingshot.altability 21c21 < "altFire" : [ "/sfx/gun/plasma_sniper1.wav" ] --- > "altFire" : [ "/sfx/gun/shotgun5.wav" ] items\active\weapons\ranged\rocketlauncher\rarerocketlauncher.activeitem 43c43 < "fire" : [ "/sfx/gun/rocket_shot.wav" ] --- > "fire" : [ "/sfx/gun/plasma_sniper4.wav" ] projectiles\explosions\regularexplosion2\electricexplosionfreeze.projectile 14a15 > "bounces" : -1, projectiles\explosions\regularexplosion2\fireexplosionfreeze.projectile 14a15 > "bounces" : -1, projectiles\explosions\regularexplosion2\iceexplosionfreeze.projectile 14a15 > "bounces" : -1, projectiles\explosions\regularexplosion2\poisonexplosionfreeze.projectile 14a15 > "bounces" : -1, projectiles\explosions\regularexplosion2\regularexplosion2.projectile 9a10 > "bounces" : -1, projectiles\explosions\regularexplosion2\regularexplosionfreeze.projectile 14a15 > "bounces" : -1, projectiles\explosions\vsmallregularexplosion\vsmallregularexplosion.projectile 9a10 > "bounces" : -1, scripts\vec2.lua 98a99,102 > > function vec2.dot(vector1, vector2) > return vector1[1] * vector2[1] + vector1[2] * vector2[2] > end \ No newline at end of file tech\dash\dash.tech 14c14,15 < "stopAfterDash" : false --- > "stopAfterDash" : true, > "groundOnly" : true