diff --git a/items/active/weapons/ranged/unique/blistergun.activeitem b/items/active/weapons/ranged/unique/blistergun.activeitem index 3a9e568067..25dc7181f0 100644 --- a/items/active/weapons/ranged/unique/blistergun.activeitem +++ b/items/active/weapons/ranged/unique/blistergun.activeitem @@ -1,120 +1,120 @@ { - "itemName" : "blistergun", - "price" : 160, - "inventoryIcon" : "blistergun.png", - "maxStack" : 1, - "rarity" : "uncommon", - "description" : "Fires repulsive glowy goo-globs. + "itemName" : "blistergun", + "price" : 160, + "inventoryIcon" : "blistergun.png", + "maxStack" : 1, + "rarity" : "uncommon", + "description" : "Fires repulsive glowy goo-globs. ^green;Targets glow ^yellow;+Pus effect^reset;", - "shortdescription" : "Blister Gun", - "category" : "bioweapon", - "level" : 3, - "tooltipKind" : "gun2", - "weaponType" : "Grenade Launcher", - "itemTags" : ["weapon","ranged","grenadelauncher","bioweapon","blister", "upgradeableWeapon"], - "twoHanded" : true, + "shortdescription" : "Blister Gun", + "category" : "bioweapon", + "level" : 3, + "tooltipKind" : "gun2", + "weaponType" : "Grenade Launcher", + "itemTags" : ["weapon","ranged","grenadelauncher","bioweapon","blister", "upgradeableWeapon"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/unique/fugun.animation", - "animationParts" : { - "butt" : "", - "middle" : "blistergun.png", - "middlefullbright" : "blistergunfullbright.png", - "barrel" : "", - "muzzleFlash" : "/animations/muzzleflash/purplemuzzle.png" - }, - "animationCustom" : { - "animatedParts" : { - "parts" : { - "middlefullbright" : { - "properties" : { - "offset" : [1.5, 0.0] - } + "animation" : "/items/active/weapons/ranged/unique/fugun.animation", + "animationParts" : { + "butt" : "", + "middle" : "blistergun.png", + "middlefullbright" : "blistergunfullbright.png", + "barrel" : "", + "muzzleFlash" : "/animations/muzzleflash/purplemuzzle.png" + }, + "animationCustom" : { + "animatedParts" : { + "parts" : { + "middlefullbright" : { + "properties" : { + "offset" : [1.5, 0.0] + } } - } - }, - "sounds" : { - "fire" : [ "/sfx/projectiles/goo_spit2.ogg" ] - }, - "lights" : { "glow" : { - "active" : true, - "position" : [0.75, 0.5], - "color" : [108, 24, 76], - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1, - "flickerPeriodVariance" : 0.075, - "flickerIntensityVariance" : 0.025 - }} - }, + } + }, + "sounds" : { + "fire" : [ "/sfx/projectiles/goo_spit2.ogg" ] + }, + "lights" : { "glow" : { + "active" : true, + "position" : [0.75, 0.5], + "color" : [108, 24, 76], + "flickerPeriod" : 0.3, + "flickerMinIntensity" : 0.95, + "flickerMaxIntensity" : 1, + "flickerPeriodVariance" : 0.075, + "flickerIntensityVariance" : 0.025 + }} + }, - "baseOffset" : [1.5, 0.0], - "muzzleOffset" : [1.645, 0.125], + "baseOffset" : [1.5, 0.0], + "muzzleOffset" : [1.645, 0.125], - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "bioweapon", + "elementalType" : "bioweapon", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 1.0, - "baseDps" : 5, - "energyUsage" : 21.0, - "inaccuracy" : 0.008, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 1.0, + "baseDps" : 5, + "energyUsage" : 21.0, + "inaccuracy" : 0.008, - "projectileCount" : 1, - "fireType" : "auto", + "projectileCount" : 1, + "fireType" : "auto", - "projectileType" : "blistergunshot", - "projectileParameters" : { - "speed" : 50, - "bounces" : 1, - "knockback" : 10, - "statusEffects" : [ "weakpoison" ] - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + //moved status effects to the explosion, not hte projectile. + "projectileType" : "blistergunshot", + "projectileParameters" : { + "speed" : 50, + "bounces" : 1, + "knockback" : 10 + }, + "stances" : { + "idle" : { + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : true, - "allowRotate" : true, - "allowFlip" : true - }, - "fire" : { - "duration" : 0, - "armRotation" : 5, - "weaponRotation" : 5, - "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire" : { + "duration" : 0, + "armRotation" : 5, + "weaponRotation" : 5, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - }, - "cooldown" : { - "duration" : 0.075, - "armRotation" : 5, - "weaponRotation" : 5, - "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : false + }, + "cooldown" : { + "duration" : 0.075, + "armRotation" : 5, + "weaponRotation" : 5, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - } - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, - "critChance" : 5, - "critBonus" : 3, - "isAmmoBased" : 1, - "magazineSize" : 12, - "reloadTime" : 1, + "critChance" : 5, + "critBonus" : 3, + "isAmmoBased" : 1, + "magazineSize" : 12, + "reloadTime" : 1, - "altAbilityType" : "blisteraltshot", - "altAbility" : { - "isAmmoBased" : 1, - "magazineSize" : 2, - "reloadTime" : 1 - }, - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "altAbilityType" : "blisteraltshot", + "altAbility" : { + "isAmmoBased" : 1, + "magazineSize" : 2, + "reloadTime" : 1 + }, + "builder" : "/items/buildscripts/buildunrandweapon.lua" } diff --git a/items/active/weapons/ranged/unique/blisterpistol.activeitem b/items/active/weapons/ranged/unique/blisterpistol.activeitem index 7901d72e66..7cf3ba1939 100644 --- a/items/active/weapons/ranged/unique/blisterpistol.activeitem +++ b/items/active/weapons/ranged/unique/blisterpistol.activeitem @@ -1,111 +1,110 @@ { - "itemName" : "blisterpistol", - "price" : 80, - "inventoryIcon" : "blisterpistol.png", - "maxStack" : 1, - "rarity" : "uncommon", - "shortdescription" : "Blister Pistol", - "description" : "Fires repulsive glowy goo-globs. + "itemName" : "blisterpistol", + "price" : 80, + "inventoryIcon" : "blisterpistol.png", + "maxStack" : 1, + "rarity" : "uncommon", + "shortdescription" : "Blister Pistol", + "description" : "Fires repulsive glowy goo-globs. ^green;Targets glow ^yellow;+Pus effect^reset;", - "level" : 3, - "category" : "bioweapon", - "itemTags" : ["weapon","ranged","machinepistol","bioweapon","blister", "upgradeableWeapon"], - "tooltipKind" : "gun2", - "twoHanded" : false, - "weaponType" : "Bioweapon", - // "learnBlueprintsOnPickup" : [ "blistergun" ], + "level" : 3, + "category" : "bioweapon", + "itemTags" : ["weapon","ranged","machinepistol","bioweapon","blister", "upgradeableWeapon"], + "tooltipKind" : "gun2", + "twoHanded" : false, + "weaponType" : "Bioweapon", +// "learnBlueprintsOnPickup" : [ "blistergun" ], - "animation" : "/items/active/weapons/ranged/unique/fugun.animation", - "animationParts" : { - "butt" : "", - "middle" : "blisterpistol.png", - "middlefullbright" : "blisterpistolfullbright.png", - "barrel" : "", - "muzzleFlash" : "/animations/muzzleflash/purplemuzzle.png" - }, + "animation" : "/items/active/weapons/ranged/unique/fugun.animation", + "animationParts" : { + "butt" : "", + "middle" : "blisterpistol.png", + "middlefullbright" : "blisterpistolfullbright.png", + "barrel" : "", + "muzzleFlash" : "/animations/muzzleflash/purplemuzzle.png" + }, - "animationCustom" : { - "animatedParts" : { - "parts" : { - "middlefullbright" : { - "properties" : { + "animationCustom" : { + "animatedParts" : { + "parts" : { + "middlefullbright" : { + "properties" : { //Same as BaseOffset - "offset" : [0.7, 0.2] - } + "offset" : [0.7, 0.2] + } } - } - }, - "sounds" : { "fire" : [ "/sfx/projectiles/goo_spit2.ogg" ] }, - "lights" : { "glow" : { - "active" : true, - "position" : [0.75, 0.5], - "color" : [108, 24, 76], - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1, - "flickerPeriodVariance" : 0.075, - "flickerIntensityVariance" : 0.025 - }} - }, + } + }, + "sounds" : { "fire" : [ "/sfx/projectiles/goo_spit2.ogg" ] }, + "lights" : { "glow" : { + "active" : true, + "position" : [0.75, 0.5], + "color" : [108, 24, 76], + "flickerPeriod" : 0.3, + "flickerMinIntensity" : 0.95, + "flickerMaxIntensity" : 1, + "flickerPeriodVariance" : 0.075, + "flickerIntensityVariance" : 0.025 + }} + }, - "baseOffset" : [0.7, 0.2], - "muzzleOffset" : [1.5, 0.125], + "baseOffset" : [0.7, 0.2], + "muzzleOffset" : [1.5, 0.125], - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "bioweapon", + "elementalType" : "bioweapon", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 0.782, - "baseDps" : 5.3, - "energyUsage" : 22, - "fireType" : "auto", - "inaccuracy" : 0.001, - "projectileCount" : 1, - "projectileType" : "blisterpistolshot", - "projectileParameters" : { - "speed" : 32, - "statusEffects" : [ "weakpoison" ] - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : false, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 0.782, + "baseDps" : 5.3, + "energyUsage" : 22, + "fireType" : "auto", + "inaccuracy" : 0.001, + "projectileCount" : 1, + "projectileType" : "blisterpistolshot", + "projectileParameters" : { + "speed" : 32 + }, + "stances" : { + "idle" : { + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : false, - "allowRotate" : true, - "allowFlip" : true - }, - "fire" : { - "duration" : 0, - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : false, + "allowRotate" : true, + "allowFlip" : true + }, + "fire" : { + "duration" : 0, + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : false, - "allowRotate" : false, - "allowFlip" : false - }, - "cooldown" : { - "duration" : 0.0, - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : false, + "allowRotate" : false, + "allowFlip" : false + }, + "cooldown" : { + "duration" : 0.0, + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : false, - "allowRotate" : false, - "allowFlip" : false - } - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, - "critChance" : 5, - "critBonus" : 3, - "isAmmoBased" : 1, - "magazineSize" : 12, - "reloadTime" : 1, + "critChance" : 5, + "critBonus" : 3, + "isAmmoBased" : 1, + "magazineSize" : 12, + "reloadTime" : 1, - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "builder" : "/items/buildscripts/buildunrandweapon.lua" } diff --git a/projectiles/explosions/blistergunexplosion/blistergunexplosion.config b/projectiles/explosions/blistergunexplosion/blistergunexplosion.config index 57b160bfc0..4165846982 100644 --- a/projectiles/explosions/blistergunexplosion/blistergunexplosion.config +++ b/projectiles/explosions/blistergunexplosion/blistergunexplosion.config @@ -1,36 +1,36 @@ { - "action" : "actions", - "list" : [ - { - "action" : "projectile", - "inheritDamageFactor" : 0, - "type" : "blistergunexplosion" - }, - { - "action" : "projectile", - "inheritDamageFactor" : 0, - "type" : "pusexplosion" - }, - { - "action" : "sound", - "options" : [ "/sfx/projectiles/goo_spit2.ogg" ] - }, - { - "action" : "liquid", - "liquid" : "pus", - "quantity" : 1 - }, - { - "action" : "light", - "color" : "blue" - }, - { - "action" : "explosion", - "foregroundRadius" : 2, - "backgroundRadius" : 0, - "explosiveDamageAmount" : 0.15, - "delaySteps" : 2 - } + "action" : "actions", + "list" : [ + { + "action" : "projectile", + "inheritDamageFactor" : 0, + "type" : "blistergunexplosion" + }, + { + "action" : "projectile", + "inheritDamageFactor" : 0, + "type" : "pusexplosion" + }, + { + "action" : "sound", + "options" : [ "/sfx/projectiles/goo_spit2.ogg" ] + }, + { + "action" : "liquid", + "liquid" : "pus", + "quantity" : 1 + }, + { + "action" : "light", + "color" : "blue" + }, + { + "action" : "explosion", + "foregroundRadius" : 2, + "backgroundRadius" : 0, + "explosiveDamageAmount" : 0.15, + "delaySteps" : 2 + } - ] + ] } diff --git a/projectiles/explosions/blistergunexplosion/blistergunexplosion.projectile b/projectiles/explosions/blistergunexplosion/blistergunexplosion.projectile index 7ffa4b8a9c..b05c0f7838 100644 --- a/projectiles/explosions/blistergunexplosion/blistergunexplosion.projectile +++ b/projectiles/explosions/blistergunexplosion/blistergunexplosion.projectile @@ -1,16 +1,17 @@ { - "projectileName" : "blistergunexplosion", - "image" : "blistergunexplosion.png", - "animationCycle" : 0.2, - "frameNumber" : 4, - "lightColor" : [255, 50, 150], - "speed" : 0, - "power" : 1, - "fullbright" : true, - "damagePoly" : [ [-18, 0], [-12, -12], [0, -18], [12, -12], [18, 0], [12, 12], [0, 18], [-12, 12] ], - "animationLoops" : false, - "piercing" : true, - "flippable" : true, - "universalDamage" : true, - "damageKind" : "default" + "projectileName" : "blistergunexplosion", + "image" : "blistergunexplosion.png", + "animationCycle" : 0.2, + "frameNumber" : 4, + "lightColor" : [255, 50, 150], + "speed" : 0, + "power" : 1, + "fullbright" : true, + "damagePoly" : [ [-18, 0], [-12, -12], [0, -18], [12, -12], [18, 0], [12, 12], [0, 18], [-12, 12] ], + "animationLoops" : false, + "piercing" : true, + "flippable" : true, + "universalDamage" : true, + "statusEffects" : [ "glow", "puseffect","weakpoison" ], + "damageKind" : "bioweaponplasma" } diff --git a/projectiles/guns/blisterguns/blistergunshot.projectile b/projectiles/guns/blisterguns/blistergunshot.projectile index 33de08aae2..ec4ae955de 100644 --- a/projectiles/guns/blisterguns/blistergunshot.projectile +++ b/projectiles/guns/blisterguns/blistergunshot.projectile @@ -1,28 +1,28 @@ { - "projectileName" : "blistergunshot", - "image" : "blistergunshot.png", - "animationCycle" : 0.5, - "level" : 1, - "frameNumber" : 2, - "damageKindImage" : "icon.png", - "physics" : "fublistergun", - "pointLight" : false, - "timeToLive" : 6, - "fullbright" : true, - "bounces" : 24, - "lightColor" : [170, 0, 170], + "projectileName" : "blistergunshot", + "image" : "blistergunshot.png", + "animationCycle" : 0.5, + "level" : 1, + "frameNumber" : 2, + "damageKindImage" : "icon.png", + "physics" : "fublistergun", + "pointLight" : false, + "timeToLive" : 6, + "fullbright" : true, + "bounces" : 24, + "lightColor" : [170, 0, 170], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/blistergunexplosion/blistergunexplosion.config" - } - ], + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/blistergunexplosion/blistergunexplosion.config" + } + ], - "statusEffects" : [ "glow" ], + //"statusEffects" : [ "glow", "puseffect","weakpoison" ], - //"power" : 1, - "damageKind" : "poisonplasma" + //"power" : 1, + "damageKind" : "bioweaponplasma" } diff --git a/projectiles/guns/blisterguns/blisterpistolshot.projectile b/projectiles/guns/blisterguns/blisterpistolshot.projectile index 83339781b6..926b87e885 100644 --- a/projectiles/guns/blisterguns/blisterpistolshot.projectile +++ b/projectiles/guns/blisterguns/blisterpistolshot.projectile @@ -1,28 +1,28 @@ { - "projectileName" : "blisterpistolshot", - "image" : "blisterpistolshot.png", - "animationCycle" : 0.5, - "level" : 1, - "frameNumber" : 2, - "damageKindImage" : "icon.png", - "physics" : "fublistergun", - "pointLight" : false, - "timeToLive" : 3, - "bounces" : 24, - "fullbright" : true, - "lightColor" : [140, 0, 140], + "projectileName" : "blisterpistolshot", + "image" : "blisterpistolshot.png", + "animationCycle" : 0.5, + "level" : 1, + "frameNumber" : 2, + "damageKindImage" : "icon.png", + "physics" : "fublistergun", + "pointLight" : false, + "timeToLive" : 3, + "bounces" : 24, + "fullbright" : true, + "lightColor" : [140, 0, 140], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/blistergunexplosion/blistergunexplosion.config" - } - ], + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/blistergunexplosion/blistergunexplosion.config" + } + ], - "statusEffects" : [ "glow" ], + //"statusEffects" : [ "glow", "puseffect","weakpoison" ], - //"power" : 1, - "damageKind" : "poisonplasma" + //"power" : 1, + "damageKind" : "bioweaponplasma" }