Merge branch 'master' of https://github.com/Nitrosteel/Project-Knight…

…fall
Nitrosteel · Aug 29, 2020 · 61b3ac3 · 61b3ac3
2 parents 90c3cf7 + a76531d
commit 61b3ac3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/items/active/weapons/ranged/abilities/quasarfire/quasarfire.lua b/items/active/weapons/ranged/abilities/quasarfire/quasarfire.lua
@@ -24,6 +24,7 @@ function Quasarfire:init()
     self.weapon:setDamage()
     activeItem.setScriptedAnimationParameter("chains", {})
     animator.setParticleEmitterActive("beamCollision", false)
+    animator.setParticleEmitterActive("muzzleFlash", false)
     animator.stopAllSounds("fireLoop")
     animator.stopAllSounds("fireLoop1")
     self.weapon:setStance(self.stances.idle)
@@ -67,7 +68,7 @@ function Quasarfire:fire()
   animator.setAnimationState("firing", "fire")
   animator.playSound("fireLoop", -1)
   animator.playSound("fireLoop1", -1)
-
+  animator.setParticleEmitterActive("muzzleFlash", true)
 
   local wasColliding = false
   while (self.fireMode == (self.activatingFireMode or self.abilitySlot) and status.overConsumeResource("energy", (self.energyUsage or 0) * self.dt) and not world.lineTileCollision(mcontroller.position(), self:firePosition())) do
@@ -199,6 +200,7 @@ function Quasarfire:reset()
   activeItem.setScriptedAnimationParameter("chains", {})
   animator.setParticleEmitterActive("beamCollision", false)
   animator.setParticleEmitterActive("beamParticles", false)
+  animator.setParticleEmitterActive("muzzleFlash", false)
   animator.stopAllSounds("fireStart")
   animator.stopAllSounds("fireLoop")
   animator.stopAllSounds("fireLoop1")

diff --git a/...ive/weapons/ranged/blackholetech/knightfall_riftburster/knightfall_riftburster.activeitem b/...ive/weapons/ranged/blackholetech/knightfall_riftburster/knightfall_riftburster.activeitem
@@ -34,7 +34,7 @@
 		}
 	},
 
-	"baseOffset": [2.1875, 0.6],
+	"baseOffset": [2.4375, 0.725],
 	"muzzleOffset": [2, 0],
 
 	"cursor" : "/cursors/knightfall_crosshair_blackholetech.cursor",

diff --git a/...tive/weapons/ranged/blackholetech/knightfall_riftburster/knightfall_riftburster.animation b/...tive/weapons/ranged/blackholetech/knightfall_riftburster/knightfall_riftburster.animation
@@ -53,7 +53,7 @@
 				"properties": {
 					"centered": true,
 					"image": "<partImage><paletteSwaps>",
-					"offset": [2.1875, 0.6], // x offset is set dynamically
+					"offset": [2.4375, 0.725], // x offset is set dynamically
 					"transformationGroups": ["weapon"]
 				},
 				"partStates": {
@@ -103,7 +103,7 @@
 					"centered": true,
 					"fullbright": true,
 					"image": "<partImage><paletteSwaps>",
-					"offset": [2.1875, 0.6], // x offset is set dynamically
+					"offset": [2.4375, 0.725], // x offset is set dynamically
 					"transformationGroups": ["weapon"]
 				},
 				"partStates": {
@@ -152,7 +152,7 @@
 					"zLevel": 2,
 					"centered": true,
 					"image": "<partImage><paletteSwaps>",
-					"offset": [2.1875, 0.6], // x offset is set dynamically
+					"offset": [2.4375, 0.725], // x offset is set dynamically
 					"transformationGroups": ["weapon"]
 				},
 				"partStates": {
@@ -200,7 +200,7 @@
 				"properties": {
 					"zLevel": 3,
 					"centered": true,
-					"offset": [2.1875, 0.6],
+					"offset": [2.4375, 0.725],
 					"fullbright": true,
 					"transformationGroups": ["weapon"]
 				},