From b9bb7ee1b3135b2d3400b575911b2d1433ec7b59 Mon Sep 17 00:00:00 2001 From: Kherae Date: Tue, 9 Jul 2024 17:39:38 -0700 Subject: [PATCH 01/10] warden/k3 element fix --- .../weapons/ranged/unique/k3rifle.activeitem | 230 +++++++++--------- .../ranged/unique/warden/warden.activeitem | 3 +- 2 files changed, 117 insertions(+), 116 deletions(-) diff --git a/items/active/weapons/ranged/unique/k3rifle.activeitem b/items/active/weapons/ranged/unique/k3rifle.activeitem index a29d8dc5c7a..81a93b3c9c6 100644 --- a/items/active/weapons/ranged/unique/k3rifle.activeitem +++ b/items/active/weapons/ranged/unique/k3rifle.activeitem @@ -1,135 +1,135 @@ { - "itemName" : "k3rifle", - "price" : 160, - "inventoryIcon" : "k3rifle.png", - "maxStack" : 1, - "rarity" : "uncommon", - "description" : "Made with that second shot in mind. Sporting. + "itemName" : "k3rifle", + "price" : 160, + "inventoryIcon" : "k3rifle.png", + "maxStack" : 1, + "rarity" : "uncommon", + "description" : "Made with that second shot in mind. Sporting. ^yellow;Burst fire^reset;", - "shortdescription" : "K3 Double-Tap", - "category" : "assaultRifle", - "level" : 3, - "tooltipKind" : "gun2", - "weaponType" : "Energy", - "itemTags" : ["weapon","ranged","assaultrifle", "upgradeableWeapon","zerchesium"], - "twoHanded" : true, + "shortdescription" : "K3 Double-Tap", + "category" : "assaultRifle", + "level" : 3, + "tooltipKind" : "gun2", + "weaponType" : "Energy", + "itemTags" : ["weapon","ranged","assaultrifle", "upgradeableWeapon","zerchesium"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "k3rifle.png", - "barrel" : "", - "muzzleFlash" : "/animations/muzzleflash/fuplasmamuzzle3blue.png" - }, - "animationCustom" : { - "particleEmitters" : { - "muzzleFlash" : { - "particles" : [ - { "particle" : "fushellcasing", "offset" : [-3.0, 0.0] } - ] - } - }, - "sounds" : { - "fire" : [ "/sfx/weapons/k3.ogg" ] - } - }, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "k3rifle.png", + "barrel" : "", + "muzzleFlash" : "/animations/muzzleflash/fuplasmamuzzle3blue.png" + }, + "animationCustom" : { + "particleEmitters" : { + "muzzleFlash" : { + "particles" : [ + { "particle" : "fushellcasing", "offset" : [-3.0, 0.0] } + ] + } + }, + "sounds" : { + "fire" : [ "/sfx/weapons/k3.ogg" ] + } + }, - "baseOffset" : [0.78, -0.12], - "muzzleOffset" : [2.445, 0.725], + "baseOffset" : [0.78, -0.12], + "muzzleOffset" : [2.445, 0.725], - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "radioactive", + "elementalType" : "radioactive", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 0.22, - "baseDps" : 8.55, - "energyUsage" : 24, - "inaccuracy" : 0.032, - "burstTime" : 0.075, - "burstCount" : 2, - "projectileCount" : 1, - "fireType" : "burst", + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 0.22, + "baseDps" : 8.55, + "energyUsage" : 24, + "inaccuracy" : 0.032, + "burstTime" : 0.075, + "burstCount" : 2, + "projectileCount" : 1, + "fireType" : "burst", - "projectileType" : "bullet-3", - "projectileParameters" : { - "speed" : 80, - "knockback" : 2, - "damageSourceKind" : "radioactive" - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "projectileType" : "bullet-3", + "projectileParameters" : { + "speed" : 80, + "knockback" : 2, + "damageKind" : "radioactive" + }, + "stances" : { + "idle" : { + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : true, - "allowRotate" : true, - "allowFlip" : true - }, - "fire" : { - "duration" : 0, - "armRotation" : 1, - "weaponRotation" : 1, - "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire" : { + "duration" : 0, + "armRotation" : 1, + "weaponRotation" : 1, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - }, - "cooldown" : { - "duration" : 0.075, - "armRotation" : 1, - "weaponRotation" : 1, - "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : false + }, + "cooldown" : { + "duration" : 0.075, + "armRotation" : 1, + "weaponRotation" : 1, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - } - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, - "critChance" : 4, - "critBonus" : 4, - "isAmmoBased" : 1, - "magazineSize" : 12, - "reloadTime" : 1.25, - //recoil - "hasRecoil" : 1, - "recoilSpeed" : 200, - "recoilForce" : 400, + "critChance" : 4, + "critBonus" : 4, + "isAmmoBased" : 1, + "magazineSize" : 12, + "reloadTime" : 1.25, + //recoil + "hasRecoil" : 1, + "recoilSpeed" : 200, + "recoilForce" : 400, - "altAbilityType" : "flashlight", + "altAbilityType" : "flashlight", - "builder" : "/items/buildscripts/buildunrandweapon.lua", + "builder" : "/items/buildscripts/buildunrandweapon.lua", - "upgradeParameters" : { - "shortdescription" : "^cyan;S7 Triple-Tap^reset; ^yellow;^reset;", - "description" : "Why stop at a double tap? Make extra sure! + "upgradeParameters" : { + "shortdescription" : "^cyan;S7 Triple-Tap^reset; ^yellow;^reset;", + "description" : "Why stop at a double tap? Make extra sure! ^yellow;More bursty^reset; ^cyan;Burst fire^reset;", - "animationParts" : { - "middle" : "k3rifle2.png" - }, - "magazineSize" : 16, - "reloadTime" : 1.15, - "inventoryIcon" : [ { "image" : "k3rifle2.png" } ], - "primaryAbility" : { - "fireTime" : 0.18, - "baseDps" : 9, - "energyUsage" : 27, - "inaccuracy" : 0.032, - "burstTime" : 0.070, - "burstCount" : 3, - "projectileCount" : 1, - "fireType" : "burst", + "animationParts" : { + "middle" : "k3rifle2.png" + }, + "magazineSize" : 16, + "reloadTime" : 1.15, + "inventoryIcon" : [ { "image" : "k3rifle2.png" } ], + "primaryAbility" : { + "fireTime" : 0.18, + "baseDps" : 9, + "energyUsage" : 27, + "inaccuracy" : 0.032, + "burstTime" : 0.070, + "burstCount" : 3, + "projectileCount" : 1, + "fireType" : "burst", - "projectileType" : "bullet-3", - "projectileParameters" : { - "speed" : 90, - "knockback" : 5 - } - } - } + "projectileType" : "bullet-3", + "projectileParameters" : { + "speed" : 90, + "knockback" : 5 + } + } + } } diff --git a/items/active/weapons/ranged/unique/warden/warden.activeitem b/items/active/weapons/ranged/unique/warden/warden.activeitem index bfb88f53b0e..0e1d735051c 100644 --- a/items/active/weapons/ranged/unique/warden/warden.activeitem +++ b/items/active/weapons/ranged/unique/warden/warden.activeitem @@ -85,7 +85,8 @@ "projectileType": "brainbullet2", "projectileCount": 1, "projectileParameters": { - "knockback": 3.5 + "knockback": 3.5, + "damageKind":"radioactive" }, "stances": { "idle": { From 4a323d641da822c3ef3d3f64a24dc3760b275588 Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 09:18:20 -0700 Subject: [PATCH 02/10] missing element --- .../ranged/unique/pistolirradiumfu.activeitem | 153 +++++++++--------- 1 file changed, 77 insertions(+), 76 deletions(-) diff --git a/items/active/weapons/ranged/unique/pistolirradiumfu.activeitem b/items/active/weapons/ranged/unique/pistolirradiumfu.activeitem index c522c03cc81..edadc496756 100644 --- a/items/active/weapons/ranged/unique/pistolirradiumfu.activeitem +++ b/items/active/weapons/ranged/unique/pistolirradiumfu.activeitem @@ -1,87 +1,88 @@ { - "itemName" : "pistolirradiumfu", - "price" : 400, - "inventoryIcon" : "pistolirradiumfu.png", - "maxStack" : 1, - "rarity" : "rare", - "description" : "Fires high-caliber rounds. + "itemName" : "pistolirradiumfu", + "price" : 400, + "inventoryIcon" : "pistolirradiumfu.png", + "maxStack" : 1, + "rarity" : "rare", + "description" : "Fires high-caliber rounds. ^yellow;High damage rounds.^reset;", - "shortdescription" : "Irradium Revolver", - "level" : 5, - "category" : "pistol", - "itemTags" : ["weapon","ranged","pistol","irradium","upgradeableWeapon","radioactive"], - "tooltipKind" : "gun2", - "twoHanded" : false, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "pistolirradiumfu.png", - "barrel" : "", - "muzzleFlash" : "/items/active/weapons/ranged/muzzleflash.png" - }, - "animationCustom" : { - "sounds" : { "fire" : [ "/sfx/gun/pistol4.ogg" ] }, - "lights" : { "muzzleFlash" : {"color" : [55, 55, 55] } } - }, + "shortdescription" : "Irradium Revolver", + "level" : 5, + "category" : "pistol", + "itemTags" : ["weapon","ranged","pistol","irradium","upgradeableWeapon","radioactive"], + "tooltipKind" : "gun2", + "twoHanded" : false, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "pistolirradiumfu.png", + "barrel" : "", + "muzzleFlash" : "/items/active/weapons/ranged/muzzleflash.png" + }, + "animationCustom" : { + "sounds" : { "fire" : [ "/sfx/gun/pistol4.ogg" ] }, + "lights" : { "muzzleFlash" : {"color" : [55, 55, 55] } } + }, - "baseOffset" : [0.4, 0.54], - "muzzleOffset" : [1.2, -0.1], + "baseOffset" : [0.4, 0.54], + "muzzleOffset" : [1.2, -0.1], - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "radioactive", + "elementalType" : "radioactive", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 1.05, - "baseDps" : 6.3, - "energyUsage" : 5, - "fireType" : "auto", - "inaccuracy" : 0.001, - "projectileCount" : 1, - "projectileType" : "bullet-4", - "projectileParameters" : { - "speed" : 64 - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : false, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 1.05, + "baseDps" : 6.3, + "energyUsage" : 5, + "fireType" : "auto", + "inaccuracy" : 0.001, + "projectileCount" : 1, + "projectileType" : "bullet-4", + "projectileParameters" : { + "speed" : 64, + "damageKind": "radioactive" + }, + "stances" : { + "idle" : { + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : false, - "allowRotate" : true, - "allowFlip" : true - }, - "fire" : { - "duration" : 0.05, - "armRotation" : 3, - "weaponRotation" : 3, - "twoHanded" : false, + "allowRotate" : true, + "allowFlip" : true + }, + "fire" : { + "duration" : 0.05, + "armRotation" : 3, + "weaponRotation" : 3, + "twoHanded" : false, - "allowRotate" : false, - "allowFlip" : false - }, - "cooldown" : { - "duration" : 0.05, - "armRotation" : 3, - "weaponRotation" : 3, - "twoHanded" : false, + "allowRotate" : false, + "allowFlip" : false + }, + "cooldown" : { + "duration" : 0.05, + "armRotation" : 3, + "weaponRotation" : 3, + "twoHanded" : false, - "allowRotate" : false, - "allowFlip" : false - } - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, - "critChance" : 3, - "critBonus" : 5, - "isAmmoBased" : 1, - "magazineSize" : 6, - "reloadTime" : 1.2, - //recoil - "hasRecoil" : 1, - "recoilSpeed" : 200, - "recoilForce" : 300, - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "critChance" : 3, + "critBonus" : 5, + "isAmmoBased" : 1, + "magazineSize" : 6, + "reloadTime" : 1.2, + //recoil + "hasRecoil" : 1, + "recoilSpeed" : 200, + "recoilForce" : 300, + "builder" : "/items/buildscripts/buildunrandweapon.lua" } From 5048bccc80c9d35f11e25b207f15abb1a055f54d Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 09:31:19 -0700 Subject: [PATCH 03/10] shroomgun do poison. and sporgus3. --- .../ranged/unique/mushroomgun.activeitem | 173 ++++---- .../sporgusish/sporgus3/sporgus3.monstertype | 414 +++++++++--------- .../floatyshroom/floatyshroom.projectile | 177 ++++---- .../shroomshard/shroomshard.projectile | 26 +- 4 files changed, 396 insertions(+), 394 deletions(-) diff --git a/items/active/weapons/ranged/unique/mushroomgun.activeitem b/items/active/weapons/ranged/unique/mushroomgun.activeitem index 6b859db0590..e2da1bc1c38 100644 --- a/items/active/weapons/ranged/unique/mushroomgun.activeitem +++ b/items/active/weapons/ranged/unique/mushroomgun.activeitem @@ -1,102 +1,103 @@ { - "itemName" : "mushroomgun", - "price" : 160, - "inventoryIcon" : "mushroomgun.png", - "maxStack" : 1, - "rarity" : "uncommon", - "description" : "Tiny little explosive buddies spew out of this thing. + "itemName" : "mushroomgun", + "price" : 160, + "inventoryIcon" : "mushroomgun.png", + "maxStack" : 1, + "rarity" : "uncommon", + "description" : "Tiny little explosive buddies spew out of this thing. ^yellow;Area-Damage weapon, ^cyan;Floran^reset;^reset;", - "shortdescription" : "Fungal Gun", - "category" : "bioweapon", - "level" : 3, - "tooltipKind" : "gun2", - "weaponType" : "Grenade Launcher", - "itemTags" : ["weapon","ranged","grenadelauncher", "bioweapon", "floran", "upgradeableWeapon"], - "twoHanded" : true, + "shortdescription" : "Fungal Gun", + "category" : "bioweapon", + "level" : 3, + "tooltipKind" : "gun2", + "weaponType" : "Grenade Launcher", + "itemTags" : ["weapon","ranged","grenadelauncher", "bioweapon", "floran", "upgradeableWeapon"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "mushroomgun.png", - "barrel" : "", - "muzzleFlash" : "/items/active/weapons/ranged/muzzleflash.png" - }, - "animationCustom" : { - "sounds" : { - "fire" : [ "/sfx/gun/pumpgun_blast2.ogg" ] - } - }, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "mushroomgun.png", + "barrel" : "", + "muzzleFlash" : "/items/active/weapons/ranged/muzzleflash.png" + }, + "animationCustom" : { + "sounds" : { + "fire" : [ "/sfx/gun/pumpgun_blast2.ogg" ] + } + }, - "baseOffset" : [0.8, 0.2], - "muzzleOffset" : [1.645, 0.125], - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "baseOffset" : [0.8, 0.2], + "muzzleOffset" : [1.645, 0.125], + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "bioweapon", + "elementalType" : "bioweapon", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 0.35, - "baseDps" : 5.8, - "energyUsage" : 21.30, - "inaccuracy" : 0.1, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 0.35, + "baseDps" : 5.8, + "energyUsage" : 21.30, + "inaccuracy" : 0.1, - "projectileCount" : 1, - "fireType" : "auto", + "projectileCount" : 1, + "fireType" : "auto", - "projectileType" : "floatyshroom", - "projectileParameters" : { - "speed" : 50, - "knockback" : 4, - "statusEffects" : [ "weakpoison" ] - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "projectileType" : "floatyshroom", + "projectileParameters" : { + "speed" : 50, + "knockback" : 4, + "damageKind": "bioweapon", + "statusEffects" : [ "weakpoison" ] + }, + "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 - } - } - }, - "particleEmitters" : { - "muzzleFlash" : { - "particles" : [ - { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] }, - { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] }, - { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] } - ] - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, + "particleEmitters" : { + "muzzleFlash" : { + "particles" : [ + { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] }, + { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] }, + { "particle" : "fastrisingpoison1", "offset" : [0.0, 0.0] } + ] + } + }, - "critChance" : 6, - "critBonus" : 2, - "isAmmoBased" : 1, - "magazineSize" : 24, - "reloadTime" : 1.4, + "critChance" : 6, + "critBonus" : 2, + "isAmmoBased" : 1, + "magazineSize" : 24, + "reloadTime" : 1.4, - "altAbilityType" : "mushroomgrenadelauncher", + "altAbilityType" : "mushroomgrenadelauncher", - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "builder" : "/items/buildscripts/buildunrandweapon.lua" } diff --git a/monsters/walkers/sporgusish/sporgus3/sporgus3.monstertype b/monsters/walkers/sporgusish/sporgus3/sporgus3.monstertype index 0224f8266ac..f681497df21 100644 --- a/monsters/walkers/sporgusish/sporgus3/sporgus3.monstertype +++ b/monsters/walkers/sporgusish/sporgus3/sporgus3.monstertype @@ -1,209 +1,209 @@ { - "type" : "sporgus3", - "shortdescription" : "Nikaw", - "description" : "A nasty fungal mutation that just can't stop spewing explosive spores.", - - "categories" : [ "sporgus3" ], - "parts" : [ "body" ], - - "animation" : "sporgus3.animation", - - "dropPools" : [ - { - "default" : "sporgus2Treasure", - "bow" : "sporgusHunting", - "firebow" : "sporgusHunting", - "icebow" : "sporgusHunting", - "poisonbow" : "sporgusHunting", - "electricbow" : "sporgusHunting", - "cosmicbow" : "sporgusHunting", - "radioactivebow" : "sporgusHunting", - "shadowbow" : "sporgusHunting" - } - ], - - "baseParameters" : { - "scripts" : [ - "/monsters/monster.lua" - ], - - "behavior" : "monster", - - "behaviorConfig" : { - "damageOnTouch" : true, - - "targetQueryRange" : 20, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 50, - "targetOutOfSightTime" : 2.5, - - "foundTargetActions" : [ { "name" : "action-aggrohop" } ], - - "fleeActions" : [], - - "hostileActions" : [ - { - "name" : "action-fire", - "cooldown" : 3.0, - "parameters" : { - "requireLineOfSight" : true, - "maximumRange" : 6, - "minimumRange" : 0, - "windupState" : "", - "windupTime" : 0.0, - - "projectileType" : "floatyshroom", - "projectileParameters" : { - "speed" : 40 - }, - "power" : 7, - "fireOffset" : [0.0, 0.0], - "aimAtTarget" : false, - "aimDirection" : [0, 1], - "inaccuracy" : 0.5, - "projectileCount" : 8, - "projectileInterval" : 0.15, - "fireState" : "fire", - "fireDelay" : 0.25, - "fireSound" : "fire", - - "winddownState" : "", - "winddownTime" : 0.2 - } - } - ], - - "periodicActions" : [], - - "approachActions" : [ - { - "name" : "approach-walk", - "parameters" : { - "canJump" : false - } - } - ], - - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { - } - }, - { - "name" : "approach-walk", - "parameters" : { - "canJump" : false - } - } - ], - - "wanderActions" : [ - { - "name" : "wander-walk", - "cooldown" : 6.0, - "parameters" : { - "wanderTime" : [5, 15] - } - } - ] - }, - - "touchDamage" : { - "poly" : [ [0.4375, 1.125], [0.9375, 0.625], [0.9375, -0.625], [0.4375, -1.125], [-0.4375, -1.125], [-0.9375, -0.625], [-0.9375, 0.625], [-0.4375, 1.125] ], - "damage" : 12, - - "teamType" : "enemy", - "damageSourceKind" : "slash", - "knockback" : 20, - "statusEffects" : [ "biooozepoison" ] - }, - - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, - - "movementSettings" : { - "collisionPoly" : [ [0.4375, 1.125], [0.9375, 0.625], [0.9375, -0.625], [0.4375, -1.125], [-0.4375, -1.125], [-0.9375, -0.625], [-0.9375, 0.625], [-0.4375, 1.125] ], - - "mass" : 1.0, - "walkSpeed" : 3, - "runSpeed" : 5, - - "airFriction" : 0, - - "airJumpProfile" : { - "jumpSpeed" : 45.0, - "jumpInitialPercentage" : 1.0, - "jumpHoldTime" : 0.0 - } - }, - - "bodyMaterialKind" : "organic", - - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" - }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", - - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" - }, - - "appliesWeatherStatusEffects" : true, - "appliesEnvironmentStatusEffects" : false, - "minimumLiquidStatusEffectPercentage" : 0.1, - - "primaryScriptSources" : [ - "/stats/monster_primary.lua" - ], - "primaryScriptDelta" : 5, - - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 - }, - "knockbackThreshold" : { - "baseValue" : 9 - }, - "maxHealth" : { - "baseValue" : 75 - }, - "protection" : { - "baseValue" : 0.0 - }, - "healthRegen" : { - "baseValue" : 0.0 - }, - "poisonStatusImmunity" : { - "baseValue" : 1.0 - }, - "powerMultiplier" : { - "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]//, - //"captureCollectables" : { "fu_monster" : "sporgus3" } - } + "type" : "sporgus3", + "shortdescription" : "Nikaw", + "description" : "A nasty fungal mutation that just can't stop spewing explosive spores.", + + "categories" : [ "sporgus3" ], + "parts" : [ "body" ], + + "animation" : "sporgus3.animation", + + "dropPools" : [ + { + "default" : "sporgus2Treasure", + "bow" : "sporgusHunting", + "firebow" : "sporgusHunting", + "icebow" : "sporgusHunting", + "poisonbow" : "sporgusHunting", + "electricbow" : "sporgusHunting", + "cosmicbow" : "sporgusHunting", + "radioactivebow" : "sporgusHunting", + "shadowbow" : "sporgusHunting" + } + ], + + "baseParameters" : { + "scripts" : [ + "/monsters/monster.lua" + ], + + "behavior" : "monster", + + "behaviorConfig" : { + "damageOnTouch" : true, + + "targetQueryRange" : 20, + "targetOnDamage" : true, + "keepTargetInSight" : true, + "keepTargetInRange" : 50, + "targetOutOfSightTime" : 2.5, + + "foundTargetActions" : [ { "name" : "action-aggrohop" } ], + + "fleeActions" : [], + + "hostileActions" : [ + { + "name" : "action-fire", + "cooldown" : 3.0, + "parameters" : { + "requireLineOfSight" : true, + "maximumRange" : 6, + "minimumRange" : 0, + "windupState" : "", + "windupTime" : 0.0, + + "projectileType" : "floatyshroom", + "projectileParameters" : { + "speed" : 40 + }, + "power" : 7, + "fireOffset" : [0.0, 0.0], + "aimAtTarget" : false, + "aimDirection" : [0, 1], + "inaccuracy" : 0.5, + "projectileCount" : 8, + "projectileInterval" : 0.15, + "fireState" : "fire", + "fireDelay" : 0.25, + "fireSound" : "fire", + + "winddownState" : "", + "winddownTime" : 0.2 + } + } + ], + + "periodicActions" : [], + + "approachActions" : [ + { + "name" : "approach-walk", + "parameters" : { + "canJump" : false + } + } + ], + + "followActions" : [ + { + "name" : "approach-teleport", + "parameters" : { + } + }, + { + "name" : "approach-walk", + "parameters" : { + "canJump" : false + } + } + ], + + "wanderActions" : [ + { + "name" : "wander-walk", + "cooldown" : 6.0, + "parameters" : { + "wanderTime" : [5, 15] + } + } + ] + }, + + "touchDamage" : { + "poly" : [ [0.4375, 1.125], [0.9375, 0.625], [0.9375, -0.625], [0.4375, -1.125], [-0.4375, -1.125], [-0.9375, -0.625], [-0.9375, 0.625], [-0.4375, 1.125] ], + "damage" : 12, + + "teamType" : "enemy", + "damageSourceKind" : "slash", + "knockback" : 20, + "statusEffects" : [ "biooozepoison" ] + }, + + "metaBoundBox" : [-4, -4, 4, 4], + "scale" : 1.0, + + "movementSettings" : { + "collisionPoly" : [ [0.4375, 1.125], [0.9375, 0.625], [0.9375, -0.625], [0.4375, -1.125], [-0.4375, -1.125], [-0.9375, -0.625], [-0.9375, 0.625], [-0.4375, 1.125] ], + + "mass" : 1.0, + "walkSpeed" : 3, + "runSpeed" : 5, + + "airFriction" : 0, + + "airJumpProfile" : { + "jumpSpeed" : 45.0, + "jumpInitialPercentage" : 1.0, + "jumpHoldTime" : 0.0 + } + }, + + "bodyMaterialKind" : "organic", + + "knockoutTime" : 0.3, + "knockoutAnimationStates" : { + "damage" : "stunned" + }, + "deathParticles" : "deathPoof", + "knockoutEffect" : "", + + "statusSettings" : { + "statusProperties" : { + "targetMaterialKind" : "organic" + }, + + "appliesWeatherStatusEffects" : true, + "appliesEnvironmentStatusEffects" : false, + "minimumLiquidStatusEffectPercentage" : 0.1, + + "primaryScriptSources" : [ + "/stats/monster_primary.lua" + ], + "primaryScriptDelta" : 5, + + "stats" : { + "knockbackStunTime" : { + "baseValue" : 0.25 + }, + "knockbackThreshold" : { + "baseValue" : 9 + }, + "maxHealth" : { + "baseValue" : 75 + }, + "protection" : { + "baseValue" : 0.0 + }, + "healthRegen" : { + "baseValue" : 0.0 + }, + "poisonStatusImmunity" : { + "baseValue" : 1.0 + }, + "powerMultiplier" : { + "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]//, + //"captureCollectables" : { "fu_monster" : "sporgus3" } + } } diff --git a/projectiles/mushroom/floatyshroom/floatyshroom.projectile b/projectiles/mushroom/floatyshroom/floatyshroom.projectile index 632fa5e3ccc..42a5384d43f 100644 --- a/projectiles/mushroom/floatyshroom/floatyshroom.projectile +++ b/projectiles/mushroom/floatyshroom/floatyshroom.projectile @@ -1,91 +1,92 @@ { - "projectileName" : "floatyshroom", - "physics" : "fu_flybug", - "speed" : 30, - "bounces" : 0, - "timeToLive" : 0.7, - "image" : "floatyshroom.png", - "animationCycle" : 1.5, - "animationLoops" : false, - "orientationLocked" : true, - "flippable" : true, - "lightColor" : [80, 0, 90], - "frameNumber" : 24, + "projectileName" : "floatyshroom", + "physics" : "fu_flybug", + "speed" : 30, + "bounces" : 0, + "timeToLive" : 0.7, + "image" : "floatyshroom.png", + "animationCycle" : 1.5, + "animationLoops" : false, + "orientationLocked" : true, + "flippable" : true, + "lightColor" : [80, 0, 90], + "frameNumber" : 24, - "power" : 10, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/vsmallregularexplosion/vsmallregularexplosion.config" - }, - { - "action" : "sound", - "options" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_idle1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_idle2.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_attack1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_attack2.ogg" ] - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : 0, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : -180, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : 90, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : -90, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : 35, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : -35, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : 65, - "inheritDamageFactor":0.53 - }, - { - "action" : "projectile", - "type" : "shroomshard", - "firePosition" : [-10, 5], - "fuzzAngle" : 180, - "angleAdjust" : -65, - "inheritDamageFactor":0.53 - } - ], - "damageKind" : "default" + "power" : 10, + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/vsmallregularexplosion/vsmallregularexplosion.config" + }, + { + "action" : "sound", + "options" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_idle1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_idle2.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_attack1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_attack2.ogg" ] + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : 0, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : -180, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : 90, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : -90, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : 35, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : -35, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : 65, + "inheritDamageFactor":0.53 + }, + { + "action" : "projectile", + "type" : "shroomshard", + "firePosition" : [-10, 5], + "fuzzAngle" : 180, + "angleAdjust" : -65, + "inheritDamageFactor":0.53 + } + ], + "damageKind" : "poison", + "statusEffects" : [ "weakpoison" ] } diff --git a/projectiles/mushroom/shroomshard/shroomshard.projectile b/projectiles/mushroom/shroomshard/shroomshard.projectile index 701e7aecfc9..60850bc171a 100644 --- a/projectiles/mushroom/shroomshard/shroomshard.projectile +++ b/projectiles/mushroom/shroomshard/shroomshard.projectile @@ -1,15 +1,15 @@ { - "projectileName" : "shroomshard", - "physics" : "grenade", - "bounces" : 1, - "timeToLive" : 1.5, - "lightColor" : [50, 0, 35], - "image" : "shroomshard.png", - "animationLoops" : false, - "animationCycle" : 0.5, - "frameNumber" : 4, - "speed" : 20, - "power" : 1.2, - "damageKind" : "default", - "statusEffects" : [ "weakpoison" ] + "projectileName" : "shroomshard", + "physics" : "grenade", + "bounces" : 1, + "timeToLive" : 1.5, + "lightColor" : [50, 0, 35], + "image" : "shroomshard.png", + "animationLoops" : false, + "animationCycle" : 0.5, + "frameNumber" : 4, + "speed" : 20, + "power" : 1.2, + "damageKind" : "poison", + "statusEffects" : [ "weakpoison" ] } From b1f63b3e1d588c74ba299b540e37c10a852c6556 Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 09:56:35 -0700 Subject: [PATCH 04/10] move pandoras box projectiles to a more appropriate location... --- .../npcs/cellblast/fucellrifleshot.projectile | 22 ++++++++++++++++++ .../{npc => npcs}/nocttopspit/icon.png | Bin .../nocttopspit/nocttopspit.frames | 0 .../{npc => npcs}/nocttopspit/nocttopspit.png | Bin .../nocttopspit/nocttopspit.projectile | 0 .../pandorasboxautumnbopplaceablespawn.frames | 0 .../pandorasboxautumnbopplaceablespawn.png | Bin ...dorasboxautumnbopplaceablespawn.projectile | 0 .../pandorasboxbonebirdmultibone.frames | 0 .../pandorasboxbonebirdmultibone.png | Bin .../pandorasboxbonebirdmultibone.projectile | 0 .../pandorasboxbulbopplaceablespawn.frames | 0 .../pandorasboxbulbopplaceablespawn.png | Bin ...pandorasboxbulbopplaceablespawn.projectile | 0 .../cakespawn}/pandorasboxcakespawn.frames | 0 .../cakespawn}/pandorasboxcakespawn.png | Bin .../pandorasboxcakespawn.projectile | 0 .../pandorasboxcandycornspawn.frames | 0 .../pandorasboxcandycornspawn.png | Bin .../pandorasboxcandycornspawn.projectile | 0 .../pandorasboxcottonbopplaceablespawn.frames | 0 .../pandorasboxcottonbopplaceablespawn.png | Bin ...dorasboxcottonbopplaceablespawn.projectile | 0 .../cottonpuff}/pandorasboxcottonpuff.frames | 0 .../cottonpuff}/pandorasboxcottonpuff.png | Bin .../pandorasboxcottonpuff.projectile | 0 .../pandorasboxcupcakespawn.frames | 0 .../cupcakespawn}/pandorasboxcupcakespawn.png | Bin .../pandorasboxcupcakespawn.projectile | 0 .../pandorasbox/darkgas}/icon.png | Bin .../darkgas}/pandorasboxdarkgas.frames | 0 .../darkgas}/pandorasboxdarkgas.png | Bin .../darkgas}/pandorasboxdarkgas.projectile | 0 .../pandorasbox/glitchtopprojectile}/icon.png | Bin .../pandorasboxglitchtopprojectile.frames | 0 .../pandorasboxglitchtopprojectile.png | Bin ...dorasboxglitchtopprojectilereal.projectile | 0 .../pandorasbox/goldfirelasershot}/icon.png | Bin .../pandorasboxgoldfirelasershot.frames | 0 .../pandorasboxgoldfirelasershot.png | Bin .../pandorasboxgoldfirelasershot.projectile | 0 .../pandorasbox/goldiceshot}/icon.png | Bin .../pandorasboxgoldiceshot.frames | 0 .../goldiceshot}/pandorasboxgoldiceshot.png | Bin .../pandorasboxgoldiceshot.projectile | 0 .../pandorasbox/icethrower}/icon.png | Bin .../icethrower}/pandorasboxicethrower.frames | 0 .../icethrower}/pandorasboxicethrower.png | Bin .../pandorasboxicethrower.projectile | 0 .../pandorasbox/lightninggunner}/icon.png | Bin .../pandorasboxlightninggunner.frames | 0 .../pandorasboxlightninggunner.png | Bin .../pandorasboxlightninggunner.projectile | 0 ...andorasboxmandrafloraplaceablespawn.frames | 0 .../pandorasboxmandrafloraplaceablespawn.png | Bin ...rasboxmandrafloraplaceablespawn.projectile | 0 .../pandorasboxmarshmallowspawn.frames | 0 .../pandorasboxmarshmallowspawn.png | Bin .../pandorasboxmarshmallowspawn.projectile | 0 .../pandorasbox/nocttopspit}/icon.png | Bin .../pandorasboxnocttopspit.frames | 0 .../nocttopspit}/pandorasboxnocttopspit.png | Bin .../pandorasboxnocttopspit.projectile | 0 .../pandorasbox/pandorabeam}/icon.png | Bin .../pandorasboxpandorabeam.frames | 0 .../pandorabeam}/pandorasboxpandorabeam.png | Bin .../pandorasboxpandorabeam.projectile | 0 .../pandorasbox/perfectcubeshot}/icon.png | Bin .../pandorasboxperfectcubeshot.frames | 0 .../pandorasboxperfectcubeshot.png | Bin .../pandorasboxperfectcubeshot.projectile | 0 .../pandorasbox/poisonshooter}/icon.png | Bin .../pandorasboxpoisonshooter.frames | 0 .../pandorasboxpoisonshooter.png | Bin .../pandorasboxpoisonshooter.projectile | 0 .../pandorasboxpdelectricplasma/icon.png | Bin .../pandorasboxpdelectricplasma.frames | 0 .../pandorasboxpdelectricplasma.png | Bin .../pandorasboxpdelectricplasma.projectile | 0 .../icon.png | Bin .../pandorasboxpdelectricplasmabouncer.frames | 0 .../pandorasboxpdelectricplasmabouncer.png | Bin ...dorasboxpdelectricplasmabouncer.projectile | 0 .../pandorasboxpdfireplasma/icon.png | Bin .../pandorasboxpdfireplasma.frames | 0 .../pandorasboxpdfireplasma.png | Bin .../pandorasboxpdfireplasma.projectile | 0 .../pandorasboxpdiceplasma/icon.png | Bin .../pandorasboxpdiceplasma.frames | 0 .../pandorasboxpdiceplasma.png | Bin .../pandorasboxpdiceplasma.projectile | 0 .../pandorasboxpdphysicalplasma/icon.png | Bin .../pandorasboxpdphysicalplasma.frames | 0 .../pandorasboxpdphysicalplasma.png | Bin .../pandorasboxpdphysicalplasma.projectile | 0 .../pandorasboxpdpoisonplasma/icon.png | Bin .../pandorasboxpdpoisonplasma.frames | 0 .../pandorasboxpdpoisonplasma.png | Bin .../pandorasboxpdpoisonplasma.projectile | 0 .../pandorasbox/pyromantleshot}/icon.png | Bin .../pandorasboxpyromantleshot.frames | 0 .../pandorasboxpyromantleshot.png | Bin .../pandorasboxpyromantleshot.projectile | 0 .../pandorasboxshadowbonebirdmultibone.frames | 0 .../pandorasboxshadowbonebirdmultibone.png | Bin ...dorasboxshadowbonebirdmultibone.projectile | 0 .../pandorasbox/snuffishspit2}/icon.png | Bin .../pandorasboxsnuffishspit2.frames | 0 .../pandorasboxsnuffishspit2.png | Bin .../pandorasboxsnuffishspit2.projectile | 0 .../pandorasboxspringbopplaceablespawn.frames | 0 .../pandorasboxspringbopplaceablespawn.png | Bin ...dorasboxspringbopplaceablespawn.projectile | 0 .../pandorasboxsummerbopplaceablespawn.frames | 0 .../pandorasboxsummerbopplaceablespawn.png | Bin ...dorasboxsummerbopplaceablespawn.projectile | 0 .../pandorasboxwinterbopplaceablespawn.frames | 0 .../pandorasboxwinterbopplaceablespawn.png | Bin ...dorasboxwinterbopplaceablespawn.projectile | 0 119 files changed, 22 insertions(+) create mode 100644 projectiles/npcs/cellblast/fucellrifleshot.projectile rename projectiles/{npc => npcs}/nocttopspit/icon.png (100%) rename projectiles/{npc => npcs}/nocttopspit/nocttopspit.frames (100%) rename projectiles/{npc => npcs}/nocttopspit/nocttopspit.png (100%) rename projectiles/{npc => npcs}/nocttopspit/nocttopspit.projectile (100%) rename projectiles/{npc/pandorasboxautumnbopplaceablespawn => npcs/pandorasbox/autumnbopplaceablespawn}/pandorasboxautumnbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxautumnbopplaceablespawn => npcs/pandorasbox/autumnbopplaceablespawn}/pandorasboxautumnbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxautumnbopplaceablespawn => npcs/pandorasbox/autumnbopplaceablespawn}/pandorasboxautumnbopplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxbonebirdmultibone => npcs/pandorasbox/bonebirdmultibone}/pandorasboxbonebirdmultibone.frames (100%) rename projectiles/{npc/pandorasboxbonebirdmultibone => npcs/pandorasbox/bonebirdmultibone}/pandorasboxbonebirdmultibone.png (100%) rename projectiles/{npc/pandorasboxbonebirdmultibone => npcs/pandorasbox/bonebirdmultibone}/pandorasboxbonebirdmultibone.projectile (100%) rename projectiles/{npc/pandorasboxbulbopplaceablespawn => npcs/pandorasbox/bulbopplaceablespawn}/pandorasboxbulbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxbulbopplaceablespawn => npcs/pandorasbox/bulbopplaceablespawn}/pandorasboxbulbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxbulbopplaceablespawn => npcs/pandorasbox/bulbopplaceablespawn}/pandorasboxbulbopplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxcakespawn => npcs/pandorasbox/cakespawn}/pandorasboxcakespawn.frames (100%) rename projectiles/{npc/pandorasboxcakespawn => npcs/pandorasbox/cakespawn}/pandorasboxcakespawn.png (100%) rename projectiles/{npc/pandorasboxcakespawn => npcs/pandorasbox/cakespawn}/pandorasboxcakespawn.projectile (100%) rename projectiles/{npc/pandorasboxcandycornspawn => npcs/pandorasbox/candycornspawn}/pandorasboxcandycornspawn.frames (100%) rename projectiles/{npc/pandorasboxcandycornspawn => npcs/pandorasbox/candycornspawn}/pandorasboxcandycornspawn.png (100%) rename projectiles/{npc/pandorasboxcandycornspawn => npcs/pandorasbox/candycornspawn}/pandorasboxcandycornspawn.projectile (100%) rename projectiles/{npc/pandorasboxcottonbopplaceablespawn => npcs/pandorasbox/cottonbopplaceablespawn}/pandorasboxcottonbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxcottonbopplaceablespawn => npcs/pandorasbox/cottonbopplaceablespawn}/pandorasboxcottonbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxcottonbopplaceablespawn => npcs/pandorasbox/cottonbopplaceablespawn}/pandorasboxcottonbopplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxcottonpuff => npcs/pandorasbox/cottonpuff}/pandorasboxcottonpuff.frames (100%) rename projectiles/{npc/pandorasboxcottonpuff => npcs/pandorasbox/cottonpuff}/pandorasboxcottonpuff.png (100%) rename projectiles/{npc/pandorasboxcottonpuff => npcs/pandorasbox/cottonpuff}/pandorasboxcottonpuff.projectile (100%) rename projectiles/{npc/pandorasboxcupcakespawn => npcs/pandorasbox/cupcakespawn}/pandorasboxcupcakespawn.frames (100%) rename projectiles/{npc/pandorasboxcupcakespawn => npcs/pandorasbox/cupcakespawn}/pandorasboxcupcakespawn.png (100%) rename projectiles/{npc/pandorasboxcupcakespawn => npcs/pandorasbox/cupcakespawn}/pandorasboxcupcakespawn.projectile (100%) rename projectiles/{npc/pandorasboxdarkgas => npcs/pandorasbox/darkgas}/icon.png (100%) rename projectiles/{npc/pandorasboxdarkgas => npcs/pandorasbox/darkgas}/pandorasboxdarkgas.frames (100%) rename projectiles/{npc/pandorasboxdarkgas => npcs/pandorasbox/darkgas}/pandorasboxdarkgas.png (100%) rename projectiles/{npc/pandorasboxdarkgas => npcs/pandorasbox/darkgas}/pandorasboxdarkgas.projectile (100%) rename projectiles/{npc/pandorasboxglitchtopprojectile => npcs/pandorasbox/glitchtopprojectile}/icon.png (100%) rename projectiles/{npc/pandorasboxglitchtopprojectile => npcs/pandorasbox/glitchtopprojectile}/pandorasboxglitchtopprojectile.frames (100%) rename projectiles/{npc/pandorasboxglitchtopprojectile => npcs/pandorasbox/glitchtopprojectile}/pandorasboxglitchtopprojectile.png (100%) rename projectiles/{npc/pandorasboxglitchtopprojectile => npcs/pandorasbox/glitchtopprojectile}/pandorasboxglitchtopprojectilereal.projectile (100%) rename projectiles/{npc/pandorasboxgoldfirelasershot => npcs/pandorasbox/goldfirelasershot}/icon.png (100%) rename projectiles/{npc/pandorasboxgoldfirelasershot => npcs/pandorasbox/goldfirelasershot}/pandorasboxgoldfirelasershot.frames (100%) rename projectiles/{npc/pandorasboxgoldfirelasershot => npcs/pandorasbox/goldfirelasershot}/pandorasboxgoldfirelasershot.png (100%) rename projectiles/{npc/pandorasboxgoldfirelasershot => npcs/pandorasbox/goldfirelasershot}/pandorasboxgoldfirelasershot.projectile (100%) rename projectiles/{npc/pandorasboxgoldiceshot => npcs/pandorasbox/goldiceshot}/icon.png (100%) rename projectiles/{npc/pandorasboxgoldiceshot => npcs/pandorasbox/goldiceshot}/pandorasboxgoldiceshot.frames (100%) rename projectiles/{npc/pandorasboxgoldiceshot => npcs/pandorasbox/goldiceshot}/pandorasboxgoldiceshot.png (100%) rename projectiles/{npc/pandorasboxgoldiceshot => npcs/pandorasbox/goldiceshot}/pandorasboxgoldiceshot.projectile (100%) rename projectiles/{npc/pandorasboxicethrower => npcs/pandorasbox/icethrower}/icon.png (100%) rename projectiles/{npc/pandorasboxicethrower => npcs/pandorasbox/icethrower}/pandorasboxicethrower.frames (100%) rename projectiles/{npc/pandorasboxicethrower => npcs/pandorasbox/icethrower}/pandorasboxicethrower.png (100%) rename projectiles/{npc/pandorasboxicethrower => npcs/pandorasbox/icethrower}/pandorasboxicethrower.projectile (100%) rename projectiles/{npc/pandorasboxlightninggunner => npcs/pandorasbox/lightninggunner}/icon.png (100%) rename projectiles/{npc/pandorasboxlightninggunner => npcs/pandorasbox/lightninggunner}/pandorasboxlightninggunner.frames (100%) rename projectiles/{npc/pandorasboxlightninggunner => npcs/pandorasbox/lightninggunner}/pandorasboxlightninggunner.png (100%) rename projectiles/{npc/pandorasboxlightninggunner => npcs/pandorasbox/lightninggunner}/pandorasboxlightninggunner.projectile (100%) rename projectiles/{npc/pandorasboxmandrafloraplaceablespawn => npcs/pandorasbox/mandrafloraplaceablespawn}/pandorasboxmandrafloraplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxmandrafloraplaceablespawn => npcs/pandorasbox/mandrafloraplaceablespawn}/pandorasboxmandrafloraplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxmandrafloraplaceablespawn => npcs/pandorasbox/mandrafloraplaceablespawn}/pandorasboxmandrafloraplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxmarshmallowspawn => npcs/pandorasbox/marshmallowspawn}/pandorasboxmarshmallowspawn.frames (100%) rename projectiles/{npc/pandorasboxmarshmallowspawn => npcs/pandorasbox/marshmallowspawn}/pandorasboxmarshmallowspawn.png (100%) rename projectiles/{npc/pandorasboxmarshmallowspawn => npcs/pandorasbox/marshmallowspawn}/pandorasboxmarshmallowspawn.projectile (100%) rename projectiles/{npc/pandorasboxnocttopspit => npcs/pandorasbox/nocttopspit}/icon.png (100%) rename projectiles/{npc/pandorasboxnocttopspit => npcs/pandorasbox/nocttopspit}/pandorasboxnocttopspit.frames (100%) rename projectiles/{npc/pandorasboxnocttopspit => npcs/pandorasbox/nocttopspit}/pandorasboxnocttopspit.png (100%) rename projectiles/{npc/pandorasboxnocttopspit => npcs/pandorasbox/nocttopspit}/pandorasboxnocttopspit.projectile (100%) rename projectiles/{npc/pandorasboxpandorabeam => npcs/pandorasbox/pandorabeam}/icon.png (100%) rename projectiles/{npc/pandorasboxpandorabeam => npcs/pandorasbox/pandorabeam}/pandorasboxpandorabeam.frames (100%) rename projectiles/{npc/pandorasboxpandorabeam => npcs/pandorasbox/pandorabeam}/pandorasboxpandorabeam.png (100%) rename projectiles/{npc/pandorasboxpandorabeam => npcs/pandorasbox/pandorabeam}/pandorasboxpandorabeam.projectile (100%) rename projectiles/{npc/pandorasboxperfectcubeshot => npcs/pandorasbox/perfectcubeshot}/icon.png (100%) rename projectiles/{npc/pandorasboxperfectcubeshot => npcs/pandorasbox/perfectcubeshot}/pandorasboxperfectcubeshot.frames (100%) rename projectiles/{npc/pandorasboxperfectcubeshot => npcs/pandorasbox/perfectcubeshot}/pandorasboxperfectcubeshot.png (100%) rename projectiles/{npc/pandorasboxperfectcubeshot => npcs/pandorasbox/perfectcubeshot}/pandorasboxperfectcubeshot.projectile (100%) rename projectiles/{npc/pandorasboxpoisonshooter => npcs/pandorasbox/poisonshooter}/icon.png (100%) rename projectiles/{npc/pandorasboxpoisonshooter => npcs/pandorasbox/poisonshooter}/pandorasboxpoisonshooter.frames (100%) rename projectiles/{npc/pandorasboxpoisonshooter => npcs/pandorasbox/poisonshooter}/pandorasboxpoisonshooter.png (100%) rename projectiles/{npc/pandorasboxpoisonshooter => npcs/pandorasbox/poisonshooter}/pandorasboxpoisonshooter.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasma/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasmabouncer/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdfireplasma/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdfireplasma/pandorasboxpdfireplasma.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdfireplasma/pandorasboxpdfireplasma.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdfireplasma/pandorasboxpdfireplasma.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdiceplasma/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdiceplasma/pandorasboxpdiceplasma.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdiceplasma/pandorasboxpdiceplasma.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdiceplasma/pandorasboxpdiceplasma.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdphysicalplasma/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.projectile (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdpoisonplasma/icon.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.frames (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.png (100%) rename projectiles/{npc/pandorasboxprotectoratedroneplasmabullets => npcs/pandorasbox/protectoratedroneplasmabullets}/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.projectile (100%) rename projectiles/{npc/pandorasboxpyromantleshot => npcs/pandorasbox/pyromantleshot}/icon.png (100%) rename projectiles/{npc/pandorasboxpyromantleshot => npcs/pandorasbox/pyromantleshot}/pandorasboxpyromantleshot.frames (100%) rename projectiles/{npc/pandorasboxpyromantleshot => npcs/pandorasbox/pyromantleshot}/pandorasboxpyromantleshot.png (100%) rename projectiles/{npc/pandorasboxpyromantleshot => npcs/pandorasbox/pyromantleshot}/pandorasboxpyromantleshot.projectile (100%) rename projectiles/{npc/pandorasboxshadowbonebirdmultibone => npcs/pandorasbox/shadowbonebirdmultibone}/pandorasboxshadowbonebirdmultibone.frames (100%) rename projectiles/{npc/pandorasboxshadowbonebirdmultibone => npcs/pandorasbox/shadowbonebirdmultibone}/pandorasboxshadowbonebirdmultibone.png (100%) rename projectiles/{npc/pandorasboxshadowbonebirdmultibone => npcs/pandorasbox/shadowbonebirdmultibone}/pandorasboxshadowbonebirdmultibone.projectile (100%) rename projectiles/{npc/pandorasboxsnuffishspit2 => npcs/pandorasbox/snuffishspit2}/icon.png (100%) rename projectiles/{npc/pandorasboxsnuffishspit2 => npcs/pandorasbox/snuffishspit2}/pandorasboxsnuffishspit2.frames (100%) rename projectiles/{npc/pandorasboxsnuffishspit2 => npcs/pandorasbox/snuffishspit2}/pandorasboxsnuffishspit2.png (100%) rename projectiles/{npc/pandorasboxsnuffishspit2 => npcs/pandorasbox/snuffishspit2}/pandorasboxsnuffishspit2.projectile (100%) rename projectiles/{npc/pandorasboxspringbopplaceablespawn => npcs/pandorasbox/springbopplaceablespawn}/pandorasboxspringbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxspringbopplaceablespawn => npcs/pandorasbox/springbopplaceablespawn}/pandorasboxspringbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxspringbopplaceablespawn => npcs/pandorasbox/springbopplaceablespawn}/pandorasboxspringbopplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxsummerbopplaceablespawn => npcs/pandorasbox/summerbopplaceablespawn}/pandorasboxsummerbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxsummerbopplaceablespawn => npcs/pandorasbox/summerbopplaceablespawn}/pandorasboxsummerbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxsummerbopplaceablespawn => npcs/pandorasbox/summerbopplaceablespawn}/pandorasboxsummerbopplaceablespawn.projectile (100%) rename projectiles/{npc/pandorasboxwinterbopplaceablespawn => npcs/pandorasbox/winterbopplaceablespawn}/pandorasboxwinterbopplaceablespawn.frames (100%) rename projectiles/{npc/pandorasboxwinterbopplaceablespawn => npcs/pandorasbox/winterbopplaceablespawn}/pandorasboxwinterbopplaceablespawn.png (100%) rename projectiles/{npc/pandorasboxwinterbopplaceablespawn => npcs/pandorasbox/winterbopplaceablespawn}/pandorasboxwinterbopplaceablespawn.projectile (100%) diff --git a/projectiles/npcs/cellblast/fucellrifleshot.projectile b/projectiles/npcs/cellblast/fucellrifleshot.projectile new file mode 100644 index 00000000000..7b6203e74f0 --- /dev/null +++ b/projectiles/npcs/cellblast/fucellrifleshot.projectile @@ -0,0 +1,22 @@ +{ + "projectileName" : "fucellrifleshot", + "physics" : "bullet", + "speed" : 60, + "bounces" : 0, + "timeToLive" : 2.0, + "image" : "cellblast.png", + "animationCycle" : 0.3, + "lightColor" : [0, 20, 50], + "frameNumber" : 10, + "emitters" : [ "electricplasma" ], + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.config" + } + ], + "power" : 200, + "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], + "damageType" : "NoDamage", + "damageKind" : "default" +} diff --git a/projectiles/npc/nocttopspit/icon.png b/projectiles/npcs/nocttopspit/icon.png similarity index 100% rename from projectiles/npc/nocttopspit/icon.png rename to projectiles/npcs/nocttopspit/icon.png diff --git a/projectiles/npc/nocttopspit/nocttopspit.frames b/projectiles/npcs/nocttopspit/nocttopspit.frames similarity index 100% rename from projectiles/npc/nocttopspit/nocttopspit.frames rename to projectiles/npcs/nocttopspit/nocttopspit.frames diff --git a/projectiles/npc/nocttopspit/nocttopspit.png b/projectiles/npcs/nocttopspit/nocttopspit.png similarity index 100% rename from projectiles/npc/nocttopspit/nocttopspit.png rename to projectiles/npcs/nocttopspit/nocttopspit.png diff --git a/projectiles/npc/nocttopspit/nocttopspit.projectile b/projectiles/npcs/nocttopspit/nocttopspit.projectile similarity index 100% rename from projectiles/npc/nocttopspit/nocttopspit.projectile rename to projectiles/npcs/nocttopspit/nocttopspit.projectile diff --git a/projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.png b/projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxautumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/autumnbopplaceablespawn/pandorasboxautumnbopplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.frames b/projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.frames similarity index 100% rename from projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.frames rename to projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.frames diff --git a/projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.png b/projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.png similarity index 100% rename from projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.png rename to projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.png diff --git a/projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.projectile b/projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.projectile similarity index 100% rename from projectiles/npc/pandorasboxbonebirdmultibone/pandorasboxbonebirdmultibone.projectile rename to projectiles/npcs/pandorasbox/bonebirdmultibone/pandorasboxbonebirdmultibone.projectile diff --git a/projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.png b/projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxbulbopplaceablespawn/pandorasboxbulbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/bulbopplaceablespawn/pandorasboxbulbopplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.frames b/projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.frames rename to projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.frames diff --git a/projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.png b/projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.png similarity index 100% rename from projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.png rename to projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.png diff --git a/projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.projectile b/projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxcakespawn/pandorasboxcakespawn.projectile rename to projectiles/npcs/pandorasbox/cakespawn/pandorasboxcakespawn.projectile diff --git a/projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.frames b/projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.frames similarity index 100% rename from projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.frames rename to projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.frames diff --git a/projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.png b/projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.png similarity index 100% rename from projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.png rename to projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.png diff --git a/projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.projectile b/projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxcandycornspawn/pandorasboxcandycornspawn.projectile rename to projectiles/npcs/pandorasbox/candycornspawn/pandorasboxcandycornspawn.projectile diff --git a/projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.png b/projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxcottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/cottonbopplaceablespawn/pandorasboxcottonbopplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.frames b/projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.frames similarity index 100% rename from projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.frames rename to projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.frames diff --git a/projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.png b/projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.png similarity index 100% rename from projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.png rename to projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.png diff --git a/projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.projectile b/projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.projectile similarity index 100% rename from projectiles/npc/pandorasboxcottonpuff/pandorasboxcottonpuff.projectile rename to projectiles/npcs/pandorasbox/cottonpuff/pandorasboxcottonpuff.projectile diff --git a/projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.frames b/projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.frames rename to projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.frames diff --git a/projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.png b/projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.png similarity index 100% rename from projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.png rename to projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.png diff --git a/projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.projectile b/projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxcupcakespawn/pandorasboxcupcakespawn.projectile rename to projectiles/npcs/pandorasbox/cupcakespawn/pandorasboxcupcakespawn.projectile diff --git a/projectiles/npc/pandorasboxdarkgas/icon.png b/projectiles/npcs/pandorasbox/darkgas/icon.png similarity index 100% rename from projectiles/npc/pandorasboxdarkgas/icon.png rename to projectiles/npcs/pandorasbox/darkgas/icon.png diff --git a/projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.frames b/projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.frames similarity index 100% rename from projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.frames rename to projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.frames diff --git a/projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.png b/projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.png similarity index 100% rename from projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.png rename to projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.png diff --git a/projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.projectile b/projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.projectile similarity index 100% rename from projectiles/npc/pandorasboxdarkgas/pandorasboxdarkgas.projectile rename to projectiles/npcs/pandorasbox/darkgas/pandorasboxdarkgas.projectile diff --git a/projectiles/npc/pandorasboxglitchtopprojectile/icon.png b/projectiles/npcs/pandorasbox/glitchtopprojectile/icon.png similarity index 100% rename from projectiles/npc/pandorasboxglitchtopprojectile/icon.png rename to projectiles/npcs/pandorasbox/glitchtopprojectile/icon.png diff --git a/projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectile.frames b/projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectile.frames similarity index 100% rename from projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectile.frames rename to projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectile.frames diff --git a/projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectile.png b/projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectile.png similarity index 100% rename from projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectile.png rename to projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectile.png diff --git a/projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectilereal.projectile b/projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectilereal.projectile similarity index 100% rename from projectiles/npc/pandorasboxglitchtopprojectile/pandorasboxglitchtopprojectilereal.projectile rename to projectiles/npcs/pandorasbox/glitchtopprojectile/pandorasboxglitchtopprojectilereal.projectile diff --git a/projectiles/npc/pandorasboxgoldfirelasershot/icon.png b/projectiles/npcs/pandorasbox/goldfirelasershot/icon.png similarity index 100% rename from projectiles/npc/pandorasboxgoldfirelasershot/icon.png rename to projectiles/npcs/pandorasbox/goldfirelasershot/icon.png diff --git a/projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.frames b/projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.frames similarity index 100% rename from projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.frames rename to projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.frames diff --git a/projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.png b/projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.png similarity index 100% rename from projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.png rename to projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.png diff --git a/projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.projectile b/projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.projectile similarity index 100% rename from projectiles/npc/pandorasboxgoldfirelasershot/pandorasboxgoldfirelasershot.projectile rename to projectiles/npcs/pandorasbox/goldfirelasershot/pandorasboxgoldfirelasershot.projectile diff --git a/projectiles/npc/pandorasboxgoldiceshot/icon.png b/projectiles/npcs/pandorasbox/goldiceshot/icon.png similarity index 100% rename from projectiles/npc/pandorasboxgoldiceshot/icon.png rename to projectiles/npcs/pandorasbox/goldiceshot/icon.png diff --git a/projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.frames b/projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.frames similarity index 100% rename from projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.frames rename to projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.frames diff --git a/projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.png b/projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.png similarity index 100% rename from projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.png rename to projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.png diff --git a/projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.projectile b/projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.projectile similarity index 100% rename from projectiles/npc/pandorasboxgoldiceshot/pandorasboxgoldiceshot.projectile rename to projectiles/npcs/pandorasbox/goldiceshot/pandorasboxgoldiceshot.projectile diff --git a/projectiles/npc/pandorasboxicethrower/icon.png b/projectiles/npcs/pandorasbox/icethrower/icon.png similarity index 100% rename from projectiles/npc/pandorasboxicethrower/icon.png rename to projectiles/npcs/pandorasbox/icethrower/icon.png diff --git a/projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.frames b/projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.frames similarity index 100% rename from projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.frames rename to projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.frames diff --git a/projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.png b/projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.png similarity index 100% rename from projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.png rename to projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.png diff --git a/projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.projectile b/projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.projectile similarity index 100% rename from projectiles/npc/pandorasboxicethrower/pandorasboxicethrower.projectile rename to projectiles/npcs/pandorasbox/icethrower/pandorasboxicethrower.projectile diff --git a/projectiles/npc/pandorasboxlightninggunner/icon.png b/projectiles/npcs/pandorasbox/lightninggunner/icon.png similarity index 100% rename from projectiles/npc/pandorasboxlightninggunner/icon.png rename to projectiles/npcs/pandorasbox/lightninggunner/icon.png diff --git a/projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.frames b/projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.frames similarity index 100% rename from projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.frames rename to projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.frames diff --git a/projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.png b/projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.png similarity index 100% rename from projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.png rename to projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.png diff --git a/projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.projectile b/projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.projectile similarity index 100% rename from projectiles/npc/pandorasboxlightninggunner/pandorasboxlightninggunner.projectile rename to projectiles/npcs/pandorasbox/lightninggunner/pandorasboxlightninggunner.projectile diff --git a/projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.frames b/projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.frames rename to projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.png b/projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.png rename to projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.png diff --git a/projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.projectile b/projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxmandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/mandrafloraplaceablespawn/pandorasboxmandrafloraplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.frames b/projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.frames similarity index 100% rename from projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.frames rename to projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.frames diff --git a/projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.png b/projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.png similarity index 100% rename from projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.png rename to projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.png diff --git a/projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.projectile b/projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxmarshmallowspawn/pandorasboxmarshmallowspawn.projectile rename to projectiles/npcs/pandorasbox/marshmallowspawn/pandorasboxmarshmallowspawn.projectile diff --git a/projectiles/npc/pandorasboxnocttopspit/icon.png b/projectiles/npcs/pandorasbox/nocttopspit/icon.png similarity index 100% rename from projectiles/npc/pandorasboxnocttopspit/icon.png rename to projectiles/npcs/pandorasbox/nocttopspit/icon.png diff --git a/projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.frames b/projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.frames similarity index 100% rename from projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.frames rename to projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.frames diff --git a/projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.png b/projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.png similarity index 100% rename from projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.png rename to projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.png diff --git a/projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.projectile b/projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.projectile similarity index 100% rename from projectiles/npc/pandorasboxnocttopspit/pandorasboxnocttopspit.projectile rename to projectiles/npcs/pandorasbox/nocttopspit/pandorasboxnocttopspit.projectile diff --git a/projectiles/npc/pandorasboxpandorabeam/icon.png b/projectiles/npcs/pandorasbox/pandorabeam/icon.png similarity index 100% rename from projectiles/npc/pandorasboxpandorabeam/icon.png rename to projectiles/npcs/pandorasbox/pandorabeam/icon.png diff --git a/projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.frames b/projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.frames similarity index 100% rename from projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.frames rename to projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.frames diff --git a/projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.png b/projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.png similarity index 100% rename from projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.png rename to projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.png diff --git a/projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.projectile b/projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.projectile similarity index 100% rename from projectiles/npc/pandorasboxpandorabeam/pandorasboxpandorabeam.projectile rename to projectiles/npcs/pandorasbox/pandorabeam/pandorasboxpandorabeam.projectile diff --git a/projectiles/npc/pandorasboxperfectcubeshot/icon.png b/projectiles/npcs/pandorasbox/perfectcubeshot/icon.png similarity index 100% rename from projectiles/npc/pandorasboxperfectcubeshot/icon.png rename to projectiles/npcs/pandorasbox/perfectcubeshot/icon.png diff --git a/projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.frames b/projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.frames similarity index 100% rename from projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.frames rename to projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.frames diff --git a/projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.png b/projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.png similarity index 100% rename from projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.png rename to projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.png diff --git a/projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.projectile b/projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.projectile similarity index 100% rename from projectiles/npc/pandorasboxperfectcubeshot/pandorasboxperfectcubeshot.projectile rename to projectiles/npcs/pandorasbox/perfectcubeshot/pandorasboxperfectcubeshot.projectile diff --git a/projectiles/npc/pandorasboxpoisonshooter/icon.png b/projectiles/npcs/pandorasbox/poisonshooter/icon.png similarity index 100% rename from projectiles/npc/pandorasboxpoisonshooter/icon.png rename to projectiles/npcs/pandorasbox/poisonshooter/icon.png diff --git a/projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.frames b/projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.frames similarity index 100% rename from projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.frames rename to projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.frames diff --git a/projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.png b/projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.png similarity index 100% rename from projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.png rename to projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.png diff --git a/projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.projectile b/projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.projectile similarity index 100% rename from projectiles/npc/pandorasboxpoisonshooter/pandorasboxpoisonshooter.projectile rename to projectiles/npcs/pandorasbox/poisonshooter/pandorasboxpoisonshooter.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasma/pandorasboxpdelectricplasma.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdelectricplasmabouncer/pandorasboxpdelectricplasmabouncer.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdfireplasma/pandorasboxpdfireplasma.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdiceplasma/pandorasboxpdiceplasma.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdphysicalplasma/pandorasboxpdphysicalplasma.projectile diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/icon.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/icon.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/icon.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/icon.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.frames b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.frames similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.frames rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.frames diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.png b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.png similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.png rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.png diff --git a/projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.projectile b/projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.projectile similarity index 100% rename from projectiles/npc/pandorasboxprotectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.projectile rename to projectiles/npcs/pandorasbox/protectoratedroneplasmabullets/pandorasboxpdpoisonplasma/pandorasboxpdpoisonplasma.projectile diff --git a/projectiles/npc/pandorasboxpyromantleshot/icon.png b/projectiles/npcs/pandorasbox/pyromantleshot/icon.png similarity index 100% rename from projectiles/npc/pandorasboxpyromantleshot/icon.png rename to projectiles/npcs/pandorasbox/pyromantleshot/icon.png diff --git a/projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.frames b/projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.frames similarity index 100% rename from projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.frames rename to projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.frames diff --git a/projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.png b/projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.png similarity index 100% rename from projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.png rename to projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.png diff --git a/projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.projectile b/projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.projectile similarity index 100% rename from projectiles/npc/pandorasboxpyromantleshot/pandorasboxpyromantleshot.projectile rename to projectiles/npcs/pandorasbox/pyromantleshot/pandorasboxpyromantleshot.projectile diff --git a/projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.frames b/projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.frames similarity index 100% rename from projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.frames rename to projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.frames diff --git a/projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.png b/projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.png similarity index 100% rename from projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.png rename to projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.png diff --git a/projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.projectile b/projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.projectile similarity index 100% rename from projectiles/npc/pandorasboxshadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.projectile rename to projectiles/npcs/pandorasbox/shadowbonebirdmultibone/pandorasboxshadowbonebirdmultibone.projectile diff --git a/projectiles/npc/pandorasboxsnuffishspit2/icon.png b/projectiles/npcs/pandorasbox/snuffishspit2/icon.png similarity index 100% rename from projectiles/npc/pandorasboxsnuffishspit2/icon.png rename to projectiles/npcs/pandorasbox/snuffishspit2/icon.png diff --git a/projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.frames b/projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.frames similarity index 100% rename from projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.frames rename to projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.frames diff --git a/projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.png b/projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.png similarity index 100% rename from projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.png rename to projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.png diff --git a/projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.projectile b/projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.projectile similarity index 100% rename from projectiles/npc/pandorasboxsnuffishspit2/pandorasboxsnuffishspit2.projectile rename to projectiles/npcs/pandorasbox/snuffishspit2/pandorasboxsnuffishspit2.projectile diff --git a/projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.png b/projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxspringbopplaceablespawn/pandorasboxspringbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/springbopplaceablespawn/pandorasboxspringbopplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.png b/projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxsummerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/summerbopplaceablespawn/pandorasboxsummerbopplaceablespawn.projectile diff --git a/projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.frames b/projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.frames similarity index 100% rename from projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.frames rename to projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.frames diff --git a/projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.png b/projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.png similarity index 100% rename from projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.png rename to projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.png diff --git a/projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.projectile b/projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.projectile similarity index 100% rename from projectiles/npc/pandorasboxwinterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.projectile rename to projectiles/npcs/pandorasbox/winterbopplaceablespawn/pandorasboxwinterbopplaceablespawn.projectile From 2a6c56865964536e649ed74bff546a05e81acdc0 Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 10:00:20 -0700 Subject: [PATCH 05/10] cell rifle actually deals the right damage and freezes. --- .../ranged/unique/fucellgun.activeitem | 148 +++++++++--------- .../fucellrifleexplosion.config | 26 +++ .../fucellrifleexplosion.projectile | 15 ++ 3 files changed, 115 insertions(+), 74 deletions(-) create mode 100644 projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.config create mode 100644 projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.projectile diff --git a/items/active/weapons/ranged/unique/fucellgun.activeitem b/items/active/weapons/ranged/unique/fucellgun.activeitem index 4e0407947f5..00eb5d7412b 100644 --- a/items/active/weapons/ranged/unique/fucellgun.activeitem +++ b/items/active/weapons/ranged/unique/fucellgun.activeitem @@ -1,89 +1,89 @@ { - "itemName" : "fucellgun", - "price" : 160, - "inventoryIcon" : "fucellgun.png", - "maxStack" : 1, - "rarity" : "uncommon", - "description" : "A truly unique long-ranged rifle, firing freezing blasts of cellular matter.", - "shortdescription" : "Cellular Rifle", - "category" : "bioweapon", - "level" : 4, - "tooltipKind" : "gun2", - "weaponType" : "Bio-Weaopn", - "itemTags" : ["weapon","ranged","sniperrifle", "energy", "bioweapon", "upgradeableWeapon"], - "twoHanded" : true, + "itemName" : "fucellgun", + "price" : 160, + "inventoryIcon" : "fucellgun.png", + "maxStack" : 1, + "rarity" : "uncommon", + "description" : "A truly unique long-ranged rifle, firing ^cyan;freezing^reset;, ^green;poisonous^reset; blasts of cellular matter.", + "shortdescription" : "Cellular Rifle", + "category" : "bioweapon", + "level" : 4, + "tooltipKind" : "gun2", + "weaponType" : "Bio-Weaopn", + "itemTags" : ["weapon","ranged","sniperrifle", "energy", "bioweapon", "upgradeableWeapon"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "fucellgun.png", - "barrel" : "", - "muzzleFlash" : "/animations/muzzleflash/fuplasmamuzzle3blue.png" - }, - "animationCustom" : { - "sounds" : { - "fire" : [ "/sfx/weapons/fucellgun.ogg" ] - } - }, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "fucellgun.png", + "barrel" : "", + "muzzleFlash" : "/animations/muzzleflash/fuplasmamuzzle3blue.png" + }, + "animationCustom" : { + "sounds" : { + "fire" : [ "/sfx/weapons/fucellgun.ogg" ] + } + }, - "baseOffset" : [0.86, 0.4], - "muzzleOffset" : [2.445, 0.125], + "baseOffset" : [0.86, 0.4], + "muzzleOffset" : [2.445, 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.7, - "baseDps" : 8.214, - "energyUsage" : 20.5, - "inaccuracy" : 0, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 0.7, + "baseDps" : 8.214, + "energyUsage" : 20.5, + "inaccuracy" : 0, - "projectileCount" : 1, - "fireType" : "auto", + "projectileCount" : 1, + "fireType" : "auto", - "projectileType" : "cellblast", - "projectileParameters" : { - "speed" : 30, - "knockback" : 5, - "statusEffects" : [ "weakpoison" ] - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + //status effect and element type handled on projectile. + "projectileType" : "fucellrifleshot", + "projectileParameters" : { + "speed" : 30, + "knockback" : 5 + }, + "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" : 3, - "critBonus" : 8, + "critChance" : 3, + "critBonus" : 8, - "altAbilityType" : "explosiveburst", + "altAbilityType" : "explosiveburst", - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "builder" : "/items/buildscripts/buildunrandweapon.lua" } diff --git a/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.config b/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.config new file mode 100644 index 00000000000..87a7d5ef709 --- /dev/null +++ b/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.config @@ -0,0 +1,26 @@ +{ + "action" : "actions", + "list" : [ + { + "action" : "projectile", + "inheritDamageFactor" : 1, + "type" : "fucellrifleexplosion" + }, + { + "action" : "sound", + "options" : [ "/sfx/gun/pulsecannon_blast1.ogg" ] + }, + { + "action" : "light", + "color" : "blue" + }, + { + "action" : "explosion", + "foregroundRadius" : 2, + "backgroundRadius" : 0, + "explosiveDamageAmount" : 0.5, + "delaySteps" : 2 + } + + ] +} diff --git a/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.projectile b/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.projectile new file mode 100644 index 00000000000..06b1b094076 --- /dev/null +++ b/projectiles/explosions/pulsecannonexplosion/fucellrifleexplosion.projectile @@ -0,0 +1,15 @@ +{ + "projectileName" : "fucellrifleexplosion", + "image" : "pulsecannonexplosion.png", + "animationCycle" : 0.2, + "frameNumber" : 4, + "speed" : 0, + "power" : 5, + "damagePoly" : [ [-18, 0], [-12, -12], [0, -18], [12, -12], [18, 0], [12, 12], [0, 18], [-12, 12] ], + "animationLoops" : false, + "emitters" : [ "electricplasma", "defaultblue" ], + "piercing" : true, + "flippable" : true, + "damageKind" : "bioweapon", + "statusEffects" : [ "weakpoison", "freezefu" ] +} From 204cc5b5038d93a7d363ea4bd5cf8a79b4073211 Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 10:27:39 -0700 Subject: [PATCH 06/10] move blistergun statuses to the explosion projectiles, make those do bioweapon damage --- .../ranged/unique/blistergun.activeitem | 204 +++++++++--------- .../ranged/unique/blisterpistol.activeitem | 185 ++++++++-------- .../blistergunexplosion.config | 66 +++--- .../blistergunexplosion.projectile | 29 +-- .../blisterguns/blistergunshot.projectile | 42 ++-- .../blisterguns/blisterpistolshot.projectile | 42 ++-- 6 files changed, 284 insertions(+), 284 deletions(-) diff --git a/items/active/weapons/ranged/unique/blistergun.activeitem b/items/active/weapons/ranged/unique/blistergun.activeitem index 3a9e5680678..25dc7181f03 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 7901d72e662..7cf3ba19396 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 57b160bfc08..4165846982f 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 7ffa4b8a9c6..b05c0f78389 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 33de08aae24..ec4ae955de2 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 83339781b65..926b87e8859 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" } From 97827ff2f5d36cb534039cadc3a6ce1d44d59220 Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 10:33:34 -0700 Subject: [PATCH 07/10] change primary of goregun to bioweapon with poison --- .../weapons/ranged/unique/goregun.activeitem | 190 +++++++++--------- 1 file changed, 96 insertions(+), 94 deletions(-) diff --git a/items/active/weapons/ranged/unique/goregun.activeitem b/items/active/weapons/ranged/unique/goregun.activeitem index 1c5a1c39148..84971f8acac 100644 --- a/items/active/weapons/ranged/unique/goregun.activeitem +++ b/items/active/weapons/ranged/unique/goregun.activeitem @@ -1,111 +1,113 @@ { - "itemName" : "goregun", - "price" : 160, - "inventoryIcon" : "goregun.png", - "maxStack" : 1, - "rarity" : "rare", - "description" : "A repulsive weapon that spews putrid blood. Awesome. + "itemName" : "goregun", + "price" : 160, + "inventoryIcon" : "goregun.png", + "maxStack" : 1, + "rarity" : "rare", + "description" : "A repulsive weapon that spews putrid blood. Awesome. ^yellow;Alt shoots vomit! Fun!^reset;", - "shortdescription" : "Gore Gun", - "category" : "bioweapon", - "level" : 4, - "tooltipKind" : "gun2", - "weaponType" : "Gore Chucker", - "itemTags" : ["weapon","ranged","assaultrifle", "bioweapon", "upgradeableWeapon"], - "twoHanded" : true, + "shortdescription" : "Gore Gun", + "category" : "bioweapon", + "level" : 4, + "tooltipKind" : "gun2", + "weaponType" : "Gore Chucker", + "itemTags" : ["weapon","ranged","assaultrifle", "bioweapon", "upgradeableWeapon"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "goregun.png", - "barrel" : "", - "muzzleFlash" : "" - }, - "animationCustom" : { - "sounds" : { - "fire" : [ "/sfx/gun/impact_flesh.ogg" ] - } - }, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "goregun.png", + "barrel" : "", + "muzzleFlash" : "" + }, + "animationCustom" : { + "sounds" : { + "fire" : [ "/sfx/gun/impact_flesh.ogg" ] + } + }, - "particleEmitters" : { - "muzzleFlash" : { - "particles" : [ - { "particle" : "dripslime", "offset" : [0.0, 0.0] }, - { "particle" : "dripslime", "offset" : [0.0, 0.0] }, - { "particle" : "dripslime", "offset" : [0.0, 0.0] } - ] - } - }, + "particleEmitters" : { + "muzzleFlash" : { + "particles" : [ + { "particle" : "dripslime", "offset" : [0.0, 0.0] }, + { "particle" : "dripslime", "offset" : [0.0, 0.0] }, + { "particle" : "dripslime", "offset" : [0.0, 0.0] } + ] + } + }, - "baseOffset" : [0.4, 0.2], - "muzzleOffset" : [2.645, 0.225], + "baseOffset" : [0.4, 0.2], + "muzzleOffset" : [2.645, 0.225], - "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.08, - "baseDps" : 10, - "energyUsage" : 20.0, - "inaccuracy" : 0.02, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 0.08, + "baseDps" : 10, + "energyUsage" : 20.0, + "inaccuracy" : 0.02, - "projectileCount" : 1, - "fireType" : "auto", + "projectileCount" : 1, + "fireType" : "auto", - "projectileType" : "bloodvomit", - "projectileParameters" : { - "speed" : 50, - "knockback" : 0 - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "projectileType" : "bloodvomit", + "projectileParameters" : { + "speed" : 50, + "knockback" : 0, + "damageKind":"bioweapon", + "statusEffects":["weakpoison"] + }, + "stances" : { + "idle" : { + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : true, - "allowRotate" : true, - "allowFlip" : true - }, - "fire" : { - "duration" : 0, - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "allowRotate" : true, + "allowFlip" : true + }, + "fire" : { + "duration" : 0, + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - }, - "cooldown" : { - "duration" : 0.015, - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "allowRotate" : false, + "allowFlip" : false + }, + "cooldown" : { + "duration" : 0.015, + "armRotation" : 0, + "weaponRotation" : 0, + "twoHanded" : true, - "allowRotate" : false, - "allowFlip" : false - } - } - }, + "allowRotate" : false, + "allowFlip" : false + } + } + }, - "critChance" : 2, - "critBonus" : 4, + "critChance" : 2, + "critBonus" : 4, - "altAbilityType" : "vomitrage", + "altAbilityType" : "vomitrage", - "builder" : "/items/buildscripts/buildunrandweapon.lua", - "upgradeParameters2" : { - "description" : "Absolutely -spews- gore.", - "shortdescription" : "Ol' Pukey", - "critChance" : 4, - "critBonus" : 6, - "baseDps" : 8, - "primaryAbility" : { - "projectileCount" : 3, - "inaccuracy" : 0.25, - "energyUsage" : 30.0 - } - } + "builder" : "/items/buildscripts/buildunrandweapon.lua", + "upgradeParameters2" : { + "description" : "Absolutely -spews- gore.", + "shortdescription" : "Ol' Pukey", + "critChance" : 4, + "critBonus" : 6, + "baseDps" : 8, + "primaryAbility" : { + "projectileCount" : 3, + "inaccuracy" : 0.25, + "energyUsage" : 30.0 + } + } } From 0ecfae0760ff4a31446b3923a8b1c222383b180d Mon Sep 17 00:00:00 2001 From: Kherae Date: Wed, 10 Jul 2024 10:51:00 -0700 Subject: [PATCH 08/10] pus status effect on ocucannons projectiles --- .../ranged/unique/eyecannon.activeitem | 157 +++++++++--------- .../guns/ocucannon/ocucannonshot.projectile | 144 ++++++++-------- .../guns/ocucannon/ocucannonshot2.projectile | 99 +++++------ .../guns/ocucannon/ocucannonspray.projectile | 71 ++++---- 4 files changed, 237 insertions(+), 234 deletions(-) diff --git a/items/active/weapons/ranged/unique/eyecannon.activeitem b/items/active/weapons/ranged/unique/eyecannon.activeitem index a8528809f70..4a7866a4ffe 100644 --- a/items/active/weapons/ranged/unique/eyecannon.activeitem +++ b/items/active/weapons/ranged/unique/eyecannon.activeitem @@ -1,94 +1,95 @@ { - "itemName" : "eyecannon", - "price" : 160, - "inventoryIcon" : "eyecannon.png", - "maxStack" : 1, - "rarity" : "rare", - "description" : "A powerful and bizarre biological weapon. + "itemName" : "eyecannon", + "price" : 160, + "inventoryIcon" : "eyecannon.png", + "maxStack" : 1, + "rarity" : "rare", + "description" : "A powerful and bizarre biological weapon. ^yellow;Inflicts pus effect, morphs tiles^reset; ^green;Multi-explosion, weird physics^reset;", - "shortdescription" : "Ocu Cannon", - "category" : "bioweapon", - "level" : 5, - "tooltipKind" : "gun2", - "weaponType" : "Bio-Tech", - "itemTags" : ["weapon","ranged","grenadelauncher", "bioweapon", "upgradeableWeapon"], - "twoHanded" : true, + "shortdescription" : "Ocu Cannon", + "category" : "bioweapon", + "level" : 5, + "tooltipKind" : "gun2", + "weaponType" : "Bio-Tech", + "itemTags" : ["weapon","ranged","grenadelauncher", "bioweapon", "upgradeableWeapon"], + "twoHanded" : true, - "animation" : "/items/active/weapons/ranged/gun.animation", - "animationParts" : { - "butt" : "", - "middle" : "eyecannon.png", - "barrel" : "", - "muzzleFlash" : "/animations/muzzleflash/goreflash1.png" - }, - "animationCustom" : { - "sounds" : { - "fire" : [ "/sfx/projectiles/goo_spit1.ogg" ] - } - }, + "animation" : "/items/active/weapons/ranged/gun.animation", + "animationParts" : { + "butt" : "", + "middle" : "eyecannon.png", + "barrel" : "", + "muzzleFlash" : "/animations/muzzleflash/goreflash1.png" + }, + "animationCustom" : { + "sounds" : { + "fire" : [ "/sfx/projectiles/goo_spit1.ogg" ] + } + }, - "baseOffset" : [1.26, 0.4], - "muzzleOffset" : [1, 0.125], - "handGrip" : "wrap", - "scripts" : ["/items/active/weapons/ranged/gun.lua"], + "baseOffset" : [1.26, 0.4], + "muzzleOffset" : [1, 0.125], + "handGrip" : "wrap", + "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "bioweapon", + "elementalType" : "bioweapon", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], - "class" : "GunFire", - "fireTime" : 1.2, - "baseDps" : 5.35, - "energyUsage" : 47.5, - "inaccuracy" : 0.05, + "primaryAbility" : { + "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], + "class" : "GunFire", + "fireTime" : 1.2, + "baseDps" : 5.35, + "energyUsage" : 47.5, + "inaccuracy" : 0.05, - "projectileCount" : 1, - "fireType" : "auto", + "projectileCount" : 1, + "fireType" : "auto", - "projectileType" : "ocucannonshot", - "projectileParameters" : { - "damageKind" : "bioweapon", - "speed" : 50, - "knockback" : 9 - }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 0, - "twoHanded" : true, + "projectileType" : "ocucannonshot", + "projectileParameters" : { + "damageKind" : "bioweapon", + "speed" : 50, + "knockback" : 9, + "statusEffects":["puseffect","weakpoison"] + }, + "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" : 8, - "critBonus" : 12, - "isAmmoBased" : 1, - "magazineSize" : 20, - "reloadTime" : 1.2, + "critChance" : 8, + "critBonus" : 12, + "isAmmoBased" : 1, + "magazineSize" : 20, + "reloadTime" : 1.2, - "altAbilityType" : "vomitrage", + "altAbilityType" : "vomitrage", - "builder" : "/items/buildscripts/buildunrandweapon.lua" + "builder" : "/items/buildscripts/buildunrandweapon.lua" } diff --git a/projectiles/guns/ocucannon/ocucannonshot.projectile b/projectiles/guns/ocucannon/ocucannonshot.projectile index bb455947742..59538cfdbc4 100644 --- a/projectiles/guns/ocucannon/ocucannonshot.projectile +++ b/projectiles/guns/ocucannon/ocucannonshot.projectile @@ -1,75 +1,75 @@ { - "projectileName" : "ocucannonshot", - "image" : "ocucannonshot.png", - "physics" : "fu_eyeball", - "animationCycle" : 1, - "frameNumber" : 8, - "power" : 0, - "speed" : 35, - "timeToLive" : 2.5, - "bounces" : 12, - "piercing" : false, - "damagePoly" : [ [-4, 0], [-3, -3], [0, -4], [3, -3], [4, 0], [3, 3], [0, 4], [-3, 3] ], - "damageKind" : "poison", + "projectileName" : "ocucannonshot", + "image" : "ocucannonshot.png", + "physics" : "fu_eyeball", + "animationCycle" : 1, + "frameNumber" : 8, + "power" : 0, + "speed" : 35, + "timeToLive" : 2.5, + "bounces" : 12, + "piercing" : false, + "damagePoly" : [ [-4, 0], [-3, -3], [0, -4], [3, -3], [4, 0], [3, 3], [0, 4], [-3, 3] ], + "damageKind" : "poison", + "statusEffects":["puseffect"], + "actionOnCollide" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" + }, + { + "action" : "sound", + "options" : [ + "/sfx/blocks/footstep_brains.ogg", + "/sfx/projectiles/goocluster_pop.ogg", + "/sfx/projectiles/bonebounce1.ogg", + "/sfx/projectiles/bonebounce3.ogg", + "/sfx/projectiles/bonebounce5.ogg" + ] + } + ], - "actionOnCollide" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" - }, - { - "action" : "sound", - "options" : [ - "/sfx/blocks/footstep_brains.ogg", - "/sfx/projectiles/goocluster_pop.ogg", - "/sfx/projectiles/bonebounce1.ogg", - "/sfx/projectiles/bonebounce3.ogg", - "/sfx/projectiles/bonebounce5.ogg" - ] - } - ], - - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" - }, - { - "action" : "liquid", - "liquid" : "pus", - "quantity" : 0.2 - }, - { - "action" : "applySurfaceMod", - "previousMod" : "metamod:none", - "newMod" : "tentaclegrass", - "radius" : 1 - }, - { - "action" : "projectile", - "type" : "ocucannonspray", - "fuzzAngle" : 20, - "inheritDamageFactor" : 0.3 - }, - { - "action" : "loop", - "count" : 6, - "body" : [ - { - "action" : "particle", - "specification" : { - "type" : "ember", - "size" : 3, - "color" : [240, 50, 80, 200], - "initialVelocity" : [0.0, -500.0], - "timeToLive" : 0.25, - "fade" : 0.8, - "destructionAction" : "shrink", - "destructionTime" : 0.25, - "layer" : "middle" - } - } - ] - } - ] + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" + }, + { + "action" : "liquid", + "liquid" : "pus", + "quantity" : 0.2 + }, + { + "action" : "applySurfaceMod", + "previousMod" : "metamod:none", + "newMod" : "tentaclegrass", + "radius" : 1 + }, + { + "action" : "projectile", + "type" : "ocucannonspray", + "fuzzAngle" : 20, + "inheritDamageFactor" : 0.3 + }, + { + "action" : "loop", + "count" : 6, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 3, + "color" : [240, 50, 80, 200], + "initialVelocity" : [0.0, -500.0], + "timeToLive" : 0.25, + "fade" : 0.8, + "destructionAction" : "shrink", + "destructionTime" : 0.25, + "layer" : "middle" + } + } + ] + } + ] } diff --git a/projectiles/guns/ocucannon/ocucannonshot2.projectile b/projectiles/guns/ocucannon/ocucannonshot2.projectile index 3cfecb4ae5f..3a3d601741a 100644 --- a/projectiles/guns/ocucannon/ocucannonshot2.projectile +++ b/projectiles/guns/ocucannon/ocucannonshot2.projectile @@ -1,51 +1,52 @@ { - "projectileName" : "ocucannonshot2", - "image" : "ocucannonshot.png", - "physics" : "grenade", - "animationCycle" : 1, - "frameNumber" : 8, - "power" : 0, - "speed" : 35, - "timeToLive" : 0.5, - "bounces" : 12, - "piercing" : false, - "damagePoly" : [ [-4, 0], [-3, -3], [0, -4], [3, -3], [4, 0], [3, 3], [0, 4], [-3, 3] ], - "damageKind" : "poison", - "actionOnReap" : [ - { - "action" : "liquid", - "liquid" : "pus", - "quantity" : 1 - }, - { - "action" : "applySurfaceMod", - "previousMod" : "metamod:none", - "newMod" : "tentaclegrass", - "radius" : 3 - }, - { - "action" : "config", - "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" - }, - { - "action" : "loop", - "count" : 6, - "body" : [ - { - "action" : "particle", - "specification" : { - "type" : "ember", - "size" : 3, - "color" : [240, 50, 80, 200], - "initialVelocity" : [0.0, -500.0], - "timeToLive" : 0.25, - "fade" : 0.8, - "destructionAction" : "shrink", - "destructionTime" : 0.25, - "layer" : "middle" - } - } - ] - } - ] + "projectileName" : "ocucannonshot2", + "image" : "ocucannonshot.png", + "physics" : "grenade", + "animationCycle" : 1, + "frameNumber" : 8, + "power" : 0, + "speed" : 35, + "timeToLive" : 0.5, + "bounces" : 12, + "piercing" : false, + "damagePoly" : [ [-4, 0], [-3, -3], [0, -4], [3, -3], [4, 0], [3, 3], [0, 4], [-3, 3] ], + "damageKind" : "poison", + "statusEffects":["puseffect"], + "actionOnReap" : [ + { + "action" : "liquid", + "liquid" : "pus", + "quantity" : 1 + }, + { + "action" : "applySurfaceMod", + "previousMod" : "metamod:none", + "newMod" : "tentaclegrass", + "radius" : 3 + }, + { + "action" : "config", + "file" : "/projectiles/explosions/fubloodexplosion/fubloodexplosion.config" + }, + { + "action" : "loop", + "count" : 6, + "body" : [ + { + "action" : "particle", + "specification" : { + "type" : "ember", + "size" : 3, + "color" : [240, 50, 80, 200], + "initialVelocity" : [0.0, -500.0], + "timeToLive" : 0.25, + "fade" : 0.8, + "destructionAction" : "shrink", + "destructionTime" : 0.25, + "layer" : "middle" + } + } + ] + } + ] } diff --git a/projectiles/guns/ocucannon/ocucannonspray.projectile b/projectiles/guns/ocucannon/ocucannonspray.projectile index 1f385e5239f..839e6392997 100644 --- a/projectiles/guns/ocucannon/ocucannonspray.projectile +++ b/projectiles/guns/ocucannon/ocucannonspray.projectile @@ -1,37 +1,38 @@ { - "projectileName" : "ocucannonspray", - "image" : "ocucannonshot.png", - "physics" : "bullet", - "animationCycle" : 1, - "frameNumber" : 1, - "power" : 0, - "speed" : 30, - "timeToLive" : 0.01, - "piercing" : true, - "damagePoly" : [ ], - "damageKind" : "poison", - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/pusexplosion/pusexplosion2.config" - }, - { - "action" : "projectile", - "type" : "ocucannonshot2", - "fuzzAngle" : 20, - "inheritDamageFactor" : 0.05 - }, - { - "action" : "projectile", - "type" : "ocucannonshot2", - "fuzzAngle" : 20, - "inheritDamageFactor" : 0.05 - }, - { - "action" : "projectile", - "type" : "ocucannonshot2", - "fuzzAngle" : 20, - "inheritDamageFactor" : 0.05 - } - ] + "projectileName" : "ocucannonspray", + "image" : "ocucannonshot.png", + "physics" : "bullet", + "animationCycle" : 1, + "frameNumber" : 1, + "power" : 0, + "speed" : 30, + "timeToLive" : 0.01, + "piercing" : true, + "damagePoly" : [], + "damageKind" : "poison", + "statusEffects":["puseffect"], + "actionOnReap" : [ + { + "action" : "config", + "file" : "/projectiles/explosions/pusexplosion/pusexplosion2.config" + }, + { + "action" : "projectile", + "type" : "ocucannonshot2", + "fuzzAngle" : 20, + "inheritDamageFactor" : 0.05 + }, + { + "action" : "projectile", + "type" : "ocucannonshot2", + "fuzzAngle" : 20, + "inheritDamageFactor" : 0.05 + }, + { + "action" : "projectile", + "type" : "ocucannonshot2", + "fuzzAngle" : 20, + "inheritDamageFactor" : 0.05 + } + ] } From 6472e40e0958dd58bac83f5a63a8d7b800fdec02 Mon Sep 17 00:00:00 2001 From: darth Date: Thu, 11 Jul 2024 16:01:08 -0300 Subject: [PATCH 09/10] Renamed some fungal decorative objects --- .../floranopenpod1/floranopenpod1.object.patch | 14 ++++++++++---- .../floranopenpod2/floranopenpod2.object.patch | 14 ++++++++++---- .../floran/floranpod1/floranpod1.object.patch | 16 +++++++++++----- .../floran/floranpod2/floranpod2.object.patch | 14 ++++++++++---- .../floran/floranpod3/floranpod3.object.patch | 14 ++++++++++---- 5 files changed, 51 insertions(+), 21 deletions(-) diff --git a/objects/floran/floranopenpod1/floranopenpod1.object.patch b/objects/floran/floranopenpod1/floranopenpod1.object.patch index c3b99f2e1cb..7b6f016ffc1 100644 --- a/objects/floran/floranopenpod1/floranopenpod1.object.patch +++ b/objects/floran/floranopenpod1/floranopenpod1.object.patch @@ -1,6 +1,12 @@ [ - { "op" : "add", - "path" : "/printable", - "value" : false - } + { + "op": "replace", + "path": "/shortdescription", + "value": "Open Curved Fungal Pod" + }, + { + "op" : "add", + "path" : "/printable", + "value" : false + } ] diff --git a/objects/floran/floranopenpod2/floranopenpod2.object.patch b/objects/floran/floranopenpod2/floranopenpod2.object.patch index c3b99f2e1cb..5f9ae7fe994 100644 --- a/objects/floran/floranopenpod2/floranopenpod2.object.patch +++ b/objects/floran/floranopenpod2/floranopenpod2.object.patch @@ -1,6 +1,12 @@ [ - { "op" : "add", - "path" : "/printable", - "value" : false - } + { + "op": "replace", + "path": "/shortdescription", + "value": "Open Angled Fungal Pod" + }, + { + "op" : "add", + "path" : "/printable", + "value" : false + } ] diff --git a/objects/floran/floranpod1/floranpod1.object.patch b/objects/floran/floranpod1/floranpod1.object.patch index c3b99f2e1cb..7d823a85455 100644 --- a/objects/floran/floranpod1/floranpod1.object.patch +++ b/objects/floran/floranpod1/floranpod1.object.patch @@ -1,6 +1,12 @@ [ - { "op" : "add", - "path" : "/printable", - "value" : false - } -] + { + "op": "replace", + "path": "/shortdescription", + "value": "Fungal Spiked Pod" + }, + { + "op" : "add", + "path" : "/printable", + "value" : false + } +] \ No newline at end of file diff --git a/objects/floran/floranpod2/floranpod2.object.patch b/objects/floran/floranpod2/floranpod2.object.patch index c3b99f2e1cb..bcd9f492f60 100644 --- a/objects/floran/floranpod2/floranpod2.object.patch +++ b/objects/floran/floranpod2/floranpod2.object.patch @@ -1,6 +1,12 @@ [ - { "op" : "add", - "path" : "/printable", - "value" : false - } + { + "op": "replace", + "path": "/shortdescription", + "value": "Fungal Tangled Pod" + }, + { + "op" : "add", + "path" : "/printable", + "value" : false + } ] diff --git a/objects/floran/floranpod3/floranpod3.object.patch b/objects/floran/floranpod3/floranpod3.object.patch index c3b99f2e1cb..e6e0c139e35 100644 --- a/objects/floran/floranpod3/floranpod3.object.patch +++ b/objects/floran/floranpod3/floranpod3.object.patch @@ -1,6 +1,12 @@ [ - { "op" : "add", - "path" : "/printable", - "value" : false - } + { + "op": "replace", + "path": "/shortdescription", + "value": "Fungal Grown Pod" + }, + { + "op" : "add", + "path" : "/printable", + "value" : false + } ] From 82c3418e681d98ba4e4dff37fb81f2739401d298 Mon Sep 17 00:00:00 2001 From: Lithoboli <168792982+Lithoboli@users.noreply.github.com> Date: Sun, 14 Jul 2024 11:12:24 +1000 Subject: [PATCH 10/10] Nightar Ship Racial Override Added racialiser override for the Nightar BYOS template to force Nightar ship components. --- frackinship/configs/ships.config | 1 + 1 file changed, 1 insertion(+) diff --git a/frackinship/configs/ships.config b/frackinship/configs/ships.config index 5f02b556889..2af77df3dcf 100644 --- a/frackinship/configs/ships.config +++ b/frackinship/configs/ships.config @@ -201,6 +201,7 @@ "ship" : "fu_byosnightarship", "name" : "Nightar BYOS Ship", "offset" : [-99,3], + "racialiserOverride" : "nightar", "icon" : "/interface/title/nightarmale.png", "previewImage" : "/interface/ai/shippreviews/fu_byosnightarship.png" },