diff --git a/_metadata b/_metadata index 02426ef9..471d034e 100644 --- a/_metadata +++ b/_metadata @@ -1,15 +1,15 @@ { "author" : "Silver Sokolova", - "description" : "[b]Betabound[/b] is a [b]base-game enhancement mod[/b] which adds tons of content consistent with the Starbound vision throughout the entire game-- from beginning to end! Although Betabound certainly has a strong presence throughout the game, it is [b]not[/b] an overhaul mod and will never outright replace content from Starbound. [b]Betabound is present, but not overwhelming.[/b]\n\nFrom the smallest quality of life changes to brand-new content, Betabound is a treasure trove of Starbound content!\n\n\n• New mining tools! Craft them and mine, but keep an eye on their durability bar! You can use ores to repair your tools.\n• New quests! Visit the Outpost and help it grow by helping those in need!\n• Enhance your ship by crafting! More fuel, faster non-FTL travel, reduced fuel costs!\n• Powerful food items which bestow useful status effects and instantly restore health and energy!\n• Unique biome-themed weapons to add spice to your universe!\n• New objects to decorate with!\n• New resources with new uses! Alien Seaweed, for example, is used to make an item to keep food fresh while in the inventory.\n• New tech for all existing tech slots... and a new tech slot!\n\n[url=https://discord.gg/5Xpc5VwnMx][img]https://i.imgur.com/jFMk4n0.png[/img][/url]\n\n[h1]Wanna see what the new update did? [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2010607826]Click here![/url]\nAlso make sure to check out the [b][url=https://steamcommunity.com/workshop/filedetails/?id=3172121173]Recommended Mods For Betabound[/url][/b] collection![/h1]\nWanna check out our wiki? [url=https://betabound.miraheze.org/wiki/Main_Page]Click this![/url]\nWant Spawnable Item Pack to show Betabound items? [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2295935729]Get the patch here![/url]\nBetabound weapons support [url=https://steamcommunity.com/sharedfiles/filedetails/?id=783742589]Weapon Assembly![/url]\nA trypophobia patch exists! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2496201241]This is where you can get it![/url]\n\n\n[Q] Other mods focusing on beta content exist. Why should I use Betabound?\n[A] Unlike those mods, Betabound asks and answers \"What would it look like if it actually got finished?\"\n\n[Q] Does Betabound replace vanilla content?\n[A] [b]No.[/b] Betabound and vanilla content are seamlessly integrated with each other, offering an experience that any Starbound player can enjoy regardless if they've played the original beta.\n\n[Q] Can I use FU with this mod?\n[A] [b]YES. Anyone that tells you this mod is incompatible with FU is a liar.[/b]\n\n[Q] Weapons are doing an absurd amount of damage!\n[A] Check your mods list for mods which increase the amount of damage done by weapons, such as \"Difficulty Overhaul\" or similar.\n\n[Q] Are there any mods that are redundant when Betabound is installed, and should I be concerned?\n[A] Betabound works quite well even when redundant mods are installed, so [b]there is no urgent need to remove any redundant mods[/b] you may have. However, it may be wise to check out the [url=https://steamcommunity.com/workshop/filedetails/discussion/2010607826/4357873056144718990/]Redundant Mods List[/url]. Bear in mind that some mods may only be partially redundant and still offer unique experiences.\n\n[url=https://ko-fi.com/silversokolova][img]https://imgur.com/ZHso4yR.png[/img][/url]\n\nA special 'thank you' to [b]pngimage.net[/b] for allowing me to use their image in the logo! Source: https://pngimage.net/beta-logo-png-5/\nShoutout to [b]Aegonian[/b] for providing an essential bit of code which allowed holiday content to be made possible! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=850109963]Check out their work![/url]\nWithout [b]jss2a98aj's[/b] work in optimizing the unique mod music, we wouldn't have those tunes! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1543219534]Show your appreciation by paying his Starbound Patch Project a visit![/url]\n[i]Betabound[/i] features music composed by [b]Toby Fox![/b] Check out his work [url=https://store.steampowered.com/app/391540/Undertale]here[/url] and [url=https://store.steampowered.com/app/1671210/DELTARUNE/]here![/url]\nThe Orange Juice and several ability icon sprites were created by [b]Frykas[/b]! Check out his work [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2431875552]here![/url]\nReefpod-based items give a swim boost buff thanks to [b]BlossomDancer's[/b] [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2787981321]Reefpod Gives Swim Boost[/url] mod! Check it out!\nA handful of sprites were done by [url=https://twitter.com/Rhopunzel][b]Rhopunzel[/b][/url]! [url=https://store.steampowered.com/app/1363900/Farworld_Pioneers/]Check out their work here![/url]\nThe Black Current Crumble and Crystal Chips sprites were made by [b]SOULs[/b]! Check out their work [url=https://twiom.carrd.co/]here![/url]\nThanks to Tea-Loving Lad, many of Betabound's angled weapons were straightened and given visual upgrades! Check out their work [url=https://steamcommunity.com/id/TeaLovingLad/myworkshopfiles/]here[/url]!\nThe skyrails and a handful of Betabound's weapons were given a visual facelift by [url=https://steamcommunity.com/profiles/76561193786172700]_InferusRF[/url]! Thank you!\nMany old objects from early Starbound beta were given new images in the style of modern Starbound by Nuggubs! Check out their work [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2735634052]here![/url]", + "description" : "[b]Betabound[/b] is a [b]base-game enhancement mod[/b] which adds tons of content consistent with the Starbound vision throughout the entire game-- from beginning to end! Although Betabound certainly has a strong presence throughout the game, it is [b]not[/b] an overhaul mod and will never outright replace content from Starbound. [b]Betabound is present, but not overwhelming.[/b]\n\nFrom the smallest quality of life changes to brand-new content, Betabound is a treasure trove of Starbound content!\n\n\n• New mining tools! Craft them and mine, but keep an eye on their durability bar! You can use ores to repair your tools.\n• New quests! Visit the Outpost and help it grow by helping those in need!\n• Enhance your ship by crafting! More fuel, faster non-FTL travel, reduced fuel costs!\n• Powerful food items which bestow useful status effects and instantly restore health and energy!\n• Unique biome-themed weapons to add spice to your universe!\n• New objects to decorate with!\n• New resources with new uses! Alien Seaweed, for example, is used to make an item to keep food fresh while in the inventory.\n• New tech for all existing tech slots... and a new tech slot!\n\n[url=https://discord.gg/5Xpc5VwnMx][img]https://i.imgur.com/jFMk4n0.png[/img][/url]\n\n[h1]Wanna see what the new update did? [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2010607826]Click here![/url]\nAlso make sure to check out the [b][url=https://steamcommunity.com/workshop/filedetails/?id=3172121173]Recommended Mods For Betabound[/url][/b] collection![/h1]\nWanna check out our wiki? [url=https://betabound.miraheze.org/wiki/Main_Page]Click this![/url]\nWant Spawnable Item Pack to show Betabound items? [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2295935729]Get the patch here![/url]\nBetabound weapons support [url=https://steamcommunity.com/sharedfiles/filedetails/?id=783742589]Weapon Assembly![/url]\nA trypophobia patch exists! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2496201241]This is where you can get it![/url]\n\n\n[Q] Other mods focusing on beta content exist. Why should I use Betabound?\n[A] Unlike those mods, Betabound asks and answers \"What would it look like if it actually got finished?\"\n\n[Q] Does Betabound replace vanilla content?\n[A] [b]No.[/b] Betabound and vanilla content are seamlessly integrated with each other, offering an experience that any Starbound player can enjoy regardless if they've played the original beta.\n\n[Q] Can I use FU with this mod?\n[A] [b]YES. Anyone that tells you this mod is incompatible with FU is a liar.[/b]\n\n[Q] Weapons are doing an absurd amount of damage!\n[A] Check your mods list for mods which increase the amount of damage done by weapons, such as \"Difficulty Overhaul\" or similar.\n\n[Q] Are there any mods that are redundant when Betabound is installed, and should I be concerned?\n[A] Betabound works quite well even when redundant mods are installed, so [b]there is no urgent need to remove any redundant mods[/b] you may have. However, it may be wise to check out the [url=https://steamcommunity.com/workshop/filedetails/discussion/2010607826/4357873056144718990/]Redundant Mods List[/url]. Bear in mind that some mods may only be partially redundant and still offer unique experiences.\n\n[url=https://ko-fi.com/silversokolova][img]https://imgur.com/ZHso4yR.png[/img][/url]\n\nA special 'thank you' to [b]pngimage.net[/b] for allowing me to use their image in the logo! Source: https://pngimage.net/beta-logo-png-5/\nShoutout to [b]Aegonian[/b] for providing an essential bit of code which allowed holiday content to be made possible! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=850109963]Check out their work![/url]\nWithout [b]jss2a98aj's[/b] work in optimizing the unique mod music, we wouldn't have those tunes! [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1543219534]Show your appreciation by paying his Starbound Patch Project a visit![/url]\n[i]Betabound[/i] features music composed by [b]Toby Fox![/b] Check out his work [url=https://store.steampowered.com/app/391540/Undertale]here[/url] and [url=https://store.steampowered.com/app/1671210/DELTARUNE/]here![/url]\nThe Orange Juice and several ability icon sprites were created by [b]Frykas[/b]! Check out his work [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2431875552]here![/url]\nReefpod-based items give a swim boost buff thanks to [b]BlossomDancer's[/b] [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2787981321]Reefpod Gives Swim Boost[/url] mod! Check it out!\nA handful of sprites were done by [url=https://twitter.com/Rhopunzel][b]Rhopunzel[/b][/url]! [url=https://store.steampowered.com/app/1363900/Farworld_Pioneers/]Check out their work here![/url]\nThe Black Current Crumble and Crystal Chips sprites were made by [b]SOULs[/b]! Check out their work [url=https://twiom.carrd.co/]here![/url]\nThanks to Tea-Loving Lad, many of Betabound's angled weapons were straightened and given visual upgrades! Check out their work [url=https://steamcommunity.com/id/TeaLovingLad/myworkshopfiles/]here[/url]!\nThe skyrails and a handful of Betabound's weapons were given a visual facelift by [url=https://steamcommunity.com/profiles/76561193786172700]_InferusRF[/url]! Thank you!\nThe jam sprites were given a face-lift by Nuggubs! Check out their work [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2735634052]here![/url]\nThe PB&J sprite was made by ShyDispatch! Check out their work [url=https://steamcommunity.com/id/Manix25/myworkshopfiles/?appid=211820]here![/url]", "friendlyName" : "^shadow;Betab^#ff0;¤^clear;.^reset,shadow;und!", - "includes" : ["EES", "Extended GUI", "ggn_interface", "bk3k_inventory_reskin", "bk3k_inventory_reskin1", "bk3k_inventory", "xrc_mccreepers", "xrc_transmutationmatrix", "XRC_BETA_STARBOUND:LECTERNS", "XRC_BETA_STARBOUND:RADIO", "XRC_BETA_STARBOUND:LADDERS", "XRC_BETA_STARBOUND:REPAIRTOOLS", "shattered_alchemy", "xrc_cursors", "Starbound++", "FrackinUniverse", "hebiohime's Armor Augments", "Augment Slots for Armor", "Manipulated UI", "StardustLib", "QuickBarMini", "QuickbarMini", "moremmupgrades", "WeaponAssembly", "StardustLibPost", "Improved Food Descriptions", "Improved Food Descriptions [Addon]", "serverDice", "FrackinXmas", "sup_overhaul", "Universal Uncrafter v1.46", "MoreFarming", "Shellguard Expansion ", "shoggothracemod", "AnomsOutpostOverhual", "More Outpost Objects", "MorePlanetInfo", "No Food Block", "StarTech", "joboffers", "Combinable Augments", "XRC_GROWINGTRAYS", "TabulaRasa", "WEdit", "RecipeMaster", "Useful Back Items", "IdleFactories", "GardenBot2", "MMConfigurator", "Item Frame v1.3", "FUExGUIPatch", "vanta-race", "Automatic Mining Augment - Compatible Arcana FU", "Matter Duplicator", "Ground Seeders", "FrackinUnicerst", "zcrab_unsealtradingcrates", "Enhanced Storage", "Improved Containers", "The Starforge v1.0", "The Starforge", "Augment Extractor", "OceanicWorldsCaveRework", "InstaUrsa", "Weapon Stats", "XRC_ShowWeaponLevels", "SmallImprovements", "Terrain_Improvements", "Project Redemption", "Tech Additions", "bk3k_techHelper", "Bug Spawn Improvement", "survivalresourcesmod", "pat_techremover", "StarburstRework", "Anter583_flashlightButtons_replacer", "Npc_Drops_Gear", "NoChuckleSplash", "Sandbox", "A.V.I.A.N.", "Quantum Stable Item Frames", "QuickStackGun", "bk3k_Techs"], + "includes" : ["EES", "Extended GUI", "ggn_interface", "bk3k_inventory_reskin", "bk3k_inventory_reskin1", "bk3k_inventory", "xrc_mccreepers", "xrc_transmutationmatrix", "XRC_BETA_STARBOUND:LECTERNS", "XRC_BETA_STARBOUND:RADIO", "XRC_BETA_STARBOUND:LADDERS", "XRC_BETA_STARBOUND:REPAIRTOOLS", "shattered_alchemy", "xrc_cursors", "Starbound++", "FrackinUniverse", "hebiohime's Armor Augments", "Augment Slots for Armor", "Manipulated UI", "StardustLib", "QuickBarMini", "QuickbarMini", "moremmupgrades", "WeaponAssembly", "StardustLibPost", "Improved Food Descriptions", "Improved Food Descriptions [Addon]", "serverDice", "FrackinXmas", "sup_overhaul", "Universal Uncrafter v1.46", "MoreFarming", "Shellguard Expansion ", "shoggothracemod", "AnomsOutpostOverhual", "More Outpost Objects", "MorePlanetInfo", "No Food Block", "StarTech", "joboffers", "Combinable Augments", "XRC_GROWINGTRAYS", "TabulaRasa", "WEdit", "RecipeMaster", "Useful Back Items", "IdleFactories", "GardenBot2", "MMConfigurator", "Item Frame v1.3", "FUExGUIPatch", "vanta-race", "Automatic Mining Augment - Compatible Arcana FU", "Matter Duplicator", "Ground Seeders", "FrackinUnicerst", "zcrab_unsealtradingcrates", "Enhanced Storage", "Improved Containers", "The Starforge v1.0", "The Starforge", "Augment Extractor", "OceanicWorldsCaveRework", "InstaUrsa", "Weapon Stats", "XRC_ShowWeaponLevels", "SmallImprovements", "Terrain_Improvements", "Project Redemption", "Tech Additions", "bk3k_techHelper", "Bug Spawn Improvement", "survivalresourcesmod", "pat_techremover", "StarburstRework", "Anter583_flashlightButtons_replacer", "Npc_Drops_Gear", "NoChuckleSplash", "Sandbox", "A.V.I.A.N.", "Quantum Stable Item Frames", "QuickStackGun", "bk3k_Techs", "Base Tech Rebalance", "fl_planetsearch"], "link" : "steam://urlCommunityFilePage/2010607826", "name" : "XRC_BETA_STARBOUND", "scripts" : { - "onLoad" : ["/scripts/assets/sb_postload.lua"] + "postLoad" : ["/scripts/assets/sb_postload.lua"] }, "steamContentId" : "2010607826", "steamTitle" : "Betabound!", "tags" : "Crafting and Building|Miscellaneous|Planets and Environments|Musical Instruments and Songs|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|User Interface|Furniture and Objects|Character Improvements|Food and Farming|In-Game Tools|Mechanics|Vehicles and Mounts|Armor and Clothes", - "version" : "0.13e" + "version" : "0.14" } \ No newline at end of file diff --git a/animations/sb/muzzleflash/blankmuzzle/blankmuzzle.frames b/animations/sb/muzzleflash/blankmuzzle/blankmuzzle.frames index f61a32cb..eaee0a99 100644 --- a/animations/sb/muzzleflash/blankmuzzle/blankmuzzle.frames +++ b/animations/sb/muzzleflash/blankmuzzle/blankmuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [1, 1], - "dimensions" : [1, 1] + "frameGrid": { + "size": [1, 1], + "dimensions": [1, 1] } } diff --git a/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.frames b/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.frames index 84a8cbe3..6bb5b806 100644 --- a/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.frames +++ b/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [32, 32], - "dimensions" : [3, 1] + "frameGrid": { + "size": [32, 32], + "dimensions": [3, 1] } } diff --git a/animations/sb/muzzleflash/bulletmuzzle1/bulletmuzzle1.frames b/animations/sb/muzzleflash/bulletmuzzle1/bulletmuzzle1.frames index b7c97a97..b8342018 100644 --- a/animations/sb/muzzleflash/bulletmuzzle1/bulletmuzzle1.frames +++ b/animations/sb/muzzleflash/bulletmuzzle1/bulletmuzzle1.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [6, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/bulletmuzzle2/bulletmuzzle2.frames b/animations/sb/muzzleflash/bulletmuzzle2/bulletmuzzle2.frames index b7c97a97..b8342018 100644 --- a/animations/sb/muzzleflash/bulletmuzzle2/bulletmuzzle2.frames +++ b/animations/sb/muzzleflash/bulletmuzzle2/bulletmuzzle2.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [6, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.frames b/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.frames index b7c97a97..b8342018 100644 --- a/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.frames +++ b/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [6, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.frames b/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.frames index 4d753255..deff5d0f 100644 --- a/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.frames +++ b/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [25, 25], - "dimensions" : [6, 1] + "frameGrid": { + "size": [25, 25], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/electromuzzle/electromuzzle.frames b/animations/sb/muzzleflash/electromuzzle/electromuzzle.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/electromuzzle/electromuzzle.frames +++ b/animations/sb/muzzleflash/electromuzzle/electromuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.frames b/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.frames index b7c97a97..b8342018 100644 --- a/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.frames +++ b/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [6, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/meteorflash/meteorflash.frames b/animations/sb/muzzleflash/meteorflash/meteorflash.frames index f2706881..5ed7933d 100644 --- a/animations/sb/muzzleflash/meteorflash/meteorflash.frames +++ b/animations/sb/muzzleflash/meteorflash/meteorflash.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [43, 24], - "dimensions" : [8, 1] + "frameGrid": { + "size": [43, 24], + "dimensions": [8, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle1/plasmamuzzle1.frames b/animations/sb/muzzleflash/plasmamuzzle1/plasmamuzzle1.frames index 55a885e8..c31f8071 100644 --- a/animations/sb/muzzleflash/plasmamuzzle1/plasmamuzzle1.frames +++ b/animations/sb/muzzleflash/plasmamuzzle1/plasmamuzzle1.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [8, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [8, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle2/plasmamuzzle2.frames b/animations/sb/muzzleflash/plasmamuzzle2/plasmamuzzle2.frames index d01e33fc..a8019ef3 100644 --- a/animations/sb/muzzleflash/plasmamuzzle2/plasmamuzzle2.frames +++ b/animations/sb/muzzleflash/plasmamuzzle2/plasmamuzzle2.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [3, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [3, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.frames b/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.frames +++ b/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.frames b/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.frames +++ b/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.frames b/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.frames +++ b/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.frames b/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.frames +++ b/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.frames b/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.frames +++ b/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.frames b/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.frames +++ b/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.frames b/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.frames index b1bd1e05..8e7bcfde 100644 --- a/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.frames +++ b/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [4, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [4, 1] } } diff --git a/animations/sb/muzzleflash/plasmamuzzle5/plasmamuzzle5.frames b/animations/sb/muzzleflash/plasmamuzzle5/plasmamuzzle5.frames index d01e33fc..a8019ef3 100644 --- a/animations/sb/muzzleflash/plasmamuzzle5/plasmamuzzle5.frames +++ b/animations/sb/muzzleflash/plasmamuzzle5/plasmamuzzle5.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [3, 1] + "frameGrid": { + "size": [15, 15], + "dimensions": [3, 1] } } diff --git a/animations/sb/muzzleflash/rainbowmuzzle/rainbowmuzzle.frames b/animations/sb/muzzleflash/rainbowmuzzle/rainbowmuzzle.frames index 4d753255..deff5d0f 100644 --- a/animations/sb/muzzleflash/rainbowmuzzle/rainbowmuzzle.frames +++ b/animations/sb/muzzleflash/rainbowmuzzle/rainbowmuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [25, 25], - "dimensions" : [6, 1] + "frameGrid": { + "size": [25, 25], + "dimensions": [6, 1] } } diff --git a/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.frames b/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.frames index 64687a31..ad9dff92 100644 --- a/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.frames +++ b/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [22, 12], - "dimensions" : [8, 1] + "frameGrid": { + "size": [22, 12], + "dimensions": [8, 1] } } diff --git a/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.frames b/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.frames index 7d64e35c..2f35e837 100644 --- a/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.frames +++ b/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [26, 22], - "dimensions" : [10, 1] + "frameGrid": { + "size": [26, 22], + "dimensions": [10, 1] } } diff --git a/animations/statuseffects/sb_frozenburning/frozenburning.animation b/animations/statuseffects/sb_frozenburning/frozenburning.animation index 10e259e5..c86e596e 100644 --- a/animations/statuseffects/sb_frozenburning/frozenburning.animation +++ b/animations/statuseffects/sb_frozenburning/frozenburning.animation @@ -1,8 +1,8 @@ { - "frames" : "frozenburning.png", - "variants" : 1, - "frameNumber" : 4, - "loops" : 20.0, - "animationCycle" : 0.8, - "offset" : [0, 0] + "frames": "frozenburning.png", + "variants": 1, + "frameNumber": 4, + "loops": 20, + "animationCycle": 0.8, + "offset": [0, 0] } diff --git a/animations/statuseffects/sb_frozenburning/frozenburning.frames b/animations/statuseffects/sb_frozenburning/frozenburning.frames index 2f9240ec..83a6f483 100644 --- a/animations/statuseffects/sb_frozenburning/frozenburning.frames +++ b/animations/statuseffects/sb_frozenburning/frozenburning.frames @@ -1,10 +1,10 @@ { - "frameGrid" : { - "size" : [6, 8], - "dimensions" : [4, 1], + "frameGrid": { + "size": [6, 8], + "dimensions": [4, 1], - "names" : [ - [ "0", "1", "2", "3" ] + "names": [ + ["0", "1", "2", "3"] ] } } diff --git a/betabound.config b/betabound.config index cae72b59..b986b5f3 100644 --- a/betabound.config +++ b/betabound.config @@ -9,6 +9,7 @@ [21, 39]//scan ], + //items "heldItemArmAngle": -0.436, "infoItemTextDirectives": "?replace;000=0000?border;1;333;0000", @@ -19,6 +20,20 @@ "hungerPopups": true, "fuelScaling": true, + //If any of these items accept augments, all Betabound items of that category which run the Betabound armor buildscript will also accept augments + //There are armor augment mods for each slot. We need the path because buildscripts run before the item database is finished + "armorAugmentModPaths": { + "headarmor": "/items/armors/other/camo/camo.head", + "chestarmor": "/items/armors/other/camo/camo.chest", + "legarmor": "/items/armors/other/camo/camo.legs", + + "headwear": "/items/armors/decorative/clothes/scarf/winterscarf.head", + "chestwear": "/items/armors/decorative/clothes/tshirt/tshirt.chest", + "legwear": "/items/armors/decorative/clothes/jeans1/jeans1.legs", + + "other": "/items/armors/backitems/eye/eye.back" + }, + //TRANSLATABLE STRINGS "showHunger": "^#d5ab36;Hunger: %s", //for sb_showhunger command "updateNote": "Update Note", diff --git a/betabound.macros b/betabound.macros index b1b5d09f..e213344e 100644 --- a/betabound.macros +++ b/betabound.macros @@ -35,8 +35,6 @@ "sb_storage": ["/warp InstanceWorld:playerstation:21df53c9aade582dfc2b38e6a28b62f0:1=cba2e7459537ec44bcfced0ab0548c99"], "sb_storage2": ["/warp InstanceWorld:playerstation:6f20604db8080bfa09f17a9cd667956b:1=2acb1e351639f3d2f738182d7f86c8a3"], - "sb_swansong": ["/warp instanceworld:cultistmission1=1633.795"], - //Progression "sb_human": ["/startquest '\"human_mission1\"'", "/completequest human_mission1"], "sb_floran": ["/startquest '\"floran_mission1\"'", "/completequest floran_mission1", "/startquest '\"floran_mission2\"'", "/completequest floran_mission2"], @@ -80,7 +78,9 @@ //Data Manipulation "sb_repeatversioning": ["/run player.setProperty('betabound',sb.jsonMerge(player.getProperty('betabound',{}),{version=player.getProperty('betabound').version -1}))"], + "sb_resetversioning": ["/run player.setProperty('betabound',sb.jsonMerge(player.getProperty('betabound',{}),{version=0}))"], //Do not use this on characters you care about "sb_data": ["/run return sb.printJson(player.getProperty('betabound'), 1)"], + "sb_resetship": ["/run local data = player.getProperty('betabound', {}) data.ship = nil data.shipUpgrades = nil player.setProperty('betabound', data)"], //Misc "sb_elliot": ["/spawnitem techlabscientistshop 1 '{\"shortdescription\":\"Questless Elliot\",\"offeredQuests\":[]}"], diff --git a/biomes/sb_oredistributions.configfunctions b/biomes/sb_oredistributions.configfunctions index bc419361..fdbeb765 100644 --- a/biomes/sb_oredistributions.configfunctions +++ b/biomes/sb_oredistributions.configfunctions @@ -1,5 +1,5 @@ { - "sb_surfaceOres" :[ + "sb_surfaceOres": [ [0.5,[["coal",0.90],["uranium",0.00],["plutonium",0.00],["solarium",0.00],["copper",0.60],["silver",0.10],["gold",0.00],["platinum",0.00],["diamond",0.00],["iron",0.15]]], [1.5,[["coal",0.90],["uranium",0.00],["plutonium",0.00],["solarium",0.00],["copper",0.60],["silver",0.20],["gold",0.05],["platinum",0.05],["diamond",0.00],["iron",0.15]]], [2.5,[["coal",0.90],["uranium",0.00],["plutonium",0.00],["solarium",0.00],["copper",0.60],["silver",0.25],["gold",0.10],["platinum",0.10],["diamond",0.05],["titanium",0.15]]], @@ -8,7 +8,7 @@ [5.5,[["coal",0.90],["uranium",0.65],["plutonium",0.60],["solarium",0.40],["copper",0.60],["silver",0.60],["gold",0.25],["platinum",0.25],["diamond",0.20],["aegisalt",0.45],["sb_rubium",0.45],["sb_cerulium",0.45]]] ], - "sb_crystalDepth2" :[ + "sb_crystalDepth2": [ [0.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.90],["tungsten",0.00],["titanium",0.00],["durasteel",0.00],["aegisalt",0.00],["ferozium",0.00],["violium",0.00],["solarium",0.00]]], [1.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.65],["tungsten",0.90],["titanium",0.00],["durasteel",0.00],["aegisalt",0.00],["ferozium",0.00],["violium",0.00],["solarium",0.00],["platinum",0.90]]], [2.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.00],["tungsten",0.65],["titanium",0.90],["durasteel",0.00],["aegisalt",0.00],["ferozium",0.00],["violium",0.00],["solarium",0.00],["platinum",0.65],["sb_fossil",0.50]]], @@ -17,7 +17,7 @@ [5.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.00],["tungsten",0.00],["titanium",0.00],["durasteel",0.00],["aegisalt",0.65],["ferozium",0.65],["violium",0.65],["solarium",0.90],["sb_rubium",0.60]]] ], - "sb_sulphurDepth3" :[ + "sb_sulphurDepth3": [ [0.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",1],["tungsten",0],["titanium",0],["durasteel",0],["aegisalt",0],["ferozium",0],["violium",0],["solarium",0],["sulphur",0.7],["lead",0.7]]], [1.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",0.8],["tungsten",1],["titanium",0],["durasteel",0],["aegisalt",0],["ferozium",0],["violium",0],["solarium",0],["platinum",1],["sulphur",0.7],["lead",0.7]]], [2.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",0],["tungsten",0.8],["titanium",1],["durasteel",0],["aegisalt",0],["ferozium",0],["violium",0],["solarium",0],["platinum",0.8],["sulphur",0.7],["lead",0.7],["sb_fossil",0.5]]], diff --git a/biomes/surface/sb_tentacle.biome b/biomes/surface/sb_tentacle.biome index e785f928..e8ea6510 100644 --- a/biomes/surface/sb_tentacle.biome +++ b/biomes/surface/sb_tentacle.biome @@ -1,6 +1,7 @@ { "name": "sb_tentacle", "friendlyName": "Tentacle", + "statusEffects": ["biomeheat"], "spawnProfile": { "groups": [{ diff --git a/biomes/surface_detached/sb_crystalline.biome b/biomes/surface_detached/sb_crystalline.biome index 3682ab00..7cd08ff9 100644 --- a/biomes/surface_detached/sb_crystalline.biome +++ b/biomes/surface_detached/sb_crystalline.biome @@ -1,104 +1,93 @@ { //TODO: make mobs spawn - "name" : "sb_crystalline", - "friendlyName" : "Crystalline", + "name": "sb_crystalline", + "friendlyName": "Crystalline", - "mainBlock" : "obsidian", - "subBlocks" : [ "ash", "blaststone" ], - "ores" : "surface", + "mainBlock": "obsidian", + "subBlocks": ["ash", "blaststone"], + "ores": "surface", - "surfacePlaceables" : { - "grassMod" : [ "blackash" ], - "grassModDensity" : 0.3, + "surfacePlaceables": { + "grassMod": ["blackash"], + "grassModDensity": 0.3, - "items" : [ - { - "mode" : "floor", - "priority" : 1.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:surfaceCapsules", + "items": [{ + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:surfaceCapsules", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "capsulesmall"], [0.35, "capsulemed"], [0.35, "capsulebig"]], + "parameters": {} } ] - }, - { - "mode" : "floor", - "priority" : 1.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:denseLarge", + }, { + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", - "type" : "tree", - "treeFoliageHueShiftMax" : 0, - "treeStemHueShiftMax" : 0, - "treeStemList" : [ "sb_crystalline" ], - "treeFoliageList" : [ "sb_crystallinenofoliage" ] - }, - { - "mode" : "floor", - "priority" : 0.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:minibiomeChests", + "type": "tree", + "treeFoliageHueShiftMax": 0, + "treeStemHueShiftMax": 0, + "treeStemList": ["sb_crystalline"], + "treeFoliageList": ["sb_crystallinenofoliage"] + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", - "type" : "treasureBox", - "treasureBoxSets" : [ "crystalChest" ] - }, - { - "mode" : "floor", - "priority" : 4.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:scatteredSmall", + "type": "treasureBox", + "treasureBoxSets": ["crystalChest"] + }, { + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:scatteredSmall", - "type" : "grass", - "grasses" : [ "crystalflower" ] - }, - { - "mode" : "floor", - "priority" : 3.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:scatteredSmall", + "type": "grass", + "grasses": ["crystalflower"] + }, { + "mode": "floor", + "priority": 3, + "variants": 1, + "distribution": "/biomes/distributions.config:scatteredSmall", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "crystallinebush1" ], [0.35, "crystallinebush2" ], [0.35, "crystallinebush3" ], [0.35, "crystallinebush4" ] ], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "crystallinebush1"], [0.35, "crystallinebush2"], [0.35, "crystallinebush3"], [0.35, "crystallinebush4"]], + "parameters": {} } ] }, - { - "mode" : "floor", - "priority" : 1.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:surfaceCrops", + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:surfaceCrops", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [1, "wildneonmelonseed" ] ], - "parameters" : { - "startingStage" : 2 + "type": "object", + "objectSets": [{ + "pool": [[1, "wildneonmelonseed"]], + "parameters": { + "startingStage": 2 } } ] - }, - { - "mode" : "floor", - "priority" : 2, - "variants" : 1, - "distribution" : "/biomes/distributions.config:surfaceCrops", + }, { + "mode": "floor", + "priority": 2, + "variants": 1, + "distribution": "/biomes/distributions.config:surfaceCrops", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [1, "wildcrystalplantseed" ] ], - "parameters" : { - "startingStage" : 2 + "type": "object", + "objectSets": [{ + "pool": [[1, "wildcrystalplantseed"]], + "parameters": { + "startingStage": 2 } } ] @@ -106,31 +95,28 @@ ] }, - "undergroundPlaceables" : { - "items" : [ - { - "mode" : "floor", - "priority" : 1.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:undergroundCapsules", + "undergroundPlaceables": { + "items": [{ + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundCapsules", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "capsulesmall"], [0.35, "capsulemed"], [0.35, "capsulebig"]], + "parameters": {} } ] - }, - { - "mode" : "floor", - "priority" : 0.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:minibiomeChests", + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", - "type" : "treasureBox", - "treasureBoxSets" : [ "crystalChest" ] + "type": "treasureBox", + "treasureBoxSets": ["crystalChest"] } ] } -} \ No newline at end of file +} diff --git a/biomes/surface_detached/sb_rust.biome b/biomes/surface_detached/sb_rust.biome index cdb29daf..15323f89 100644 --- a/biomes/surface_detached/sb_rust.biome +++ b/biomes/surface_detached/sb_rust.biome @@ -1,13 +1,12 @@ { //TODO: critters? - "name" : "sb_rust", - "friendlyName" : "Rust", + "name": "sb_rust", + "friendlyName": "Rust", - "spawnProfile" : { - "groups" : [ - { - "select" : 2, - "pool" : [ + "spawnProfile": { + "groups": [{ + "select": 2, + "pool": [ [1, "bobot"], [1, "scandroid"] ] @@ -15,86 +14,77 @@ ] }, - "mainBlock" : "rock19", - "subBlocks" : ["ash", "blaststone"], - "ores" : "surface", + "mainBlock": "rock19", + "subBlocks": ["ash", "blaststone"], + "ores": "surface", - "surfacePlaceables" : { - "grassMod" : ["metal"], - "grassModDensity" : 0.8, + "surfacePlaceables": { + "grassMod": ["metal"], + "grassModDensity": 0.8, - "items" : [ - { - "mode" : "floor", - "priority" : 1, - "variants" : 1, - "distribution" : "/biomes/distributions.config:surfaceCapsules", + "items": [{ + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:surfaceCapsules", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "capsulesmall"], [0.35, "capsulemed"], [0.35, "capsulebig"]], + "parameters": {} } ] - }, - { - "mode" : "floor", - "priority" : 1, - "variants" : 1, - "distribution" : "/biomes/distributions.config:denseLarge", + }, { + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", - "type" : "tree", - "treeFoliageHueShiftMax" : 0, - "treeStemHueShiftMax" : 0, - "treeStemList" : ["rust"], - "treeFoliageList" : ["rustflower"] - }, - { - "mode" : "floor", - "priority" : 0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:minibiomeChests", + "type": "tree", + "treeFoliageHueShiftMax": 0, + "treeStemHueShiftMax": 0, + "treeStemList": ["rust"], + "treeFoliageList": ["rustflower"] + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", - "type" : "treasureBox", - "treasureBoxSets" : ["sb_rustChest"] - }, - { - "mode" : "floor", - "priority" : 4.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:scatteredSmall", + "type": "treasureBox", + "treasureBoxSets": ["sb_rustChest"] + }, { + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:scatteredSmall", - "type" : "grass", - "grasses" : ["rustflower"] - }, - { - "mode" : "floor", - "priority" : 3, - "variants" : 1, - "distribution" : "/biomes/distributions.config:denseMedium", + "type": "grass", + "grasses": ["rustflower"] + }, { + "mode": "floor", + "priority": 3, + "variants": 1, + "distribution": "/biomes/distributions.config:denseMedium", - "type" : "object", - "objectSets" : [ - { - "pool" : [[0.35,"rustbush1"], [0.35,"rustbush2"], [0.35,"rustbush3"], [0.35,"rustbush4"]], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "rustbush1"], [0.35, "rustbush2"], [0.35, "rustbush3"], [0.35, "rustbush4"]], + "parameters": {} } ] }, - { - "mode" : "floor", - "priority" : 1.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:surfaceCrops", + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:surfaceCrops", - "type" : "object", - "objectSets" : [ - { - "pool" : [[1, "wilddiodiaseed"]], - "parameters" : { - "startingStage" : 2 + "type": "object", + "objectSets": [{ + "pool": [[1, "wilddiodiaseed"]], + "parameters": { + "startingStage": 2 } } ] @@ -102,31 +92,28 @@ ] }, - "undergroundPlaceables" : { - "items" : [ - { - "mode" : "floor", - "priority" : 1, - "variants" : 1, - "distribution" : "/biomes/distributions.config:undergroundCapsules", + "undergroundPlaceables": { + "items": [{ + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundCapsules", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], - "parameters" : { } + "type": "object", + "objectSets": [{ + "pool": [[0.35, "capsulesmall"], [0.35, "capsulemed"], [0.35, "capsulebig"]], + "parameters": {} } ] - }, - { - "mode" : "floor", - "priority" : 0.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:minibiomeChests", + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", - "type" : "treasureBox", - "treasureBoxSets" : ["sb_rustChest"] + "type": "treasureBox", + "treasureBoxSets": ["sb_rustChest"] } ] } -} \ No newline at end of file +} diff --git a/biomes/underground/sb_tentacleunderground.biome b/biomes/underground/sb_tentacleunderground.biome index 362272e9..e978a2fd 100644 --- a/biomes/underground/sb_tentacleunderground.biome +++ b/biomes/underground/sb_tentacleunderground.biome @@ -85,7 +85,7 @@ "items": [{ "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:overgroundChests", @@ -93,7 +93,7 @@ "treasureBoxSets": ["basicChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:overgroundChests", @@ -101,7 +101,7 @@ "treasureBoxSets": ["weaponChest"] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:overgroundChests", @@ -113,7 +113,7 @@ ] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:potsRare", @@ -133,7 +133,7 @@ "microdungeons": ["sb_glitchencounter", "sb_randomencounter", "sb_miniboss"] }, { "mode": "floor", - "priority": 3.0, + "priority": 3, "variants": 1, "distribution": "/biomes/distributions.config:tiyDist", @@ -141,7 +141,7 @@ "microdungeons": ["block1platforms", "loops", "spiralspikes", "blocks", "stripeblocks", "blockpile", "reversepyramids", "flats", "spikes", "rods", "wiggles", "rockyshapes", "layeredspire", "blank", "none"] }, { "mode": "floor", - "priority": 3.0, + "priority": 3, "variants": 1, "distribution": "/biomes/distributions.config:scatteredSmall", @@ -149,7 +149,7 @@ "grasses": ["pebbles"] }, { "mode": "floor", - "priority": 3.0, + "priority": 3, "variants": 1, "distribution": "/biomes/distributions.config:tiyDistTerrainfeatures", @@ -157,7 +157,7 @@ "microdungeons": ["terrainfeatures"] }, { "mode": "floor", - "priority": 3.0, + "priority": 3, "variants": 1, "distribution": "/biomes/distributions.config:tiyDistPlatform", @@ -165,7 +165,7 @@ "microdungeons": ["aridplatforming"] }, { "mode": "floor", - "priority": 2.0, + "priority": 2, "variants": 1, "distribution": "/biomes/distributions.config:scatteredSmall", @@ -178,7 +178,7 @@ ] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:denseLarge", @@ -197,7 +197,7 @@ "items": [{ "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:undergroundChests", @@ -205,7 +205,7 @@ "treasureBoxSets": ["basicChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:undergroundtechChests", @@ -213,7 +213,7 @@ "treasureBoxSets": ["techChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:undergroundChests", @@ -221,7 +221,7 @@ "treasureBoxSets": ["weaponChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:undergroundChests", @@ -229,7 +229,7 @@ "treasureBoxSets": ["sb_gunChest"] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:undergroundChests", @@ -241,7 +241,7 @@ ] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:scatteredPots", @@ -253,7 +253,7 @@ ] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:scatteredSmall", diff --git a/biomes/underground_detached/sb_coralcave.biome b/biomes/underground_detached/sb_coralcave.biome index 538c154f..132c08db 100644 --- a/biomes/underground_detached/sb_coralcave.biome +++ b/biomes/underground_detached/sb_coralcave.biome @@ -53,7 +53,7 @@ "grassModDensity": 0.9, "items": [{ "mode": "floor", - "priority": 2.0, + "priority": 2, "variants": 1, "distribution": "/biomes/distributions.config:potsRare", @@ -67,7 +67,7 @@ ] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:denseLarge", @@ -86,7 +86,7 @@ "grassModDensity": 0.9, "items": [{ "mode": "floor", - "priority": 2.0, + "priority": 2, "variants": 1, "distribution": "/biomes/distributions.config:potsRare", @@ -100,7 +100,7 @@ ] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:minibiomeChests", @@ -108,7 +108,7 @@ "treasureBoxSets": ["barrelChest", "sb_coralcaveChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:minibiomeChests", @@ -116,7 +116,7 @@ "microdungeons": ["sb_coraltemple"] }, { "mode": "floor", - "priority": 1.0, + "priority": 1, "variants": 1, "distribution": "/biomes/distributions.config:denseLarge", @@ -128,7 +128,7 @@ ] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 4, "distribution": "/biomes/distributions.config:scatteredLarge", diff --git a/biomes/underground_detached/sb_crystalcave.biome b/biomes/underground_detached/sb_crystalcave.biome index f55348aa..c3769317 100644 --- a/biomes/underground_detached/sb_crystalcave.biome +++ b/biomes/underground_detached/sb_crystalcave.biome @@ -100,7 +100,7 @@ ] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 1, "distribution": "/biomes/distributions.config:minibiomeChests", @@ -108,7 +108,7 @@ "treasureBoxSets": ["crystalChest"] }, { "mode": "floor", - "priority": 0.0, + "priority": 0, "variants": 4, "distribution": "/biomes/distributions.config:scatteredLarge", diff --git a/biomes/underground_detached/sb_heck.biome b/biomes/underground_detached/sb_heck.biome index 3373f3d4..697e92d6 100644 --- a/biomes/underground_detached/sb_heck.biome +++ b/biomes/underground_detached/sb_heck.biome @@ -1,13 +1,13 @@ { "name": "sb_heck", - "friendlyName": "Heck", - "description": "A Heck biome.", //this string appears in biome data when dumping worlds + "friendlyName": "Heck Caves", +// "description": "A Heck biome.", //this string appears in biome data when dumping worlds "spawnProfile": { "groups": [{ "select": 1, "pool": [ - [1.0, "sb_heckblob"] + [1, "sb_heckblob"] ] } ] @@ -76,7 +76,7 @@ ] }, { "mode": "floor", - "priority": 4.0, + "priority": 4, "variants": 1, "distribution": "/biomes/distributions.config:denseLarge", @@ -128,7 +128,7 @@ ] }, { "mode": "floor", - "priority": 4.0, + "priority": 4, "variants": 1, "distribution": "/biomes/distributions.config:denseLarge", @@ -136,7 +136,7 @@ "grasses": ["heckflower"] }, { "mode": "floor", - "priority": 8.0, + "priority": 8, "variants": 1, "distribution": "/biomes/distributions.config:rare", @@ -144,7 +144,7 @@ "treasureBoxSets": ["sb_heckChest"] }, { "mode": "floor", - "priority": 8.0, + "priority": 8, "variants": 1, "distribution": "/biomes/distributions.config:uncommon", @@ -152,7 +152,7 @@ "microdungeons": ["sb_heckmicrodungeons"] }, { "mode": "ceiling", - "priority": 2.0, + "priority": 2, "variants": 1, "distribution": "/biomes/distributions.config:denseMedium", diff --git a/cinematics/busy3.frames b/cinematics/busy3.frames index 533d9183..5c47c999 100644 --- a/cinematics/busy3.frames +++ b/cinematics/busy3.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [24, 24], - "dimensions" : [8, 1] + "frameGrid": { + "size": [24, 24], + "dimensions": [8, 1] } } diff --git a/cinematics/sb_busy.frames b/cinematics/sb_busy.frames index 533d9183..5c47c999 100644 --- a/cinematics/sb_busy.frames +++ b/cinematics/sb_busy.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [24, 24], - "dimensions" : [8, 1] + "frameGrid": { + "size": [24, 24], + "dimensions": [8, 1] } } diff --git a/cinematics/sb_upgrade/airf.currency b/cinematics/sb_upgrade/airf.currency index 6b6cc044..3d8e9a97 100644 --- a/cinematics/sb_upgrade/airf.currency +++ b/cinematics/sb_upgrade/airf.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_airf", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/airf.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_airf", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/airf.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/airm.currency b/cinematics/sb_upgrade/airm.currency index d9d52ee7..60e51a25 100644 --- a/cinematics/sb_upgrade/airm.currency +++ b/cinematics/sb_upgrade/airm.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_airm", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/airm.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_airm", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/airm.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/coldf.currency b/cinematics/sb_upgrade/coldf.currency index 604bea12..df6ff428 100644 --- a/cinematics/sb_upgrade/coldf.currency +++ b/cinematics/sb_upgrade/coldf.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_coldf", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/coldf.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_coldf", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/coldf.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/coldm.currency b/cinematics/sb_upgrade/coldm.currency index 51093bdd..ae608670 100644 --- a/cinematics/sb_upgrade/coldm.currency +++ b/cinematics/sb_upgrade/coldm.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_coldm", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/coldm.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_coldm", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/coldm.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/default.frames b/cinematics/sb_upgrade/default.frames index 83b1bda5..514b9b62 100644 --- a/cinematics/sb_upgrade/default.frames +++ b/cinematics/sb_upgrade/default.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [76, 76], - "dimensions" : [7, 7] + "frameGrid": { + "size": [76, 76], + "dimensions": [7, 7] } } diff --git a/cinematics/sb_upgrade/radf.currency b/cinematics/sb_upgrade/radf.currency index a89902c9..d40a4b23 100644 --- a/cinematics/sb_upgrade/radf.currency +++ b/cinematics/sb_upgrade/radf.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_radf", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/radf.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_radf", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/radf.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/radm.currency b/cinematics/sb_upgrade/radm.currency index 2ff4236c..2f81f72a 100644 --- a/cinematics/sb_upgrade/radm.currency +++ b/cinematics/sb_upgrade/radm.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_radm", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/radm.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_radm", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/radm.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/codex/default/sb_gunguide.codex b/codex/default/sb_gunguide.codex index 2fe100f5..a91f6226 100644 --- a/codex/default/sb_gunguide.codex +++ b/codex/default/sb_gunguide.codex @@ -9,7 +9,8 @@ - Uses energy when ammo is depleted or when ^#71f2f6;SHIFT^reset; is held - Ammo is automatically used when in the inventory - Craft ammo at an anvil - - All types of ammo are universally accepted" + - All ammos are universally accepted + - Bullet icons on weapons are their projectile when no ammo is used" ], "itemConfig": { "rarity": "uncommon", diff --git a/collections/cooking.collection.patch b/collections/cooking.collection.patch index c34f3d15..0de83505 100644 --- a/collections/cooking.collection.patch +++ b/collections/cooking.collection.patch @@ -37,7 +37,7 @@ [{"op":"add","path":"/collectables/sb_lollypop","value":{"order":81,"item":"sb_lollypop"}}], [{"op":"add","path":"/collectables/sb_orangetart","value":{"order":81.1,"item":"sb_orangetart"}}], [{"op":"add","path":"/collectables/sb_crystaltart","value":{"order":81.1,"item":"sb_crystaltart"}}], -[{"op":"add","path":"/collectables/sb_peanutbutterjar","value":{"order":82,"item":"sb_peanutbutterjar"}}], +[{"op":"add","path":"/collectables/sb_pbj","value":{"order":82,"item":"sb_pbj"}}], [{"op":"add","path":"/collectables/sb_pussplumpie","value":{"order":83,"item":"sb_pussplumpie"}}], [{"op":"add","path":"/collectables/sb_sweettime","value":{"order":84,"item":"sb_sweettime"}}], [{"op":"add","path":"/collectables/sb_brineapple","value":{"order":84.9,"item":"sb_brineapple"}}], @@ -81,6 +81,7 @@ [{"op":"add","path":"/collectables/sb_orangenergyglass","value":{"order":134.9,"item":"sb_orangenergyglass"}}], [{"op":"add","path":"/collectables/sb_liquifiedcrystal","value":{"order":134.9,"item":"sb_liquifiedcrystal"}}], +[{"op":"add","path":"/collectables/sb_peanutbutterjar","value":{"order":149.9,"item":"sb_peanutbutterjar"}}], [{"op":"add","path":"/collectables/sb_orangejam","value":{"order":150.9,"item":"sb_orangejam"}}], [{"op":"add","path":"/collectables/sb_crystaljam","value":{"order":151.9,"item":"sb_crystaljam"}}], [{"op":"add","path":"/collectables/sb_thornjam","value":{"order":152.9,"item":"sb_thornjam"}}] diff --git a/damage/sb_brain.damage b/damage/sb_brain.damage index 87148c2e..c6308af9 100644 --- a/damage/sb_brain.damage +++ b/damage/sb_brain.damage @@ -1,1962 +1,1844 @@ { - "kind" : "sb_brain", - "effects" : { - "organic" : { - "hit" : { - "sounds" : [ "/sfx/gun/brainextractor_hit.ogg" ], - "particles" : [ + "kind": "sb_brain", + "effects": { + "organic": { + "hit": { + "sounds": ["/sfx/gun/brainextractor_hit.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [208, 100, 87, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [208, 100, 87, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [208, 100, 87, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [208, 100, 87, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [208, 100, 87, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [208, 100, 87, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 } } ] ] }, - "kill" : { - "sounds" : [ "/sfx/gun/brainextractor_kill.ogg" ], - "particles" : [ + "kill": { + "sounds": ["/sfx/gun/brainextractor_kill.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [219, 139, 123, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [219, 139, 123, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 } } ] ] } }, - "robotic" : { - "hit" : { - "sounds" : [ "/sfx/gun/brainextractor_hit.ogg" ], - "particles" : [ + "robotic": { + "hit": { + "sounds": ["/sfx/gun/brainextractor_hit.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 } } ] ] }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg" ], - "particles" : [ + "kill": { + "sounds": ["/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 } } ] ] } }, - "wooden" : { - "hit" : { - "sounds" : [ "/sfx/melee/sword_hit_wood1.ogg", "/sfx/melee/sword_hit_wood2.ogg", "/sfx/melee/sword_hit_wood3.ogg" ], - "particles" : [ + "wooden": { + "hit": { + "sounds": ["/sfx/melee/sword_hit_wood1.ogg", "/sfx/melee/sword_hit_wood2.ogg", "/sfx/melee/sword_hit_wood3.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/largehitspark/largehitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [20, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [12, 6.0], - "finalVelocity" : [17, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [13, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [11, 7.0], - "finalVelocity" : [13, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [17, 6.0], - "finalVelocity" : [-7, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [16, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 + { + "type": "animated", + "animation": "/animations/largehitspark/largehitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [20, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [12, 6], + "finalVelocity": [17, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [13, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [11, 7], + "finalVelocity": [13, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [17, 6], + "finalVelocity": [-7, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [16, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 } } ] ] }, - "stronghit" : { - "sounds" : [ [ "/sfx/melee/sword_hit_wood1.ogg", "/sfx/melee/critical_hit_heavy.ogg" ], [ "/sfx/melee/sword_hit_wood2.ogg", "/sfx/melee/critical_hit_heavy.ogg" ], [ "/sfx/melee/sword_hit_wood3.ogg", "/sfx/melee/critical_hit_heavy.ogg" ] ], - "particles" : [ + "stronghit": { + "sounds": [["/sfx/melee/sword_hit_wood1.ogg", "/sfx/melee/critical_hit_heavy.ogg"], ["/sfx/melee/sword_hit_wood2.ogg", "/sfx/melee/critical_hit_heavy.ogg"], ["/sfx/melee/sword_hit_wood3.ogg", "/sfx/melee/critical_hit_heavy.ogg"]], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/largehitspark/largehitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [20, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [12, 6.0], - "finalVelocity" : [17, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [13, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [11, 7.0], - "finalVelocity" : [13, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [17, 6.0], - "finalVelocity" : [-7, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [16, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 + { + "type": "animated", + "animation": "/animations/largehitspark/largehitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [20, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [12, 6], + "finalVelocity": [17, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [13, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [11, 7], + "finalVelocity": [13, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [17, 6], + "finalVelocity": [-7, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [16, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 } } ] ] }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg" ], - "particles" : [ + "kill": { + "sounds": ["/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/largehitspark/largehitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [20, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [12, 6.0], - "finalVelocity" : [17, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [13, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [11, 7.0], - "finalVelocity" : [13, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [17, 6.0], - "finalVelocity" : [-7, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.8, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [164, 120, 68, 255], - "fade" : 0.9, - "initialVelocity" : [16, 8.0], - "finalVelocity" : [16, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 - } - }, - - { - "type" : "ember", - "size" : 1.3, - "color" : [117, 76, 35, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -19.0], - "approach" : [20, 30], - "timeToLive" : 0.9, - "layer" : "front", - "variance" : { - "initialVelocity" : [13, 3], - "timeToLive" : 1, - "size" : 1.3 + { + "type": "animated", + "animation": "/animations/largehitspark/largehitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [20, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [12, 6], + "finalVelocity": [17, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [13, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [11, 7], + "finalVelocity": [13, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [17, 6], + "finalVelocity": [-7, -19], + "approach": [20, 30], + "timeToLive": 0.8, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1, + "color": [164, 120, 68, 255], + "fade": 0.9, + "initialVelocity": [16, 8], + "finalVelocity": [16, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 + } + }, + { + "type": "ember", + "size": 1.3, + "color": [117, 76, 35, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -19], + "approach": [20, 30], + "timeToLive": 0.9, + "layer": "front", + "variance": { + "initialVelocity": [13, 3], + "timeToLive": 1, + "size": 1.3 } } ] ] } }, - "stone" : { - "hit" : { - "sounds" : [ "/sfx/gun/brainextractor_hit.ogg" ], - "particles" : [ + "stone": { + "hit": { + "sounds": ["/sfx/gun/brainextractor_hit.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1, - "size" : 0.5 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1, + "size": 0.5 } } ] ] }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_stone1.ogg", "/sfx/melee/kill_stone2.ogg", "/sfx/melee/kill_stone3.ogg", "/sfx/melee/kill_stone4.ogg", "/sfx/melee/kill_stone5.ogg" ], - "particles" : [ + "kill": { + "sounds": ["/sfx/melee/kill_stone1.ogg", "/sfx/melee/kill_stone2.ogg", "/sfx/melee/kill_stone3.ogg", "/sfx/melee/kill_stone4.ogg", "/sfx/melee/kill_stone5.ogg"], + "particles": [ [ - - { - "type" : "animated", - "animation" : "/animations/1hswordhitspark/1hswordhitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 1, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [7, 6.0], - "finalVelocity" : [7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [6, 8.0], - "finalVelocity" : [6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [3, 7.0], - "finalVelocity" : [3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-7, 6.0], - "finalVelocity" : [-7, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.45, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-6, 8.0], - "finalVelocity" : [-6, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 - } - }, - - { - "type" : "ember", - "size" : 1.0, - "color" : [255, 200, 0, 255], - "fade" : 0.9, - "initialVelocity" : [-3, 7.0], - "finalVelocity" : [-3, -9.0], - "approach" : [1, 14], - "timeToLive" : 0.65, - "layer" : "front", - "variance" : { - "initialVelocity" : [3, 3], - "timeToLive" : 1 + { + "type": "animated", + "animation": "/animations/1hswordhitspark/1hswordhitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 1, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [7, 6], + "finalVelocity": [7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [6, 8], + "finalVelocity": [6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-7, 6], + "finalVelocity": [-7, -9], + "approach": [1, 14], + "timeToLive": 0.45, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-6, 8], + "finalVelocity": [-6, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 + } + }, + { + "type": "ember", + "size": 1, + "color": [255, 200, 0, 255], + "fade": 0.9, + "initialVelocity": [-3, 7], + "finalVelocity": [-3, -9], + "approach": [1, 14], + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 3], + "timeToLive": 1 } } ] diff --git a/damage/sb_snowball.damage b/damage/sb_snowball.damage index 44f9debb..28bf32d6 100644 --- a/damage/sb_snowball.damage +++ b/damage/sb_snowball.damage @@ -1,5 +1,6 @@ { //They couldn't have made a `softball` damageType and give that to every throwable, could they? + //The vanilla snowball damage type is used by multiple throwables, and we only want snowballs to do ice damage "kind": "sb_snowball", "elementalType": "ice", "effects": { diff --git a/effects/sb_freezesquirt.effectsource b/effects/sb_freezesquirt.effectsource index ef0111cd..403e3580 100644 --- a/effects/sb_freezesquirt.effectsource +++ b/effects/sb_freezesquirt.effectsource @@ -1,24 +1,24 @@ { - "kind" : "sb_freezesquirt", - "location" : "mouth", - "definition" : { - "duration" : 0.001, - "loops" : true, - "start" : { - "particles" : [ + "kind": "sb_freezesquirt", + "location": "mouth", + "definition": { + "duration": 0.001, + "loops": true, + "start": { + "particles": [ ["sb_freezesquirt"] ], - "sounds" : [[]] + "sounds": [[]] }, - "particles" : [ + "particles": [ ["sb_freezesquirt"] ], - "sounds" : [[]], - "stop" : { - "particles" : [ + "sounds": [[]], + "stop": { + "particles": [ [] ], - "sounds" : [[]] + "sounds": [[]] } } -} \ No newline at end of file +} diff --git a/effects/sb_frozenburning.effectsource b/effects/sb_frozenburning.effectsource index 72c24b40..b2217be2 100644 --- a/effects/sb_frozenburning.effectsource +++ b/effects/sb_frozenburning.effectsource @@ -1,28 +1,28 @@ { - "kind" : "sb_frozenburning", - "definition" : { - "duration" : 0.2, - "loops" : true, - "start" : { - "particles" : [ - [ ] + "kind": "sb_frozenburning", + "definition": { + "duration": 0.2, + "loops": true, + "start": { + "particles": [ + [] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] }, - "particles" : [ - [ "sb_frozenburningdust" ] + "particles": [ + ["sb_frozenburningdust"] ], - "sounds" : [ - [ ] + "sounds": [ + [] ], - "stop" : { - "particles" : [ - [ "burningdust2", "burningdust2", "burningdust2", "burningdust2" ] + "stop": { + "particles": [ + ["burningdust2", "burningdust2", "burningdust2", "burningdust2"] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] } } diff --git a/effects/sb_frozenfiretrail.effectsource b/effects/sb_frozenfiretrail.effectsource index 50fdde85..f5fd76b8 100644 --- a/effects/sb_frozenfiretrail.effectsource +++ b/effects/sb_frozenfiretrail.effectsource @@ -1,28 +1,28 @@ { - "kind" : "sb_frozenfiretrail", - "definition" : { - "duration" : 0.035, - "loops" : true, - "start" : { - "particles" : [ - [ ] + "kind": "sb_frozenfiretrail", + "definition": { + "duration": 0.035, + "loops": true, + "start": { + "particles": [ + [] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] }, - "particles" : [ - [ "sb_frozenfiretrail" ] + "particles": [ + ["sb_frozenfiretrail"] ], - "sounds" : [ - [ ] + "sounds": [ + [] ], - "stop" : { - "particles" : [ - [ ] + "stop": { + "particles": [ + [] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] } } diff --git a/effects/sb_frozenflames.effectsource b/effects/sb_frozenflames.effectsource index ae8f5ebf..3253b287 100644 --- a/effects/sb_frozenflames.effectsource +++ b/effects/sb_frozenflames.effectsource @@ -1,28 +1,28 @@ { - "kind" : "sb_frozenflames", - "definition" : { - "duration" : 0.1, - "loops" : true, - "start" : { - "particles" : [ - [ ] + "kind": "sb_frozenflames", + "definition": { + "duration": 0.1, + "loops": true, + "start": { + "particles": [ + [] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] }, - "particles" : [ - [ "sb_frozenburningdust", "sb_frozenflames", "sb_frozenflames", "dust2" ] + "particles": [ + ["sb_frozenburningdust", "sb_frozenflames", "sb_frozenflames", "dust2"] ], - "sounds" : [ - [ ] + "sounds": [ + [] ], - "stop" : { - "particles" : [ - [ "burningdust2", "burningdust2", "burningdust2", "burningdust2" ] + "stop": { + "particles": [ + ["burningdust2", "burningdust2", "burningdust2", "burningdust2"] ], - "sounds" : [ - [ ] + "sounds": [ + [] ] } } diff --git a/events/sb_events.config b/events/sb_events.config index ac8e10b3..36c42839 100644 --- a/events/sb_events.config +++ b/events/sb_events.config @@ -18,7 +18,7 @@ "sb_spacepod", "sb_dropship", "sb_envprobe" - // "sb_cultistscandroid" + // "sb_cultistscandroid" //disabled because they spawn way high up so most people walk past them ], "wanted": [ diff --git a/help.config.patch b/help.config.patch index c69f7095..cb77ca63 100644 --- a/help.config.patch +++ b/help.config.patch @@ -20,7 +20,7 @@ ,[{"op":"test","path":"/adminCommands/setdungeonid","inverse":true},{"op":"add","path":"/debugCommands/setdungeonid","value": "Usage /setdungeonid dungeonId. Sets the dungeonId of the (single) tile at the cursor's position."}] -//xrc +//utility ,[{"op":"add","path":"/debugCommands/sb_punchy","value":"Usage /sb_punchy. Creates a DPS Target at the mouse cursor which ^#f00;is not^reset; attacked by companions/homing projectiles."}] ,[{"op":"add","path":"/debugCommands/sb_evilpunchy","value":"Usage /sb_evilpunchy. Creates a DPS Target at the mouse cursor which ^#f00;is^reset; attacked by companions/homing projectiles."}] ,[{"op":"add","path":"/debugCommands/sb_gleap","value":"Usage /sb_gleap. Summons an enemy Gleap at the mouse cursor."}] @@ -39,12 +39,10 @@ ,[{"op":"add","path":"/adminCommands/sb_toggleevents","value":"Usage /sb_toggleevents. Prevents certain random events for the current world."}] -,[{"op":"add","path":"/debugCommands/sb_givemetech","value":"Usage /sb_givemetech. Spawns tech unlock items at the mouse cursor."}] ,[{"op":"add","path":"/debugCommands/sb_itemID","value":"Usage /sb_itemID itemName. Prints basic item info into chat."}] -,[{"op":"add","path":"/adminCommands/sb_toggledronespawning","value":"Usage /sb_toggledronespawning. Causes any Environmental Protection Drones to fade out of existence upon init."}] ,[{"op":"add","path":"/debugCommands/sb_foodweight","value":"Usage /sb_foodweight itemName. Returns 1-/100. Accepts more than 1 itemName, separate with spaces."}] ,[{"op":"add","path":"/debugCommands/sb_foodsum","value":"Usage /sb_foodsum itemName. Calculates the logical food value of a food item based on the sum on its ingredients."}] ,[{"op":"add","path":"/debugCommands/sb_lootpool","value":"Usage /sb_lootpool. Prompts the object at the mouse cursor to state its position and any lootpools it may have. Additional information shown in chat."}] -,[{"op":"add","path":"/debugCommands/sb_enabletech","value":"Usage /sb_enabletech techName. Same as enabletech but for suit techs. Requires StarExtentions."}] -,[{"op":"add","path":"/debugCommands/sb_maketechavailable","value":"Usage /sb_maketechavailable techName. Same as maketechavailable but for suit techs. Requires StarExtentions."}] +,[{"op":"add","path":"/debugCommands/sb_enabletech","value":"Usage /sb_enabletech techName. Same as enabletech but for suit techs. Requires StarExtentions or OpenStarbound."}] +,[{"op":"add","path":"/debugCommands/sb_maketechavailable","value":"Usage /sb_maketechavailable techName. Same as maketechavailable but for suit techs. Requires StarExtentions or OpenStarbound."}] ] \ No newline at end of file diff --git a/interface/cockpit/cockpit.config.patch b/interface/cockpit/cockpit.config.patch index 11045747..371b57e9 100644 --- a/interface/cockpit/cockpit.config.patch +++ b/interface/cockpit/cockpit.config.patch @@ -183,33 +183,35 @@ } } ], + /* dont think we'll ever need this. just comment it out so Planet Search doesnt know about it solely from us [{ - "op": "test", - "path": "/displayOres/trianglium", - "inverse": true - }, { - "op": "add", - "path": "/displayOres/trianglium", - "value": { - "displayName": "Trianglium", - "icon": "/items/generic/crafting/triangliumore.png" - } - } - ], + "op": "test", + "path": "/displayOres/trianglium", + "inverse": true + }, { + "op": "add", + "path": "/displayOres/trianglium", + "value": { + "displayName": "Trianglium", + "icon": "/items/generic/crafting/triangliumore.png" + } + } + ],*/ + /* [{ - "op": "test", - "path": "/displayOres/prisilite", - "inverse": true - }, { - "op": "add", - "path": "/displayOres/prisilite", - "value": { - "displayName": "Prisilite", - "icon": "/items/generic/crafting/prisiliteore.png" - } - } + "op": "test", + "path": "/displayOres/prisilite", + "inverse": true + }, { + "op": "add", + "path": "/displayOres/prisilite", + "value": { + "displayName": "Prisilite", + "icon": "/items/generic/crafting/prisiliteore.png" + } + } ], - + */ [{ "op": "add", "path": "/displayOres/sb_rubium", @@ -261,14 +263,13 @@ } ], + //Fix for MPI calling Crystalline biomes "Crystallineline" [{ "op": "test", - "path": "/wordsList", - "inverse": true + "path": "/wordsList/crystal" }, { - "op": "add", - "path": "/wordsList", - "value": {} + "op": "remove", + "path": "/wordsList/crystal" } ], [{ @@ -300,25 +301,8 @@ } } ], - [{ - "op": "add", - "path": "/wordsList/sb_crystallineline", - "value": { - "word": "inel", - "friendlyWord": "" - } - } - ], //Futile attempt to prevent the 'crystal' in 'crystalline' from being replaced with 'crystalline' - [{ - "op": "add", - "path": "/namesList/sb_crystallineline", - "value": { - "word": "inel", - "friendlyWord": "" - } - } - ], + //MPI & Planet Search dungeons [{ "op": "test", "path": "/displayDungeons" @@ -329,9 +313,51 @@ "op": "copy", "path": "/displayDungeons/sb_humanbunker", "from": "/displayDungeons/humanbunker" + }, { + "op": "add", + "path": "/displayDungeons/sb_humanbunker/ps_name", + "value": "U.S.C.M. Bunker" + }, { + "op": "add", + "path": "/displayDungeons/sb_humanbunker/ps_icon", + "value": "/items/active/starbound/guns/randomgenerated/pulserifle/pulserifleicon.png?replace;e35f5d=809778;b22042=516d47;871132=214516;818181=5f5540;606060=3f3624;404040=231c10" //green + } + ], + + //Planet Search biomes + [{ + "op": "test", + "path": "/displayBiomes" + }, {//surface + "op": "add","path": "/displayBiomes/sb_crystalline", + "value": {"name": "Crystalline", "icon": "/items/generic/crafting/crystal.png"} + }, { + "op": "add","path": "/displayBiomes/sb_rust", + "value": {"name": "Rust Fields", "icon": "/items/generic/crafting/metallic.png"} + }, {//underground + "op": "add","path": "/displayBiomes/sb_coralcave", + "value": {"name": "Coral Caves", "icon": "/items/generic/crafting/coralfragment.png"} + }, { + "op": "add","path": "/displayBiomes/sb_crystalcave", + "value": {"name": "Crystal Caves", "icon": "/items/materials/crystalblock.png"} + }, { + "op": "add","path": "/displayBiomes/sb_heck", + "value": {"name": "Heck Caves", "icon": "/items/materials/hellstone.png"} + } + ], + + //Planet Search biome blacklist + [{ + "op": "test", + "path": "/planetSearch_ignore" + }, { + "op": "add", + "path": "/planetSearch_ignore/biomes/-", + "value": "sb_tentacleunderground" } ], + //Our planets [{ "op": "add", "path": "/visitableTypeDescription/sb_tentacle", diff --git a/interface/cockpit/sb_cockpit.lua b/interface/cockpit/sb_cockpit.lua index 26585d2c..ddd89527 100644 --- a/interface/cockpit/sb_cockpit.lua +++ b/interface/cockpit/sb_cockpit.lua @@ -1,7 +1,7 @@ require "/scripts/sb_assetmissing.lua" -local ini = init +local originalInit = init -function init() ini() +function init() originalInit() if root.assetJson("/betabound.config:fuelScaling") and not sb_hasOtherFuelScalingMod() then sb_jumpFuelCostCap = config.getParameter("sb_jumpFuelCostCap") --sb_fuelJumpCostDivision = config.getParameter("sb_fuelJumpCostDivision") diff --git a/interface/expandstation/expandstation.config.patch b/interface/expandstation/expandstation.config.patch deleted file mode 100644 index a2e8becc..00000000 --- a/interface/expandstation/expandstation.config.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/gui/placeButton/caption","value":"place"},{"op":"replace","path":"/gui/placeButton/caption","value":"Place"}]] \ No newline at end of file diff --git a/interface/itemdescriptions/sb_bow.itemdescription b/interface/itemdescriptions/sb_bow.itemdescription index 9d5125b3..9da0a198 100644 --- a/interface/itemdescriptions/sb_bow.itemdescription +++ b/interface/itemdescriptions/sb_bow.itemdescription @@ -68,7 +68,7 @@ }, "objectImage": { "type": "image", - "position": [74, 125], + "position": [77, 122], "file": "", "centered": true, "maxSize": [70, 45], diff --git a/interface/mmutility/sb_mmutility.lua b/interface/mmutility/sb_mmutility.lua index 7eb929b2..c850b24e 100644 --- a/interface/mmutility/sb_mmutility.lua +++ b/interface/mmutility/sb_mmutility.lua @@ -1,4 +1,4 @@ -local sb_init = init or function() end +local originalInit = init or function() end function sb_itemType() sb_root_itemType = root.itemType root.itemType = function(n) @@ -6,4 +6,4 @@ function sb_itemType() return sb_root_itemType(n) end end -function init() sb_itemType() sb_init() end \ No newline at end of file +function init() sb_itemType() originalInit() end \ No newline at end of file diff --git a/interface/sb_crafting/categories.png b/interface/sb_crafting/categories.png index 591c9312..8cb4ea91 100644 Binary files a/interface/sb_crafting/categories.png and b/interface/sb_crafting/categories.png differ diff --git a/interface/sb_crafting/categoriesselected.png b/interface/sb_crafting/categoriesselected.png index 7b8c2520..de09ae2e 100644 Binary files a/interface/sb_crafting/categoriesselected.png and b/interface/sb_crafting/categoriesselected.png differ diff --git a/interface/sb_font.frames b/interface/sb_font.frames index f19bea92..7b8e5a7d 100644 --- a/interface/sb_font.frames +++ b/interface/sb_font.frames @@ -1,7 +1,7 @@ { - "frameGrid" : { - "size" : [5, 6], - "dimensions" : [14, 1], - "names": [["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "/", ":", "+", ","]] //I don't particularly like this but whatever + "frameGrid": { + "size": [5, 6], + "dimensions": [14, 1], + "names": [["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "/", ":", "+", ","]]//I don't particularly like this but whatever } -} \ No newline at end of file +} diff --git a/interface/sb_numbers.frames b/interface/sb_numbers.frames deleted file mode 100644 index 88105adf..00000000 --- a/interface/sb_numbers.frames +++ /dev/null @@ -1,6 +0,0 @@ -{ - "frameGrid" : { - "size" : [5, 6], - "dimensions" : [14, 1] - } -} \ No newline at end of file diff --git a/interface/sb_numbers.png b/interface/sb_numbers.png deleted file mode 100644 index e91308c9..00000000 Binary files a/interface/sb_numbers.png and /dev/null differ diff --git a/interface/sb_quests/mainquestgiver.animation b/interface/sb_quests/mainquestgiver.animation index ea5869a0..ad3de86e 100644 --- a/interface/sb_quests/mainquestgiver.animation +++ b/interface/sb_quests/mainquestgiver.animation @@ -1,6 +1,4 @@ { - "frames" : "mainquestgiver.png", - "mode" : "loopForever"//, -// "animationCycle" : 0//, -// "frameNumber" : 1 + "frames": "mainquestgiver.png", + "mode": "loopForever" } diff --git a/interface/sb_quests/mainquestreceiver.animation b/interface/sb_quests/mainquestreceiver.animation index 4f59f036..c699e356 100644 --- a/interface/sb_quests/mainquestreceiver.animation +++ b/interface/sb_quests/mainquestreceiver.animation @@ -1,4 +1,4 @@ { - "frames" : "mainquestreceiver.png", - "mode" : "loopForever" + "frames": "mainquestreceiver.png", + "mode": "loopForever" } diff --git a/interface/sb_tooltips/acidclustergrenade.png b/interface/sb_tooltips/acidclustergrenade.png deleted file mode 100644 index 783f6887..00000000 Binary files a/interface/sb_tooltips/acidclustergrenade.png and /dev/null differ diff --git a/interface/sb_tooltips/bubble.png b/interface/sb_tooltips/bubble.png deleted file mode 100644 index 6e966907..00000000 Binary files a/interface/sb_tooltips/bubble.png and /dev/null differ diff --git a/interface/sb_tooltips/hivebomb.png b/interface/sb_tooltips/hivebomb.png new file mode 100644 index 00000000..257d42a2 Binary files /dev/null and b/interface/sb_tooltips/hivebomb.png differ diff --git a/interface/sb_tooltips/pinkplasma.png b/interface/sb_tooltips/pinkplasma.png deleted file mode 100644 index 28563b0e..00000000 Binary files a/interface/sb_tooltips/pinkplasma.png and /dev/null differ diff --git a/interface/sb_tooltips/boomblast.png b/interface/sb_tooltips/sb_boomblast.png similarity index 100% rename from interface/sb_tooltips/boomblast.png rename to interface/sb_tooltips/sb_boomblast.png diff --git a/interface/sb_tooltips/sb_corrosiveparticle.png b/interface/sb_tooltips/sb_corrosiveparticle.png deleted file mode 100644 index 68e811c0..00000000 Binary files a/interface/sb_tooltips/sb_corrosiveparticle.png and /dev/null differ diff --git a/interface/sb_tooltips/plasmapulse.png b/interface/sb_tooltips/sb_plasmapulse.png similarity index 100% rename from interface/sb_tooltips/plasmapulse.png rename to interface/sb_tooltips/sb_plasmapulse.png diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/icon.png b/interface/sb_tooltips/sb_redgiant.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/icon.png rename to interface/sb_tooltips/sb_redgiant.png diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/icon.png b/interface/sb_tooltips/sb_supergiant.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/icon.png rename to interface/sb_tooltips/sb_supergiant.png diff --git a/interface/sb_tooltips/sb_whipcrackjelly.png b/interface/sb_tooltips/sb_whipcrackjelly.png new file mode 100644 index 00000000..152bbcd4 Binary files /dev/null and b/interface/sb_tooltips/sb_whipcrackjelly.png differ diff --git a/interface/scripted/augment combiner/sb_augmentcombiner.lua b/interface/scripted/augment combiner/sb_augmentcombiner.lua index b780320e..129eb263 100644 --- a/interface/scripted/augment combiner/sb_augmentcombiner.lua +++ b/interface/scripted/augment combiner/sb_augmentcombiner.lua @@ -1,7 +1,7 @@ -local isEppWithAugmen = isEppWithAugment or function() end +local originalIsEppWithAugment = isEppWithAugment or function() end function isEppWithAugment(i) if not i then return false end local j = root.itemConfig(i) - return i.parameters.acceptsAugmentType=="back" or isEppWithAugmen(i) + return i.parameters.acceptsAugmentType=="back" or originalIsEppWithAugment(i) end \ No newline at end of file diff --git a/interface/scripted/mmupgrade/sb_mmupgradegui.lua b/interface/scripted/mmupgrade/sb_mmupgradegui.lua index ddb167ea..5bbc7805 100644 --- a/interface/scripted/mmupgrade/sb_mmupgradegui.lua +++ b/interface/scripted/mmupgrade/sb_mmupgradegui.lua @@ -1,6 +1,6 @@ -local ini = init or function() end -local updateGu = updateGui or function() end -local performUpgrad = performUpgrade or function() end +local originalInit = init or function() end +local originalUpdateGui = updateGui or function() end +local originalPerformUpgrade = performUpgrade or function() end function sb_moveGui() local w = {{"LiquidCollection","Beamaxe","PaintMode","WireMode","ScanMode"},root.assetJson("/betabound.config:posMMUI")} @@ -8,7 +8,7 @@ function sb_moveGui() for i = 0, 6 do widget.setImage("imgSbLine"..i,"/assetmissing.png") end end -function init() ini() +function init() originalInit() if (root.assetJson("/betabound.config:forceMoveMMUI") --betabound or (#config.getParameter("upgrades",{}).paintmode.prerequisites < 1) --EnhancedMatterManipulator or betterResetTools) --moremmupgrades @@ -28,7 +28,7 @@ function init() ini() end end -function updateGui() updateGu() +function updateGui() originalUpdateGui() local upgrades = sb_getUpgrades() if not sb_mmChecked and contains(upgrades, "sb_generic") then local mm = player.essentialItem("beamaxe").parameters.upgrades @@ -119,7 +119,7 @@ function performUpgrade(widgetName, widgetData) player.giveItem(oldItem) end end - return performUpgrad(widgetName, widgetData) + return originalPerformUpgrade(widgetName, widgetData) end function sb_setWidgetsVisible(w,b) for i=1, #w do widget.setVisible(w[i],b) end end diff --git a/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua b/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua index cc804514..578c1043 100644 --- a/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua +++ b/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua @@ -1,10 +1,10 @@ -local sb_init = init or function() end -local sb_update = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end -function init() sb_init() +function init() originalInit() widget.setPosition("sb_lblGravity", {widget.getPosition("sb_lblGravity")[1], widget.getPosition("lblGravity")[2]}) end -function update(...) sb_update(...) +function update(...) originalUpdate(...) widget.setText("sb_lblGravity", widget.getSliderValue("sldGravity")) end \ No newline at end of file diff --git a/interface/windowconfig/sb_craftingresearch.config b/interface/scripted/sb_research/research.config similarity index 98% rename from interface/windowconfig/sb_craftingresearch.config rename to interface/scripted/sb_research/research.config index 58ecf7f4..6badbda9 100644 --- a/interface/windowconfig/sb_craftingresearch.config +++ b/interface/scripted/sb_research/research.config @@ -241,7 +241,7 @@ } } }, - "scripts": ["/interface/windowconfig/sb_craftingresearch.lua"], + "scripts": ["/interface/scripted/sb_research/research.lua"], "scriptDelta": 15, "scriptWidgetCallbacks": ["searchBar", "craft", "categories", "itemSelected"], "ownedIcon": "/interface/sb_crafting/owned.png" diff --git a/interface/windowconfig/sb_craftingresearch.lua b/interface/scripted/sb_research/research.lua similarity index 75% rename from interface/windowconfig/sb_craftingresearch.lua rename to interface/scripted/sb_research/research.lua index 52c87f2a..f6902630 100644 --- a/interface/windowconfig/sb_craftingresearch.lua +++ b/interface/scripted/sb_research/research.lua @@ -5,12 +5,12 @@ function init() subtitles = root.assetJson("/items/categories.config:labels") iconUnderlay = root.assetJson("/blueprint.config").iconUnderlay.image itemList, query, lastQuery, category, selectedItem = "scrollArea.itemList", nil, nil, "all", nil --(config.getParameter("gui").categories.buttons)[1].data - newIconOffset = (root.imageSize(root.assetJson("/interface/windowconfig/sb_craftingresearch.config").gui.scrollArea.children.itemList.schema.listTemplate.newIcon.file)[1] - root.imageSize(ownedIcon)[1])/2.5 + newIconOffset = (root.imageSize(config.getParameter("gui.scrollArea.children.itemList.schema.listTemplate.newIcon.file"))[1] - root.imageSize(ownedIcon)[1])/2.5 populateList() end function update(dt) - widget.setText("lblPlayerMoney",tostring(player.currency("money"))) + widget.setText("lblPlayerMoney", tostring(player.currency("money"))) widget.setButtonEnabled("btnCraft", selectedItem and hasItems()) if (query ~= lastQuery) then populateList(category) end lastQuery = query @@ -55,28 +55,33 @@ function craft() end function hasItems() - if player.isAdmin() then return true end - return player.hasItem("sb_blankblueprint") and player.currency("money") > selectedItem[2][2] + return player.isAdmin() or (player.hasItem("sb_blankblueprint") and player.currency("money") >= selectedItem[2][2]) end function itemSelected() local listItem = widget.getListSelected(itemList) if listItem then selectedItem = widget.getData(itemList.."."..listItem) - local item = root.itemConfig(selectedItem[1]); local directory = item.directory; item = sb.jsonMerge(item.config,item.parameters) + local item = root.itemConfig(selectedItem[1]) + local directory = item.directory + item = sb.jsonMerge(item.config, item.parameters) + widget.setText("description", item.description or "This item needs to have a description set.") widget.setText("shortdescription", item.shortdescription or "Unnamed Item") - local category = item.category or "other"; widget.setText("itemSubtitle", "^gray;"..(subtitles[item.category] or item.category)) + --This is funny because this station only deals in blueprints, so it will always be "Blueprint". Other languages exist, so don't hardcode it to say 'Blueprint'! + local category = item.category or "other" + widget.setText("itemSubtitle", "^gray;"..(subtitles[category] or category)) + widget.setImage("objectImage", formatIcon(item.inventoryIcon, directory)) - widget.setItemSlotItem("currentRecipeIconInput2",selectedItem[2]) - widget.setItemSlotItem("currentRecipeIconOutput1",selectedItem[1]) - widget.setItemSlotItem("currentRecipeIconOutput2",{selectedItem[1],1,{tooltipKind="simpletooltip"}}) + widget.setItemSlotItem("currentRecipeIconInput2", selectedItem[2]) + widget.setItemSlotItem("currentRecipeIconOutput1", selectedItem[1]) + widget.setItemSlotItem("currentRecipeIconOutput2", {selectedItem[1], 1, {tooltipKind="simpletooltip"}}) local recipeData = root.recipesForItem(selectedItem[1]:sub(1,-8))[1].output widget.setItemSlotItem("currentRecipeIconOutput3",{recipeData.name, 1, recipeData.parameters}) if not selectedAnything then widget.setImage("objectUnderlay", iconUnderlay) - widget.setItemSlotItem("currentRecipeIconInput1","sb_blankblueprint") + widget.setItemSlotItem("currentRecipeIconInput1", "sb_blankblueprint") widget.setVisible("currentRecipeIconOutput2", true) widget.setVisible("currentRecipeIconOutput3", true) widget.setVisible("lblInput", true) @@ -87,6 +92,7 @@ function itemSelected() end end +--TODO: Can image widgets use drawables? If so, grab the weapon's drawable icon from the 'Hover for details' slot function formatIcon(icon, directory) if type(icon) ~= "string" then return (#icon == 1 and formatIcon(icon[1].image, directory) or "/items/generated/blueprintinhand.png") end return string.sub(icon, 1, 1) == "/" and icon or directory..icon diff --git a/interface/scripted/sbvn/sb_sbvnobject.lua b/interface/scripted/sbvn/sb_sbvnobject.lua index e597b287..c0511b4a 100644 --- a/interface/scripted/sbvn/sb_sbvnobject.lua +++ b/interface/scripted/sbvn/sb_sbvnobject.lua @@ -1,10 +1,10 @@ -local ini = init or function() end -local unini = uninit or function() end +local originalInit = init or function() end +local originalUninit = uninit or function() end -function init() ini() +function init() originalInit() storage = config.getParameter("scriptStorage", storage) end -function uninit() unini() +function uninit() originalUninit() object.setConfigParameter("scriptStorage", storage) end \ No newline at end of file diff --git a/interface/scripted/techupgrade/sb_techupgradegui.lua b/interface/scripted/techupgrade/sb_techupgradegui.lua index 37b47047..5ad82477 100644 --- a/interface/scripted/techupgrade/sb_techupgradegui.lua +++ b/interface/scripted/techupgrade/sb_techupgradegui.lua @@ -1,14 +1,14 @@ require("/scripts/sb_assetmissing.lua") -local sb_init = init or function() end -local sb_setSelectedTech = setSelectedTech or function() end -local sb_animateSelection = animateSelection or function() end -local sb_populateTechList = populateTechList or function() end -local sb_equipTech = equipTech or function() end -local sb_createTooltip = createTooltip or function() end -local sb_techSlotGroup = techSlotGroup or function() end -local sb_pat_remove = pat_remove or function() end - -function init() sb_init() +local originalInit = init or function() end +local originalSetSelectedTech = setSelectedTech or function() end +local originalAnimateSelection = animateSelection or function() end +local originalPopulateTechList = populateTechList or function() end +local originalEquipTech = equipTech or function() end +local originalCreateTooltip = createTooltip or function() end +local originalTechSlotGroup = techSlotGroup or function() end +local originalPat_remove = pat_remove or function() end + +function init() originalInit() if sb_didInit then return end --prevent stack overflow when removing techs with Patman's mod sb_didInit = true @@ -60,7 +60,7 @@ end function setSelectedTech(techName) if self.selectedSlot ~= "sb_suit" then - sb_setSelectedTech(techName) + originalSetSelectedTech(techName) local config = root.techConfig(techName) if config.sb_briefDescription then widget.setText("lblDescription", config.sb_briefDescription) @@ -79,7 +79,7 @@ function setSelectedTech(techName) end function animateSelection(dt) - if self.selectedSlot ~= "sb_suit" then sb_animateSelection(dt) else + if self.selectedSlot ~= "sb_suit" then originalAnimateSelection(dt) else self.animationTimer = self.animationTimer + dt while self.animationTimer > self.selectionPulse do self.animationTimer = self.animationTimer - self.selectionPulse @@ -94,7 +94,7 @@ end function populateTechList(slot) self.selectedTech = nil - if slot ~= "sb_suit" then sb_populateTechList(slot) else + if slot ~= "sb_suit" then originalPopulateTechList(slot) else widget.clearListItems(self.techList) local listedTechs = {} for i = 1, 2 do @@ -146,12 +146,12 @@ end --end function techSlotGroup(button, slot) - sb_techSlotGroup(button, slot) + originalTechSlotGroup(button, slot) sb_toggleButtons() end function equipTech(tech) - if self.selectedSlot ~= "sb_suit" then sb_equipTech(tech) end + if self.selectedSlot ~= "sb_suit" then originalEquipTech(tech) end sb_toggleButtons() end @@ -202,7 +202,7 @@ end function pat_remove() if self.selectedSlot ~= "sb_suit" then sb_toggleButtons() - return sb_pat_remove() + return originalPat_remove() end end @@ -222,7 +222,7 @@ function sb_prepareSuits() end function createTooltip(p) - if self.selectedSlot ~= "sb_suit" then return sb_createTooltip(p) else + if self.selectedSlot ~= "sb_suit" then return originalCreateTooltip(p) else name = widget.getChildAt(p) name = name and name:sub(2,(name:find("%.", 26) or 3)-1) or nil name = name and widget.getData(name) diff --git a/interface/tooltips/fistweapon.tooltip.patch b/interface/tooltips/fistweapon.tooltip.patch index b951cee3..26694910 100644 --- a/interface/tooltips/fistweapon.tooltip.patch +++ b/interface/tooltips/fistweapon.tooltip.patch @@ -11,5 +11,16 @@ "wrapWidth": 126 } } + ], + //fix for Patch Project + [{ + "op": "test", + "path": "/background/fileBody", + "value": "/interface/tooltips/bodyobject3extended.png" + }, { + "op": "replace", + "path": "/sb_levelLabel/position/1", + "value": 154 + } ] ] diff --git a/interface/tooltips/sb_gun4.tooltip b/interface/tooltips/sb_gun4.tooltip index ea664d62..1928398a 100644 --- a/interface/tooltips/sb_gun4.tooltip +++ b/interface/tooltips/sb_gun4.tooltip @@ -21,7 +21,8 @@ "position": [11, 109], "hAnchor": "left", "vAnchor": "top", - "wrapWidth": 126 + "wrapWidth": 126, + "lineSpacing": 0.9 }, "ammoLabel": { "type": "label", diff --git a/interface/tooltips/shield.tooltip.patch b/interface/tooltips/shield.tooltip.patch index 1c699848..ae1a2261 100644 --- a/interface/tooltips/shield.tooltip.patch +++ b/interface/tooltips/shield.tooltip.patch @@ -11,5 +11,16 @@ "wrapWidth": 126 } } + ], + //fix for Patch Project + [{ + "op": "test", + "path": "/background/fileBody", + "value": "/interface/tooltips/bodyobject3extended.png" + }, { + "op": "replace", + "path": "/sb_levelLabel/position/1", + "value": 156 + } ] ] diff --git a/items/active/grapplinghooks/grapplinghook/sb_grapplinghook.lua b/items/active/grapplinghooks/grapplinghook/sb_grapplinghook.lua index 9a7926a0..7cccf958 100644 --- a/items/active/grapplinghooks/grapplinghook/sb_grapplinghook.lua +++ b/items/active/grapplinghooks/grapplinghook/sb_grapplinghook.lua @@ -1,13 +1,13 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end function init() sb_hasHook = root.assetJson("/items/active/grapplinghooks/grapplinghook/grapplinghook.animation").animatedParts.stateTypes.sb_hook and true - ini() + originalInit() end function update(...) - updat(...) + originalUpdate(...) if sb_hasHook then animator.setAnimationState("sb_hook", self.projectileId and "off" or "on") end diff --git a/items/active/grapplinghooks/grapplinghook/sb_hookshot.lua b/items/active/grapplinghooks/grapplinghook/sb_hookshot.lua index 38346b95..d7767381 100644 --- a/items/active/grapplinghooks/grapplinghook/sb_hookshot.lua +++ b/items/active/grapplinghooks/grapplinghook/sb_hookshot.lua @@ -1,7 +1,7 @@ -local swin = swing or function() end +local originalSwing = swing or function() end function swing(moves) moves.up = true moves.down = false - swin(moves) + originalSwing(moves) end \ No newline at end of file diff --git a/items/active/shields/sb_shield.lua b/items/active/shields/sb_shield.lua index 94dff874..9c0a0be6 100644 --- a/items/active/shields/sb_shield.lua +++ b/items/active/shields/sb_shield.lua @@ -1,6 +1,6 @@ -local ini = init +local originalInit = init or function() end --disabled naming for mushroom/eye shields since merchants would keep regenerating them while the menu was open -function init() ini() +function init() originalInit() if player and not sb_init then sb_resourceNames = {shieldStamina = 1, shieldStaminaRegenBlock = 1, shieldHealth = 1, perfectBlock = 1, perfectBlockLimit = 1} --TODO: move to config? sb_hand = activeItem.hand() == "alt" and "R" or "L" @@ -40,8 +40,8 @@ function init() ini() return status.sb_modifyResource(resourceName, value) end - activeItem.sb_setItemDamageSources = activeItem.setItemDamageSources - activeItem.setItemDamageSources = function(damageSources) + activeItem.sb_setItemDamageSources = activeItem.setItemDamageSources + activeItem.setItemDamageSources = function(damageSources) if sb_statusEffects and damageSources then for i = 1, #damageSources do damageSources[i].statusEffects = damageSources[i].statusEffects or {} diff --git a/items/active/starbound/bows/aegisaltbow.activeitem b/items/active/starbound/bows/aegisaltbow.activeitem index bd9d2590..a35cf79f 100644 --- a/items/active/starbound/bows/aegisaltbow.activeitem +++ b/items/active/starbound/bows/aegisaltbow.activeitem @@ -8,7 +8,8 @@ "fixedRarity": true, "rarity": "rare", "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_aegisaltarrow.png" + "damageKindImage": "/interface/sb_tooltips/sb_aegisaltarrow.png", + "objectImage": "/items/active/starbound/bows/aegisaltbowfull.png:0" }, "description": "Harvests meat and other goods from monsters.", "shortdescription": "Aegisalt Bow", diff --git a/items/active/starbound/bows/feroziumbow.activeitem b/items/active/starbound/bows/feroziumbow.activeitem index 5dc7dfd2..f8c4865c 100644 --- a/items/active/starbound/bows/feroziumbow.activeitem +++ b/items/active/starbound/bows/feroziumbow.activeitem @@ -8,7 +8,8 @@ "fixedRarity": true, "rarity": "legendary", "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/purplearrow.png" + "damageKindImage": "/interface/sb_tooltips/purplearrow.png", + "objectImage": "/items/active/starbound/bows/feroziumbowfull.png:0" }, "description": "Harvests meat and other goods from monsters.", "shortdescription": "Scintillium Bow", diff --git a/items/active/starbound/bows/firebow.activeitem b/items/active/starbound/bows/firebow.activeitem index fd382e41..baad00ea 100644 --- a/items/active/starbound/bows/firebow.activeitem +++ b/items/active/starbound/bows/firebow.activeitem @@ -6,7 +6,8 @@ "": "fire" }, "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/flamearrow.png" + "damageKindImage": "/interface/sb_tooltips/flamearrow.png", + "objectImage": "/items/active/starbound/bows/firebowfull.png:0" }, "description": "Every arrow loosed from this bow at full power is set aflame.", "shortdescription": "Fire Bow", diff --git a/items/active/starbound/bows/frozenfirebow.activeitem b/items/active/starbound/bows/frozenfirebow.activeitem index 733a2c1d..41c36207 100644 --- a/items/active/starbound/bows/frozenfirebow.activeitem +++ b/items/active/starbound/bows/frozenfirebow.activeitem @@ -9,7 +9,8 @@ "fixedRarity": false, "fixedLevel": false, "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_frozenflamearrow.png" + "damageKindImage": "/interface/sb_tooltips/sb_frozenflamearrow.png", + "objectImage": "/items/active/starbound/bows/frozenfirebowfull.png:0" }, "description": "Every arrow loosed from this bow at full power is imbued with a crippling frostfire.", "shortdescription": "Frozenfire Bow", diff --git a/items/active/starbound/bows/heartstringbow.activeitem b/items/active/starbound/bows/heartstringbow.activeitem index 4ddde2e5..2dfcbaf3 100644 --- a/items/active/starbound/bows/heartstringbow.activeitem +++ b/items/active/starbound/bows/heartstringbow.activeitem @@ -1,3 +1,4 @@ +//TODO: fix the bottom two(?) pixels being cropped off. also add an arrow { "itemName": "sb_heartstringbow", "definition": "bow", @@ -6,7 +7,8 @@ "": "heartstring" }, "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_heckarrow.png" + "damageKindImage": "/interface/sb_tooltips/sb_heckarrow.png", + "objectImage": "/items/active/starbound/bows/heartstringbowfull.png:0" }, "description": "Harvests meat and other goods from monsters.", "shortdescription": "Heartstring Bow", diff --git a/items/active/starbound/bows/slingshot.activeitem b/items/active/starbound/bows/slingshot.activeitem index 69fadb5e..2d772fde 100644 --- a/items/active/starbound/bows/slingshot.activeitem +++ b/items/active/starbound/bows/slingshot.activeitem @@ -18,7 +18,8 @@ "category": "uniqueWeapon" }, "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_slingshot.png" + "damageKindImage": "/interface/sb_tooltips/sb_slingshot.png", + "objectImage": "/items/active/starbound/bows/slingshotfull.png:0" }, "description": "A basic, easily concealed ranged weapon.", "shortdescription": "Slingshot", diff --git a/items/active/starbound/feed/feed.lua b/items/active/starbound/feed/feed.lua index 5d318bce..2d006dde 100644 --- a/items/active/starbound/feed/feed.lua +++ b/items/active/starbound/feed/feed.lua @@ -19,6 +19,7 @@ function update(dt, fireMode, shiftHeld) updat(dt, fireMode, shiftHeld) item.consume(1) animator.playSound("eat") promised = nil + target = nil end end end diff --git a/items/active/starbound/guns/alienlaser.activeitem b/items/active/starbound/guns/alienlaser.activeitem index 68a96aee..2982ea08 100644 --- a/items/active/starbound/guns/alienlaser.activeitem +++ b/items/active/starbound/guns/alienlaser.activeitem @@ -4,12 +4,6 @@ "maxStack": 1, "price": 1500, "tooltipKind": "sb_gun2", - "tooltipFields": { - "damageKindImage": "/projectiles/guns/plasmabullets/fireplasma/icon.png", - "damageKindBImage": "/projectiles/guns/plasmabullets/electricplasma/icon.png" - // "damageKindImage" : "/interface/elements/fire.png", - // "damageKindBImage" : "/interface/elements/electric.png" - }, "itemTags": ["weapon", "ranged", "pistol"], "category": "pistol", "rarity": "Rare", @@ -43,16 +37,18 @@ "twoHanded": false, "fixedLevel": false, "level": 1, + "elementalType": "electric", "primaryAbilityType": "sb_gun", "primaryAbility": { "fireTime": 0.8, "baseDps": 12.25, "energyUsage": 19.5, "inaccuracy": 0.01, - "projectileType": ["electricplasma", "fireplasma"], + "projectileType": "electricplasma", "projectileParameters": { "speed": 75, - "timeToLive": 3 + "timeToLive": 3, + "statusEffects": ["electrified"] } }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" diff --git a/items/active/starbound/guns/blowgun.activeitem b/items/active/starbound/guns/blowgun.activeitem index 5c889d2b..f5cf636d 100644 --- a/items/active/starbound/guns/blowgun.activeitem +++ b/items/active/starbound/guns/blowgun.activeitem @@ -29,6 +29,7 @@ "twoHanded": false, "fixedLevel": false, "level": 1, + "elementalType": "poison", "primaryAbilityType": "sb_gun", "primaryAbility": { "fireTime": 1.25, diff --git a/items/active/starbound/guns/bonerifle.activeitem b/items/active/starbound/guns/bonerifle.activeitem index f73a3d5a..d71fca93 100644 --- a/items/active/starbound/guns/bonerifle.activeitem +++ b/items/active/starbound/guns/bonerifle.activeitem @@ -41,11 +41,11 @@ "class": "GunFire", "projectileType": ["bonethorn"], //,"throwingbone"], "projectileParameters": { - "knockbackRange": [3, 11] + "knockbackRange": [3, 6] }, - "fireTime": [0.12, 0.22], + "fireTime": [0.11, 0.18], "fireType": "auto", - "baseDps": [9.25, 13.75], + "baseDps": [9.25, 10.25], "energyUsage": [25, 30], "inaccuracy": 0.025, "stances": { diff --git a/items/active/starbound/guns/brainextractor.activeitem b/items/active/starbound/guns/brainextractor.activeitem index 12c7b4d4..3620aaab 100644 --- a/items/active/starbound/guns/brainextractor.activeitem +++ b/items/active/starbound/guns/brainextractor.activeitem @@ -5,7 +5,8 @@ "price": 300, "tooltipKind": "sb_gun2", "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/electric.png" + "damageKindImage": "/interface/sb_tooltips/electric.png", + "objectImage": "/items/active/starbound/guns/brainextractor.png" }, "itemTags": ["weapon", "ranged", "pistol"], "category": "pistol", @@ -14,7 +15,7 @@ "animation": "/items/active/weapons/ranged/gun.animation", "animationCustom": { "sounds": { - "fire": ["/sfx/gun/lightningcoil1.ogg","/sfx/gun/lightningcoil2.ogg","/sfx/gun/lightningcoil3.ogg"] + "fire": ["/sfx/gun/lightningcoil1.ogg", "/sfx/gun/lightningcoil2.ogg", "/sfx/gun/lightningcoil3.ogg"] } }, "animationParts": { diff --git a/items/active/starbound/guns/corrosivegun.activeitem b/items/active/starbound/guns/corrosivegun.activeitem index 7c73a7b6..620cb266 100644 --- a/items/active/starbound/guns/corrosivegun.activeitem +++ b/items/active/starbound/guns/corrosivegun.activeitem @@ -4,9 +4,6 @@ "maxStack": 1, "price": 800, "tooltipKind": "sb_gun2", - "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.png" - }, "itemTags": ["weapon", "ranged", "unique"], "category": "uniqueWeapon", "rarity": "Rare", @@ -31,6 +28,7 @@ "twoHanded": true, "level": 1, + "elementalType": "fire", "primaryAbilityType": "sb_gun", "primaryAbility": { "stances": { diff --git a/items/active/starbound/guns/heatray.activeitem b/items/active/starbound/guns/heatray.activeitem index bf98ef72..675f497a 100644 --- a/items/active/starbound/guns/heatray.activeitem +++ b/items/active/starbound/guns/heatray.activeitem @@ -4,7 +4,9 @@ "maxStack": 1, "price": 640, "tooltipKind": "sb_gun2", - //"tooltipFields" : {"damageKindImage":"/interface/elements/fire.png"}, + "tooltipFields": { + "objectImage": "/items/active/starbound/guns/heatray.png" + }, "itemTags": ["weapon", "ranged", "unique"], "category": "uniqueWeapon", "rarity": "Rare", @@ -40,6 +42,7 @@ "twoHanded": false, "fixedLevel": false, "level": 1, + "elementalType": "fire", "primaryAbilityType": "sb_gun", "primaryAbility": { diff --git a/items/active/starbound/guns/icechucker.activeitem b/items/active/starbound/guns/icechucker.activeitem index 5849d764..6943a9cb 100644 --- a/items/active/starbound/guns/icechucker.activeitem +++ b/items/active/starbound/guns/icechucker.activeitem @@ -10,7 +10,7 @@ "tooltipKind": "sb_gun2", "tooltipFields": { "damageKindImage": "/projectiles/material/sb_icematerial.png", - "objectImage":"/items/active/starbound/guns/icechucker.png" + "objectImage": "/items/active/starbound/guns/icechucker.png" }, "animation": "/items/active/weapons/ranged/gun.animation", "animationCustom": { @@ -38,6 +38,7 @@ "twoHanded": false, "fixedLevel": false, + "elementalType": "ice", "primaryAbilityType": "sb_gun", "primaryAbility": { diff --git a/items/active/starbound/guns/irradiatedlauncher.activeitem b/items/active/starbound/guns/irradiatedlauncher.activeitem index 62c33a19..880ec233 100644 --- a/items/active/starbound/guns/irradiatedlauncher.activeitem +++ b/items/active/starbound/guns/irradiatedlauncher.activeitem @@ -4,9 +4,6 @@ "maxStack": 1, "price": 1500, "tooltipKind": "sb_gun2", - "tooltipFields": { - "damageKindImage": "/projectiles/guns/grenades/impactgrenade/poisonicon.png" - }, "itemTags": ["weapon", "ranged", "grenadelauncher"], "category": "grenadeLauncher", "rarity": "Rare", diff --git a/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem b/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem index 853c79fc..f8bfc18f 100644 --- a/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem +++ b/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem @@ -5,9 +5,37 @@ "shortdescription": "Elemental Crossbow", "itemTags": ["weapon", "ranged", "crossbow", "bow"], "configOverrides": { - "primaryAbility": { - "projectileType": ["woodenbolt", "flamebolt", "icebolt", "poisonbolt", "electricbolt", "explosivebolt"] - } + "builderConfig": [{ + "elementalType": [ + "fire", + "ice", + "electric", + "poison" + ], + "elementalConfig": { + "fire": { + "primaryAbility": { + "projectileType": ["flamebolt", "explosivebolt"] + } + }, + "ice": { + "primaryAbility": { + "projectileType": ["icebolt"] + } + }, + "electric": { + "primaryAbility": { + "projectileType": ["electricbolt"] + } + }, + "poison": { + "primaryAbility": { + "projectileType": ["poisonbolt"] + } + } + } + } + ] }, "builder": "/items/buildscripts/starbound/buildweapon.lua" } diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem b/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem index 15a3c8c0..b530df5d 100644 --- a/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem +++ b/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem @@ -5,7 +5,7 @@ "rarity": "uncommon", "muzzleOffset": [0.5, 0.4], "baseOffset": [-1, 0], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "uniqueWeapon", "description": "", "shortdescription": "Flamethrower", @@ -25,7 +25,8 @@ "primaryAbilityType": "sb_gun2", "primaryAbility": { "projectileParameters": { - "knockback": 0 + "knockback": 0, + "speedRange": [20, 30] }, "fireTime": [0.03, 0.09], "baseDps": [6.5, 8.5], @@ -71,6 +72,7 @@ ], "elementalConfig": { "fire": { + "description": "Love the smell of napalm, any time of day.", "animationCustom": { "sounds": { "fire": ["/sfx/gun/fireblast.ogg", "/sfx/gun/flamethrower_stop.ogg", "/sfx/melee/rocketspear_stop_fire.ogg"] @@ -81,6 +83,7 @@ } }, "ice": { + "description": "Love the smell of frost, any time of day.", "animationCustom": { "sounds": { "fire": ["/sfx/melee/rocketspear_stop_ice.ogg"] @@ -91,6 +94,7 @@ } }, "electric": { + "description": "Love the crackling of thunder, any time of day.", "animationCustom": { "sounds": { "fire": ["/sfx/gun/lightningcoil1.ogg", "/sfx/gun/lightningcoil2.ogg", "/sfx/gun/lightningcoil3.ogg"] @@ -101,6 +105,7 @@ } }, "poison": { + "description": "Love the smell of toxins, any time of day.", "animationCustom": { "sounds": { "fire": ["/sfx/melee/rocketspear_stop_poison.ogg"] diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png index 8050ba30..73ee0124 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png and b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/2.png b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/2.png index 33ae239c..aa5733fa 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/2.png and b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/3.png b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/3.png index eac2ecdd..98b91e4f 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/3.png and b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/butt/1.png b/items/active/starbound/guns/randomgenerated/pulserifle/butt/1.png index 2c42785a..ea26d442 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/butt/1.png and b/items/active/starbound/guns/randomgenerated/pulserifle/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/butt/2.png b/items/active/starbound/guns/randomgenerated/pulserifle/butt/2.png index 40ae5610..02830bcb 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/butt/2.png and b/items/active/starbound/guns/randomgenerated/pulserifle/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/butt/3.png b/items/active/starbound/guns/randomgenerated/pulserifle/butt/3.png index 40ae5610..c016bf28 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/butt/3.png and b/items/active/starbound/guns/randomgenerated/pulserifle/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/middle/1.png b/items/active/starbound/guns/randomgenerated/pulserifle/middle/1.png index 43cbd185..54216289 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/middle/1.png and b/items/active/starbound/guns/randomgenerated/pulserifle/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/middle/2.png b/items/active/starbound/guns/randomgenerated/pulserifle/middle/2.png index 626ef4c8..7ca1b48d 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/middle/2.png and b/items/active/starbound/guns/randomgenerated/pulserifle/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/middle/3.png b/items/active/starbound/guns/randomgenerated/pulserifle/middle/3.png index b8f9de5d..20de8575 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/middle/3.png and b/items/active/starbound/guns/randomgenerated/pulserifle/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem index d59fe423..7f70dada 100644 --- a/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem @@ -5,8 +5,8 @@ "muzzleOffset": [0.875, 0.3], "baseOffset": [-1.25, 0.5], "price": 620, - "tooltipKind": "sb_gun", - "description": "", //A firearm mass-produced by the now-defunct USCM organization. + "tooltipKind": "sb_gun2", + "description": "A firearm mass-produced by the now-defunct USCM organization.", "shortdescription": "Pulse Rifle", "paletteSwaps": "", "category": "assaultRifle", diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/pulserifleicon.png b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifleicon.png index 7c40ce99..2ecb1aad 100644 Binary files a/items/active/starbound/guns/randomgenerated/pulserifle/pulserifleicon.png and b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifleicon.png differ diff --git a/items/active/starbound/guns/testrevolver.activeitem b/items/active/starbound/guns/testrevolver.activeitem index 9230f74a..7dce7e93 100644 --- a/items/active/starbound/guns/testrevolver.activeitem +++ b/items/active/starbound/guns/testrevolver.activeitem @@ -4,6 +4,9 @@ "itemTags": ["weapon", "ranged", "pistol", "revolver", "novakid"], "rarity": "essential", "configOverrides": { + "tooltipFields": { + "objectImage": "/items/active/starbound/guns/revolver.png" + }, "inventoryIcon": "revolvericon.png", "animationParts": { "middle": "revolver.png" diff --git a/items/active/starbound/hawkeyes/hawkeyes.lua b/items/active/starbound/hawkeyes/hawkeyes.lua index 34961b74..9d4666fe 100644 --- a/items/active/starbound/hawkeyes/hawkeyes.lua +++ b/items/active/starbound/hawkeyes/hawkeyes.lua @@ -39,5 +39,5 @@ function withinBounds(pos) pos[i] = lastPos[i] end end - return pos + return {math.floor(pos[1]), math.floor(pos[2])} end \ No newline at end of file diff --git a/items/active/starbound/hawkeyes/hawkeyes.projectile b/items/active/starbound/hawkeyes/hawkeyes.projectile index 5bfb0575..bd4c434a 100644 --- a/items/active/starbound/hawkeyes/hawkeyes.projectile +++ b/items/active/starbound/hawkeyes/hawkeyes.projectile @@ -4,13 +4,18 @@ "timeToLive": 600, "image": "hawkeyes.png", "actionOnReap": [], - "speed": 0, + "speed": 40, "power": 0, - "onlyHitTerrain": true, "fullbright": true, + "flippable": true, "orientationLocked": true, + "controlMovement": { + "maxSpeed": 40, + "controlForce": 120 + }, + "piercing": true, "bounces": -1, diff --git a/items/active/starbound/hawkeyes/hawkeyesprojectile.lua b/items/active/starbound/hawkeyes/hawkeyesprojectile.lua index 7fd99ef3..60c54a8e 100644 --- a/items/active/starbound/hawkeyes/hawkeyesprojectile.lua +++ b/items/active/starbound/hawkeyes/hawkeyesprojectile.lua @@ -1,13 +1,56 @@ +require "/scripts/vec2.lua" +require "/scripts/util.lua" + function init() - oldPosition = mcontroller.position() - message.setHandler("updateProjectile", function(_, _, aimPosition) - if world.magnitude(aimPosition, oldPosition) > 0.1 then - mcontroller.setPosition(aimPosition) + controlMovement = config.getParameter("controlMovement") + controlRotation = config.getParameter("controlRotation") + rotationSpeed = 0 + timedActions = config.getParameter("timedActions", {}) + + aimPosition = mcontroller.position() + oldPosition = {0, 0} + + message.setHandler("updateProjectile", function(_, _, newPosition) + if world.magnitude(aimPosition, oldPosition) > 4 then + local vel = mcontroller.velocity() + aimPosition = {newPosition[1] - vel[1]/2, newPosition[2] - vel[2]/2} end end) message.setHandler("kill", function() projectile.die() end) end -function update() - oldPosition = mcontroller.position() +function update(dt) + if aimPosition then + if controlMovement then + controlTo(aimPosition) + end + + if controlRotation then + rotateTo(aimPosition, dt) + end + end +end + +function controlTo(position) + local offset = world.distance(position, mcontroller.position()) + mcontroller.approachVelocity(vec2.mul(vec2.norm(offset), controlMovement.maxSpeed), controlMovement.controlForce) +end + +function rotateTo(position, dt) + local vectorTo = world.distance(position, mcontroller.position()) + local angleTo = vec2.angle(vectorTo) + if controlRotation.maxSpeed then + local currentRotation = mcontroller.rotation() + local angleDiff = util.angleDiff(currentRotation, angleTo) + local diffSign = angleDiff > 0 and 1 or -1 + + local targetSpeed = math.max(0.1, math.min(1, math.abs(angleDiff) / 0.5)) * controlRotation.maxSpeed + local acceleration = diffSign * controlRotation.controlForce * dt + rotationSpeed = math.max(-targetSpeed, math.min(targetSpeed, rotationSpeed + acceleration)) + rotationSpeed = rotationSpeed - rotationSpeed * controlRotation.friction * dt + + mcontroller.setRotation(currentRotation + rotationSpeed * dt) + else + mcontroller.setRotation(angleTo) + end end \ No newline at end of file diff --git a/items/active/starbound/itembox/itembox.animation b/items/active/starbound/itembox/itembox.animation index 0b1e65b5..ee2c4e77 100644 --- a/items/active/starbound/itembox/itembox.animation +++ b/items/active/starbound/itembox/itembox.animation @@ -1,210 +1,199 @@ { - "animatedParts" : { - "stateTypes" : { - "firing" : { - "default" : "off", - "states" : { - "off" : { - "properties" : { - "particleEmittersOff" : ["confetti"] + "animatedParts": { + "stateTypes": { + "firing": { + "default": "off", + "states": { + "off": { + "properties": { + "particleEmittersOff": ["confetti"] } }, - "fire" : { - "frames" : 2, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "confetti", - "properties" : { - "immediateSound" : "/sfx/objects/colonydeed_partyhorn.ogg", - "particleEmittersOff" : ["confetti"] - }, - "frameProperties" : { - "stateNudge" : [[-0.125,0],[0,0]] + "fire": { + "frames": 2, + "cycle": 0.1, + "mode": "transition", + "transition": "confetti", + "properties": { + "immediateSound": "/sfx/objects/colonydeed_partyhorn.ogg", + "particleEmittersOff": ["confetti"] } }, - "confetti" : { - "cycle" : 0.2, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : ["confetti"] + "confetti": { + "cycle": 0.2, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["confetti"] } } } } }, - "parts" : { - "gun" : { - "properties" : { - "centered" : true, - "image" : "", - "offset" : [0, 0] + "parts": { + "gun": { + "properties": { + "centered": true, + "image": "", + "offset": [0, 0] } } } }, - "particleEmitters" : { - "confetti" : { - "emissionRate" : 500, - "emissionRateVariance" : 0, - "active" : true, + "particleEmitters": { + "confetti": { + "emissionRate": 500, + "emissionRateVariance": 0, + "active": true, - "particles" : [ - { + "particles": [{ //Red, drifting - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [255, 0, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 9], - "finalVelocity" : [0, -5], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 0, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 9], + "finalVelocity": [0, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { //Red, falling fast - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [255, 0, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 7], - "finalVelocity" : [0, -50], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 0, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 7], + "finalVelocity": [0, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [5, 2] } } - }, - { + }, { //Green, drifting - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [0, 255, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 9], - "finalVelocity" : [0, -5], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 255, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 9], + "finalVelocity": [0, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { //Green, falling fast - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [0, 255, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 7], - "finalVelocity" : [0, -50], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 255, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 7], + "finalVelocity": [0, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [5, 2] } } - }, - { + }, { //Blue, drifting - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [0, 0, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 9], - "finalVelocity" : [0, -5], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 0, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 9], + "finalVelocity": [0, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { //Blue, falling fast - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [0, 0, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 7], - "finalVelocity" : [0, -50], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 0, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 7], + "finalVelocity": [0, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [5, 2] } } - }, - { + }, { //White, drifting - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [255, 255, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 9], - "finalVelocity" : [0, -5], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 255, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 9], + "finalVelocity": [0, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { //White, falling fast - "particle" : { - "type" : "ember", - "position" : [1, 0], - "size" : 2, - "color" : [255, 255, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0, 7], - "finalVelocity" : [0, -50], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 255, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [0, 7], + "finalVelocity": [0, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [5, 2] } } } ] } } -} \ No newline at end of file +} diff --git a/items/active/starbound/partypopper/muzzleflash.frames b/items/active/starbound/partypopper/muzzleflash.frames index 1fdcb088..ce8b268c 100644 --- a/items/active/starbound/partypopper/muzzleflash.frames +++ b/items/active/starbound/partypopper/muzzleflash.frames @@ -1,12 +1,12 @@ { - "frameGrid" : { - "size" : [15, 15], - "dimensions" : [2, 3], + "frameGrid": { + "size": [15, 15], + "dimensions": [2, 3], - "names" : [ - [ "1.1", "1.2" ], - [ "2.1", "2.2" ], - [ "3.1", "3.2" ] + "names": [ + ["1.1", "1.2"], + ["2.1", "2.2"], + ["3.1", "3.2"] ] } } diff --git a/items/active/starbound/partypopper/partypopper.activeitem b/items/active/starbound/partypopper/partypopper.activeitem index c4b856ea..e6383be7 100644 --- a/items/active/starbound/partypopper/partypopper.activeitem +++ b/items/active/starbound/partypopper/partypopper.activeitem @@ -1,20 +1,20 @@ { - "itemName" : "sb_partypopper", - "rarity" : "common", - "description" : "It's party time!", - "shortdescription" : "Party Popper", - "twoHanded" : true, - "category" : "toy", - "itemTags" : ["toy"], - "tooltipKind" : "sb_object", - "price" : 25, + "itemName": "sb_partypopper", + "rarity": "common", + "description": "It's party time!", + "shortdescription": "Party Popper", + "twoHanded": true, + "category": "toy", + "itemTags": ["toy"], + "tooltipKind": "sb_object", + "price": 25, - "inventoryIcon" : "partypoppericon.png", - "animation" : "partypopper.animation", - "animationCustom" : {}, - "scripts" : ["partypopper.lua"], + "inventoryIcon": "partypoppericon.png", + "animation": "partypopper.animation", + "animationCustom": {}, + "scripts": ["partypopper.lua"], - "emotes" : ["happy","laugh","oh"], - "fireTime" : 0.8, //2, - "fireOffset" : [1, 0] -} \ No newline at end of file + "emotes": ["happy", "laugh", "oh"], + "fireTime": 0.8, //2, + "fireOffset": [1, 0] +} diff --git a/items/active/starbound/partypopper/partypopper.animation b/items/active/starbound/partypopper/partypopper.animation index 7750abba..c68d2199 100644 --- a/items/active/starbound/partypopper/partypopper.animation +++ b/items/active/starbound/partypopper/partypopper.animation @@ -1,69 +1,66 @@ { - "animatedParts" : { - "stateTypes" : { - "firing" : { - "default" : "off", - "states" : { - "off" : { - "properties" : { - "particleEmittersOff" : [ "confetti" ] + "animatedParts": { + "stateTypes": { + "firing": { + "default": "off", + "states": { + "off": { + "properties": { + "particleEmittersOff": ["confetti"] } }, - "fire" : { - "frames" : 2, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "confetti", - "properties" : { - "immediateSound" : "/sfx/gun/grenadeblast1.ogg", - "particleEmittersOff" : [ "confetti" ] - }, - "frameProperties" : { - "stateNudge" : [ [-0.125, 0], [0, 0] ] + "fire": { + "frames": 2, + "cycle": 0.1, + "mode": "transition", + "transition": "confetti", + "properties": { + "immediateSound": "/sfx/gun/grenadeblast1.ogg", + "particleEmittersOff": ["confetti"] } }, - "confetti" : { - "cycle" : 0.2, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : [ "confetti" ] + "confetti": { + "cycle": 0.2, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["confetti"] } } } } }, - "parts" : { - "gun" : { - "properties" : { - "centered" : true, - "image" : "partypopper.png", - "offset" : [0.0, 0.0] + "parts": { + "gun": { + "properties": { + "centered": true, + "image": "partypopper.png", + "offset": [0.25, 0] } }, - "muzzleFlash" : { - "properties" : { - "zLevel" : 1, - "centered" : true, - "offset" : [1.6, 0.0] + "muzzleFlash": { + "properties": { + "zLevel": 1, + "centered": true, + "offset": [1.6, 0] }, - "partStates" : { - "firing" : { - "off" : { - "properties" : { - "image" : "" + "partStates": { + "firing": { + "off": { + "properties": { + "image": "" } }, - "fire" : { - "properties" : { - "image" : "muzzleflash.png:." + "fire": { + "properties": { + "image": "muzzleflash.png:." } }, - "confetti" : { - "properties" : { - "image" : "" + "confetti": { + "properties": { + "image": "" } } } @@ -72,164 +69,172 @@ } }, - "particleEmitters" : { - "confetti" : { - "emissionRate" : 500.0, - "emissionRateVariance" : 0.0, - "active" : true, - "particles" : [{"particle":"orespark"},{"particle":"orespark"}, - { + "particleEmitters": { + "confetti": { + "emissionRate": 300, + "emissionRateVariance": 300, + "active": true, + "particles": [{ + "particle": { + "type": "animated", + "animation": "/animations/sparkles/orespark.animation", + "position": [1, 0], + "initialVelocity": [3, 5], + "finalVelocity": [3, -10], + "approach": [0, 30], + "fade": 0.5, + "timeToLive": 0.65, + "layer": "front", + "variance": { + "initialVelocity": [3, 2], + "timeToLive": 0.2 + } + } + }, { // Red, drifting - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [255, 0, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 9.0], - "finalVelocity" : [0.0, -5.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 0, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 9], + "finalVelocity": [3, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { // Red, falling fast - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [255, 0, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 7.0], - "finalVelocity" : [0.0, -50.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 0, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [-5, 2] } } - }, - { + }, { // Green, drifting - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [0, 255, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 9.0], - "finalVelocity" : [0.0, -5.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 255, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 9], + "finalVelocity": [3, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { // Green, falling fast - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [0, 255, 0, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 7.0], - "finalVelocity" : [0.0, -50.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 255, 0, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [-5, 2] } } - }, - { + }, { // Blue, drifting - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [0, 0, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 9.0], - "finalVelocity" : [0.0, -5.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 0, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 9], + "finalVelocity": [3, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { // Blue, falling fast - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [0, 0, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 7.0], - "finalVelocity" : [0.0, -50.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [0, 0, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [-5, 2] } } - }, - { + }, { // White, drifting - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [255, 255, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 9.0], - "finalVelocity" : [0.0, -5.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [2, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 255, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 9], + "finalVelocity": [3, -5], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [2, 2] } } - }, - { + }, { // White, falling fast - "particle" : { - "type" : "ember", - "position" : [1.0, 0], - "size" : 2.0, - "color" : [255, 255, 255, 255], - "light" : [50, 50, 50], - "fade" : 0.9, - "initialVelocity" : [0.0, 7.0], - "finalVelocity" : [0.0, -50.0], - "approach" : [0, 20], - "timeToLive" : 5, - "layer" : "middle", - "variance" : { - "initialVelocity" : [5, 2.0] + "particle": { + "type": "ember", + "position": [1, 0], + "size": 2, + "color": [255, 255, 255, 255], + "light": [50, 50, 50], + "fade": 0.9, + "initialVelocity": [3, 7], + "finalVelocity": [3, -50], + "approach": [0, 20], + "timeToLive": 5, + "layer": "middle", + "variance": { + "initialVelocity": [-5, 2] } } - },{"particle":"orespark"},{"particle":"orespark"} + } ] } } diff --git a/items/active/starbound/partypopper/partypopper.lua b/items/active/starbound/partypopper/partypopper.lua index 6f1fdfdf..fc67cfff 100644 --- a/items/active/starbound/partypopper/partypopper.lua +++ b/items/active/starbound/partypopper/partypopper.lua @@ -1,13 +1,14 @@ -require "/scripts/vec2.lua" +--WONTFIX: You can reuse them by dropping them before they're consumed function init() emotes = config.getParameter("emotes") - emoteChance = config.getParameter("emoteChance",2) - consumeTimer = config.getParameter("consumeTimer",0.6) + emoteChance = config.getParameter("emoteChance", 2) + storage.consumeTimer = storage.consumeTimer or config.getParameter("consumeTimer", 0.6) fireOffset = config.getParameter("fireOffset") + baseFireTime = config.getParameter("fireTime", 1) recoil = 0 recoilRate = 0 - active, firing = false, false + active, firing = false, firing or false storage.fireTimer = storage.fireTimer or 0 animator.setPartTag("muzzleFlash", "variant", "1") updateAim() @@ -17,27 +18,30 @@ function update(dt, fireMode, shiftHeld) updateAim() storage.fireTimer = math.max(storage.fireTimer - dt, 0) - if active then - recoilRate = 0 - else - recoilRate = math.max(1, recoilRate + (10 * dt)) - end + recoilRate = active and 0 or math.max(1, recoilRate + (10 * dt)) recoil = math.max(recoil - dt * recoilRate, 0) if active and storage.fireTimer <= 0 then - consumeTimer = math.max(0, consumeTimer - dt) + storage.consumeTimer = math.max(0, storage.consumeTimer - dt) recoil = recoil + 0.1 -- aimAngle if animator.animationState("firing") == "off" then - if math.random(emoteChance) == 1 then activeItem.emote(emotes[math.random(1,#emotes)]) end + if math.random(emoteChance) == 1 then + activeItem.emote(emotes[math.random(#emotes)]) + end animator.setAnimationState("firing", "fire") end animator.setPartTag("muzzleFlash", "variant", math.random(1, 3)) - storage.fireTimer = config.getParameter("fireTime", 1.0) + storage.fireTimer = baseFireTime end active = false - if firing then consumeTimer = math.max(0, consumeTimer - dt) - if consumeTimer <= 0 then item.consume(1) consumeTimer = 1 firing = false end + if firing then + storage.consumeTimer = math.max(0, storage.consumeTimer - dt) + if storage.consumeTimer <= 0 then + item.consume(1) + storage.consumeTimer = 1 + firing = false + end end end diff --git a/items/active/starbound/partypopper/partypopper.png b/items/active/starbound/partypopper/partypopper.png index 9f8994fe..6b223540 100644 Binary files a/items/active/starbound/partypopper/partypopper.png and b/items/active/starbound/partypopper/partypopper.png differ diff --git a/items/active/starbound/partypopper/partypoppericon.png b/items/active/starbound/partypopper/partypoppericon.png index 15559007..47091826 100644 Binary files a/items/active/starbound/partypopper/partypoppericon.png and b/items/active/starbound/partypopper/partypoppericon.png differ diff --git a/items/active/starbound/staves/oceantrident.activeitem b/items/active/starbound/staves/oceantrident.activeitem index 6b21f288..ed01fb64 100644 --- a/items/active/starbound/staves/oceantrident.activeitem +++ b/items/active/starbound/staves/oceantrident.activeitem @@ -18,7 +18,7 @@ // "sounds" : {"zoneactivate" : ["/sfx/blocks/water_puddlemod.ogg","/sfx/blocks/water_swim.ogg"]} }, - "elementalType": "ice", + "elementalType": "physical", "altAbilityType": "forcecage", "primaryAbility": { "projectileType": "randomfish", diff --git a/items/active/starbound/staves/racialstaves/apexsteelstaff1.activeitem b/items/active/starbound/staves/racialstaves/apexsteelstaff1.activeitem index 9b43b4c1..b2017511 100644 --- a/items/active/starbound/staves/racialstaves/apexsteelstaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/apexsteelstaff1.activeitem @@ -12,7 +12,6 @@ "description": "Deploys a small drone that shoots lasers.", "shortdescription": "Monkey Nut Staff", "tooltipFields": { - "subtitle": "Steel Staff", "damageKindImage": "/interface/sb_tooltips/sb_monkeynut.png" }, "elementalType": "electric", diff --git a/items/active/starbound/staves/racialstaves/apexsteelstaff2.activeitem b/items/active/starbound/staves/racialstaves/apexsteelstaff2.activeitem index 8f906de6..722faa44 100644 --- a/items/active/starbound/staves/racialstaves/apexsteelstaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/apexsteelstaff2.activeitem @@ -12,7 +12,6 @@ "description": "Deploys a drone that fires lasers and rockets.", "shortdescription": "Deadbolt Staff", "tooltipFields": { - "subtitle": "Steel Staff", "damageKindImage": "/interface/sb_tooltips/sb_deadbolt.png" }, "elementalType": "electric", diff --git a/items/active/starbound/staves/racialstaves/aviancrystalstaff1.activeitem b/items/active/starbound/staves/racialstaves/aviancrystalstaff1.activeitem index 5b4bb9bb..6f9f9e71 100644 --- a/items/active/starbound/staves/racialstaves/aviancrystalstaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/aviancrystalstaff1.activeitem @@ -12,7 +12,6 @@ "description": "Creates a floating crystal that harms anything nearby.", "shortdescription": "Cardinal's Chalcedony", "tooltipFields": { - "subtitle": "Crystal Staff", "damageKindImage": "/projectiles/sb_staves/racialstaves/crystal/cardinalschalcedony/cardinalschalcedony.png:0" }, "elementalType": "electric", diff --git a/items/active/starbound/staves/racialstaves/aviancrystalstaff2.activeitem b/items/active/starbound/staves/racialstaves/aviancrystalstaff2.activeitem index 853a30ca..990f85dd 100644 --- a/items/active/starbound/staves/racialstaves/aviancrystalstaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/aviancrystalstaff2.activeitem @@ -12,7 +12,6 @@ "description": "Creates a gemstone pulsing with tremendous energy.", "shortdescription": "Quetzalcoatl's Quartz", "tooltipFields": { - "subtitle": "Crystal Staff", "damageKindImage": "/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.png:0" }, "elementalType": "electric", diff --git a/items/active/starbound/staves/racialstaves/default.frames b/items/active/starbound/staves/racialstaves/default.frames index 9642a519..eee765c0 100644 --- a/items/active/starbound/staves/racialstaves/default.frames +++ b/items/active/starbound/staves/racialstaves/default.frames @@ -1,12 +1,12 @@ { - "frameGrid" : { - "size" : [24, 50], - "dimensions" : [23, 1], - "names" : [ - [ - "charging.1", "charging.2", "charging.3", "charging.4", "charging.5", "charging.6", "charging.7", "charging.8", "charging.9", "charging.10", - "charging.11", "charging.12", "charging.13", "spark.1", "spark.2", "spark.3", "loop.1", "loop.2", "loop.3", "loop.4", - "discharge.1", "discharge.2", "discharge.3" + "frameGrid": { + "size": [24, 50], + "dimensions": [23, 1], + "names": [ + [ + "charging.1", "charging.2", "charging.3", "charging.4", "charging.5", "charging.6", "charging.7", "charging.8", "charging.9", "charging.10", + "charging.11", "charging.12", "charging.13", "spark.1", "spark.2", "spark.3", "loop.1", "loop.2", "loop.3", "loop.4", + "discharge.1", "discharge.2", "discharge.3" ] ] } diff --git a/items/active/starbound/staves/racialstaves/floranleafstaff1.activeitem b/items/active/starbound/staves/racialstaves/floranleafstaff1.activeitem index a2ab5bc7..da012426 100644 --- a/items/active/starbound/staves/racialstaves/floranleafstaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/floranleafstaff1.activeitem @@ -12,7 +12,6 @@ "description": "Creates a powerful blizzard of leaves.", "shortdescription": "Leaf Flurry", "tooltipFields": { - "subtitle": "Leaf Staff", "damageKindImage": "/items/throwables/sb_cutterleaf.png" }, "elementalType": "poison", diff --git a/items/active/starbound/staves/racialstaves/floranleafstaff2.activeitem b/items/active/starbound/staves/racialstaves/floranleafstaff2.activeitem index 109ec7ad..dad50371 100644 --- a/items/active/starbound/staves/racialstaves/floranleafstaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/floranleafstaff2.activeitem @@ -12,7 +12,6 @@ "description": "Creates an unbearable flurry of petals.", "shortdescription": "Petal Storm Staff", "tooltipFields": { - "subtitle": "Leaf Staff", "damageKindImage": "/items/throwables/sb_cutterleaf.png" }, "elementalType": "poison", diff --git a/items/active/starbound/staves/racialstaves/glitchglitchstaff1.activeitem b/items/active/starbound/staves/racialstaves/glitchglitchstaff1.activeitem index c5ddd886..05070efd 100644 --- a/items/active/starbound/staves/racialstaves/glitchglitchstaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/glitchglitchstaff1.activeitem @@ -12,7 +12,6 @@ "description": "01100101 01110010 01110010 01101111 01110010", "shortdescription": "Binary Breaker", "tooltipFields": { - "subtitle": "Glitch Staff", "damageKindImage": "/interface/statuses/crash.png" }, "elementalType": "fire", diff --git a/items/active/starbound/staves/racialstaves/glitchglitchstaff2.activeitem b/items/active/starbound/staves/racialstaves/glitchglitchstaff2.activeitem index 470ad923..d5833d9d 100644 --- a/items/active/starbound/staves/racialstaves/glitchglitchstaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/glitchglitchstaff2.activeitem @@ -17,7 +17,8 @@ ªŒ—üð†", "shortdescription": "G4mE_bReÄK3r", "tooltipFields": { - "subtitle": "61!7(|-| 574|=|=", + "subtitle": "574|=|=", + "damageKindImage": "/items/active/starbound/staves/racialstaves/glitchglitchstaff2.png", "damageKindDImage": "/interface/statuses/crash.png?flipy", "priceLabel": "LEET", "rarityLabel": "1363|/||)4|2\\|/", diff --git a/items/active/starbound/staves/racialstaves/humanplasmastaff1.activeitem b/items/active/starbound/staves/racialstaves/humanplasmastaff1.activeitem index 2327fc90..737d03b5 100644 --- a/items/active/starbound/staves/racialstaves/humanplasmastaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/humanplasmastaff1.activeitem @@ -12,8 +12,7 @@ "description": "Channels the energy of human spirit.", "shortdescription": "Plasma Pulse Staff", "tooltipFields": { - "subtitle": "Plasma Staff", - "damageKindImage": "/interface/sb_tooltips/boomblast.png" + "damageKindImage": "/interface/sb_tooltips/sb_boomblast.png" }, "elementalType": "electric", "altAbilityType": "plasmabarrage", diff --git a/items/active/starbound/staves/racialstaves/humanplasmastaff2.activeitem b/items/active/starbound/staves/racialstaves/humanplasmastaff2.activeitem index 1914c4d3..069ba7ac 100644 --- a/items/active/starbound/staves/racialstaves/humanplasmastaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/humanplasmastaff2.activeitem @@ -12,8 +12,7 @@ "description": "Powered by the destructive desires of the wielder. And a battery.", "shortdescription": "Boom Blast Staff", "tooltipFields": { - "subtitle": "Plasma Staff", - "damageKindImage": "/interface/sb_tooltips/plasmapulse.png" + "damageKindImage": "/interface/sb_tooltips/sb_plasmapulse.png" }, "elementalType": "fire", "altAbilityType": "plasmabarrage", diff --git a/items/active/starbound/staves/racialstaves/hylotlaquastaff1.activeitem b/items/active/starbound/staves/racialstaves/hylotlaquastaff1.activeitem index 32955670..f645fe12 100644 --- a/items/active/starbound/staves/racialstaves/hylotlaquastaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/hylotlaquastaff1.activeitem @@ -9,10 +9,9 @@ }, "rarity": "rare", "level": 5, - "description": "Creates a a splash of water.", + "description": "Creates a splash of water.", "shortdescription": "Sacred Splash Staff", "tooltipFields": { - "subtitle": "Aqua Staff", "damageKindImage": "/items/liquids/liquidwatericon.png" }, "animationCustom": { diff --git a/items/active/starbound/staves/racialstaves/hylotlaquastaff2.activeitem b/items/active/starbound/staves/racialstaves/hylotlaquastaff2.activeitem index 1ab8aae9..f8f42a7d 100644 --- a/items/active/starbound/staves/racialstaves/hylotlaquastaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/hylotlaquastaff2.activeitem @@ -9,10 +9,9 @@ }, "rarity": "legendary", "level": 6, - "description": "Creates a a torrent of water.", + "description": "Creates a torrent of water.", "shortdescription": "Hylid's Pulse Staff", "tooltipFields": { - "subtitle": "Aqua Staff", "damageKindImage": "/items/liquids/liquidwatericon.png" }, "animationCustom": { diff --git a/items/active/starbound/staves/racialstaves/novakidlightstaff1.activeitem b/items/active/starbound/staves/racialstaves/novakidlightstaff1.activeitem index 6734d9be..666acac9 100644 --- a/items/active/starbound/staves/racialstaves/novakidlightstaff1.activeitem +++ b/items/active/starbound/staves/racialstaves/novakidlightstaff1.activeitem @@ -12,8 +12,7 @@ "description": "Creates a miniature sun to light up the area.", "shortdescription": "Red Giant Orb", "tooltipFields": { - "subtitle": "Light Staff", - "damageKindImage": "/projectiles/sb_staves/racialstaves/light/redgiant/icon.png" + "damageKindImage": "/interface/sb_tooltips/sb_redgiant.png" }, "animationCustom": { "lights": { @@ -24,6 +23,11 @@ } }, "configOverrides": { + "inventoryIcon": ".png?multiply=fffffffe", + "animationParts": { + "staff": "", + "staffFullbright": ".png" + }, "stances": { "idle": { "armRotation": 20, diff --git a/items/active/starbound/staves/racialstaves/novakidlightstaff2.activeitem b/items/active/starbound/staves/racialstaves/novakidlightstaff2.activeitem index 74cd3a4d..08eb4369 100644 --- a/items/active/starbound/staves/racialstaves/novakidlightstaff2.activeitem +++ b/items/active/starbound/staves/racialstaves/novakidlightstaff2.activeitem @@ -12,8 +12,7 @@ "description": "Creates a bright star to light up the area.", "shortdescription": "Supergiant Orb", "tooltipFields": { - "subtitle": "Light Staff", - "damageKindImage": "/projectiles/sb_staves/racialstaves/light/supergiant/icon.png" + "damageKindImage": "/interface/sb_tooltips/sb_supergiant.png" }, "animationCustom": { "lights": { @@ -31,6 +30,11 @@ } }, "configOverrides": { + "inventoryIcon": ".png?multiply=fffffffe", + "animationParts": { + "staff": "", + "staffFullbright": ".png" + }, "stances": { "idle": { "armRotation": 20, diff --git a/items/active/starbound/staves/scistaff.activeitem b/items/active/starbound/staves/scistaff.activeitem index 03dd5e56..c87c1bcf 100644 --- a/items/active/starbound/staves/scistaff.activeitem +++ b/items/active/starbound/staves/scistaff.activeitem @@ -4,18 +4,16 @@ "itemTags": ["weapon", "staff"], "tags": { "": "sci", - "": "/items/active/weapons/staff/generated/glow/physical" + "": "racialstaves/crystalstaffglow" }, "description": "Gives nearby foes an icy reception at your command.", - "shortdescription": "Sci-Cryo Staff", - "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/icethrower.png" - }, + "shortdescription": "Cryo Staff", //Sci Staff is a weird name. All staves are sciency "staffHasFullbright": true, "animationCustom": { "animatedParts": { +// "stateTypes": {"charge":{"states":{"charge":{"cycle":0.7}}}}, "parts": { "chargeEffect": { "properties": { @@ -30,16 +28,25 @@ "altAbilityType": "elementswarm", "primaryAbilityType": "plasmabarrage", "primaryAbility": { + "projectileType": "icebreath", + "energyCost": 20, + "projectileParameters": { + "speed": 0, + "baseDamage": 14 + } + }, + "altAbility": { + "name": "Cold Front", + "energyCost": 80, "projectileType": "icebreath", "projectileParameters": { "speed": 0, - "baseDamage": 8 + "power": 7.5 } }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua", "craftedParameters": { - "level": 5, - "seed": 1 + "level": 5 } } diff --git a/items/active/starbound/staves/slimestaff.activeitem b/items/active/starbound/staves/slimestaff.activeitem index b212e727..177e73e0 100644 --- a/items/active/starbound/staves/slimestaff.activeitem +++ b/items/active/starbound/staves/slimestaff.activeitem @@ -30,12 +30,16 @@ }, "elementalType": "poison", - "altAbilityType": "elementbouncer", + "altAbilityType": "elementswarm", "primaryAbility": { "projectileType": "slimeexplosion", + "energyCost": 30, "projectileParameters": { + "damageTeam": { + "type": "friendly" + }, "speed": 0, - "baseDamage": 8, + "baseDamage": 12, "statusEffects": [{ "effect": "slimeslow", "duration": 5 @@ -43,10 +47,24 @@ ] } }, + "altAbility": { + "name": "Toxic Bubbles", + "projectileType": "poisonbubble", + "projectileDistance": 0.75, + "projectileParameters": { + "animationCycle": 2, + "timeToLive": 1.9, + "speed": 7.5, + "statusEffects": [{ + "effect": "slimeslow", + "duration": 2.5 + } + ] + } + }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua", "craftedParameters": { - "level": 5, - "seed": 1 + "level": 5 } } diff --git a/items/active/starbound/staves/staff.animation b/items/active/starbound/staves/staff.animation index 4ae691d9..c9857fe4 100644 --- a/items/active/starbound/staves/staff.animation +++ b/items/active/starbound/staves/staff.animation @@ -38,7 +38,7 @@ "zLevel": 0, "centered": true, "image": "", - "offset": [0.0, 1.0], + "offset": [0, 1], "focalPoint": [0, 2.5], "transformationGroups": ["weapon"] } @@ -49,8 +49,8 @@ "centered": true, "fullbright": true, "image": "", - "offset": [0.0, 1.0], - "focalPoint": [0.0, 2.5], + "offset": [0, 1], + "focalPoint": [0, 2.5], "transformationGroups": ["weapon"] } }, @@ -60,7 +60,7 @@ "centered": true, "fullbright": false, "image": "", - "offset": [0.0, 2], + "offset": [0, 2], "focalPoint": [0, 0], "transformationGroups": ["weapon"] } @@ -109,7 +109,7 @@ "lights": { "glow": { "active": false, - "position": [0, 3.0], + "position": [0, 3], "color": [0, 0, 0], "transformationGroups": ["weapon"] } diff --git a/items/active/starbound/staves/uraniumrodstaff.activeitem b/items/active/starbound/staves/uraniumrodstaff.activeitem index 8255314e..fcf7a702 100644 --- a/items/active/starbound/staves/uraniumrodstaff.activeitem +++ b/items/active/starbound/staves/uraniumrodstaff.activeitem @@ -9,9 +9,6 @@ "description": "Sometimes a simple fireball just isn't enough.", "shortdescription": "Uranium Rod Staff", - "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/poisonthrower.png" - }, "fuelAmount": 50, "animationCustom": { diff --git a/items/active/starbound/weapons/broadsword.animation b/items/active/starbound/weapons/broadsword.animation index a012bf86..34a232ee 100644 --- a/items/active/starbound/weapons/broadsword.animation +++ b/items/active/starbound/weapons/broadsword.animation @@ -1,94 +1,93 @@ { - "globalTagDefaults" : { - "paletteSwaps" : "" + "globalTagDefaults": { + "paletteSwaps": "" }, - "animatedParts" : { - "stateTypes" : { - "swoosh" : { - "default" : "idle", - "states" : { - "idle" : { + "animatedParts": { + "stateTypes": { + "swoosh": { + "default": "idle", + "states": { + "idle": {}, + "fire": { + "frames": 3, + "cycle": 0.07, + "mode": "transition", + "transition": "idle" }, - "fire" : { - "frames" : 3, - "cycle" : 0.07, - "mode" : "transition", - "transition" : "idle" + "fire2": { + "frames": 3, + "cycle": 0.1, + "mode": "transition", + "transition": "idle" }, - "fire2" : { - "frames" : 3, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "idle" - }, - "fire3" : { - "frames" : 3, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "idle" + "fire3": { + "frames": 3, + "cycle": 0.1, + "mode": "transition", + "transition": "idle" } } } }, - "parts" : { - "handle" : { - "properties" : { - "zLevel" : 1, - "centered" : true, - "image" : "", - "offset" : [0.3, 1.875], - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0], - "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + "parts": { + "handle": { + "properties": { + "zLevel": 1, + "centered": true, + "image": "", + "offset": [0.3, 1.875], + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0], + "damageArea": [[-0.7, -1], [-0.7, 2.5], [0.5, 2.5], [0.5, -1]] } }, - "blade" : { - "properties" : { - "zLevel" : 0, - "centered" : true, - "image" : "?", - "offset" : [0.3, 1.875], - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0], - "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] + "blade": { + "properties": { + "zLevel": 0, + "centered": true, + "image": "?", + "offset": [0.3, 1.875], + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0], + "damageArea": [[-0.7, -1], [-0.7, 2.5], [0.5, 2.5], [0.5, -1]] } }, - "swoosh" : { - "properties" : { - "zLevel" : -1, - "centered" : true, - "transformationGroups" : ["swoosh"], - "rotationCenter" : [0, 0] + "swoosh": { + "properties": { + "zLevel": -1, + "centered": true, + "transformationGroups": ["swoosh"], + "rotationCenter": [0, 0] }, - "partStates" : { - "swoosh" : { - "idle" : { - "properties" : { - "image" : "" + "partStates": { + "swoosh": { + "idle": { + "properties": { + "image": "" } }, - "fire" : { - "properties" : { - "image" : "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", - "offset" : [-0.25, 2.5], - "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] + "fire": { + "properties": { + "image": "/items/active/weapons/melee/broadsword/swoosh/swoosh.png:", + "offset": [-0.25, 2.5], + "damageArea": [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] } }, - "fire2" : { - "properties" : { - "image" : "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", - "offset" : [5, 1], - "damageArea" : [[-4, 1], [2.5, 1], [2.5, -2], [-4, -2]] + "fire2": { + "properties": { + "image": "/items/active/weapons/melee/broadsword/swoosh2/swoosh.png:", + "offset": [5, 1], + "damageArea": [[-4, 1], [2.5, 1], [2.5, -2], [-4, -2]] } }, - "fire3" : { - "properties" : { - "image" : "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", - "offset" : [3.5, 0], - "damageArea" : [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] + "fire3": { + "properties": { + "image": "/items/active/weapons/melee/broadsword/swoosh3/swoosh.png:", + "offset": [3.5, 0], + "damageArea": [[-4.75, 1.5], [3, 1], [3, -1], [-4.75, -1.5]] } } } @@ -97,109 +96,130 @@ } }, - "transformationGroups" : { - "weapon" : {}, - "swoosh" : {} + "transformationGroups": { + "weapon": {}, + "swoosh": {} }, - "particleEmitters" : { - "physicalswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ + "particleEmitters": { + "physicalswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [0.75, 0, 4.25, 5], + "particles": [ ] }, - "fireswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"}, - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"} + "fireswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [0.75, 0, 4.25, 5], + "particles": [{ + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + }, { + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + } ] }, - "electricswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "electricswoosh1"}, - { "particle" : "electricswoosh2"}, - { "particle" : "electricswoosh2"} + "electricswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [0.75, 0, 4.25, 5], + "particles": [{ + "particle": "electricswoosh1" + }, { + "particle": "electricswoosh2" + }, { + "particle": "electricswoosh2" + } ] }, - "poisonswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"}, - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"} + "poisonswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [0.75, 0, 4.25, 5], + "particles": [{ + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + }, { + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + } ] }, - "iceswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"}, - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"} + "iceswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [0.75, 0, 4.25, 5], + "particles": [{ + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + }, { + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + } ] } }, - "lights" : { - "glow" : { - "active" : true, - "position" : [0.0, 0.0], - "color" : [0, 0, 0], - "flickerPeriod" : 1, - "flickerMinIntensity" : 0.75, - "flickerMaxIntensity" : 0.9, - "flickerPeriodVariance" : 0.0, - "flickerIntensityVariance" : 0.0 + "lights": { + "glow": { + "active": true, + "position": [0, 0], + "color": [0, 0, 0], + "flickerPeriod": 1, + "flickerMinIntensity": 0.75, + "flickerMaxIntensity": 0.9, + "flickerPeriodVariance": 0, + "flickerIntensityVariance": 0.0 } }, - "sounds" : { - "fire" : [], //for alt abilities + "sounds": { + "fire": [], //for alt abilities - "physicalfire1" : ["/sfx/melee/swing_broadsword.ogg"], - "physicalfire2" : ["/sfx/melee/swing_shortsword.ogg"], - "physicalfire3" : ["/sfx/melee/swing_spear.ogg"], + "physicalfire1": ["/sfx/melee/swing_broadsword.ogg"], + "physicalfire2": ["/sfx/melee/swing_shortsword.ogg"], + "physicalfire3": ["/sfx/melee/swing_spear.ogg"], - "firefire1" : ["/sfx/melee/swing_broadsword_fire1.ogg", "/sfx/melee/swing_broadsword_fire2.ogg", "/sfx/melee/swing_broadsword_fire3.ogg"], - "firefire2" : ["/sfx/melee/swing_shortsword_fire1.ogg", "/sfx/melee/swing_shortsword_fire2.ogg", "/sfx/melee/swing_shortsword_fire3.ogg"], - "firefire3" : ["/sfx/melee/swing_spear_fire1.ogg", "/sfx/melee/swing_spear_fire2.ogg", "/sfx/melee/swing_spear_fire3.ogg"], + "firefire1": ["/sfx/melee/swing_broadsword_fire1.ogg", "/sfx/melee/swing_broadsword_fire2.ogg", "/sfx/melee/swing_broadsword_fire3.ogg"], + "firefire2": ["/sfx/melee/swing_shortsword_fire1.ogg", "/sfx/melee/swing_shortsword_fire2.ogg", "/sfx/melee/swing_shortsword_fire3.ogg"], + "firefire3": ["/sfx/melee/swing_spear_fire1.ogg", "/sfx/melee/swing_spear_fire2.ogg", "/sfx/melee/swing_spear_fire3.ogg"], - "icefire1" : ["/sfx/melee/swing_broadsword_ice1.ogg", "/sfx/melee/swing_broadsword_ice2.ogg", "/sfx/melee/swing_broadsword_ice3.ogg"], - "icefire2" : ["/sfx/melee/swing_shortsword_ice1.ogg", "/sfx/melee/swing_shortsword_ice2.ogg", "/sfx/melee/swing_shortsword_ice3.ogg"], - "icefire3" : ["/sfx/melee/swing_spear_ice1.ogg", "/sfx/melee/swing_spear_ice2.ogg", "/sfx/melee/swing_spear_ice3.ogg"], + "icefire1": ["/sfx/melee/swing_broadsword_ice1.ogg", "/sfx/melee/swing_broadsword_ice2.ogg", "/sfx/melee/swing_broadsword_ice3.ogg"], + "icefire2": ["/sfx/melee/swing_shortsword_ice1.ogg", "/sfx/melee/swing_shortsword_ice2.ogg", "/sfx/melee/swing_shortsword_ice3.ogg"], + "icefire3": ["/sfx/melee/swing_spear_ice1.ogg", "/sfx/melee/swing_spear_ice2.ogg", "/sfx/melee/swing_spear_ice3.ogg"], - "poisonfire1" : ["/sfx/melee/swing_broadsword_poison1.ogg", "/sfx/melee/swing_broadsword_poison2.ogg", "/sfx/melee/swing_broadsword_poison3.ogg"], - "poisonfire2" : ["/sfx/melee/swing_shortsword_poison1.ogg", "/sfx/melee/swing_shortsword_poison2.ogg", "/sfx/melee/swing_shortsword_poison3.ogg"], - "poisonfire3" : ["/sfx/melee/swing_spear_poison1.ogg", "/sfx/melee/swing_spear_poison2.ogg", "/sfx/melee/swing_spear_poison3.ogg"], + "poisonfire1": ["/sfx/melee/swing_broadsword_poison1.ogg", "/sfx/melee/swing_broadsword_poison2.ogg", "/sfx/melee/swing_broadsword_poison3.ogg"], + "poisonfire2": ["/sfx/melee/swing_shortsword_poison1.ogg", "/sfx/melee/swing_shortsword_poison2.ogg", "/sfx/melee/swing_shortsword_poison3.ogg"], + "poisonfire3": ["/sfx/melee/swing_spear_poison1.ogg", "/sfx/melee/swing_spear_poison2.ogg", "/sfx/melee/swing_spear_poison3.ogg"], - "electricfire1" : ["/sfx/melee/swing_broadsword_electric1.ogg", "/sfx/melee/swing_broadsword_electric2.ogg", "/sfx/melee/swing_broadsword_electric3.ogg"], - "electricfire2" : ["/sfx/melee/swing_shortsword_electric1.ogg", "/sfx/melee/swing_shortsword_electric2.ogg", "/sfx/melee/swing_shortsword_electric3.ogg"], - "electricfire3" : ["/sfx/melee/swing_spear_electric1.ogg", "/sfx/melee/swing_spear_electric2.ogg", "/sfx/melee/swing_spear_electric3.ogg"] + "electricfire1": ["/sfx/melee/swing_broadsword_electric1.ogg", "/sfx/melee/swing_broadsword_electric2.ogg", "/sfx/melee/swing_broadsword_electric3.ogg"], + "electricfire2": ["/sfx/melee/swing_shortsword_electric1.ogg", "/sfx/melee/swing_shortsword_electric2.ogg", "/sfx/melee/swing_shortsword_electric3.ogg"], + "electricfire3": ["/sfx/melee/swing_spear_electric1.ogg", "/sfx/melee/swing_spear_electric2.ogg", "/sfx/melee/swing_spear_electric3.ogg"] } -} \ No newline at end of file +} diff --git a/items/active/starbound/weapons/broadswords/deathstick.activeitem b/items/active/starbound/weapons/broadswords/deathstick.activeitem new file mode 100644 index 00000000..dda0b235 --- /dev/null +++ b/items/active/starbound/weapons/broadswords/deathstick.activeitem @@ -0,0 +1,98 @@ +{ + "itemName": "sb_deathstick", + "price": 800, + "maxStack": 1, + "fixedLevel": false, + "rarity": "rare", + "category": "broadsword", + "description": "OH NO NOT THE BEES NO NO ARGH MY EYES!", + "shortdescription": "Death Stick", + "tooltipKind": "sb_sword2", + "tooltipFields": { + "damageKindImage": "/items/throwables/hivebombicon.png", + "objectImage": "/items/active/starbound/weapons/broadswords/deathstick.png" + }, + "twoHanded": true, + "itemTags": ["weapon", "melee", "broadsword"], + "inventoryIcon": "deathstickicon.png", + "animation": "/items/active/starbound/weapons/broadsword.animation", + "animationParts": { + "blade": "deathstick.png", + "handle": "" + }, + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "offset": [-0.25, 2] + } + }, + "fire2": { + "properties": { + "offset": [5, 0.25] + } + }, + "fire3": { + "properties": { + "offset": [3.5, -0.5] + } + } + } + } + } + } + } + }, + + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "elementalType": "physical", + "altAbilityType": "spinslash", + "primaryAbilityType": "sb_meleeslash", + "primaryAbility": { + "fireTime": 0.9, + "baseDps": 11, + "projectileType": "hivebomb", + "projectileConfig": { + "speed": 60, + "power": 1.5, + "actionOnReap": [{ + "action": "sound", + "options": ["/sfx/projectiles/hivebomb_impact.ogg"] + }, { + "action": "sound", + "options": ["/sfx/projectiles/bugswarm1.ogg"] + }, { + "action": "projectile", + "inheritDamageFactor": 1, + "type": "hiveswarm", + "config": { + "damageTeam": { + "type": "friendly" + } + }, + "fuzzAngle": 90 + }, { + "action": "particle", + "specification": { + "type": "animated", + "animation": "/animations/dusttest/dusttest.animation", + "approach": [0.5, 0.5], + "timeToLive": 0.85, + "variance": { + "rotation": 180 + } + } + } + ] + } + }, + "builder": "/items/buildscripts/starbound/buildunrandweapon.lua", + + "craftedParameters": { + "level": 3 + } +} diff --git a/items/active/starbound/weapons/broadswords/deathstick.png b/items/active/starbound/weapons/broadswords/deathstick.png new file mode 100644 index 00000000..f28c0034 Binary files /dev/null and b/items/active/starbound/weapons/broadswords/deathstick.png differ diff --git a/items/active/starbound/weapons/broadswords/deathstickicon.png b/items/active/starbound/weapons/broadswords/deathstickicon.png new file mode 100644 index 00000000..6ea5086a Binary files /dev/null and b/items/active/starbound/weapons/broadswords/deathstickicon.png differ diff --git a/items/active/starbound/weapons/broadswords/starcleaver.activeitem b/items/active/starbound/weapons/broadswords/starcleaver.activeitem index 8a2eb810..ec552a0f 100644 --- a/items/active/starbound/weapons/broadswords/starcleaver.activeitem +++ b/items/active/starbound/weapons/broadswords/starcleaver.activeitem @@ -56,6 +56,7 @@ "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], "elementalType": "physical", + "projectileDamageMultiplier": 0.4, "primaryAbilityType": "sb_meleeslash", "primaryAbility": { "fireTime": [0.6, 0.9], diff --git a/items/active/starbound/weapons/broadswords/starcleaversword.animation b/items/active/starbound/weapons/broadswords/starcleaversword.animation deleted file mode 100644 index ca83e82e..00000000 --- a/items/active/starbound/weapons/broadswords/starcleaversword.animation +++ /dev/null @@ -1,158 +0,0 @@ -{ - "globalTagDefaults" : { - "paletteSwaps" : "" - }, - - "animatedParts" : { - "stateTypes" : { - "swoosh" : { - "default" : "idle", - "states" : { - "idle" : { - }, - "fire" : { - "frames" : 3, - "cycle" : 0.11, - "mode" : "transition", - "transition" : "idle" - } - } - } - }, - - "parts" : { - "handle" : { - "properties" : { - "zLevel" : 1, - "centered" : true, - "image" : "", - "offset" : [0.3, 1.875], - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0], - "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] - } - }, - "blade" : { - "properties" : { - "zLevel" : 0, - "centered" : true, - "image" : "", - "offset" : [0.3, 1.875], - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0], - "damageArea" : [ [-0.7, -1.0], [-0.7, 2.5], [0.5, 2.5], [0.5, -1.0] ] - } - }, - "swoosh" : { - "properties" : { - "zLevel" : -1, - "centered" : true, - "transformationGroups" : ["swoosh"], - "rotationCenter" : [0, 0] - }, - - "partStates" : { - "swoosh" : { - "idle" : { - "properties" : { - "image" : "" - } - }, - "fire" : { - "properties" : { - "image" : "", - "offset" : [-0.25, 2.5], - "damageArea" : [[-5, 2], [-2.5, 3], [1, 3], [4, 1.75], [5, -0.25], [5, -2.25], [4, -3.25], [0, -2.5]] - } - } - } - } - } - } - }, - - "transformationGroups" : { - "weapon" : {}, - "swoosh" : {} - }, - - "particleEmitters" : { - "physicalswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [] - }, - "fireswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"}, - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"} - ] - }, - "electricswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "electricswoosh1"}, - { "particle" : "electricswoosh2"}, - { "particle" : "electricswoosh2"} - ] - }, - "poisonswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"}, - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"} - ] - }, - "iceswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [0.75, 0.0, 4.25, 5.0], - "particles" : [ - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"}, - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"} - ] - } - }, - - "lights" : { - "glow" : { - "active" : false, - "position" : [0.0, 0.0], - "color" : [100, 100, 100], - "flickerPeriod" : 1, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1.0, - "flickerPeriodVariance" : 0.0, - "flickerIntensityVariance" : 0.0 - } - }, - - "sounds" : { - "fire" : ["/sfx/melee/swing_broadsword.ogg"] - } -} \ No newline at end of file diff --git a/items/active/starbound/weapons/dagger.animation b/items/active/starbound/weapons/dagger.animation index 93aa4033..5e24d642 100644 --- a/items/active/starbound/weapons/dagger.animation +++ b/items/active/starbound/weapons/dagger.animation @@ -58,7 +58,7 @@ "fire": { "properties": { "image": "/items/active/weapons/melee/dagger/swoosh/swoosh.png:", - "damageArea": [[0.25, 1.125], [0.75, 1.125], [2.0, 0.25], [2.0, -0.5], [0.5, -1.5], [-1.0, -1.5], [-2.0, -0.75]] + "damageArea": [[0.25, 1.125], [0.75, 1.125], [2, 0.25], [2, -0.5], [0.5, -1.5], [-1, -1.5], [-2, -0.75]] } } } @@ -77,14 +77,14 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 40, - "offsetRegion": [-1.5, -0.25, 1.5, 2.0], + "offsetRegion": [-1.5, -0.25, 1.5, 2], "particles": [] }, "fireswoosh": { "active": false, "transformationGroups": ["swoosh"], "emissionRate": 40, - "offsetRegion": [-1.5, -0.25, 1.5, 2.0], + "offsetRegion": [-1.5, -0.25, 1.5, 2], "particles": [{ "particle": "fireswoosh1" }, { @@ -104,7 +104,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 40, - "offsetRegion": [-1.5, -0.25, 1.5, 2.0], + "offsetRegion": [-1.5, -0.25, 1.5, 2], "particles": [{ "particle": "electricswoosh1" }, { @@ -118,7 +118,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 40, - "offsetRegion": [-1.5, -0.25, 1.5, 2.0], + "offsetRegion": [-1.5, -0.25, 1.5, 2], "particles": [{ "particle": "iceswoosh1" }, { @@ -138,7 +138,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 40, - "offsetRegion": [-1.5, -0.25, 1.5, 2.0], + "offsetRegion": [-1.5, -0.25, 1.5, 2], "particles": [{ "particle": "poisonswoosh1" }, { @@ -158,12 +158,12 @@ "lights": { "glow": { "active": true, - "position": [0.0, 0.0], + "position": [0, 0], "color": [0, 0, 0], "flickerPeriod": 1, "flickerMinIntensity": 0.65, "flickerMaxIntensity": 0.9, - "flickerPeriodVariance": 0.0, + "flickerPeriodVariance": 0, "flickerIntensityVariance": 0.0 } }, diff --git a/items/active/starbound/weapons/daggers/shiv.activeitem b/items/active/starbound/weapons/daggers/shiv.activeitem index 959f4d98..77e0d798 100644 --- a/items/active/starbound/weapons/daggers/shiv.activeitem +++ b/items/active/starbound/weapons/daggers/shiv.activeitem @@ -4,14 +4,13 @@ "maxStack": 1, "paletteSwaps": "", "rarity": "uncommon", - "description": "A homemade weapon from prison.", + "description": "A homemade weapon from prison. It can cause some targets to bleed.", "shortdescription": "Shiv", "tooltipKind": "sb_sword2", "price": 495, "category": "dagger", "tooltipFields": { - "subtitle": "Shiv", - "damageKindImage": "/interface/statuses/sb_bleed.png" + "subtitle": "Shiv" }, "twoHanded": false, // "sb_dyeable" : true, diff --git a/items/active/starbound/weapons/hammer.animation b/items/active/starbound/weapons/hammer.animation index aa5e3ad6..d8eb50f5 100644 --- a/items/active/starbound/weapons/hammer.animation +++ b/items/active/starbound/weapons/hammer.animation @@ -1,67 +1,66 @@ { - "globalTagDefaults" : { - "paletteSwaps" : "" + "globalTagDefaults": { + "paletteSwaps": "" }, - "animatedParts" : { - "stateTypes" : { - "swoosh" : { - "default" : "idle", - "states" : { - "idle" : { - }, - "fire" : { - "frames" : 3, - "cycle" : 0.07, - "mode" : "transition", - "transition" : "idle" + "animatedParts": { + "stateTypes": { + "swoosh": { + "default": "idle", + "states": { + "idle": {}, + "fire": { + "frames": 3, + "cycle": 0.07, + "mode": "transition", + "transition": "idle" } } } }, - "parts" : { - "blade" : { - "properties" : { - "centered" : true, - "zLevel" : 1, - "image" : "", - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0], - "damageArea" : [[-1, 0.25], [-1, 1.5], [1.5, 1.75], [1.5, 0.0]], - "groundImpactPoly" : [ [1, 1.75], [1, 0.0], [2, 0.0], [2, 1.75] ] + "parts": { + "blade": { + "properties": { + "centered": true, + "zLevel": 1, + "image": "", + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0], + "damageArea": [[-1, 0.25], [-1, 1.5], [1.5, 1.75], [1.5, 0]], + "groundImpactPoly": [[1, 1.75], [1, 0], [2, 0], [2, 1.75]] } }, - "handle" : { - "properties" : { - "zLevel" : 0, - "centered" : true, - "image" : "", - "offset" : [0, 0], - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0] + "handle": { + "properties": { + "zLevel": 0, + "centered": true, + "image": "", + "offset": [0, 0], + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0] } }, - "swoosh" : { - "properties" : { - "zLevel" : -1, - "centered" : true, - "offset" : [-2.0, 1.5], - "transformationGroups" : ["swoosh"], - "rotationCenter" : [0, 0] + "swoosh": { + "properties": { + "zLevel": -1, + "centered": true, + "offset": [-2, 1.5], + "transformationGroups": ["swoosh"], + "rotationCenter": [0, 0] }, - "partStates" : { - "swoosh" : { - "idle" : { - "properties" : { - "image" : "" + "partStates": { + "swoosh": { + "idle": { + "properties": { + "image": "" } }, - "fire" : { - "properties" : { - "image" : "/items/active/weapons/melee/hammer/swoosh/swoosh.png:", - "damageArea" : [[-3.5, 2], [-2.5, 3], [1, 3], [3, 1.75], [4, -0.25], [4, -2.25], [3, -3.25], [0, -2.5]] + "fire": { + "properties": { + "image": "/items/active/weapons/melee/hammer/swoosh/swoosh.png:", + "damageArea": [[-3.5, 2], [-2.5, 3], [1, 3], [3, 1.75], [4, -0.25], [4, -2.25], [3, -3.25], [0, -2.5]] } } } @@ -70,104 +69,124 @@ } }, - "transformationGroups" : { - "weapon" : {}, - "swoosh" : {} + "transformationGroups": { + "weapon": {}, + "swoosh": {} }, - "particleEmitters" : { - "physicalswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [-2.0, 0.0, 1.5, 5.0], - "particles" : [ + "particleEmitters": { + "physicalswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [-2, 0, 1.5, 5], + "particles": [ ] }, - "fireswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [-2.0, 0.0, 1.5, 5.0], - "particles" : [ - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"}, - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"} + "fireswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [-2, 0, 1.5, 5], + "particles": [{ + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + }, { + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + } ] }, - "electricswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [-2.0, 0.0, 1.5, 5.0], - "particles" : [ - { "particle" : "electricswoosh1"}, - { "particle" : "electricswoosh2"}, - { "particle" : "electricswoosh2"} + "electricswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [-2, 0, 1.5, 5], + "particles": [{ + "particle": "electricswoosh1" + }, { + "particle": "electricswoosh2" + }, { + "particle": "electricswoosh2" + } ] }, - "poisonswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [-2.0, 0.0, 1.5, 5.0], - "particles" : [ - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"}, - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"} + "poisonswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [-2, 0, 1.5, 5], + "particles": [{ + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + }, { + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + } ] }, - "iceswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 50, - "offsetRegion" : [-2.0, 0.0, 1.5, 5.0], - "particles" : [ - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"}, - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"} + "iceswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 50, + "offsetRegion": [-2, 0, 1.5, 5], + "particles": [{ + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + }, { + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + } ] }, - "groundImpact" : { - "transformationGroups" : ["weapon"], - "particles" : [ - { - "count" : 1, - "particle" : { - "type" : "animated", - "mode" : "LoopForever", - "animation" : "/animations/jumpsmoke/jumpsmoke.animation", - "fade" : 0.9, - "destructionAction" : "shrink", - "destructionTime" : 0.4, - "position" : [1.0, 0.75], - "offsetRegion" : [0, 0, 0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [5, 5], - "timeToLive" : 0.4 + "groundImpact": { + "transformationGroups": ["weapon"], + "particles": [{ + "count": 1, + "particle": { + "type": "animated", + "mode": "LoopForever", + "animation": "/animations/jumpsmoke/jumpsmoke.animation", + "fade": 0.9, + "destructionAction": "shrink", + "destructionTime": 0.4, + "position": [1, 0.75], + "offsetRegion": [0, 0, 0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [5, 5], + "timeToLive": 0.4 } } ] } }, - "sounds" : { - "fire" : [], - "physicalfire" : ["/sfx/melee/swing_hammer.ogg"], - "firefire" : ["/sfx/melee/swing_hammer_fire1.ogg", "/sfx/melee/swing_hammer_fire2.ogg", "/sfx/melee/swing_hammer_fire3.ogg"], - "electricfire" : ["/sfx/melee/swing_hammer_electric1.ogg", "/sfx/melee/swing_hammer_electric2.ogg", "/sfx/melee/swing_hammer_electric3.ogg"], - "poisonfire" : ["/sfx/melee/swing_hammer_poison1.ogg", "/sfx/melee/swing_hammer_poison2.ogg", "/sfx/melee/swing_hammer_poison3.ogg"], - "icefire" : ["/sfx/melee/swing_hammer_ice1.ogg", "/sfx/melee/swing_hammer_ice2.ogg", "/sfx/melee/swing_hammer_ice3.ogg"], - "groundImpact" : ["/sfx/melee/hammer_hit_ground3.ogg", "/sfx/melee/hammer_hit_ground4.ogg"] + "sounds": { + "fire": [], + "physicalfire": ["/sfx/melee/swing_hammer.ogg"], + "firefire": ["/sfx/melee/swing_hammer_fire1.ogg", "/sfx/melee/swing_hammer_fire2.ogg", "/sfx/melee/swing_hammer_fire3.ogg"], + "electricfire": ["/sfx/melee/swing_hammer_electric1.ogg", "/sfx/melee/swing_hammer_electric2.ogg", "/sfx/melee/swing_hammer_electric3.ogg"], + "poisonfire": ["/sfx/melee/swing_hammer_poison1.ogg", "/sfx/melee/swing_hammer_poison2.ogg", "/sfx/melee/swing_hammer_poison3.ogg"], + "icefire": ["/sfx/melee/swing_hammer_ice1.ogg", "/sfx/melee/swing_hammer_ice2.ogg", "/sfx/melee/swing_hammer_ice3.ogg"], + "groundImpact": ["/sfx/melee/hammer_hit_ground3.ogg", "/sfx/melee/hammer_hit_ground4.ogg"] } -} \ No newline at end of file +} diff --git a/items/active/starbound/weapons/projectile.lua b/items/active/starbound/weapons/projectile.lua index d848f626..21727313 100644 --- a/items/active/starbound/weapons/projectile.lua +++ b/items/active/starbound/weapons/projectile.lua @@ -2,6 +2,7 @@ function projectileInit(self, primaryAbility) self.projectilePower = self.damageConfig.baseDamage * config.getParameter("damageLevelMultiplier",1) * config.getParameter("projectileDamageMultiplier",0.6) self.projectileType = primaryAbility.projectileType or false self.projectileId = world.spawnProjectile("invisibleprojectile", {0, -99}) + self.projectileConfig = primaryAbility.projectileConfig or {} self.projectileCount = self.projectileCount or 1 if self.projectileType then self.projectileOffset = primaryAbility.projectileOffset or {0, 0.1} end end @@ -15,12 +16,14 @@ function projectileFire(self) local handPosition = self.handPositionOffset and activeItem.handPosition(self.handPositionOffset) or {0, 0} for i = 1, self.projectileCount do - local position = self.holdDamageConfig and vec2.add(mcontroller.position(), activeItem.handPosition({-3, 7})) - or vec2.add(vec2.add(mcontroller.position(), handPosition), {self.projectileOffset[1] * mcontroller.facingDirection(), (-1.5 + self.projectileOffset[2])}) - local params = { + local position = mcontroller.position() + position = {position[1], position[2] - (mcontroller.crouching() and 0.75 or 0)} --0.75 to keep starcleaver above ground + position = self.holdDamageConfig and vec2.add(position, activeItem.handPosition({-3, 7})) + or vec2.add(vec2.add(position, handPosition), {self.projectileOffset[1] * mcontroller.facingDirection(), (-1.5 + self.projectileOffset[2])}) + local params = sb.jsonMerge({ powerMultiplier = activeItem.ownerPowerMultiplier(), power = self.projectilePower - } + }, self.projectileConfig) self.projectileId = world.spawnProjectile(self.projectileType, position, activeItem.ownerEntityId(), aimVector, false, params) end end diff --git a/items/active/starbound/weapons/shortsword.animation b/items/active/starbound/weapons/shortsword.animation index d4795646..7fd4c8c7 100644 --- a/items/active/starbound/weapons/shortsword.animation +++ b/items/active/starbound/weapons/shortsword.animation @@ -1,63 +1,62 @@ { - "globalTagDefaults" : { - "paletteSwaps" : "" + "globalTagDefaults": { + "paletteSwaps": "" }, - "animatedParts" : { - "stateTypes" : { - "swoosh" : { - "default" : "idle", - "states" : { - "idle" : { - }, - "fire" : { - "frames" : 3, - "cycle" : 0.08, - "mode" : "transition", - "transition" : "idle" + "animatedParts": { + "stateTypes": { + "swoosh": { + "default": "idle", + "states": { + "idle": {}, + "fire": { + "frames": 3, + "cycle": 0.08, + "mode": "transition", + "transition": "idle" } } } }, - "parts" : { - "blade" : { - "properties" : { - "zLevel" : 0, - "centered" : true, - "image" : "", - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0] + "parts": { + "blade": { + "properties": { + "zLevel": 0, + "centered": true, + "image": "", + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0] } }, - "handle" : { - "properties" : { - "zLevel" : 1, - "centered" : true, - "image" : "", - "transformationGroups" : ["weapon"], - "rotationCenter" : [0, 0] + "handle": { + "properties": { + "zLevel": 1, + "centered": true, + "image": "", + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0] } }, - "swoosh" : { - "properties" : { - "zLevel" : -1, - "centered" : true, - "offset" : [1.75, 0.75], - "transformationGroups" : ["swoosh"], - "rotationCenter" : [0, 0] + "swoosh": { + "properties": { + "zLevel": -1, + "centered": true, + "offset": [1.75, 0.75], + "transformationGroups": ["swoosh"], + "rotationCenter": [0, 0] }, - "partStates" : { - "swoosh" : { - "idle" : { - "properties" : { - "image" : "" + "partStates": { + "swoosh": { + "idle": { + "properties": { + "image": "" } }, - "fire" : { - "properties" : { - "image" : "/items/active/weapons/melee/shortsword/swoosh/swoosh.png:", - "damageArea" : [[0.25, 1.125], [0.75, 1.125], [2.0, 0.25], [2.0, -0.5], [0.5, -1.5], [-1.0, -1.5], [-2.0, -0.75]] + "fire": { + "properties": { + "image": "/items/active/weapons/melee/shortsword/swoosh/swoosh.png:", + "damageArea": [[0.25, 1.125], [0.75, 1.125], [2, 0.25], [2, -0.5], [0.5, -1.5], [-1, -1.5], [-2, -0.75]] } } } @@ -66,91 +65,112 @@ } }, - "transformationGroups" : { - "weapon" : {}, - "swoosh" : {} + "transformationGroups": { + "weapon": {}, + "swoosh": {} }, - "particleEmitters" : { - "physicalswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 40, - "offsetRegion" : [-1.5, -0.25, 1.5, 2.0], - "particles" : [ ] + "particleEmitters": { + "physicalswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 40, + "offsetRegion": [-1.5, -0.25, 1.5, 2], + "particles": [] }, - "fireswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 40, - "offsetRegion" : [-1.5, -0.25, 1.5, 2.0], - "particles" : [ - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"}, - { "particle" : "fireswoosh1"}, - { "particle" : "fireswoosh2"}, - { "particle" : "fireswoosh3"} + "fireswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 40, + "offsetRegion": [-1.5, -0.25, 1.5, 2], + "particles": [{ + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + }, { + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + } ] }, - "electricswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 40, - "offsetRegion" : [-1.5, -0.25, 1.5, 2.0], - "particles" : [ - { "particle" : "electricswoosh1"}, - { "particle" : "electricswoosh2"}, - { "particle" : "electricswoosh2"} + "electricswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 40, + "offsetRegion": [-1.5, -0.25, 1.5, 2], + "particles": [{ + "particle": "electricswoosh1" + }, { + "particle": "electricswoosh2" + }, { + "particle": "electricswoosh2" + } ] }, - "iceswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 40, - "offsetRegion" : [-1.5, -0.25, 1.5, 2.0], - "particles" : [ - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"}, - { "particle" : "iceswoosh1"}, - { "particle" : "iceswoosh2"}, - { "particle" : "iceswoosh3"} + "iceswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 40, + "offsetRegion": [-1.5, -0.25, 1.5, 2], + "particles": [{ + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + }, { + "particle": "iceswoosh1" + }, { + "particle": "iceswoosh2" + }, { + "particle": "iceswoosh3" + } ] }, - "poisonswoosh" : { - "active" : false, - "transformationGroups" : ["swoosh"], - "emissionRate" : 40, - "offsetRegion" : [-1.5, -0.25, 1.5, 2.0], - "particles" : [ - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"}, - { "particle" : "poisonswoosh1"}, - { "particle" : "poisonswoosh2"}, - { "particle" : "fireswoosh2"} + "poisonswoosh": { + "active": false, + "transformationGroups": ["swoosh"], + "emissionRate": 40, + "offsetRegion": [-1.5, -0.25, 1.5, 2], + "particles": [{ + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + }, { + "particle": "poisonswoosh1" + }, { + "particle": "poisonswoosh2" + }, { + "particle": "fireswoosh2" + } ] } }, - "lights" : { - "glow" : { - "active" : true, - "position" : [0.0, 0.0], - "color" : [0, 0, 0], - "flickerPeriod" : 1, - "flickerMinIntensity" : 0.65, - "flickerMaxIntensity" : 0.9, - "flickerPeriodVariance" : 0.0, - "flickerIntensityVariance" : 0.0 + "lights": { + "glow": { + "active": true, + "position": [0, 0], + "color": [0, 0, 0], + "flickerPeriod": 1, + "flickerMinIntensity": 0.65, + "flickerMaxIntensity": 0.9, + "flickerPeriodVariance": 0, + "flickerIntensityVariance": 0.0 } }, - "sounds" : { - "physicalfire" : ["/sfx/melee/swing_shortsword.ogg"], - "firefire" : ["/sfx/melee/swing_shortsword_fire1.ogg", "/sfx/melee/swing_shortsword_fire2.ogg", "/sfx/melee/swing_shortsword_fire3.ogg"], - "electricfire" : ["/sfx/melee/swing_shortsword_electric1.ogg", "/sfx/melee/swing_shortsword_electric2.ogg", "/sfx/melee/swing_shortsword_electric3.ogg"], - "poisonfire" : ["/sfx/melee/swing_shortsword_poison1.ogg", "/sfx/melee/swing_shortsword_poison2.ogg", "/sfx/melee/swing_shortsword_poison3.ogg"], - "icefire" : ["/sfx/melee/swing_shortsword_ice1.ogg", "/sfx/melee/swing_shortsword_ice2.ogg", "/sfx/melee/swing_shortsword_ice3.ogg"] + "sounds": { + "physicalfire": ["/sfx/melee/swing_shortsword.ogg"], + "firefire": ["/sfx/melee/swing_shortsword_fire1.ogg", "/sfx/melee/swing_shortsword_fire2.ogg", "/sfx/melee/swing_shortsword_fire3.ogg"], + "electricfire": ["/sfx/melee/swing_shortsword_electric1.ogg", "/sfx/melee/swing_shortsword_electric2.ogg", "/sfx/melee/swing_shortsword_electric3.ogg"], + "poisonfire": ["/sfx/melee/swing_shortsword_poison1.ogg", "/sfx/melee/swing_shortsword_poison2.ogg", "/sfx/melee/swing_shortsword_poison3.ogg"], + "icefire": ["/sfx/melee/swing_shortsword_ice1.ogg", "/sfx/melee/swing_shortsword_ice2.ogg", "/sfx/melee/swing_shortsword_ice3.ogg"] } -} \ No newline at end of file +} diff --git a/items/active/starbound/weapons/shortswords/slavesword.activeitem b/items/active/starbound/weapons/shortswords/slavesword.activeitem index 835e5606..ae186e2a 100644 --- a/items/active/starbound/weapons/shortswords/slavesword.activeitem +++ b/items/active/starbound/weapons/shortswords/slavesword.activeitem @@ -9,12 +9,13 @@ "category": "shortsword", "sb_waBan": true, "tooltipFields": { - "subtitle": "Slave Sword" + "subtitle": "Slave Sword", + "objectImage": "/items/active/starbound/weapons/shortswords/slavesword.png" }, "itemTags": ["weapon", "melee", "shortsword"], "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], "animation": "/items/active/starbound/weapons/shortsword.animation", - "inventoryIcon": "slavesword.png", + "inventoryIcon": "slaveswordicon.png", "animationParts": { "handle": "", "blade": "slavesword.png" diff --git a/items/active/starbound/weapons/shortswords/slaveswordicon.png b/items/active/starbound/weapons/shortswords/slaveswordicon.png new file mode 100644 index 00000000..f490e8d7 Binary files /dev/null and b/items/active/starbound/weapons/shortswords/slaveswordicon.png differ diff --git a/items/active/starbound/weapons/spear.animation b/items/active/starbound/weapons/spear.animation index 76672485..aafb78f5 100644 --- a/items/active/starbound/weapons/spear.animation +++ b/items/active/starbound/weapons/spear.animation @@ -25,9 +25,9 @@ "zLevel": 1, "centered": true, "image": "", - "offset": [0.0, 0.0], + "offset": [0, 0], "transformationGroups": ["weapon"], - "damageArea": [[0, -0.5], [-0.75, 1.0], [-0.75, 2.75], [0, 4.25], [0.75, 2.75], [0.75, 1.0]] + "damageArea": [[0, -0.5], [-0.75, 1], [-0.75, 2.75], [0, 4.25], [0.75, 2.75], [0.75, 1]] } }, "handle": { @@ -35,7 +35,7 @@ "zLevel": 0, "centered": true, "image": "", - "offset": [0.0, 0.0], + "offset": [0, 0], "transformationGroups": ["weapon"] } }, @@ -43,7 +43,7 @@ "properties": { "zLevel": -1, "centered": true, - "offset": [3.0, 0.0], + "offset": [3, 0], "transformationGroups": ["swoosh"] }, @@ -76,14 +76,14 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 60, - "offsetRegion": [3.5, -1.0, 7.5, 1.0], + "offsetRegion": [3.5, -1, 7.5, 1], "particles": [] }, "fireswoosh": { "active": false, "transformationGroups": ["swoosh"], "emissionRate": 60, - "offsetRegion": [3.5, -1.0, 7.5, 1.0], + "offsetRegion": [3.5, -1, 7.5, 1], "particles": [{ "particle": "fireswoosh1" }, { @@ -103,7 +103,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 60, - "offsetRegion": [3.5, -1.0, 7.5, 1.0], + "offsetRegion": [3.5, -1, 7.5, 1], "particles": [{ "particle": "electricswoosh1" }, { @@ -117,7 +117,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 60, - "offsetRegion": [3.5, -1.0, 7.5, 1.0], + "offsetRegion": [3.5, -1, 7.5, 1], "particles": [{ "particle": "iceswoosh1" }, { @@ -137,7 +137,7 @@ "active": false, "transformationGroups": ["swoosh"], "emissionRate": 60, - "offsetRegion": [3.5, -1.0, 7.5, 1.0], + "offsetRegion": [3.5, -1, 7.5, 1], "particles": [{ "particle": "poisonswoosh1" }, { @@ -157,12 +157,12 @@ "lights": { "glow": { "active": true, - "position": [0.0, 0.0], + "position": [0, 0], "color": [0, 0, 0], "flickerPeriod": 1, "flickerMinIntensity": 0.65, "flickerMaxIntensity": 0.9, - "flickerPeriodVariance": 0.0, + "flickerPeriodVariance": 0, "flickerIntensityVariance": 0.0 } }, diff --git a/items/active/starbound/whistle/whistle.activeitem b/items/active/starbound/whistle/whistle.activeitem new file mode 100644 index 00000000..262801c4 --- /dev/null +++ b/items/active/starbound/whistle/whistle.activeitem @@ -0,0 +1,12 @@ +{ + "itemName": "sb_whistle", + "rarity": "uncommon", + "category": "tool", + "price": 250, + "tooltipKind": "sb_object", + "inventoryIcon": "whistle.png", + "shortdescription": "Pet Whistle", + "description": "Calls deployed pets back to you.", + "scripts": ["whistle.lua", "/scripts/activeitem/sb_held.lua"], + "cooldownTime": 50 +} diff --git a/items/active/starbound/whistle/whistle.lua b/items/active/starbound/whistle/whistle.lua new file mode 100644 index 00000000..ede5b40d --- /dev/null +++ b/items/active/starbound/whistle/whistle.lua @@ -0,0 +1,15 @@ +function init() + cooldownTime = config.getParameter("cooldownTime") + storage.cooldownTimer = storage.cooldownTimer or 0 +end + +function activate() + if player and storage.cooldownTimer == 0 then + world.sendEntityMessage(player.id(), "pets.sb_callPodPets") + storage.cooldownTimer = cooldownTime + end +end + +function update() + storage.cooldownTimer = math.max(0, storage.cooldownTimer - 1) +end \ No newline at end of file diff --git a/items/active/starbound/whistle/whistle.png b/items/active/starbound/whistle/whistle.png new file mode 100644 index 00000000..cffda161 Binary files /dev/null and b/items/active/starbound/whistle/whistle.png differ diff --git a/items/active/unsorted/broom/sb_broom.lua b/items/active/unsorted/broom/sb_broom.lua index 0ad6ff04..4f1510dc 100644 --- a/items/active/unsorted/broom/sb_broom.lua +++ b/items/active/unsorted/broom/sb_broom.lua @@ -1,19 +1,19 @@ -local sb_sweep = sweep or function() end -local sb_activate = activate or function() end -local sb_update = update or function() end +local originalSweep = sweep or function() end +local originalActivate = activate or function() end +local originalUpdate = update or function() end function activate(fireMode, shiftHeld) sb_fireMode = fireMode - sb_activate(fireMode, shiftHeld) + originalActivate(fireMode, shiftHeld) end function update(dt, fireMode, shiftHeld) aimAngle, aimDirection = activeItem.aimAngleAndDirection(0, activeItem.ownerAimPosition()) activeItem.setFacingDirection(aimDirection) - sb_update(dt, fireMode, shiftHeld) + originalUpdate(dt, fireMode, shiftHeld) end -function sweep() sb_sweep() +function sweep() originalSweep() if not player then return end local pos = mcontroller.position() pos = {math.floor(pos[1]), math.floor(pos[2])} diff --git a/items/active/unsorted/relocator/sb_relocator.lua b/items/active/unsorted/relocator/sb_relocator.lua index 51046e55..0530a4ad 100644 --- a/items/active/unsorted/relocator/sb_relocator.lua +++ b/items/active/unsorted/relocator/sb_relocator.lua @@ -1,16 +1,16 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end -function init() ini() +function init() originalInit() if config.getParameter("sb_doNotUpdateInventoryIcon") then - update = updat + update = originalUpdate return end sb_lastSize = config.getParameter("scriptStorage", {}) sb_lastSize = #(sb_lastSize.storedMonsters or '') end -function update(...) updat(...) +function update(...) originalUpdate(...) local currentSize = config.getParameter("scriptStorage", {}) currentSize = #(currentSize.storedMonsters or '') if currentSize ~= sb_lastSize then diff --git a/items/active/unsorted/rewardbag/sb_rewardbag.lua b/items/active/unsorted/rewardbag/sb_rewardbag.lua index 811f63cf..6e1d9266 100644 --- a/items/active/unsorted/rewardbag/sb_rewardbag.lua +++ b/items/active/unsorted/rewardbag/sb_rewardbag.lua @@ -1,6 +1,6 @@ -local ini = init or 0 +local originalInit = init or function() end -function init() if type(ini) == "function" then ini() end +function init() originalInit() sb_techTier = player.getProperty("sb_techTier") --TODO: could we move this to the if statement below? or the return? if config.getParameter("sb_useTechTier", false) then root.sb_createTreasure = root.createTreasure diff --git a/items/active/unsorted/stunmine/sb_stunmine.lua b/items/active/unsorted/stunmine/sb_stunmine.lua index 0a365474..40d894fe 100644 --- a/items/active/unsorted/stunmine/sb_stunmine.lua +++ b/items/active/unsorted/stunmine/sb_stunmine.lua @@ -1,5 +1,5 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end function init() item.sb_consume = item.consume @@ -11,7 +11,7 @@ function init() setStance("idle") return item.sb_consume(count) end - ini() + originalInit() end function update(...) @@ -19,5 +19,5 @@ function update(...) item.consume(0) return end - updat(...) + originalUpdate(...) end \ No newline at end of file diff --git a/items/active/weapons/bow/bow/bow.activeitem.patch b/items/active/weapons/bow/bow/bow.activeitem.patch index ff474094..15c41ba6 100644 --- a/items/active/weapons/bow/bow/bow.activeitem.patch +++ b/items/active/weapons/bow/bow/bow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/bow/bowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/cavebow/cavebow.activeitem.patch b/items/active/weapons/bow/cavebow/cavebow.activeitem.patch index ff474094..4b17e290 100644 --- a/items/active/weapons/bow/cavebow/cavebow.activeitem.patch +++ b/items/active/weapons/bow/cavebow/cavebow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/cavebow/cavebow.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/compoundbow/compoundbow.activeitem.patch b/items/active/weapons/bow/compoundbow/compoundbow.activeitem.patch index ff474094..b77a83b7 100644 --- a/items/active/weapons/bow/compoundbow/compoundbow.activeitem.patch +++ b/items/active/weapons/bow/compoundbow/compoundbow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/compoundbow/compoundbowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/cupidsbow/cupidsbow.activeitem.patch b/items/active/weapons/bow/cupidsbow/cupidsbow.activeitem.patch index ff474094..774401db 100644 --- a/items/active/weapons/bow/cupidsbow/cupidsbow.activeitem.patch +++ b/items/active/weapons/bow/cupidsbow/cupidsbow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/cupidsbow/cupidsbowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/frozenbow/frozenbow.activeitem.patch b/items/active/weapons/bow/frozenbow/frozenbow.activeitem.patch index ff474094..fbe21109 100644 --- a/items/active/weapons/bow/frozenbow/frozenbow.activeitem.patch +++ b/items/active/weapons/bow/frozenbow/frozenbow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/frozenbow/frozenbowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/harpoongun/harpoongun.activeitem.patch b/items/active/weapons/bow/harpoongun/harpoongun.activeitem.patch index 97cd4140..0f7227ad 100644 --- a/items/active/weapons/bow/harpoongun/harpoongun.activeitem.patch +++ b/items/active/weapons/bow/harpoongun/harpoongun.activeitem.patch @@ -11,5 +11,8 @@ [{"op":"test","path":"/twoHanded","value":false},{"op":"test","path":"/primaryAbility/stances/draw","inverse":true},{"op":"add","path":"/primaryAbility/stances/draw","value":{"twoHanded":false}}], [{"op":"test","path":"/twoHanded","value":false},{"op":"test","path":"/primaryAbility/stances/fire/twoHanded","inverse":true},{"op":"add","path":"/primaryAbility/stances/fire/twoHanded","value":false}], +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/harpoongun/harpoongunfull.png:0"}], + [{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/lightbow/lightbow.activeitem.patch b/items/active/weapons/bow/lightbow/lightbow.activeitem.patch index 0e09f5db..a666414e 100644 --- a/items/active/weapons/bow/lightbow/lightbow.activeitem.patch +++ b/items/active/weapons/bow/lightbow/lightbow.activeitem.patch @@ -1,5 +1,8 @@ [ [{"op":"test","path":"/altAbilityType","inverse":true},{"op":"test","path":"/altAbility","inverse":true},{"op":"add","path":"/altAbilityType","value":"zenshot"},{"op":"add","path":"/altAbility","value":{"projectileType":"lightarrow","projectileParameters":{"power":8.125}}}], -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/lightbow/lightbowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/poisonbow/poisonbow.activeitem.patch b/items/active/weapons/bow/poisonbow/poisonbow.activeitem.patch index ff474094..5770dc2e 100644 --- a/items/active/weapons/bow/poisonbow/poisonbow.activeitem.patch +++ b/items/active/weapons/bow/poisonbow/poisonbow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/poisonbow/poisonbowfull.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/bow/tungstenbow/tungstenbow.activeitem.patch b/items/active/weapons/bow/tungstenbow/tungstenbow.activeitem.patch index ff474094..a1f9d10a 100644 --- a/items/active/weapons/bow/tungstenbow/tungstenbow.activeitem.patch +++ b/items/active/weapons/bow/tungstenbow/tungstenbow.activeitem.patch @@ -1,3 +1,6 @@ [ -[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}] +[{"op":"test","path":"/builder"},{"op":"test","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua","inverse":true},{"op":"move","from":"/builder","path":"/sb_builder"}],[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildvweapon.lua"}], + +[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":{}}], +[{"op":"test","path":"/tooltipFields/objectImage","inverse":true},{"op":"add","path":"/tooltipFields/objectImage","value":"/items/active/weapons/bow/tungstenbow/tungstenbow.png:0"}] ] \ No newline at end of file diff --git a/items/active/weapons/whip/sb_jellywhip.activeitem b/items/active/weapons/whip/sb_jellywhip.activeitem index c2e052f8..1734ef9d 100644 --- a/items/active/weapons/whip/sb_jellywhip.activeitem +++ b/items/active/weapons/whip/sb_jellywhip.activeitem @@ -11,6 +11,10 @@ "twoHanded": false, "itemTags": ["weapon"], + "tooltipFields": { + "damageKindImage": "/interface/sb_tooltips/sb_whipcrackjelly.png" + }, + "inventoryIcon": "sb_jellywhip.png:idle", "animation": "whip.animation", "animationParts": { diff --git a/items/armors/backitems/isn_mining_magnet/sb_mining_magnet.lua b/items/armors/backitems/isn_mining_magnet/sb_mining_magnet.lua index 7e11298a..bbec0b59 100644 --- a/items/armors/backitems/isn_mining_magnet/sb_mining_magnet.lua +++ b/items/armors/backitems/isn_mining_magnet/sb_mining_magnet.lua @@ -1,4 +1,5 @@ -local ini = init or function() end -local isn_oreExchang = isn_oreExchange or function(a) end -function init() ini() sb_ores = root.assetJson("/sb_oreexchange.config") end -function isn_oreExchange(a) return sb_ores[a] or isn_oreExchang(a) end \ No newline at end of file +local originalInit = init or function() end +local originalIsn_oreExchang = isn_oreExchange or function(a) return a end + +function init() originalInit() sb_ores = root.assetJson("/sb_oreexchange.config") end +function isn_oreExchange(a) return sb_ores[a] or originalIsn_oreExchang(a) end \ No newline at end of file diff --git a/items/armors/backitems/rainbowcape/rainbowcape.back.patch b/items/armors/backitems/rainbowcape/rainbowcape.back.patch new file mode 100644 index 00000000..d53185b2 --- /dev/null +++ b/items/armors/backitems/rainbowcape/rainbowcape.back.patch @@ -0,0 +1 @@ +[[{"op":"test","path":"/description","value":"Studies have shown that it is impossible to be unhappy whilst wearing this cape."},{"op":"replace","path":"/description","value":"Studies have shown that it is impossible to be unhappy whilst wearing this beautiful, fabulously sparkling cape."}]] \ No newline at end of file diff --git a/items/armors/backitems/sb_airpocket/airpocket.back b/items/armors/backitems/sb_airpocket/airpocket.back index 9e3ea84c..f4c0dc4a 100644 --- a/items/armors/backitems/sb_airpocket/airpocket.back +++ b/items/armors/backitems/sb_airpocket/airpocket.back @@ -1,34 +1,34 @@ { - "itemName" : "sb_airpocketback", - "price" : 500, - "inventoryIcon" : "airpocketicon.png", - "tooltipKind" : "sb_baseaugment", - "rarity" : "uncommon", - "category" : "enviroProtectionPack", - "description" : "This creates breathable air around the wearer. Sadly it won't work in liquids.", - "shortdescription" : "Air Pocket Generator", + "itemName": "sb_airpocketback", + "price": 500, + "inventoryIcon": "airpocketicon.png", + "tooltipKind": "sb_baseaugment", + "rarity": "uncommon", + "category": "enviroProtectionPack", + "description": "This creates breathable air around the wearer. Sadly it won't work in liquids.", + "shortdescription": "Air Pocket Generator", - "maleFrames" : "back.png", - "femaleFrames" : "back.png", - "maxStack" : 1, + "maleFrames": "back.png", + "femaleFrames": "back.png", + "maxStack": 1, - "statusEffects" : ["sb_airpocket"], + "statusEffects": ["sb_airpocket"], - "acceptsAugmentType" : "back", - "radioMessagesOnPickup" : [ "pickupepp" ], + "acceptsAugmentType": "back", + "radioMessagesOnPickup": ["pickupepp"], - "colorOptions" : [ - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "313332" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "313332" }, - { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" }, - { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" }, - { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" }, - { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" }, - { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" }, - { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, - { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" }, - { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" }, - { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" } + "colorOptions": [ + {"ffca8a": "b5b5b5", "e0975c": "808080", "a85636": "555", "6f2919": "313332"}, + {"ffca8a": "838383", "e0975c": "555", "a85636": "383838", "6f2919": "151515"}, + {"ffca8a": "b5b5b5", "e0975c": "808080", "a85636": "555", "6f2919": "313332"}, + {"ffca8a": "e6e6e6", "e0975c": "b6b6b6", "a85636": "7b7b7b", "6f2919": "373737"}, + {"ffca8a": "f4988c", "e0975c": "d93a3a", "a85636": "932625", "6f2919": "601119"}, + {"ffca8a": "ffd495", "e0975c": "ea9931", "a85636": "af4e00", "6f2919": "6e2900"}, + {"ffca8a": "ffffa7", "e0975c": "e2c344", "a85636": "a46e06", "6f2919": "642f00"}, + {"ffca8a": "b2e89d", "e0975c": "51bd3b", "a85636": "247824", "6f2919": "144216"}, + {"ffca8a": "96cbe7", "e0975c": "5588d4", "a85636": "344495", "6f2919": "1a1c51"}, + {"ffca8a": "d29ce7", "e0975c": "a451c4", "a85636": "6a2284", "6f2919": "320c40"}, + {"ffca8a": "eab3db", "e0975c": "d35eae", "a85636": "97276d", "6f2919": "59163f"}, + {"ffca8a": "ccae7c", "e0975c": "a47844", "a85636": "754c23", "6f2919": "472b13"} ] } diff --git a/items/armors/backitems/sb_naturecape/back.png b/items/armors/backitems/sb_naturecape/back.png new file mode 100644 index 00000000..d2b898c5 Binary files /dev/null and b/items/armors/backitems/sb_naturecape/back.png differ diff --git a/items/armors/backitems/sb_naturecape/icon.png b/items/armors/backitems/sb_naturecape/icon.png new file mode 100644 index 00000000..8eb52419 Binary files /dev/null and b/items/armors/backitems/sb_naturecape/icon.png differ diff --git a/items/armors/backitems/sb_naturecape/naturecape.back b/items/armors/backitems/sb_naturecape/naturecape.back new file mode 100644 index 00000000..f66fb10b --- /dev/null +++ b/items/armors/backitems/sb_naturecape/naturecape.back @@ -0,0 +1,45 @@ +{ + "itemName": "sb_naturecapeback", + "price": 2500, + "inventoryIcon": "icon.png", + "rarity": "Rare", + "category": "backwear", + "description": "This cape smells of roses.", + "shortdescription": "Shawl of Earth's Bounty", + "tooltipKind": "sb_armor", + + "maleFrames": "back.png", + "femaleFrames": "back.png", + "maxStack": 1, + + "builder": "/items/buildscripts/starbound/buildarmor.lua", + + "colorOptions": [ + //BLUE + {"ffca8a": "96cbe7", "e0975c": "5588d4", "a85636": "344495", "6f2919": "1a1c51"}, + //BLACK + {"ffca8a": "838383", "e0975c": "555555", "a85636": "383838", "6f2919": "151515"}, + //GREY + {"ffca8a": "b5b5b5", "e0975c": "808080", "a85636": "555555", "6f2919": "303030"}, + //WHITE + {"ffca8a": "e6e6e6", "e0975c": "b6b6b6", "a85636": "7b7b7b", "6f2919": "373737"}, + //RED + {"ffca8a": "f4988c", "e0975c": "d93a3a", "a85636": "932625", "6f2919": "601119"}, + //ORANGE + {"ffca8a": "ffd495", "e0975c": "ea9931", "a85636": "af4e00", "6f2919": "6e2900"}, + //YELLOW + {"ffca8a": "ffffa7", "e0975c": "e2c344", "a85636": "a46e06", "6f2919": "642f00"}, + //GREEN + {"ffca8a": "b2e89d", "e0975c": "51bd3b", "a85636": "247824", "6f2919": "144216"}, + //BLUE + {"ffca8a": "96cbe7", "e0975c": "5588d4", "a85636": "344495", "6f2919": "1a1c51"}, + //PURPLE + {"ffca8a": "d29ce7", "e0975c": "a451c4", "a85636": "6a2284", "6f2919": "320c40"}, + //PINK + {"ffca8a": "eab3db", "e0975c": "d35eae", "a85636": "97276d", "6f2919": "59163f"}, + //BROWN + {"ffca8a": "ccae7c", "e0975c": "a47844", "a85636": "754c23", "6f2919": "472b13"} + ], + + "effectSources": ["growflowers"] +} diff --git a/items/armors/decorative/costumes/sb_techmaster/techmaster.chest b/items/armors/decorative/costumes/sb_techmaster/techmaster.chest index b058b261..b2bff274 100644 --- a/items/armors/decorative/costumes/sb_techmaster/techmaster.chest +++ b/items/armors/decorative/costumes/sb_techmaster/techmaster.chest @@ -8,6 +8,7 @@ "price" : 5000, "description": "This jacket is usually worn by those privy to some of the universe's best kept secrets.", "shortdescription": "Tech Master's Techjacket", + "builder": "/items/buildscripts/starbound/buildarmor.lua", "maleFrames": { "body": "chest.png", "backSleeve": "bsleeve.png", diff --git a/items/armors/decorative/costumes/sb_techmaster/techmaster.head b/items/armors/decorative/costumes/sb_techmaster/techmaster.head index da4c252d..5975c9ee 100644 --- a/items/armors/decorative/costumes/sb_techmaster/techmaster.head +++ b/items/armors/decorative/costumes/sb_techmaster/techmaster.head @@ -2,6 +2,7 @@ "itemName": "sb_techmasterhead", "description": "This helm contains a voice box changer. Side effects may include picking up any heavy breathing.", "shortdescription": "Tech Master's Techhelm", + "builder": "/items/buildscripts/starbound/buildarmor.lua", "maleFrames": "head.png", "femaleFrames": "head.png", "mask": "mask.png", diff --git a/items/augments/sb_abilitymod/abilitymod.augment b/items/augments/sb_abilitymod/abilitymod.augment index 0a24ed7b..e8e0acf7 100644 --- a/items/augments/sb_abilitymod/abilitymod.augment +++ b/items/augments/sb_abilitymod/abilitymod.augment @@ -10,8 +10,10 @@ }, "subtitle": "Weapon Mod (%s)", "description": "Replaces the %s^reset; ability of non-unique weapons.\n^gray;Apply to weapon with right-click", //Unfortunately we can't add 'certain' because that, plus 'primary', is too long. It'd work perfectly if we had our own version of the codex tooltip - "primaryDescription": "^blue;primary", - "altDescription": "^red;special", + "slotNames": { + "primary": "^blue;primary", + "alt": "^red;special" + }, "elementalNameDescription": "Element", "shortdescription": "", "scripts": ["/scripts/augments/sb_ability.lua"], diff --git a/items/augments/sb_abilitymod/randomabilitymod.augment b/items/augments/sb_abilitymod/randomabilitymod.augment new file mode 100644 index 00000000..1b6a1d4e --- /dev/null +++ b/items/augments/sb_abilitymod/randomabilitymod.augment @@ -0,0 +1,21 @@ +{ + "itemName": "sb_randomabilitymod", + "price": 1500, + "tooltipKind": "sb_object4", + "rarity": "common", + "itemTags": ["weapon", "ranged", "revolver", "pistol", "gun"], + "category": "pistol", + "tooltipFields": { + "subtitle": "Weapon Mod" + }, + "description": "Replaces the abilities of non-unique weapons.\n^gray;Apply to weapon with right-click", + "shortdescription": "Randomize", + "slots": ["primary", "alt"], + "inventoryIcon": [{ + "image": "/interface/sb_backingicon.png" + }, { + "image": "sb_random.png" + } + ], + "scripts": ["/scripts/augments/sb_randomability.lua"] +} diff --git a/items/augments/sb_abilitymod/sb_default.png b/items/augments/sb_abilitymod/sb_default.png new file mode 100644 index 00000000..d4ffb2bd Binary files /dev/null and b/items/augments/sb_abilitymod/sb_default.png differ diff --git a/items/augments/sb_abilitymod/sb_random.png b/items/augments/sb_abilitymod/sb_random.png new file mode 100644 index 00000000..b24f73a0 Binary files /dev/null and b/items/augments/sb_abilitymod/sb_random.png differ diff --git a/items/buildscripts/starbound/buildabilitymod.lua b/items/buildscripts/starbound/buildabilitymod.lua index 72d176c7..2674bc43 100644 --- a/items/buildscripts/starbound/buildabilitymod.lua +++ b/items/buildscripts/starbound/buildabilitymod.lua @@ -13,7 +13,7 @@ function build(directory, config, parameters) if icon then if icon:sub(0, 1) ~= "/" then icon = directory..icon end end - table.insert(config.inventoryIcon, icon and {image = icon} or {image = sb_assetmissing(directory..parameters.ability..".png", "/interface/sb_tooltips/assetmissing.png")}) + table.insert(config.inventoryIcon, icon and {image = icon} or {image = sb_assetmissing(directory..parameters.ability..".png", "sb_default.png")}) --table.insert(config.inventoryIcon, {image = "/interface/sb_tooltips/assetmissing.png"}) abilityData = root.assetJson(root.assetJson("/items/buildscripts/weaponabilities.config")[parameters.ability]).ability @@ -30,7 +30,7 @@ function build(directory, config, parameters) config.acceptedElements = acceptedElements end config.shortdescription = string.gsub((config.rarity ~= "common" and "^yellow;" or "")..abilityData.name.."^reset;", "", config.elementalNameDescription) - config.description = string.format(config.description, config[(config.slot and "primary" or "alt").."Description" or "???"]) + config.description = string.format(config.description, config.slotNames[(config.slot and config.slot or "alt")] or "^yellow;???") config.tooltipFields = parameters.tooltipFields or config.tooltipFields or {} local weaponName = (abilities[parameters.ability] or {}).weaponName diff --git a/items/buildscripts/starbound/buildarmor.lua b/items/buildscripts/starbound/buildarmor.lua index 4b3542ca..11fe8431 100644 --- a/items/buildscripts/starbound/buildarmor.lua +++ b/items/buildscripts/starbound/buildarmor.lua @@ -8,12 +8,7 @@ function build(directory, config, parameters) config = applyDefinition(config, definition, configParameter("configOverrides")) end - if configParameter("acceptsAugmentType") or configParameter("currentAugment") or root.assetJson("/items/armors/biome/copperarmor/copperarmor.head").acceptsAugmentType then - config.tooltipKind = "sb_armoraugment" - parameters.acceptsAugmentType = configParameter("acceptsAugmentType","back") - else - config.tooltipKind = "sb_armor" - end + acceptsAugments = configParameter("acceptsAugmentType") or configParameter("currentAugment") if parameters.tooltipKind == "sb_armoraugment" then parameters.tooltipKind = nil end --fix for uninstalls :( @@ -25,5 +20,22 @@ function build(directory, config, parameters) config.tooltipFields.levelLabel = "^shadow;"..level config.tooltipFields.level2Label = level end + + --We can't use root.itemType or root.itemConfig because buildscripts run while the item database is loading for some reason + if not acceptsAugments then + local itemToCheck = root.assetJson("/betabound.config:armorAugmentModPaths") + itemToCheck = itemToCheck[config.category or "other"] or itemToCheck.other + if itemToCheck then + acceptsAugments = root.assetJson(itemToCheck).acceptsAugmentType + end + end + + if acceptsAugments then + config.tooltipKind = "sb_armoraugment" + parameters.acceptsAugmentType = configParameter("acceptsAugmentType", "back") + else + config.tooltipKind = "sb_armor" + end + return config, parameters end \ No newline at end of file diff --git a/items/buildscripts/starbound/buildunrandweapon.lua b/items/buildscripts/starbound/buildunrandweapon.lua index e1deb638..98de2a12 100644 --- a/items/buildscripts/starbound/buildunrandweapon.lua +++ b/items/buildscripts/starbound/buildunrandweapon.lua @@ -23,7 +23,7 @@ function build(directory, config, parameters, level, seed) config.directives = "?replace" local selectedSwaps = config.colorOptions[parameters.colorIndex+1] for k, v in pairs(selectedSwaps) do - config.directives = string.format("%s;%s=%s",config.directives,k,v) + config.directives = string.format("%s;%s=%s",config.directives,k,v) end end config.directives = config.directives..config.sb_extraDirectives @@ -37,9 +37,9 @@ function build(directory, config, parameters, level, seed) if config.primaryAbility and config.primaryAbility.stances and rotate then for k, v in pairs(config.primaryAbility.stances) do if k == "idle" then - config.primaryAbility.stances[k].aimAngle = 0 + config.primaryAbility.stances[k].aimAngle = 0 else - util.mergeTable(config.primaryAbility.stances[k], {allowRotate = true, allowFlip = true}) + util.mergeTable(config.primaryAbility.stances[k], {allowRotate = true, allowFlip = true}) end end end diff --git a/items/buildscripts/starbound/buildvweapon.lua b/items/buildscripts/starbound/buildvweapon.lua index 97df8823..51410961 100644 --- a/items/buildscripts/starbound/buildvweapon.lua +++ b/items/buildscripts/starbound/buildvweapon.lua @@ -5,11 +5,12 @@ function build(directory, config, parameters, level, seed) parameters = util.mergeTable(configParameter("sb_craftedParameters", {}), parameters) parameters.sb_crafted = nil end + local sb_tooltipFields = config.tooltipFields or {} if config.sb_builder then require(config.sb_builder) config, parameters = build(directory, config, parameters, level, seed) end - config.tooltipFields = config.tooltipFields or {} + config.tooltipFields = sb.jsonMerge(config.tooltipFields or {}, sb_tooltipFields) local level = string.format("%.0f",configParameter("level", 1)) if string.find((config.tooltipKind or "base"), "sb_") then config.tooltipFields.levelLabel = "^shadow;Lvl "..level diff --git a/items/buildscripts/starbound/buildweapon.lua b/items/buildscripts/starbound/buildweapon.lua index 72c6f78a..8b87e279 100644 --- a/items/buildscripts/starbound/buildweapon.lua +++ b/items/buildscripts/starbound/buildweapon.lua @@ -50,7 +50,12 @@ function build(directory, config, parameters, level, seed) poisonthrower = "poison", lightningthrower = "electric" } - parameters.elementalType = projectileMap[parameters.primaryAbility and parameters.primaryAbility.projectileType or "flamethrower"] + local previousProjectile = projectileMap[parameters.primaryAbility and parameters.primaryAbility.projectileType] + if previousProjectile then + parameters.elementalType = previousProjectile + else + parameters.elementalType = randomFromList(builderConfig.elementalType, seed, "elementalType") + end else parameters.elementalType = randomFromList(builderConfig.elementalType, seed, "elementalType") end @@ -135,9 +140,14 @@ function build(directory, config, parameters, level, seed) config.primaryAbility.energyUsage = config.primaryAbility.energyUsage+(config.primaryAbility.projectileCount*1.4) end end + + --various ranges if config.primaryAbility.projectileParameters.knockbackRange then config.primaryAbility.projectileParameters.knockback = scaleConfig(parameters.primaryAbility.fireTimeFactor, config.primaryAbility.projectileParameters.knockbackRange) end + if config.primaryAbility.projectileParameters.speedRange then + config.primaryAbility.projectileParameters.speed = randomIntInRange(config.primaryAbility.projectileParameters.speedRange, seed, "speed") + end end --remove stance durations if needed @@ -252,19 +262,6 @@ function build(directory, config, parameters, level, seed) config.animationCustom.sounds.fire = type(sound) == "table" and sound or {sound} end - -- build inventory icon - if not config.inventoryIcon and config.animationParts then - config.inventoryIcon = jarray() - local parts = builderConfig.iconDrawables or {} - for _,partName in pairs(parts) do - local drawable = { - image = config.animationParts[partName], - position = partImagePositions[partName] - } - table.insert(config.inventoryIcon, drawable) - end - end - -- populate tooltip fields config.tooltipFields = config.tooltipFields or {} config.tooltipFields.dyeLabel = configParameter("sb_dyeable") and "^gray;(Dyeable)" or "" @@ -287,30 +284,47 @@ function build(directory, config, parameters, level, seed) if config.primaryAbility then config.tooltipFields.primaryAbilityTitleLabel = "Primary:" config.tooltipFields.primaryAbilityLabel = config.primaryAbility.name or "unknown" - if parameters.primaryAbility.projectileType then - if type(parameters.primaryAbility.projectileType) == "string" then - config.tooltipFields.damageKindImage = sb_assetmissing("/interface/sb_tooltips/"..parameters.primaryAbility.projectileType..".png", "/interface/sb_tooltips/assetmissing.png") - elseif type(parameters.primaryAbility.projectileType) == "table" then - local projectiles = parameters.primaryAbility.projectileType - --todo: loop - if #projectiles >= 1 then config.tooltipFields.damageKindImage = sb_assetmissing("/interface/sb_tooltips/"..projectiles[1]..".png","/interface/sb_tooltips/assetmissing.png") end - if #projectiles >= 2 then config.tooltipFields.damageKindBImage = sb_assetmissing("/interface/sb_tooltips/"..projectiles[2]..".png","/interface/sb_tooltips/assetmissing.png") end - if #projectiles >= 3 then config.tooltipFields.damageKindCImage = sb_assetmissing("/interface/sb_tooltips/"..projectiles[3]..".png","/interface/sb_tooltips/assetmissing.png") end - if #projectiles >= 4 then config.tooltipFields.damageKindDImage = sb_assetmissing("/interface/sb_tooltips/"..projectiles[4]..".png","/interface/sb_tooltips/assetmissing.png") end - end + local projectileType = parameters.primaryAbility.projectileType + if projectileType then + config.tooltipFields.damageKindImage = sb_assetmissing("/interface/sb_tooltips/"..(type(projectileType) == "table" and projectileType[1] or projectileType)..".png", "/interface/sb_tooltips/assetmissing.png") end end if config.altAbility then config.tooltipFields.altAbilityTitleLabel = "Special:" config.tooltipFields.altAbilityLabel = config.altAbility.name or "unknown" end + + -- build inventory/object icon + if config.animationParts then + assembledIcon = jarray() + local parts = builderConfig.iconDrawables or {} + for _,partName in pairs(parts) do + local drawable = { + image = util.absolutePath(directory, config.animationParts[partName]), + position = partImagePositions[partName] + } + useAssembledIcon = true + table.insert(assembledIcon, drawable) + end + end + + if useAssembledIcon then + if config.inventoryIcon then + config.tooltipFields.objectImage = assembledIcon + else + config.inventoryIcon = assembledIcon + end + end + + -- calculate price and rarity config.price = (config.price or 10) * root.evalFunction("itemLevelPriceMultiplier", configParameter("level", 1)) if not config.fixedRarity then - local rarities = {"common","uncommon","rare","legendary","essential"} + local rarities = {"common", "uncommon", "rare", "legendary", "essential"} config.rarity = rarities[root.evalFunction("sb_rarity", math.floor(configParameter("level", 1)))] or config.rarity or "legendary" end - if config.rarity == "essential" then config.tooltipFields.rarityLabel = "Epic" end + if config.rarity == "essential" then config.tooltipFields.rarityLabel = "Epic" end --TODO: translatable string + -- apply tags from definition local tags = configParameter("tags") if tags then for k, v in pairs(tags) do replacePatternInData(config, nil, k, v) end end diff --git a/items/buildscripts/starbound/fromsource.lua b/items/buildscripts/starbound/fromsource.lua index 6091a71a..a46f1eaf 100644 --- a/items/buildscripts/starbound/fromsource.lua +++ b/items/buildscripts/starbound/fromsource.lua @@ -1,6 +1,6 @@ function build(directory, config, parameters) config.builder = nil - config = sb.jsonMerge(root.assetJson(config.sb_itemName:sub(1,1) == "/" and config.sb_itemName or (directory..config.sb_itemName)),config) + config = sb.jsonMerge(root.assetJson(config.originalItemName:sub(1,1) == "/" and config.originalItemName or (directory..config.originalItemName)),config) if config.builder then require(config.builder) diff --git a/items/currency/essence.currency.patch b/items/currency/essence.currency.patch deleted file mode 100644 index 04cc4ec0..00000000 --- a/items/currency/essence.currency.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/category","inverse":true}, -{"op":"add","path":"/category","value":"currency"}] -] \ No newline at end of file diff --git a/items/currency/money.currency.patch b/items/currency/money.currency.patch index 17cd1ace..82b07cdd 100644 --- a/items/currency/money.currency.patch +++ b/items/currency/money.currency.patch @@ -1,6 +1,4 @@ [ -[{"op":"test","path":"/category","inverse":true}, -{"op":"add","path":"/category","value":"currency"}], [{"op":"test","path":"/description","value":"Pixels are a universal currency. They can also be used for 3D Printing."}, -{"op":"replace","path":"/description","value":"Pixels, used for 3D Printing; they have become a universal currency."}] +{"op":"replace","path":"/description","value":"Pixels, used for 3D printing; they have become a universal currency."}] ] \ No newline at end of file diff --git a/items/currency/sb_goldcoin.currency b/items/currency/sb_goldcoin.currency index f3495b88..ded5a166 100644 --- a/items/currency/sb_goldcoin.currency +++ b/items/currency/sb_goldcoin.currency @@ -1,7 +1,7 @@ { "itemName": "sb_goldcoin", - "price": 10, - "value": 10, + "price": 5, + "value": 5, "tooltipKind": "sb_object", "rarity": "common", "category": "currency", @@ -10,7 +10,7 @@ "pickupSoundsMedium": ["/sfx/objects/coinstack_medium1.ogg", "/sfx/objects/coinstack_medium2.ogg"], "pickupSoundsLarge": ["/sfx/objects/coinstack_large.ogg"], "inventoryIcon": "sb_goldcoin.png", - "description": "A gold coin worth 10 pixels.", + "description": "A gold coin worth 5 pixels.", "shortdescription": "Gold Coin", "smallStackLimit": 999, "mediumStackLimit": 4999, diff --git a/items/generic/crafting/endomorphicjelly.item.patch b/items/generic/crafting/endomorphicjelly.item.patch index bc87a3d7..c12b6a7b 100644 --- a/items/generic/crafting/endomorphicjelly.item.patch +++ b/items/generic/crafting/endomorphicjelly.item.patch @@ -1,6 +1,7 @@ [ [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_jelly"}], +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_jelly"}, +{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_pbj"}], [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], [{"op":"test","path":"/price","value":10},{"op":"replace","path":"/price","value":500}], [{"op":"test","path":"/rarity","value":"Uncommon"},{"op":"replace","path":"/rarity","value":"Rare"}], diff --git a/items/generic/crafting/fossilore.item.patch b/items/generic/crafting/fossilore.item.patch index e685e7ac..28f48968 100644 --- a/items/generic/crafting/fossilore.item.patch +++ b/items/generic/crafting/fossilore.item.patch @@ -1,5 +1,43 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], -[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":0}], -[{"op":"replace","path":"/price","value":5}] -//,[{"op":"replace","path":"/category","value":"smallFossil"}] -] \ No newline at end of file +[ + [{ + "op": "test", + "path": "/tooltipKind", + "inverse": true + }, { + "op": "add", + "path": "/tooltipKind", + "value": "sb_object" + } + ], + [{ + "op": "test", + "path": "/price", + "value": 0 + }, { + "op": "replace", + "path": "/price", + "value": 25 + } + ], + [{ + "op": "test", + "path": "/description", + "value": "It's a fossil. I wonder what kind it is." + }, { + "op": "replace", + "path": "/description", + "value": "An unidentified fossil. I wonder what kind it is. Bring it to a Fossil Station to find out!" + } + ], + [{ + "op": "test", + "path": "/category", + "value": "craftingMaterial" + }, { + "op": "replace", + "path": "/category", + "value": "other" + } + ] + //,[{"op":"replace","path":"/category","value":"smallFossil"}] +] diff --git a/items/generic/food/sb_condiments/peanutbutterjar.consumable b/items/generic/food/sb_condiments/peanutbutterjar.consumable index c97b1431..dfbe3b49 100644 --- a/items/generic/food/sb_condiments/peanutbutterjar.consumable +++ b/items/generic/food/sb_condiments/peanutbutterjar.consumable @@ -1,9 +1,9 @@ { "itemName": "sb_peanutbutterjar", - "price": 125, - "foodValue": 20, - "tooltipKind": "sb_object", - "rarity": "common", + "price": 165, + "foodValue": 30, + "tooltipKind": "sb_object4", + "rarity": "uncommon", "sb_plate": { "image": true, "hidePlate": true @@ -12,15 +12,15 @@ "category": "food", "effects": [[{ "effect": "maxenergyscalingboostfood", - "duration": 90 + "duration": 135 }, { "effect": "sb_protectionboost5", - "duration": 90 + "duration": 135 }, - "sb_foodheal50" + "sb_foodheal95" ]], "learnBlueprintsOnPickup": ["sb_peanutbutter"], - "description": "Now with actual butter. And peas. No nuts though.", + "description": "A rich, creamy spread enhanced with actual butter. It offers a nutty flavor.", "shortdescription": "Peanut Butter", "builder": "/items/buildscripts/starbound/buildfood.lua", "itemAgingScripts": ["/scripts/items/rotting.lua"], diff --git a/items/generic/food/sb_entrees/pbj.consumable b/items/generic/food/sb_entrees/pbj.consumable new file mode 100644 index 00000000..f5cf2570 --- /dev/null +++ b/items/generic/food/sb_entrees/pbj.consumable @@ -0,0 +1,29 @@ +{ + "itemName": "sb_pbj", + "price": 450, + "rarity": "uncommon", + "foodValue": 35, + "tooltipKind": "sb_object4", + "inventoryIcon": "pbj.png", + "category": "preparedFood", + "description": "A classic homemade meal enjoyed by many. Perfect for the spacefarer on the go.", + "effects": [[{ + "effect": "sb_protectionboost5", + "duration": 105 + },{ + "effect": "jumpboostfood", + "duration": 105 + },{ + "effect": "runboostfood", + "duration": 105 + },{ + "effect": "sb_health", + "duration": 20 + }, + "sb_foodheal120" + ]], + "shortdescription": "PB&J Sandwich", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_entrees/pbj.png b/items/generic/food/sb_entrees/pbj.png new file mode 100644 index 00000000..59064c45 Binary files /dev/null and b/items/generic/food/sb_entrees/pbj.png differ diff --git a/items/generic/food/tier2/coffee.activeitem b/items/generic/food/tier2/coffee.activeitem index 24a016ce..6c538a43 100644 --- a/items/generic/food/tier2/coffee.activeitem +++ b/items/generic/food/tier2/coffee.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "coffee.consumable", + "originalItemName": "coffee.consumable", "itemName": "coffee", "shortdescription": "Coffee", "animation": "/items/sb_consumable.animation", diff --git a/items/generic/food/tier2/flatwhite.activeitem b/items/generic/food/tier2/flatwhite.activeitem index 275240e0..01077760 100644 --- a/items/generic/food/tier2/flatwhite.activeitem +++ b/items/generic/food/tier2/flatwhite.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "flatwhite.consumable", + "originalItemName": "flatwhite.consumable", "itemName": "flatwhite", "shortdescription": "Flat White Coffee", "animation": "/items/sb_consumable.animation", diff --git a/items/generic/food/tier2/mocha.activeitem b/items/generic/food/tier2/mocha.activeitem index 27d7ae46..4342958c 100644 --- a/items/generic/food/tier2/mocha.activeitem +++ b/items/generic/food/tier2/mocha.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "mocha.consumable", + "originalItemName": "mocha.consumable", "itemName": "mocha", "shortdescription": "Mochaccino", "animation": "/items/sb_consumable.animation", diff --git a/items/generic/other/antidote.activeitem b/items/generic/other/antidote.activeitem index 89dc82b5..d88f20fd 100644 --- a/items/generic/other/antidote.activeitem +++ b/items/generic/other/antidote.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "antidote.consumable", + "originalItemName": "antidote.consumable", "itemName": "antidote", "animation": "/items/sb_consumable.animation", "scripts": ["/items/sb_consumable.lua"], diff --git a/items/generic/other/bottledhealingwater.activeitem b/items/generic/other/bottledhealingwater.activeitem index 1a166b24..fe0d872f 100644 --- a/items/generic/other/bottledhealingwater.activeitem +++ b/items/generic/other/bottledhealingwater.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "bottledhealingwater.consumable", + "originalItemName": "bottledhealingwater.consumable", "itemName": "bottledhealingwater", "animation": "/items/sb_consumable.animation", "scripts": ["/items/sb_consumable.lua"], diff --git a/items/generic/other/bottledwater.activeitem b/items/generic/other/bottledwater.activeitem index 98d3075c..e147a08c 100644 --- a/items/generic/other/bottledwater.activeitem +++ b/items/generic/other/bottledwater.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "bottledwater.consumable", + "originalItemName": "bottledwater.consumable", "itemName": "bottledwater", "animation": "/items/sb_consumable.animation", "scripts": ["/items/sb_consumable.lua"], diff --git a/items/generic/other/sb_ammo.item b/items/generic/other/sb_ammo.item index 2fb3ae4c..5b9f8f76 100644 --- a/items/generic/other/sb_ammo.item +++ b/items/generic/other/sb_ammo.item @@ -9,7 +9,8 @@ "subtitle": "Ammunition" }, "radioMessagesOnPickup": ["sb_pickupammo"], - //"itemTags" : ["weapon","ranged","revolver","pistol","gun"], Uncrafter will see it as a weapon + //"itemTags": ["weapon","ranged","revolver","pistol","gun"], Uncrafter will see it as a weapon + "itemTags": ["ammo", "ammunition"], "description": "This type of ammo will automatically be used with certain firearms. They will state if they can use ammo.", "shortdescription": "Ammunition", "projectileTypes": ["standardbullet", "fast", "bouncybullet"], diff --git a/items/generic/produce/kelp.consumable b/items/generic/produce/kelp.consumable index b7f9b2ff..13cd8f72 100644 --- a/items/generic/produce/kelp.consumable +++ b/items/generic/produce/kelp.consumable @@ -1,5 +1,5 @@ { - "sb_itemName": "kelp.item", + "originalItemName": "kelp.item", "itemName": "kelp", "shortdescription": "Kelp", "foodValue": 1.5, diff --git a/items/generic/produce/rice.consumable b/items/generic/produce/rice.consumable index 060b1613..4f227d75 100644 --- a/items/generic/produce/rice.consumable +++ b/items/generic/produce/rice.consumable @@ -1,5 +1,5 @@ { - "sb_itemName": "rice.item", + "originalItemName": "rice.item", "itemName": "rice", "shortdescription": "Rice", "foodValue": 2.5, diff --git a/items/generic/produce/sb_crystalplant.consumable b/items/generic/produce/sb_crystalplant.consumable index c292744c..83034ce1 100644 --- a/items/generic/produce/sb_crystalplant.consumable +++ b/items/generic/produce/sb_crystalplant.consumable @@ -1,6 +1,6 @@ -//TODO: wait for Sayter to accept my pull request and push to Steam then rename this file +//TODO: rename this file after FU is updated. Thank you, Sayter! { - "sb_itemName": "crystalplant.item", + "originalItemName": "crystalplant.item", "itemName": "crystalplant", "shortdescription": "Crystal Plant", "category": "food", diff --git a/items/generic/shop/milk.consumable.patch b/items/generic/shop/milk.consumable.patch index c9ea30b2..e7c4d990 100644 --- a/items/generic/shop/milk.consumable.patch +++ b/items/generic/shop/milk.consumable.patch @@ -6,5 +6,8 @@ [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal25"}], -[{"op":"add","path":"/sb_plate","value":{"image":true,"offset":-0.05}}] +[{"op":"add","path":"/sb_plate","value":{"image":true,"offset":-0.05}}], + +[{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_butter"}] ] \ No newline at end of file diff --git a/items/materials/rainbowwood.matitem b/items/materials/rainbowwood.matitem index 29cc4cc5..8d319015 100644 --- a/items/materials/rainbowwood.matitem +++ b/items/materials/rainbowwood.matitem @@ -1,10 +1,10 @@ { - "sb_itemName" : "/items/generic/crafting/rainbowwood.item", - "itemName" : "rainbowwood", - "inventoryIcon" : "/items/generic/crafting/rainbowwood.png", - "tooltipKind" : "sb_object", - "shortdescription" : "Rainbow Wood", - "builder" : "/items/buildscripts/starbound/fromsource.lua", + "originalItemName": "/items/generic/crafting/rainbowwood.item", + "itemName": "rainbowwood", + "inventoryIcon": "/items/generic/crafting/rainbowwood.png", + "tooltipKind": "sb_object", + "shortdescription": "Rainbow Wood", + "builder": "/items/buildscripts/starbound/fromsource.lua", - "materialId" : 570 -} \ No newline at end of file + "materialId": 570 +} diff --git a/items/materials/rock12.matitem.patch b/items/materials/rock12.matitem.patch index 31865f9b..b2a2fe16 100644 --- a/items/materials/rock12.matitem.patch +++ b/items/materials/rock12.matitem.patch @@ -1,4 +1,4 @@ [ [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}], -[{"op":"test","path":"/shortdescription","value":"Rough Stone"},{"op":"replace","path":"/shortdescription","value":"Limestone Rock"}] +[{"op":"test","path":"/shortdescription","value":"Rough Stone"},{"op":"replace","path":"/shortdescription","value":"Rough Limestone"}] ] \ No newline at end of file diff --git a/items/tools/inspectionmode.inspectiontool.patch b/items/tools/inspectionmode.inspectiontool.patch new file mode 100644 index 00000000..aa647fc6 --- /dev/null +++ b/items/tools/inspectionmode.inspectiontool.patch @@ -0,0 +1,13 @@ +[ +[{"op":"test","path":"/description","value":"Inspect the world around you. ^green;Quick select with [N] key."},{"op":"replace","path":"/description","value":"Describe things in the world and scan objects for printing."}] + +[{"op":"test","path":"/description","value":"Inspect the world around you. ^green;Quick select with [N] key."},{"op":"replace","path":"/description","value":"Describe things in the world and scan objects for printing."}] //patch project + +[{"op":"test","path":"/nothingThereText/human","inverse":true},{"op":"add","path":"/nothingThereText/human","value":[]}], +[{"op":"add","path":"/nothingThereText/human/-","value":"Nope, didn't find anything."}, +{"op":"add","path":"/nothingThereText/human/-","value":"Oh. My. God! It's a... wait... nope sorry, nothing."}, +{"op":"add","path":"/nothingThereText/human/-","value":"My god, it's full of nothing."}, +{"op":"add","path":"/nothingThereText/human/-","value":"If at first you don't succeed, keep looking at the nothing."}, +{"op":"add","path":"/nothingThereText/human/-","value":"I tried hard to make something out over there, but failed."}, +{"op":"add","path":"/nothingThereText/human/-","value":"Nada, nothing, zilch, zip."}] +] \ No newline at end of file diff --git a/items/tools/inspectiontool/inspectionmode.inspectiontool.patch b/items/tools/inspectiontool/inspectionmode.inspectiontool.patch index c95ced7d..f3982b48 100644 --- a/items/tools/inspectiontool/inspectionmode.inspectiontool.patch +++ b/items/tools/inspectiontool/inspectionmode.inspectiontool.patch @@ -1,13 +1,13 @@ [ +[{"op":"test","path":"/description","value":"Inspect the world around you. ^green;Quick select with [N] key."},{"op":"replace","path":"/description","value":"Inspect the world around you."}], + +[{"op":"test","path":"/description","value":"Inspect the world around you. ^green;Quick select with [N] key.^reset;"},{"op":"replace","path":"/description","value":"Inspect the world around you."}], //patch project + [{"op":"test","path":"/nothingThereText/human","inverse":true},{"op":"add","path":"/nothingThereText/human","value":[]}], -[{"op":"add","path":"/nothingThereText/human/-","value":"Nothing of interest here."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nothing to see here."}, -{"op":"add","path":"/nothingThereText/human/-","value":"This isn't really anything."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nothing much to speak of."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nope, didn't find anything."}, +[{"op":"add","path":"/nothingThereText/human/-","value":"Nope, didn't find anything."}, {"op":"add","path":"/nothingThereText/human/-","value":"Oh. My. God! It's a... wait... nope sorry, nothing."}, {"op":"add","path":"/nothingThereText/human/-","value":"My god, it's full of nothing."}, -{"op":"add","path":"/nothingThereText/human/-","value":"If at first you don't succeed keep looking at the nothing."}, -{"op":"add","path":"/nothingThereText/human/-","value":"You try hard to make something out there, but fail."}, +{"op":"add","path":"/nothingThereText/human/-","value":"If at first you don't succeed, keep looking at the nothing."}, +{"op":"add","path":"/nothingThereText/human/-","value":"I tried hard to make something out over there, but failed."}, {"op":"add","path":"/nothingThereText/human/-","value":"Nada, nothing, zilch, zip."}] ] \ No newline at end of file diff --git a/items/tools/inspectiontool/scanmode.inspectiontool.patch b/items/tools/inspectiontool/scanmode.inspectiontool.patch index c95ced7d..12a7f9a3 100644 --- a/items/tools/inspectiontool/scanmode.inspectiontool.patch +++ b/items/tools/inspectiontool/scanmode.inspectiontool.patch @@ -1,13 +1,13 @@ [ +[{"op":"test","path":"/description","value":"Describe things in the world and scan objects for printing. ^green;Quick select with [N] key."},{"op":"replace","path":"/description","value":"Describe things in the world and scan objects for printing."}], + +[{"op":"test","path":"/description","value":"Describe things in the world and scan objects for printing. ^green;Quick select with [N] key.^reset;"},{"op":"replace","path":"/description","value":"Describe things in the world and scan objects for printing."}], //patch project + [{"op":"test","path":"/nothingThereText/human","inverse":true},{"op":"add","path":"/nothingThereText/human","value":[]}], -[{"op":"add","path":"/nothingThereText/human/-","value":"Nothing of interest here."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nothing to see here."}, -{"op":"add","path":"/nothingThereText/human/-","value":"This isn't really anything."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nothing much to speak of."}, -{"op":"add","path":"/nothingThereText/human/-","value":"Nope, didn't find anything."}, +[{"op":"add","path":"/nothingThereText/human/-","value":"Nope, didn't find anything."}, {"op":"add","path":"/nothingThereText/human/-","value":"Oh. My. God! It's a... wait... nope sorry, nothing."}, {"op":"add","path":"/nothingThereText/human/-","value":"My god, it's full of nothing."}, -{"op":"add","path":"/nothingThereText/human/-","value":"If at first you don't succeed keep looking at the nothing."}, -{"op":"add","path":"/nothingThereText/human/-","value":"You try hard to make something out there, but fail."}, +{"op":"add","path":"/nothingThereText/human/-","value":"If at first you don't succeed, keep looking at the nothing."}, +{"op":"add","path":"/nothingThereText/human/-","value":"I tried hard to make something out over there, but failed."}, {"op":"add","path":"/nothingThereText/human/-","value":"Nada, nothing, zilch, zip."}] ] \ No newline at end of file diff --git a/items/tools/mininglantern.activeitem b/items/tools/mininglantern.activeitem index 3bc8cc68..5f2c986b 100644 --- a/items/tools/mininglantern.activeitem +++ b/items/tools/mininglantern.activeitem @@ -1,5 +1,5 @@ { - "sb_itemName": "mininglantern.flashlight", + "originalItemName": "mininglantern.flashlight", "itemName": "mininglantern", "builder": "/items/buildscripts/starbound/fromsource.lua", "animationParts": { diff --git a/items/tools/miningtools/beamaxe.beamaxe.patch b/items/tools/miningtools/beamaxe.beamaxe.patch new file mode 100644 index 00000000..7268def8 --- /dev/null +++ b/items/tools/miningtools/beamaxe.beamaxe.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/description","value":"Manipulates anything that matters. ^green;Quick select with [R] key."},{"op":"replace","path":"/description","value":"Manipulates anything that matters."}], + +[{"op":"test","path":"/description","value":"Manipulates anything that matters. ^green;Quick select with [R] key.^reset;"},{"op":"replace","path":"/description","value":"Manipulates anything that matters."}] //patch project +] \ No newline at end of file diff --git a/items/tools/miningtools/copperdrill.miningtool.patch b/items/tools/miningtools/copperdrill.miningtool.patch index 0416a3f8..9b4fbbac 100644 --- a/items/tools/miningtools/copperdrill.miningtool.patch +++ b/items/tools/miningtools/copperdrill.miningtool.patch @@ -1,8 +1,9 @@ [ [{"op":"test","path":"/tooltipKind","value":"tool"},{"op":"replace","path":"/tooltipKind","value":"sb_tool"}], [{"op":"test","path":"/blockRadius","value":2},{"op":"replace","path":"/blockRadius","value":4}], -[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], [{"op":"test","path":"/durability","value":1000},{"op":"replace","path":"/durability","value":750}], +[{"op":"test","path":"/price","value":150},{"op":"replace","path":"/price","value":550}], [{"op":"test","path":"/description","value":"Drills fast but breaks quickly. A temporary alternative to the matter manipulator."}, {"op":"replace","path":"/description","value":"A copper drill! This is more like it."}], diff --git a/items/tools/miningtools/copperpickaxe.miningtool.patch b/items/tools/miningtools/copperpickaxe.miningtool.patch index b2b7af9e..ac81056f 100644 --- a/items/tools/miningtools/copperpickaxe.miningtool.patch +++ b/items/tools/miningtools/copperpickaxe.miningtool.patch @@ -2,6 +2,7 @@ [{"op":"test","path":"/tooltipKind","value":"tool"},{"op":"replace","path":"/tooltipKind","value":"sb_tool"}], [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/durability","value":200},{"op":"replace","path":"/durability","value":750}], +[{"op":"test","path":"/price","value":50},{"op":"replace","path":"/price","value":250}], [{"op":"test","path":"/description","value":"This tool won't last long, but I'll be able to dig pretty fast with it."}, {"op":"replace","path":"/description","value":"Pickaxes are so last millennium! This one is made of copper."}], diff --git a/items/tools/miningtools/diamonddrill.miningtool.patch b/items/tools/miningtools/diamonddrill.miningtool.patch index 38bc4177..c23a405b 100644 --- a/items/tools/miningtools/diamonddrill.miningtool.patch +++ b/items/tools/miningtools/diamonddrill.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/blockRadius","value":2},{"op":"replace","path":"/blockRadius","value":4}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], [{"op":"test","path":"/durability","value":1000},{"op":"replace","path":"/durability","value":6000}], +[{"op":"test","path":"/price","value":450},{"op":"replace","path":"/price","value":845}], [{"op":"test","path":"/description","value":"Drills fast but breaks quickly. A temporary alternative to the matter manipulator."}, {"op":"replace","path":"/description","value":"A diamond drill! This is more like it."}], diff --git a/items/tools/miningtools/diamondpickaxe.miningtool.patch b/items/tools/miningtools/diamondpickaxe.miningtool.patch index a19ba350..841cb27e 100644 --- a/items/tools/miningtools/diamondpickaxe.miningtool.patch +++ b/items/tools/miningtools/diamondpickaxe.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}], [{"op":"test","path":"/durability","value":350},{"op":"replace","path":"/durability","value":6000}], +[{"op":"test","path":"/price","value":150},{"op":"replace","path":"/price","value":375}], [{"op":"test","path":"/description","value":"This tool won't last long, but I'll be able to dig pretty fast with it."}, {"op":"replace","path":"/description","value":"Pickaxes are so last millennium! This one is made of diamond."}], diff --git a/items/tools/miningtools/golddrill.miningtool.patch b/items/tools/miningtools/golddrill.miningtool.patch index 50ad8589..f5edf814 100644 --- a/items/tools/miningtools/golddrill.miningtool.patch +++ b/items/tools/miningtools/golddrill.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/blockRadius","value":2},{"op":"replace","path":"/blockRadius","value":4}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], [{"op":"test","path":"/durability","value":1000},{"op":"replace","path":"/durability","value":3000}], +[{"op":"test","path":"/price","value":300},{"op":"replace","path":"/price","value":700}], [{"op":"test","path":"/description","value":"Drills fast but breaks quickly. A temporary alternative to the matter manipulator."}, {"op":"replace","path":"/description","value":"A gold drill! This is more like it."}], diff --git a/items/tools/miningtools/goldpickaxe.miningtool.patch b/items/tools/miningtools/goldpickaxe.miningtool.patch index 14903c1a..0fa94fed 100644 --- a/items/tools/miningtools/goldpickaxe.miningtool.patch +++ b/items/tools/miningtools/goldpickaxe.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], [{"op":"test","path":"/durability","value":200},{"op":"replace","path":"/durability","value":1500}], +[{"op":"test","path":"/price","value":100},{"op":"replace","path":"/price","value":325}], [{"op":"test","path":"/description","value":"This tool won't last long, but I'll be able to dig pretty fast with it."}, {"op":"replace","path":"/description","value":"Pickaxes are so last millennium! This one is made of gold."}], diff --git a/items/tools/miningtools/pickaxe.miningtool.patch b/items/tools/miningtools/pickaxe.miningtool.patch index a8b405e5..14874aae 100644 --- a/items/tools/miningtools/pickaxe.miningtool.patch +++ b/items/tools/miningtools/pickaxe.miningtool.patch @@ -2,6 +2,7 @@ [{"op":"test","path":"/tooltipKind","value":"tool"},{"op":"replace","path":"/tooltipKind","value":"sb_tool"}], [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/durability","value":200},{"op":"replace","path":"/durability","value":850}], +[{"op":"test","path":"/price","value":50},{"op":"replace","path":"/price","value":275}], [{"op":"test","path":"/shortdescription","value":"Pickaxe"}, {"op":"replace","path":"/shortdescription","value":"Iron Pickaxe"}], [{"op":"test","path":"/description","value":"Pickaxes are so last millennium!"}, diff --git a/items/tools/miningtools/platinumdrill.miningtool.patch b/items/tools/miningtools/platinumdrill.miningtool.patch index 943f41b4..e091e227 100644 --- a/items/tools/miningtools/platinumdrill.miningtool.patch +++ b/items/tools/miningtools/platinumdrill.miningtool.patch @@ -3,8 +3,9 @@ [{"op":"test","path":"/blockRadius","value":2},{"op":"replace","path":"/blockRadius","value":4}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], [{"op":"test","path":"/durability","value":1000},{"op":"replace","path":"/durability","value":4000}], -[{"op":"test","path":"/shortdescription","value":"Titanium Drill"}, -{"op":"replace","path":"/shortdescription","value":"Platinum Drill"}], +[{"op":"test","path":"/price","value":375},{"op":"replace","path":"/price","value":775}], + +[{"op":"test","path":"/shortdescription","value":"Titanium Drill"},{"op":"replace","path":"/shortdescription","value":"Platinum Drill"}], //Why not just make your own fucking item?? [{"op":"test","path":"/description","value":"Drills fast but breaks quickly. A temporary alternative to the matter manipulator."}, {"op":"replace","path":"/description","value":"A platinum drill! This is more like it."}], diff --git a/items/tools/miningtools/platinumpickaxe.miningtool.patch b/items/tools/miningtools/platinumpickaxe.miningtool.patch index a47d7a6c..339c6c51 100644 --- a/items/tools/miningtools/platinumpickaxe.miningtool.patch +++ b/items/tools/miningtools/platinumpickaxe.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], [{"op":"test","path":"/durability","value":200},{"op":"replace","path":"/durability","value":3500}], +[{"op":"test","path":"/price","value":125},{"op":"replace","path":"/price","value":350}], [{"op":"test","path":"/shortdescription","value":"Titanium Pickaxe"}, {"op":"replace","path":"/shortdescription","value":"Platinum Pickaxe"}], [{"op":"test","path":"/description","value":"This tool won't last long, but I'll be able to dig pretty fast with it."}, diff --git a/items/tools/miningtools/sb_handdrill.miningtool b/items/tools/miningtools/sb_handdrill.miningtool index 381db25e..5ed521e0 100644 --- a/items/tools/miningtools/sb_handdrill.miningtool +++ b/items/tools/miningtools/sb_handdrill.miningtool @@ -1,6 +1,6 @@ { "itemName": "sb_handdrill", - "price": 150, + "price": 500, "category": "tool", "inventoryIcon": "handdrillicon.png", "maxStack": 1, diff --git a/items/tools/miningtools/sb_stonepickaxe.miningtool b/items/tools/miningtools/sb_stonepickaxe.miningtool index 934f61a2..53212695 100644 --- a/items/tools/miningtools/sb_stonepickaxe.miningtool +++ b/items/tools/miningtools/sb_stonepickaxe.miningtool @@ -3,7 +3,7 @@ "inventoryIcon": "sb_stonepickaxeicon.png", "maxStack": 1, "rarity": "common", - "price": 80, + "price": 30, "tooltipKind": "sb_tool", "category": "tool", "description": "Pickaxes are so last millennium!", diff --git a/items/tools/miningtools/silverdrill.miningtool.patch b/items/tools/miningtools/silverdrill.miningtool.patch index 1f866928..696732cc 100644 --- a/items/tools/miningtools/silverdrill.miningtool.patch +++ b/items/tools/miningtools/silverdrill.miningtool.patch @@ -3,6 +3,7 @@ [{"op":"test","path":"/blockRadius","value":2},{"op":"replace","path":"/blockRadius","value":4}], [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], [{"op":"test","path":"/durability","value":1000},{"op":"replace","path":"/durability","value":1500}], +[{"op":"test","path":"/price","value":225},{"op":"replace","path":"/price","value":625}], [{"op":"test","path":"/description","value":"Drills fast but breaks quickly. A temporary alternative to the matter manipulator."}, {"op":"replace","path":"/description","value":"A silver drill! This is more like it."}], diff --git a/items/tools/miningtools/silverpickaxe.miningtool.patch b/items/tools/miningtools/silverpickaxe.miningtool.patch index 3a095057..ee9d1d87 100644 --- a/items/tools/miningtools/silverpickaxe.miningtool.patch +++ b/items/tools/miningtools/silverpickaxe.miningtool.patch @@ -2,6 +2,7 @@ [{"op":"test","path":"/tooltipKind","value":"tool"},{"op":"replace","path":"/tooltipKind","value":"sb_tool"}], [{"op":"test","path":"/fireTime","value":0.3},{"op":"replace","path":"/fireTime","value":0.25}], [{"op":"test","path":"/durability","value":200},{"op":"replace","path":"/durability","value":950}], +[{"op":"test","path":"/price","value":50},{"op":"replace","path":"/price","value":300}], [{"op":"test","path":"/description","value":"This tool won't last long, but I'll be able to dig pretty fast with it."}, {"op":"replace","path":"/description","value":"Pickaxes are so last millennium! This one is made of silver."}], diff --git a/items/tools/painttool.painttool.patch b/items/tools/painttool.painttool.patch new file mode 100644 index 00000000..f3426049 --- /dev/null +++ b/items/tools/painttool.painttool.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/description","value":"Primary fire applies paint, secondary changes colour. ^green;Quick select with [Y] key."},{"op":"replace","path":"/description","value":"Primary fire applies paint, secondary changes colour."}], + +[{"op":"test","path":"/description","value":"Primary fire applies paint, secondary changes colour. ^green;Quick select with [Y] key.^reset;"},{"op":"replace","path":"/description","value":"Primary fire applies paint, secondary changes colour."}] //patch project +] \ No newline at end of file diff --git a/items/tools/sb_draintool.painttool b/items/tools/sb_draintool.painttool index 801f9a75..6761fc56 100644 --- a/items/tools/sb_draintool.painttool +++ b/items/tools/sb_draintool.painttool @@ -1,7 +1,7 @@ { "itemName": "sb_draintool", "price": 1000, - "inventoryIcon": "sb_paintergun2icon.png", + "inventoryIcon": "sb_paintergunicon.png?replace;e7c474=97a5b0;c88b28=646d7e;8d581c=3b4054;513310=212430;6f2919=808080;e0975c=e8e8e8;a85636=b8b8b8", "maxStack": 1, "rarity": "Uncommon", "description": "Secondary fire extracts natural hue from tiles for later use.", @@ -11,10 +11,10 @@ "altBlockRadius": 1, "twoHanded": true, "strikeSounds": ["/sfx/tools/paint_splash.ogg"], - "largeImage": "/items/tools/sb_paintergunlarge.png", + "largeImage": "/items/tools/sb_paintergunlarge.png?replace;e7c474=97a5b0;c88b28=646d7e;8d581c=3b4054;513310=212430;6f2919=8f8f8f;a85636=b8b8b8;e0975c=e8e8e8", "tooltipKind": "sb_tool", "category": "tool", - "image": "/items/tools/sb_paintergun2.png", + "image": "/items/tools/sb_paintergunvariants.png:0.red?replace;e7c474=97a5b0;c88b28=646d7e;8d581c=3b4054;513310=212430;820606=8f8f8f;c12d1d=b8b8b8;fd713f=e8e8e8", "endImages": ["/humanoid/any/ball.png", "/humanoid/any/tileglow.png", "/humanoid/any/4tileglow.png"], "scripts": ["/items/tools/sb_draintool.lua"], "handPosition": [-3, 0], diff --git a/items/tools/sb_ironaxe.miningtool b/items/tools/sb_ironaxe.miningtool index b2c8afea..52ed0e78 100644 --- a/items/tools/sb_ironaxe.miningtool +++ b/items/tools/sb_ironaxe.miningtool @@ -3,7 +3,7 @@ "inventoryIcon": "sb_ironaxeicon.png", "maxStack": 1, "rarity": "common", - "price": 220, + "price": 200, "tooltipKind": "sb_object4", "category": "tool", "description": "My favourite part was when he said, \"It's choppin' time\" and then chopped down a ton of trees.", diff --git a/items/tools/sb_paintergun2.png b/items/tools/sb_paintergun2.png deleted file mode 100644 index ae8a7dd5..00000000 Binary files a/items/tools/sb_paintergun2.png and /dev/null differ diff --git a/items/tools/sb_paintergun2icon.png b/items/tools/sb_paintergun2icon.png deleted file mode 100644 index 5768ae23..00000000 Binary files a/items/tools/sb_paintergun2icon.png and /dev/null differ diff --git a/items/tools/sb_paintergunicon.png b/items/tools/sb_paintergunicon.png index 73bd4377..c880a5ad 100644 Binary files a/items/tools/sb_paintergunicon.png and b/items/tools/sb_paintergunicon.png differ diff --git a/items/tools/sb_paintergunvariants.frames b/items/tools/sb_paintergunvariants.frames index 8b8ca252..593e9ba1 100644 --- a/items/tools/sb_paintergunvariants.frames +++ b/items/tools/sb_paintergunvariants.frames @@ -1,18 +1,17 @@ - { - "frameGrid" : { - "size" : [13, 12], - "dimensions" : [1, 9], - "names" : [ - [ "0" ], - [ "0.red" ], - [ "0.blue" ], - [ "0.green" ], - [ "0.yellow" ], - [ "0.orange" ], - [ "0.pink" ], - [ "0.black" ], - [ "0.white" ] - +{ + "frameGrid": { + "size": [13, 12], + "dimensions": [1, 9], + "names": [ + ["0"], + ["0.red"], + ["0.blue"], + ["0.green"], + ["0.yellow"], + ["0.orange"], + ["0.pink"], + ["0.black"], + ["0.white"] ] } } diff --git a/items/tools/sb_paintergunvariants.png b/items/tools/sb_paintergunvariants.png index 6eaddda8..ee068df1 100644 Binary files a/items/tools/sb_paintergunvariants.png and b/items/tools/sb_paintergunvariants.png differ diff --git a/items/tools/sb_painttool.painttool b/items/tools/sb_painttool.painttool index fddb06c9..690a855c 100644 --- a/items/tools/sb_painttool.painttool +++ b/items/tools/sb_painttool.painttool @@ -16,11 +16,8 @@ "category": "tool", "image": "/items/tools/sb_paintergunvariants.png:0", "endImages": ["/humanoid/any/ball.png", "/humanoid/any/tileglow.png", "/humanoid/any/4tileglow.png"], - "handPosition": [-4, 0], - "firePosition": [7, 2], - - // "handPosition" : [-2, 0], - // "firePosition" : [5, 0], + "handPosition": [-3, 0], + "firePosition": [6, 2], "segmentsPerUnit": 1, "nearControlPointElasticity": 0.1, "farControlPointElasticity": 0.9, diff --git a/items/tools/sb_stoneaxe.miningtool b/items/tools/sb_stoneaxe.miningtool index fbfe26b7..88257ae8 100644 --- a/items/tools/sb_stoneaxe.miningtool +++ b/items/tools/sb_stoneaxe.miningtool @@ -3,7 +3,7 @@ "inventoryIcon": "sb_stoneaxeicon.png", "maxStack": 1, "rarity": "common", - "price": 110, + "price": 30, "tooltipKind": "sb_object", "category": "tool", "description": "Chop chop! This axe will make getting wood easier.", diff --git a/items/tools/sb_stonehoe.activeitem b/items/tools/sb_stonehoe.activeitem index b600ea5f..e0406e8f 100644 --- a/items/tools/sb_stonehoe.activeitem +++ b/items/tools/sb_stonehoe.activeitem @@ -1,6 +1,6 @@ { "itemName": "sb_stonehoe", - "price": 110, + "price": 30, "maxStack": 1, "rarity": "common", "category": "tool", diff --git a/items/tools/sb_wiretool.wiretool b/items/tools/sb_wiretool.wiretool index e85b547c..dff75a4e 100644 --- a/items/tools/sb_wiretool.wiretool +++ b/items/tools/sb_wiretool.wiretool @@ -1,21 +1,21 @@ { "itemName": "sb_wiretool", - "inventoryIcon": "sb_wiringgun2icon.png", "maxStack": 1, "rarity": "Uncommon", "description": "Built to place optical wires between input points.", "shortdescription": "Wiring Tool", "tooltipKind": "sb_tool", - "image": "/items/tools/wiringgun2.png", - "handPosition": [-4, 0], + "inventoryIcon": "sb_wiringgun2icon.png", + "image": "/items/tools/wiringgun2.png?replace;edd664=e7c474;d7b719=c88b28;866410=8d581c;4e3e09=593812;8f8f8f=808080", + "largeImage": "/items/tools/sb_wiretoolbig.png?replace;eeda72=e7c474;d7b719=c88b28;a47913=8d581c;4e3e09=593812;8f8f8f=808080", + "handPosition": [-3, 0], "fireTime": 0.25, "twoHanded": true, "price": 1000, "category": "tool", "strikeSounds": ["/sfx/tools/wiretool.ogg"], - "largeImage": "/items/tools/sb_wiretoolbig.png", "endImages": ["/humanoid/any/ball2.png", "/humanoid/any/tileglow.png", "/humanoid/any/4tileglow.png", "/humanoid/any/ball2.png"], - "firePosition": [5, 0], + "firePosition": [5, 2], "segmentsPerUnit": 1, "nearControlPointElasticity": 0.1, "farControlPointElasticity": 0.9, diff --git a/items/tools/sb_wiretoolbig.png b/items/tools/sb_wiretoolbig.png index 283640fd..f8eccf18 100644 Binary files a/items/tools/sb_wiretoolbig.png and b/items/tools/sb_wiretoolbig.png differ diff --git a/items/tools/sb_wiringgun2icon.png b/items/tools/sb_wiringgun2icon.png index a1bfb24b..2736878f 100644 Binary files a/items/tools/sb_wiringgun2icon.png and b/items/tools/sb_wiringgun2icon.png differ diff --git a/items/tools/wiretool.wiretool.patch b/items/tools/wiretool.wiretool.patch new file mode 100644 index 00000000..c687e680 --- /dev/null +++ b/items/tools/wiretool.wiretool.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/description","value":"Built to place optical wires between input points. ^green;Quick select with [T] key."},{"op":"replace","path":"/description","value":"Built to place optical wires between input points."}], + +[{"op":"test","path":"/description","value":"Built to place optical wires between input points. ^green;Quick select with [T] key.^reset;"},{"op":"replace","path":"/description","value":"Built to place optical wires between input points."}] //patch project +] \ No newline at end of file diff --git a/monsters/boss/guardianboss/sb_guardian.lua b/monsters/boss/guardianboss/sb_guardian.lua index 512c28d4..8a6fd48a 100644 --- a/monsters/boss/guardianboss/sb_guardian.lua +++ b/monsters/boss/guardianboss/sb_guardian.lua @@ -1,6 +1,6 @@ -local ini = init or function() end - -function init() ini() +local originalInit = init or function() end +--This is specifically because they should be invulnerable when they have a ton of defense, and our changes to defense scaling undoes that +function init() originalInit() self.damageTaken = damageListener("damageTaken", function(notifications) for _,notification in pairs(notifications) do if notification.healthLost == 5 then diff --git a/monsters/boss/sb_jellyboss/jellyboss.frames b/monsters/boss/sb_jellyboss/jellyboss.frames index d139b90f..0eb66ab3 100644 --- a/monsters/boss/sb_jellyboss/jellyboss.frames +++ b/monsters/boss/sb_jellyboss/jellyboss.frames @@ -1,11 +1,10 @@ { - "frameGrid" : { - "size" : [152, 148], - "dimensions" : [9, 2], + "frameGrid": { + "size": [152, 148], + "dimensions": [8, 1], - "names" : [ - [ null, "idle.1", "idle.2", "idle.3", "idle.4", "idle.5", "idle.6", "idle.7", "idle.8" ], - [ null, null, null, null, null, null, null, null, "rotation" ] + "names": [ + ["idle.1", "idle.2", "idle.3", "idle.4", "idle.5", "idle.6", "idle.7", "idle.8"] ] } } diff --git a/monsters/boss/sb_jellyboss/jellyboss.monstertype b/monsters/boss/sb_jellyboss/jellyboss.monstertype index db5c843c..616e85ad 100644 --- a/monsters/boss/sb_jellyboss/jellyboss.monstertype +++ b/monsters/boss/sb_jellyboss/jellyboss.monstertype @@ -103,6 +103,7 @@ "winddownTime": 0.5 } }, { + //downwards splash "name": "action-fire", "cooldown": 8, "parameters": { @@ -113,11 +114,11 @@ "windupState": "teslawindup", "windupTime": 1.32, "projectileType": "sb_jellybossgoosplash", - "power": 2, + "power": 8, "fireOffset": [0, 1], "aimAtTarget": true, "projectileCount": 16, - "inaccuracy": 1.3, + "inaccuracy": 3.3, "projectileInterval": 0, "fireSound": "attack", "range": 8, diff --git a/monsters/boss/sb_jellyboss/jellyboss.png b/monsters/boss/sb_jellyboss/jellyboss.png index d0d0b139..ad276420 100644 Binary files a/monsters/boss/sb_jellyboss/jellyboss.png and b/monsters/boss/sb_jellyboss/jellyboss.png differ diff --git a/monsters/bugs/sb_moondancer/moondancer.animation b/monsters/bugs/sb_moondancer/moondancer.animation index bf143716..bc3b9828 100644 --- a/monsters/bugs/sb_moondancer/moondancer.animation +++ b/monsters/bugs/sb_moondancer/moondancer.animation @@ -1,50 +1,49 @@ { - "animatedParts" : { - "parts" : { - "body" : { - "zLevel" : 0, - "properties" : { - "rotationGroup" : "body", - "image" : "" + "animatedParts": { + "parts": { + "body": { + "zLevel": 0, + "properties": { + "rotationGroup": "body", + "image": "" } }, - "head" : { - "zLevel" : 1, - "properties" : { - "rotationGroup" : "body", - "image" : "", - "fullbright" : true + "head": { + "zLevel": 1, + "properties": { + "rotationGroup": "body", + "image": "", + "fullbright": true } } } }, - "rotationGroups" : { - "body" : { - "rotationCenter" : [0, 0], - "angularVelocity" : 5 + "rotationGroups": { + "body": { + "rotationCenter": [0, 0], + "angularVelocity": 5 } }, - "particleEmitters" : { - "trail" : { - "active" : true, - "emissionRate" : 10, - "particles" : [ - { - "particle" : { - "type" : "animated", - "animation" : "/animations/fizz2/fizz2.animation", - "size" : 0.5, - "angularVelocity" : 20, - "fade" : 1, - "destructionTime" : 0, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "timeToLive" : 4, - "layer" : "middle", - "variance" : { - "initialVelocity" : [1, 1] + "particleEmitters": { + "trail": { + "active": true, + "emissionRate": 10, + "particles": [{ + "particle": { + "type": "animated", + "animation": "/animations/fizz2/fizz2.animation", + "size": 0.5, + "angularVelocity": 20, + "fade": 1, + "destructionTime": 0, + "position": [0, 0], + "initialVelocity": [0, 0], + "timeToLive": 4, + "layer": "middle", + "variance": { + "initialVelocity": [1, 1] } } } @@ -52,16 +51,16 @@ } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0, - "directives" : "fade=ffffff;0.5" + "effects": { + "blink": { + "type": "flash", + "time": 0, + "directives": "fade=ffffff;0.5" } }, - "sounds" : { - "turnHostile" : [], - "deathPuff" : ["/sfx/npc/enemydeathpuff.ogg"] + "sounds": { + "turnHostile": [], + "deathPuff": ["/sfx/npc/enemydeathpuff.ogg"] } -} \ No newline at end of file +} diff --git a/monsters/dungeon/giftmonster/sb_behavior.lua b/monsters/dungeon/giftmonster/sb_behavior.lua index 356d863e..fa8152dd 100644 --- a/monsters/dungeon/giftmonster/sb_behavior.lua +++ b/monsters/dungeon/giftmonster/sb_behavior.lua @@ -1,4 +1,4 @@ -local unini = uninit or function() end +local originalUninit = uninit or function() end function uninit() if status.isResource("health") and status.resource("health") <= 0 then @@ -11,6 +11,5 @@ function uninit() end end end - - unini() + originalUninit() end \ No newline at end of file diff --git a/monsters/dungeon/sb_repairbot/repairbot.animation b/monsters/dungeon/sb_repairbot/repairbot.animation index 8cc41680..571de60a 100644 --- a/monsters/dungeon/sb_repairbot/repairbot.animation +++ b/monsters/dungeon/sb_repairbot/repairbot.animation @@ -1,140 +1,140 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", - "states" : { - "idle" : { - "frames" : 7, - "cycle" : 0.25, - "mode" : "loop" + "states": { + "idle": { + "frames": 7, + "cycle": 0.25, + "mode": "loop" }, - "move" : { - "frames" : 4, - "cycle" : 0.25, - "mode" : "loop" + "move": { + "frames": 4, + "cycle": 0.25, + "mode": "loop" }, - "repairStart" : { - "frames" : 5, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "repair" + "repairStart": { + "frames": 5, + "cycle": 0.25, + "mode": "transition", + "transition": "repair" }, - "repair" : { - "frames" : 13, - "cycle" : 0.25, - "mode" : "loop", - "properties" : { - "persistentSound" : "/sfx/interface/crafting_furnacetech.ogg" + "repair": { + "frames": 13, + "cycle": 0.25, + "mode": "loop", + "properties": { + "persistentSound": "/sfx/interface/crafting_furnacetech.ogg" } }, - "repairEnd" : { - "frames" : 5, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "move" + "repairEnd": { + "frames": 5, + "cycle": 0.25, + "mode": "transition", + "transition": "move" }, - "attackStart" : { - "frames" : 3, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "attack" + "attackStart": { + "frames": 3, + "cycle": 0.25, + "mode": "transition", + "transition": "attack" }, - "attack" : { - "frames" : 2, - "cycle" : 0.25, - "mode" : "loop" + "attack": { + "frames": 2, + "cycle": 0.25, + "mode": "loop" }, - "attackEnd" : { - "frames" : 2, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "idle" + "attackEnd": { + "frames": 2, + "cycle": 0.25, + "mode": "transition", + "transition": "idle" } } }, - "damage" : { - "priority" : 3, - "default" : "none", - "states" : { - "none" : { - "frames" : 1 + "damage": { + "priority": 3, + "default": "none", + "states": { + "none": { + "frames": 1 }, - "stunned" : { - "frames" : 1 + "stunned": { + "frames": 1 } } }, - "releaseParticles" : { - "default" : "off", - "states" : { - "off" : { - "frames" : 1, - "properties" : { - "particleEmittersOff" : [ "releaseParticles" ] + "releaseParticles": { + "default": "off", + "states": { + "off": { + "frames": 1, + "properties": { + "particleEmittersOff": ["releaseParticles"] } }, - "on" : { - "frames" : 1, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : [ "releaseParticles" ] + "on": { + "frames": 1, + "cycle": 0.1, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["releaseParticles"] } } } } }, - "parts" : { - "body" : { - "properties" : { - "offset" : [0, 0.5], - "transformationGroups" : ["facing", "body"] + "parts": { + "body": { + "properties": { + "offset": [0, 0.5], + "transformationGroups": ["facing", "body"] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle." + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle." } }, - "move" : { - "properties" : { - "image" : ":move." + "move": { + "properties": { + "image": ":move." } }, - "repairStart" : { - "properties" : { - "image" : ":repairStart." + "repairStart": { + "properties": { + "image": ":repairStart." } }, - "repair" : { - "properties" : { - "image" : ":repair." + "repair": { + "properties": { + "image": ":repair." } }, - "repairEnd" : { - "properties" : { - "image" : ":repairEnd." + "repairEnd": { + "properties": { + "image": ":repairEnd." } }, - "attackStart" : { - "properties" : { - "image" : ":attackStart." + "attackStart": { + "properties": { + "image": ":attackStart." } }, - "attack" : { - "properties" : { - "image" : ":attack." + "attack": { + "properties": { + "image": ":attack." } }, - "attackEnd" : { - "properties" : { - "image" : ":attackEnd." + "attackEnd": { + "properties": { + "image": ":attackEnd." } } } @@ -143,65 +143,72 @@ } }, - "transformationGroups" : { - "body" : { "interpolated" : true }, - "facing" : { "interpolated" : false } + "transformationGroups": { + "body": { + "interpolated": true + }, + "facing": { + "interpolated": false + } }, - "particleEmitters" : { - "captureParticles" : { - "particles" : [ - { "particle" : "monstercapture" } + "particleEmitters": { + "captureParticles": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "releaseParticles" : { - "particles" : [ - { "particle" : "monsterrelease" } + "releaseParticles": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "teleportOut" : { - "particles" : [ - { "particle" : "monstercapture" } + "teleportOut": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "teleportIn" : { - "particles" : [ - { "particle" : "monsterrelease" } + "teleportIn": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "deathPoof" : { - "particles" : [ - { - "particle" : { - "type" : "animated", - "animation" : "/animations/puff2c/puff2c.animation", - "size" : 1, - "angularVelocity" : 35, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 1], - "timeToLive" : 0.4, - "layer" : "middle" + "deathPoof": { + "particles": [{ + "particle": { + "type": "animated", + "animation": "/animations/puff2c/puff2c.animation", + "size": 1, + "angularVelocity": 35, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 1], + "timeToLive": 0.4, + "layer": "middle" } } ] } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0.25, - "directives" : "fade=fff;0.5" + "effects": { + "blink": { + "type": "flash", + "time": 0.25, + "directives": "fade=fff;0.5" } }, - "sounds" : { - "fire" : ["/sfx/gun/elemental_lance.ogg"], - "aggroHop" : [], - "deathPuff" : ["/sfx/npc/enemydeathpuff.ogg"] + "sounds": { + "fire": ["/sfx/gun/elemental_lance.ogg"], + "aggroHop": [], + "deathPuff": ["/sfx/npc/enemydeathpuff.ogg"] } -} \ No newline at end of file +} diff --git a/monsters/dungeon/sb_serpentdroid/serpentdroid.animation b/monsters/dungeon/sb_serpentdroid/serpentdroid.animation index 0f048d80..db678a28 100644 --- a/monsters/dungeon/sb_serpentdroid/serpentdroid.animation +++ b/monsters/dungeon/sb_serpentdroid/serpentdroid.animation @@ -1,200 +1,207 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", - "states" : { - "idle" : { - "frames" : 12, - "mode" : "loop", - "cycle" : 1.2 + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", + "states": { + "idle": { + "frames": 12, + "mode": "loop", + "cycle": 1.2 }, - "walk" : { - "frames" : 4, - "mode" : "loop", - "cycle" : 0.4 + "walk": { + "frames": 4, + "mode": "loop", + "cycle": 0.4 }, - "windup" : {//shield - "frames" : 9, - "cycle" : 0.9, + "windup": { //shield + "frames": 9, + "cycle": 0.9, "properties": { "immediateSound": "/sfx/npc/boss/ufo_teleport_appear.ogg", "immediateSoundRangeMultiplier": 0.5 } }, - "invulnerable" : { - "frames" : 14, - "cycle" : 1.4 + "invulnerable": { + "frames": 14, + "cycle": 1.4 //,"properties": {"immediateSound": "sfx/gun/magnorbs_shield_loop1.ogg","immediateSoundRangeMultiplier": 0.5} }, - "winddown" : { - "frames" : 5, - "cycle" : 0.5, + "winddown": { + "frames": 5, + "cycle": 0.5, "properties": { "immediateSound": "/sfx/npc/boss/ufo_teleport_disappear.ogg", "immediateSoundRangeMultiplier": 0.5 } }, - "fire" : { - "frames" : 3, - "cycle" : 0.3, - "mode" : "loop" + "fire": { + "frames": 3, + "cycle": 0.3, + "mode": "loop" } } }, - "damage" : { - "priority" : 3, - "default" : "none", - "states" : { - "none" : { - "frames" : 1 + "damage": { + "priority": 3, + "default": "none", + "states": { + "none": { + "frames": 1 }, - "stunned" : { - "frames" : 1 + "stunned": { + "frames": 1 } } }, - "releaseParticles" : { - "default" : "off", - "states" : { - "off" : { - "frames" : 1, - "properties" : { - "particleEmittersOff" : ["releaseParticles"] + "releaseParticles": { + "default": "off", + "states": { + "off": { + "frames": 1, + "properties": { + "particleEmittersOff": ["releaseParticles"] } }, - "on" : { - "frames" : 1, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : ["releaseParticles"] + "on": { + "frames": 1, + "cycle": 0.1, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["releaseParticles"] } } } } }, - "parts" : { - "body" : { - "properties" : { - "zLevel" : 1, - "transformationGroups" : ["body"] + "parts": { + "body": { + "properties": { + "zLevel": 1, + "transformationGroups": ["body"] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle.?flipx" + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle.?flipx" } }, - "walk" : { - "properties" : { - "image" : ":walk.?flipx" + "walk": { + "properties": { + "image": ":walk.?flipx" } }, - "windup" : { - "properties" : { - "image" : ":windup.?flipx" + "windup": { + "properties": { + "image": ":windup.?flipx" } }, - "invulnerable" : { - "properties" : { - "image" : ":invulnerable.?flipx" + "invulnerable": { + "properties": { + "image": ":invulnerable.?flipx" } }, - "winddown" : { - "properties" : { - "image" : ":winddown.?flipx" + "winddown": { + "properties": { + "image": ":winddown.?flipx" } }, - "fire" : { - "properties" : { - "image" : ":fire.?flipx" + "fire": { + "properties": { + "image": ":fire.?flipx" } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : ":hurt.?flipx" + "damage": { + "stunned": { + "properties": { + "image": ":hurt.?flipx" } } } } }, - "arm" : { - "properties" : { - "image" : ":arm?flipx", - "transformationGroups" : ["aim"], - "zLevel" : 2 + "arm": { + "properties": { + "image": ":arm?flipx", + "transformationGroups": ["aim"], + "zLevel": 2 } } } }, - "transformationGroups" : { - "body" : {"interpolated" : true}, - "aim" : {"interpolated" : true} + "transformationGroups": { + "body": { + "interpolated": true + }, + "aim": { + "interpolated": true + } }, - "particleEmitters" : { - "captureParticles" : { - "particles" : [ - {"particle" : "monstercapture"} + "particleEmitters": { + "captureParticles": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "releaseParticles" : { - "particles" : [ - {"particle" : "monsterrelease"} + "releaseParticles": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "teleportOut" : { - "particles" : [ - {"particle" : "monstercapture"} + "teleportOut": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "teleportIn" : { - "particles" : [ - {"particle" : "monsterrelease"} + "teleportIn": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "deathPoof" : { - "particles" : [ - { - "particle" : { - "type" : "animated", - "animation" : "/animations/puff2c/puff2c.animation", - "size" : 1, - "angularVelocity" : 35, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 1], - "timeToLive" : 0.4, - "layer" : "middle" + "deathPoof": { + "particles": [{ + "particle": { + "type": "animated", + "animation": "/animations/puff2c/puff2c.animation", + "size": 1, + "angularVelocity": 35, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 1], + "timeToLive": 0.4, + "layer": "middle" } } ] } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0.25, - "directives" : "fade=ffffff;0.5" + "effects": { + "blink": { + "type": "flash", + "time": 0.25, + "directives": "fade=ffffff;0.5" } }, - "sounds" : { - "aggroHop" : ["/sfx/npc/monsters/monster_surprise.ogg"], - "deathPuff" : ["/sfx/npc/enemydeathpuff.ogg"], - "fire" : ["/sfx/sb/gun/mp4.ogg","/sfx/sb/gun/plasma_pistol1.ogg","/sfx/sb/gun/plasma_pistol3.ogg"] + "sounds": { + "aggroHop": ["/sfx/npc/monsters/monster_surprise.ogg"], + "deathPuff": ["/sfx/npc/enemydeathpuff.ogg"], + "fire": ["/sfx/sb/gun/mp4.ogg", "/sfx/sb/gun/plasma_pistol1.ogg", "/sfx/sb/gun/plasma_pistol3.ogg"] } -} \ No newline at end of file +} diff --git a/monsters/dungeon/swarpion/swarpion.monstertype.patch b/monsters/dungeon/swarpion/swarpion.monstertype.patch index 91c926ff..50023326 100644 --- a/monsters/dungeon/swarpion/swarpion.monstertype.patch +++ b/monsters/dungeon/swarpion/swarpion.monstertype.patch @@ -2,5 +2,7 @@ [{"op":"test","path":"/baseParameters/captureCollectables","inverse":true},{"op":"add","path":"/baseParameters/captureCollectables","value":{"monsters":"swarpion"}}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-1.625,-1.25],[1.0,-1.25],[1.0,0.5],[-1.625,0.5]]}, -{"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[-1.625,0.5],[-0.312,-1.25],[1,0.5],[1,0.5],[-1.625,0.5]]}] +{"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[-1.625,0.5],[-0.312,-1.25],[1,0.5],[1,0.5],[-1.625,0.5]]}], + +[{"op":"test","path":"/dropPools"},{"op":"add","path":"/dropPools/-","value":"sb_weaklingVenomSample"}] ] \ No newline at end of file diff --git a/monsters/events/sb_envprobe/envprobe.animation b/monsters/events/sb_envprobe/envprobe.animation index ae95ff90..4a6aad6c 100644 --- a/monsters/events/sb_envprobe/envprobe.animation +++ b/monsters/events/sb_envprobe/envprobe.animation @@ -1,99 +1,111 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", - "states" : { - "idle" : {"frames":6,"mode" : "loop"}, - "aggro" : {"frames":6,"mode" : "loop"} + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", + "states": { + "idle": { + "frames": 6, + "mode": "loop" + }, + "aggro": { + "frames": 6, + "mode": "loop" + } } }, - "damage" : { - "priority" : 3, - "default" : "none", - "states" : { - "none" : {"frames":6,"mode" : "loop"}, - "stunned" : {"frames":6,"mode" : "loop"} + "damage": { + "priority": 3, + "default": "none", + "states": { + "none": { + "frames": 6, + "mode": "loop" + }, + "stunned": { + "frames": 6, + "mode": "loop" + } } }, - "releaseParticles" : { - "default" : "off", - "states" : { - "off" : { - "frames" : 1, - "properties" : { - "particleEmittersOff" : [ "releaseParticles" ] + "releaseParticles": { + "default": "off", + "states": { + "off": { + "frames": 1, + "properties": { + "particleEmittersOff": ["releaseParticles"] } }, - "on" : { - "frames" : 1, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : [ "releaseParticles" ] + "on": { + "frames": 1, + "cycle": 0.1, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["releaseParticles"] } } } } }, - "parts" : { - "body" : { - "properties" : { - "zLevel" : 1, - "transformationGroups" : [ "body" ], - "centered" : true, - "offset" : [0.0, 0.0], - "electrics" : [1.0, 0.0] + "parts": { + "body": { + "properties": { + "zLevel": 1, + "transformationGroups": ["body"], + "centered": true, + "offset": [0.0, 0.0], + "electrics": [1.0, 0.0] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle." + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle." } }, - "aggro" : { - "properties" : { - "image" : ":aggro." + "aggro": { + "properties": { + "image": ":aggro." } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : ":stunned." + "damage": { + "stunned": { + "properties": { + "image": ":stunned." } } } } }, - "bodyfullbright" : { - "properties" : { - "zLevel" : 2, - "centered" : true, - "anchorPart" : "body", - "fullbright" : true + "bodyfullbright": { + "properties": { + "zLevel": 2, + "centered": true, + "anchorPart": "body", + "fullbright": true }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle." + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle." } }, - "aggro" : { - "properties" : { - "image" : ":aggro." + "aggro": { + "properties": { + "image": ":aggro." } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : ":stunned." + "damage": { + "stunned": { + "properties": { + "image": ":stunned." } } } @@ -102,74 +114,84 @@ } }, - "transformationGroups" : { - "body" : { "interpolated" : true } + "transformationGroups": { + "body": { + "interpolated": true + } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0, - "directives" : "fade=ffffff;0.5" + "effects": { + "blink": { + "type": "flash", + "time": 0, + "directives": "fade=ffffff;0.5" } }, - "particleEmitters" : { - "deathPoof" : { - "offsetRegion" : [-0.75, -0.75, 0.75, 0.75], - "burstCount" : 5, - "particles" : [ - { "particle" : "dust2" }, - { "particle" : "metalshard", "count" : 3 } + "particleEmitters": { + "deathPoof": { + "offsetRegion": [-0.75, -0.75, 0.75, 0.75], + "burstCount": 5, + "particles": [{ + "particle": "dust2" + }, { + "particle": "metalshard", + "count": 3 + } ] }, - "captureParticles" : { - "particles" : [ - { "particle" : "monstercapture" } + "captureParticles": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "releaseParticles" : { - "particles" : [ - { "particle" : "monsterrelease" } + "releaseParticles": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "teleportOut" : { - "particles" : [ - { "particle" : "monstercapture" } + "teleportOut": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "teleportIn" : { - "particles" : [ - { "particle" : "monsterrelease" } + "teleportIn": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "levelUp" : { - "particles" : [ - { "particle" : "monsterlevelup" } + "levelUp": { + "particles": [{ + "particle": "monsterlevelup" + } ] } }, - - "lights" : { - "glow" : { - "active" : true, - "transformationGroups" : [], - "position" : [0.0, 0.0], - "color" : [40, 90, 30] + + "lights": { + "glow": { + "active": true, + "transformationGroups": [], + "position": [0.0, 0.0], + "color": [40, 90, 30] }, - "scan" : { - "active" : false, - "transformationGroups" : [ "body" ], - "position" : [0.0, 0.0], - "color" : [81, 189, 59], - "pointLight" : true, - "pointAngle" : 0, - "pointBeam" : 3 + "scan": { + "active": false, + "transformationGroups": ["body"], + "position": [0.0, 0.0], + "color": [81, 189, 59], + "pointLight": true, + "pointAngle": 0, + "pointBeam": 3 } }, - "sounds" : { - "deathPuff" : [ + "sounds": { + "deathPuff": [ "/sfx/gun/grenadeblast_small_fire1.ogg", "/sfx/gun/grenadeblast_small_fire2.ogg", "/sfx/gun/grenadeblast_small_fire3.ogg" diff --git a/monsters/events/sb_envprobe/envprobe.lua b/monsters/events/sb_envprobe/envprobe.lua index 95702095..17efdd3a 100644 --- a/monsters/events/sb_envprobe/envprobe.lua +++ b/monsters/events/sb_envprobe/envprobe.lua @@ -46,6 +46,7 @@ end function update(dt) capturable.update(dt) mcontroller.controlFace(1) + mcontroller.controlDown() if status.resourcePositive("stunned") then animator.setAnimationState("damage", "stunned") diff --git a/monsters/events/sb_envprobe/envprobe2.lua b/monsters/events/sb_envprobe/envprobe2.lua index f97c478d..22d84560 100644 --- a/monsters/events/sb_envprobe/envprobe2.lua +++ b/monsters/events/sb_envprobe/envprobe2.lua @@ -2,7 +2,10 @@ require "/scripts/util.lua" require "/scripts/vec2.lua" require "/scripts/companions/capturable.lua" +--TODO: Not prefixing the probe functions seems fine for now but it'll probably cause problems later. See you in 2034 +local originalInit = init or function() end function init() + originalInit() self.dialog = config.getParameter("dialog") mcontroller.controlFace(1) @@ -15,12 +18,14 @@ function init() self.attack = FSM:new() self.lightning = config.getParameter("lightning") - capturable.init() end +local sb_update = update or function() end function update(dt) + sb_update(dt) capturable.update(dt) mcontroller.controlFace(1) + mcontroller.controlDown() if status.resourcePositive("stunned") then animator.setAnimationState("damage", "stunned") diff --git a/monsters/events/sb_envprobe/envprobe2.monstertype b/monsters/events/sb_envprobe/envprobe2.monstertype index cb0398db..22bd6cfc 100644 --- a/monsters/events/sb_envprobe/envprobe2.monstertype +++ b/monsters/events/sb_envprobe/envprobe2.monstertype @@ -12,6 +12,7 @@ "baseParameters": { "scripts": [ + "/monsters/monster.lua", "/monsters/events/sb_envprobe/envprobe2.lua" ], @@ -21,6 +22,7 @@ ] }, + "behavior": "monster", "animationScripts": ["/items/active/effects/lightning.lua"], "lightning": [{ "partStartPosition": ["body", "electrics"], diff --git a/monsters/events/sb_ruinportal/ruinportal.animation b/monsters/events/sb_ruinportal/ruinportal.animation index 554a8752..3de52477 100644 --- a/monsters/events/sb_ruinportal/ruinportal.animation +++ b/monsters/events/sb_ruinportal/ruinportal.animation @@ -1,95 +1,95 @@ { - "animatedParts" : { - "stateTypes" : { - "music" : { - "default" : "on", - "states" : { - "off" : {}, - "on" : { - "mode" : "loop", - "properties" : { - "persistentSound": "", - "persistentSoundStopTime" : 6, - "persistentSoundRangeMultiplier" : 7 + "animatedParts": { + "stateTypes": { + "music": { + "default": "on", + "states": { + "off": {}, + "on": { + "mode": "loop", + "properties": { + "persistentSound": "", + "persistentSoundStopTime": 6, + "persistentSoundRangeMultiplier": 7 } } } }, - "portal" : { - "default" : "open", - "states" : { - "closed" : {}, - "open" : { - "frames" : 9, - "cycle" : 0.3, - "mode" : "transition", - "transition" : "openloop" + "portal": { + "default": "open", + "states": { + "closed": {}, + "open": { + "frames": 9, + "cycle": 0.3, + "mode": "transition", + "transition": "openloop" }, - "openloop" : { - "frames" : 2, - "cycle" : 0.1, - "mode" : "loop" + "openloop": { + "frames": 2, + "cycle": 0.1, + "mode": "loop" }, - "close" : { - "frames" : 9, - "cycle" : 0.3, - "mode" : "transition", - "transition" : "closed" + "close": { + "frames": 9, + "cycle": 0.3, + "mode": "transition", + "transition": "closed" } } } }, - "parts" : { - "portalbg" : { - "properties" : { - "centered" : true, - "zLevel" : 3, - "fullbright" : true + "parts": { + "portalbg": { + "properties": { + "centered": true, + "zLevel": 3, + "fullbright": true }, - "partStates" : { - "portal" : { - "open" : { - "properties" : { - "image" : ":open." + "partStates": { + "portal": { + "open": { + "properties": { + "image": ":open." } }, - "openloop" : { - "properties" : { - "image" : ":openloop." + "openloop": { + "properties": { + "image": ":openloop." } }, - "close" : { - "properties" : { - "image" : ":close." + "close": { + "properties": { + "image": ":close." } } } } }, - "portal" : { - "properties" : { - "centered" : true, - "zLevel" : 4, - "fullbright" : true + "portal": { + "properties": { + "centered": true, + "zLevel": 4, + "fullbright": true }, - "partStates" : { - "portal" : { - "open" : { - "properties" : { - "image" : ":open." + "partStates": { + "portal": { + "open": { + "properties": { + "image": ":open." } }, - "openloop" : { - "properties" : { - "image" : ":openloop." + "openloop": { + "properties": { + "image": ":openloop." } }, - "close" : { - "properties" : { - "image" : ":close." + "close": { + "properties": { + "image": ":close." } } } @@ -98,15 +98,15 @@ } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0, - "directives" : "" + "effects": { + "blink": { + "type": "flash", + "time": 0, + "directives": "" } }, - "particleEmitters" : {}, + "particleEmitters": {}, - "sounds" : {} -} \ No newline at end of file + "sounds": {} +} diff --git a/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype b/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype index 8115699a..e4abff97 100644 --- a/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype +++ b/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype @@ -152,8 +152,8 @@ "resources": { "stunned": { - "deltaValue": -1.0, - "initialValue": 0.0 + "deltaValue": -1, + "initialValue": 0 }, "health": { "maxStat": "maxHealth", diff --git a/monsters/sb_bossmonster.lua b/monsters/sb_bossmonster.lua index bee27e9b..eb334f10 100644 --- a/monsters/sb_bossmonster.lua +++ b/monsters/sb_bossmonster.lua @@ -1,7 +1,8 @@ -local ini = init or function() end -local updat = update or function() end -local di = die or function() end -function init() ini() monster.setAggressive(true) +local originalInit = init or function() end +local originalUpdate = update or function() end +local originalDie = die or function() end + +function init() originalInit() monster.setAggressive(true) sb_music = status.statusProperty("bossMusic","") self.players = {} --??? sb_noMusic = config.getParameter("podUuid") @@ -9,7 +10,7 @@ function init() ini() monster.setAggressive(true) animator.setAnimationState("music","off") end -function update(dt) updat(dt) +function update(dt) originalUpdate(dt) --local nearPlayers = world.playerQuery(entity.position(),80) if not sb_noMusic then local players = world.players() @@ -24,7 +25,7 @@ function update(dt) updat(dt) end end -function die() di() +function die() originalDie() local players = world.players() if not sb_noMusic then for _,i in pairs(players) do world.sendEntityMessage(i,"stopAltMusic",1) end diff --git a/monsters/sb_miniboss.lua b/monsters/sb_miniboss.lua index 221138c0..48a87e62 100644 --- a/monsters/sb_miniboss.lua +++ b/monsters/sb_miniboss.lua @@ -1,13 +1,13 @@ -local ini = init or function() end -local updat = update or function(...) end -function init() ini() +local originalInit = init or function() end +local originalUpdate = update or function(...) end +function init() originalInit() if not status.statusProperty("sb_minibossSpawned") then status.addEphemeralEffect("sb_minibossspawn") status.setStatusProperty("sb_minibossSpawned", true) end end -function update(...) updat(...) +function update(...) originalUpdate(...) if mcontroller.running() and mcontroller.onGround() and mcontroller.canJump() and (mcontroller.xVelocity() == 0) then mcontroller.controlJump() end diff --git a/monsters/space/rustick/sb_behavior.lua b/monsters/space/rustick/sb_behavior.lua index 77ac3b99..8b1addb7 100644 --- a/monsters/space/rustick/sb_behavior.lua +++ b/monsters/space/rustick/sb_behavior.lua @@ -1,4 +1,4 @@ -local ini = init or function() end +local originalInit = init or function() end function init() if world.type() == "cultistmission1" then @@ -9,5 +9,5 @@ function init() mcontroller.setPosition({pos[1]-1,pos[2]-1}) end end - ini() + originalInit() end \ No newline at end of file diff --git a/monsters/walkers/sb_poptop/poptop.animation b/monsters/walkers/sb_poptop/poptop.animation index 3e0f9851..2b5c35ad 100644 --- a/monsters/walkers/sb_poptop/poptop.animation +++ b/monsters/walkers/sb_poptop/poptop.animation @@ -1,176 +1,176 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", - "states" : { - "idle" : { - "frames" : 1, - "cycle" : 1, - "properties" : { - "particleEmittersOff" : [ "music" ] + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", + "states": { + "idle": { + "frames": 1, + "cycle": 1, + "properties": { + "particleEmittersOff": ["music"] } }, - "walk" : { - "frames" : 8, - "cycle" : 0.6, - "mode" : "loop", - "properties" : { - "particleEmittersOff" : [ "music" ] + "walk": { + "frames": 8, + "cycle": 0.6, + "mode": "loop", + "properties": { + "particleEmittersOff": ["music"] } }, - "run" : { - "frames" : 8, - "cycle" : 0.6, - "mode" : "loop", - "properties" : { - "particleEmittersOff" : [ "music" ] + "run": { + "frames": 8, + "cycle": 0.6, + "mode": "loop", + "properties": { + "particleEmittersOff": ["music"] } }, - "stroll" : { - "frames" : 8, - "cycle" : 0.8, - "mode" : "loop", - "properties" : { - "particleEmittersOn" : [ "music" ], - "persistentSound" : "/sfx/npc/monsters/poptop_sing_loop.ogg", - "persistentSoundStopTime" : 0.5 + "stroll": { + "frames": 8, + "cycle": 0.8, + "mode": "loop", + "properties": { + "particleEmittersOn": ["music"], + "persistentSound": "/sfx/npc/monsters/poptop_sing_loop.ogg", + "persistentSoundStopTime": 0.5 } }, - "jump" : { - "frames" : 4, - "cycle" : 0.5, - "properties" : { - "particleEmittersOff" : [ "music" ], - "immediateSound" : "/sfx/npc/monsters/monster_hop.ogg", - "immediateSoundRangeMultiplier" : 0.5 + "jump": { + "frames": 4, + "cycle": 0.5, + "properties": { + "particleEmittersOff": ["music"], + "immediateSound": "/sfx/npc/monsters/monster_hop.ogg", + "immediateSoundRangeMultiplier": 0.5 } }, - "fall" : { - "frames" : 4, - "cycle" : 0.5, - "properties" : { - "particleEmittersOff" : [ "music" ] + "fall": { + "frames": 4, + "cycle": 0.5, + "properties": { + "particleEmittersOff": ["music"] } }, - "chargewindup" : { - "frames" : 4, - "cycle" : 0.4, - "mode" : "loop", - "properties" : { - "particleEmittersOff" : [ "music" ] + "chargewindup": { + "frames": 4, + "cycle": 0.4, + "mode": "loop", + "properties": { + "particleEmittersOff": ["music"] } }, - "chargewinddown" : { - "frames" : 4, - "cycle" : 0.1, - "properties" : { - "particleEmittersOff" : [ "music" ] + "chargewinddown": { + "frames": 4, + "cycle": 0.1, + "properties": { + "particleEmittersOff": ["music"] } }, - "charge" : { - "frames" : 4, - "cycle" : 0.3, - "properties" : { - "particleEmittersOff" : [ "music" ], - "immediateSound" : "/sfx/npc/monsters/monster_bite2.ogg" + "charge": { + "frames": 4, + "cycle": 0.3, + "properties": { + "particleEmittersOff": ["music"], + "immediateSound": "/sfx/npc/monsters/monster_bite2.ogg" } } } }, - "damage" : { - "priority" : 3, - "default" : "none", - "states" : { - "none" : { - "frames" : 1 + "damage": { + "priority": 3, + "default": "none", + "states": { + "none": { + "frames": 1 }, - "stunned" : { - "frames" : 1 + "stunned": { + "frames": 1 } } }, - "releaseParticles" : { - "default" : "off", - "states" : { - "off" : { - "frames" : 1, - "properties" : { - "particleEmittersOff" : [ "releaseParticles" ] + "releaseParticles": { + "default": "off", + "states": { + "off": { + "frames": 1, + "properties": { + "particleEmittersOff": ["releaseParticles"] } }, - "on" : { - "frames" : 1, - "cycle" : 0.1, - "mode" : "transition", - "transition" : "off", - "properties" : { - "particleEmittersOn" : [ "releaseParticles" ] + "on": { + "frames": 1, + "cycle": 0.1, + "mode": "transition", + "transition": "off", + "properties": { + "particleEmittersOn": ["releaseParticles"] } } } } }, - "parts" : { - "body" : { - "properties" : { - "transformationGroups" : [ "body" ], - "offset" : [-0.0625, 0.6875] + "parts": { + "body": { + "properties": { + "transformationGroups": ["body"], + "offset": [-0.0625, 0.6875] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle." + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle." } }, - "walk" : { - "properties" : { - "image" : ":walk." + "walk": { + "properties": { + "image": ":walk." } }, - "run" : { - "properties" : { - "image" : ":run." + "run": { + "properties": { + "image": ":run." } }, - "stroll" : { - "properties" : { - "image" : ":stroll." + "stroll": { + "properties": { + "image": ":stroll." } }, - "jump" : { - "properties" : { - "image" : ":jump." + "jump": { + "properties": { + "image": ":jump." } }, - "fall" : { - "properties" : { - "image" : ":fall." + "fall": { + "properties": { + "image": ":fall." } }, - "chargewindup" : { - "properties" : { - "image" : ":jump." + "chargewindup": { + "properties": { + "image": ":jump." } }, - "chargewinddown" : { - "properties" : { - "image" : ":jump." + "chargewinddown": { + "properties": { + "image": ":jump." } }, - "charge" : { - "properties" : { - "image" : ":charge." + "charge": { + "properties": { + "image": ":charge." } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : ":idle." + "damage": { + "stunned": { + "properties": { + "image": ":idle." } } } @@ -179,76 +179,83 @@ } }, - "transformationGroups" : { - "body" : { "interpolated" : true } + "transformationGroups": { + "body": { + "interpolated": true + } }, - "effects" : { - "blink" : { - "type" : "flash", - "time" : 0, - "directives" : "fade=fff;0.5" + "effects": { + "blink": { + "type": "flash", + "time": 0, + "directives": "fade=fff;0.5" } }, - "particleEmitters" : { - "music" : { - "emissionRate" : 1, - "offsetRegion" : [ -0.0, 1.25, 0.0, 1.25 ], - "particles" : [ - { "particle" : "music" } + "particleEmitters": { + "music": { + "emissionRate": 1, + "offsetRegion": [-0.0, 1.25, 0.0, 1.25], + "particles": [{ + "particle": "music" + } ] }, - "deathPoof" : { - "particles" : [ - { - "particle" : { - "type" : "animated", - "animation" : "/animations/puff2c/puff2c.animation", - "size" : 1, - "angularVelocity" : 35, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 1], - "timeToLive" : 0.4, - "layer" : "middle" + "deathPoof": { + "particles": [{ + "particle": { + "type": "animated", + "animation": "/animations/puff2c/puff2c.animation", + "size": 1, + "angularVelocity": 35, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 1], + "timeToLive": 0.4, + "layer": "middle" } } ] }, - "captureParticles" : { - "particles" : [ - { "particle" : "monstercapture" } + "captureParticles": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "releaseParticles" : { - "particles" : [ - { "particle" : "monsterrelease" } + "releaseParticles": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "teleportOut" : { - "particles" : [ - { "particle" : "monstercapture" } + "teleportOut": { + "particles": [{ + "particle": "monstercapture" + } ] }, - "teleportIn" : { - "particles" : [ - { "particle" : "monsterrelease" } + "teleportIn": { + "particles": [{ + "particle": "monsterrelease" + } ] }, - "levelUp" : { - "particles" : [ - { "particle" : "monsterlevelup" } + "levelUp": { + "particles": [{ + "particle": "monsterlevelup" + } ] } }, - "sounds" : { - "aggroHop" : [ "/sfx/npc/monsters/monster_surprise.ogg" ], - "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ], - "fire" : [ "/sfx/projectiles/spit1.ogg", "/sfx/projectiles/spit2.ogg" ] + "sounds": { + "aggroHop": ["/sfx/npc/monsters/monster_surprise.ogg"], + "deathPuff": ["/sfx/npc/enemydeathpuff.ogg"], + "fire": ["/sfx/projectiles/spit1.ogg", "/sfx/projectiles/spit2.ogg"] } } diff --git a/npcs/crew/crewmemberchemistblue.npctype.patch b/npcs/crew/crewmemberchemistblue.npctype.patch new file mode 100644 index 00000000..bc7eeb13 --- /dev/null +++ b/npcs/crew/crewmemberchemistblue.npctype.patch @@ -0,0 +1,12 @@ +[ + [{ + "op": "test", + "path": "/scriptConfig/crew/role/name", + "inverse": true + }, + { + "op": "add", + "path": "/scriptConfig/crew/role/name", + "value": "Blue Chemist" + }] +] \ No newline at end of file diff --git a/npcs/crew/crewmemberchemistgreen.npctype.patch b/npcs/crew/crewmemberchemistgreen.npctype.patch new file mode 100644 index 00000000..77ba63c9 --- /dev/null +++ b/npcs/crew/crewmemberchemistgreen.npctype.patch @@ -0,0 +1,12 @@ +[ + [{ + "op": "test", + "path": "/scriptConfig/crew/role/name", + "inverse": true + }, + { + "op": "add", + "path": "/scriptConfig/crew/role/name", + "value": "Green Chemist" + }] +] \ No newline at end of file diff --git a/npcs/crew/crewmemberchemistorange.npctype.patch b/npcs/crew/crewmemberchemistorange.npctype.patch new file mode 100644 index 00000000..cc0e813d --- /dev/null +++ b/npcs/crew/crewmemberchemistorange.npctype.patch @@ -0,0 +1,12 @@ +[ + [{ + "op": "test", + "path": "/scriptConfig/crew/role/name", + "inverse": true + }, + { + "op": "add", + "path": "/scriptConfig/crew/role/name", + "value": "Orange Chemist" + }] +] \ No newline at end of file diff --git a/npcs/crew/crewmemberchemistyellow.npctype.patch b/npcs/crew/crewmemberchemistyellow.npctype.patch new file mode 100644 index 00000000..b5d47dc8 --- /dev/null +++ b/npcs/crew/crewmemberchemistyellow.npctype.patch @@ -0,0 +1,12 @@ +[ + [{ + "op": "test", + "path": "/scriptConfig/crew/role/name", + "inverse": true + }, + { + "op": "add", + "path": "/scriptConfig/crew/role/name", + "value": "Yellow Chemist" + }] +] \ No newline at end of file diff --git a/npcs/crew/sb_crewmemberchemistgrey.npctype b/npcs/crew/sb_crewmemberchemistgrey.npctype index 3f69f276..d9812d81 100644 --- a/npcs/crew/sb_crewmemberchemistgrey.npctype +++ b/npcs/crew/sb_crewmemberchemistgrey.npctype @@ -6,6 +6,7 @@ "scriptConfig": { "crew": { "role": { + "name": "Grey Chemist", "benefits": [{ "type": "EphemeralEffect", "effect": "sb_greystim", diff --git a/npcs/mission/florangladiator.npctype.patch b/npcs/mission/florangladiator.npctype.patch new file mode 100644 index 00000000..59848172 --- /dev/null +++ b/npcs/mission/florangladiator.npctype.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/items/override/0/1/0/primary/0","value":"npchammer"},{"op":"replace","path":"/items/override/0/1/0/primary/0","value":"sb_bonehammer"}] +] \ No newline at end of file diff --git a/npcs/outpost/outposthumanexcon.npctype.patch b/npcs/outpost/outposthumanexcon.npctype.patch index 2d374e10..6ebceb05 100644 --- a/npcs/outpost/outposthumanexcon.npctype.patch +++ b/npcs/outpost/outposthumanexcon.npctype.patch @@ -2,11 +2,11 @@ [{ "op": "add", "path": "/scriptConfig/sb_offeredQuests", - "value": ["sb_humanexcon2.gearup", "sb_humanexcon4.gearup"] + "value": ["sb_humanexcon2.gearup", "sb_humanexcon4.gearup", "sb_peanutbutter"] }, { "op": "add", "path": "/scriptConfig/sb_turnInQuests", - "value": ["sb_humanexcon2.gearup", "sb_humanexcon4.gearup"] + "value": ["sb_humanexcon2.gearup", "sb_humanexcon4.gearup", "sb_peanutbutter"] } ] ] diff --git a/npcs/outpost/outpostpenguinscientist.npctype.patch b/npcs/outpost/outpostpenguinscientist.npctype.patch index a7ff6f26..df24f9e9 100644 --- a/npcs/outpost/outpostpenguinscientist.npctype.patch +++ b/npcs/outpost/outpostpenguinscientist.npctype.patch @@ -1,12 +1,32 @@ [ + [{ + "op": "test", + "path": "/scriptConfig/offeredQuests", + "inverse": true + }, { + "op": "add", + "path": "/scriptConfig/offeredQuests", + "value": [] + } + ], + [{ + "op": "test", + "path": "/scriptConfig/turnInQuests", + "inverse": true + }, { + "op": "add", + "path": "/scriptConfig/turnInQuests", + "value": [] + } + ], [{ "op": "add", - "path": "/scriptConfig/sb_offeredQuests", - "value": ["sb_robot"] + "path": "/scriptConfig/offeredQuests/-", + "value": "sb_robot" }, { "op": "add", - "path": "/scriptConfig/sb_turnInQuests", - "value": ["sb_robot"] + "path": "/scriptConfig/turnInQuests/-", + "value": "sb_robot" } ] ] diff --git a/npcs/sb_bmain.lua b/npcs/sb_bmain.lua index 5c4c62e3..3a475532 100644 --- a/npcs/sb_bmain.lua +++ b/npcs/sb_bmain.lua @@ -1,7 +1,7 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end -function init() ini() +function init() originalInit() sb_npcType = npc.npcType() sb_crouching = config.getParameter("sb_crouching") @@ -57,7 +57,7 @@ function init() ini() end end -function update(dt) updat(dt) +function update(dt) originalUpdate(dt) --NPC type checks. We need them in update since the player can update quest/universe state while in the target world if sb_npcType == "outpostfloranfan" then if world.universeFlagSet("sb_floranfan1") then diff --git a/objects/actionfigure/sb_envprobe/envprobeAF.animation b/objects/actionfigure/sb_envprobe/envprobeAF.animation index 1d8e53d1..64e90703 100644 --- a/objects/actionfigure/sb_envprobe/envprobeAF.animation +++ b/objects/actionfigure/sb_envprobe/envprobeAF.animation @@ -56,5 +56,5 @@ } }, - "sounds" : {"interact":["/sfx/tools/flashlight_toggle.ogg"]} + "sounds": {"interact":["/sfx/tools/flashlight_toggle.ogg"]} } \ No newline at end of file diff --git a/objects/actionfigure/sb_jelly/jellyAF.png b/objects/actionfigure/sb_jelly/jellyAF.png index 5d05ae63..1ead1e55 100644 Binary files a/objects/actionfigure/sb_jelly/jellyAF.png and b/objects/actionfigure/sb_jelly/jellyAF.png differ diff --git a/objects/ancient/ancientconsole/sb_ancientconsole.lua b/objects/ancient/ancientconsole/sb_ancientconsole.lua index 96223342..bd04e5a7 100644 --- a/objects/ancient/ancientconsole/sb_ancientconsole.lua +++ b/objects/ancient/ancientconsole/sb_ancientconsole.lua @@ -1,14 +1,12 @@ -require "/scripts/vec2.lua" +local originalInit = init or function() end +local originalUpdate = update or function() end -local ini = init or function() end -local updat = update or function() end - -function init() ini() +function init() originalInit() sb_knownPlayers = {} sb_radioMessage = config.getParameter("sb_radioMessage") end -function update(dt) updat(dt) +function update(dt) originalUpdate(dt) if not self.isOutpostGate then local players = world.players() if #players > 0 then diff --git a/objects/apex/sb_apexstandingtv/apexstandingtv.animation b/objects/apex/sb_apexstandingtv/apexstandingtv.animation index 560b4344..9c42e283 100644 --- a/objects/apex/sb_apexstandingtv/apexstandingtv.animation +++ b/objects/apex/sb_apexstandingtv/apexstandingtv.animation @@ -1,59 +1,59 @@ { - "animatedParts" : { - "stateTypes" : { - "light" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : { - "frames" : 14, - "cycle" : 2.0, - "mode" : "loop" + "animatedParts": { + "stateTypes": { + "light": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 14, + "cycle": 2.0, + "mode": "loop" } } } }, - "parts" : { - "bg" : { - "properties" : { - "centered" : false + "parts": { + "bg": { + "properties": { + "centered": false }, - "partStates" : { - "light" : { - "off" : { - "properties" : { - "image" : ":.off" + "partStates": { + "light": { + "off": { + "properties": { + "image": ":.off" } }, - "on" : { - "properties" : { - "image" : ":.", - "fullbright" : true + "on": { + "properties": { + "image": ":.", + "fullbright": true } } } } }, - "fg" : { - "properties" : { - "centered" : false, - "zLevel" : 1 + "fg": { + "properties": { + "centered": false, + "zLevel": 1 }, - "partStates" : { - "light" : { - "off" : { - "properties" : { - "image" : ":.off" + "partStates": { + "light": { + "off": { + "properties": { + "image": ":.off" } }, - "on" : { - "properties" : { - "image" : ":." + "on": { + "properties": { + "image": ":." } } } diff --git a/objects/avian/sb_tribaloven2/default.frames b/objects/avian/sb_tribaloven2/default.frames index c18cbedd..ed453909 100644 --- a/objects/avian/sb_tribaloven2/default.frames +++ b/objects/avian/sb_tribaloven2/default.frames @@ -1,13 +1,13 @@ { - "frameGrid" : { - "size" : [20, 16], - "dimensions" : [5, 1], - "names" : [ - [ "default.0", "default.1", "default.2", "default.3", "default.4" ] + "frameGrid": { + "size": [20, 16], + "dimensions": [5, 1], + "names": [ + ["default.0", "default.1", "default.2", "default.3", "default.4"] ] }, - "aliases" : { - "default.default" : "default.0" + "aliases": { + "default.default": "default.0" } } diff --git a/objects/avian/sb_tribaloven2/tribaloven2.object b/objects/avian/sb_tribaloven2/tribaloven2.object index 8ccda84b..9273bcf2 100644 --- a/objects/avian/sb_tribaloven2/tribaloven2.object +++ b/objects/avian/sb_tribaloven2/tribaloven2.object @@ -1,7 +1,7 @@ { "objectName": "sb_tribaloven2", "colonyTags": ["cooking", "light", "avian"], - "rarity": "Uncommon", + "rarity": "Common", "description": "Crackling quietly, the smell of hickory smoke wafts from its grate.", "shortdescription": "^orange;Stout Oven^reset;", "category": "crafting", diff --git a/objects/biome/sb_geometric/geometricbed.object b/objects/biome/sb_geometric/geometricbed.object index 6fad8942..ff441da0 100644 --- a/objects/biome/sb_geometric/geometricbed.object +++ b/objects/biome/sb_geometric/geometricbed.object @@ -1,42 +1,41 @@ { - "objectName" : "sb_geometricbed", - "colonyTags" : ["geometric"], - "printable" : false, - "rarity" : "Common", - "description" : "A sublime geometric bed.", - "shortdescription" : "Geometric Ice Bed", - "race" : "generic", - "category" : "furniture", - "price" : 350, - "tooltipKind" : "sb_object", + "objectName": "sb_geometricbed", + "colonyTags": ["geometric"], + "printable": false, + "rarity": "Common", + "description": "A sublime geometric bed.", + "shortdescription": "Geometric Ice Bed", + "race": "generic", + "category": "furniture", + "price": 350, + "tooltipKind": "sb_object", - "apexDescription" : "A hard bed and a soft blanket.", - "avianDescription" : "This bed is imposing... The blanket is comforting.", - "floranDescription" : "Floran sssleep. Nice blanket.", - "glitchDescription" : "Content. The blanket on this bed looks nice.", - "humanDescription" : "This bed has a sleek blanket.", - "hylotlDescription" : "An unpleasant bed with a pleasant blanket.", - "novakidDescription" : "That's one mighty fine blanket!", + "apexDescription": "A hard bed and a soft blanket.", + "avianDescription": "This bed is imposing... The blanket is comforting.", + "floranDescription": "Floran sssleep. Nice blanket.", + "glitchDescription": "Content. The blanket on this bed looks nice.", + "humanDescription": "This bed has a sleek blanket.", + "hylotlDescription": "An unpleasant bed with a pleasant blanket.", + "novakidDescription": "That's one mighty fine blanket!", - "objectType" : "loungeable", - "sitFlipDirection" : true, - "sitPosition" : [-13, 12.5], - "sitOrientation" : "lay", - "sitAngle" : 90, - "sitCoverImage" : "/objects/biome/sb_geometric/geometricbedcover.png", - "sitEmote" : "sleep", - "sitStatusEffects" : ["bed1"], - "sitEffectEmitters" : ["sleepbubbles"], + "objectType": "loungeable", + "sitFlipDirection": true, + "sitPosition": [-13, 12.5], + "sitOrientation": "lay", + "sitAngle": 90, + "sitCoverImage": "/objects/biome/sb_geometric/geometricbedcover.png", + "sitEmote": "sleep", + "sitStatusEffects": ["bed1"], + "sitEffectEmitters": ["sleepbubbles"], - "inventoryIcon" : "geometricbedicon.png", - "orientations" : [ - { - "dualImage" : "geometricbed.png:", - "imagePosition" : [-24, 0], - "frames" : 1, - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "inventoryIcon": "geometricbedicon.png", + "orientations": [{ + "dualImage": "geometricbed.png:", + "imagePosition": [-24, 0], + "frames": 1, + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["bottom"] } ] -} \ No newline at end of file +} diff --git a/objects/biome/sb_geometric/geometricscreen.animation b/objects/biome/sb_geometric/geometricscreen.animation index d83d8f02..a3bed4a6 100644 --- a/objects/biome/sb_geometric/geometricscreen.animation +++ b/objects/biome/sb_geometric/geometricscreen.animation @@ -1,59 +1,59 @@ { - "animatedParts" : { - "stateTypes" : { - "light" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : { - "frames" : 7, - "cycle" : 1.0, - "mode" : "loop" + "animatedParts": { + "stateTypes": { + "light": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 7, + "cycle": 1.0, + "mode": "loop" } } } }, - "parts" : { - "bg" : { - "properties" : { - "centered" : false + "parts": { + "bg": { + "properties": { + "centered": false }, - "partStates" : { - "light" : { - "off" : { - "properties" : { - "image" : ":.off" + "partStates": { + "light": { + "off": { + "properties": { + "image": ":.off" } }, - "on" : { - "properties" : { - "image" : ":.", - "fullbright" : true + "on": { + "properties": { + "image": ":.", + "fullbright": true } } } } }, - "fg" : { - "properties" : { - "centered" : false, - "zLevel" : 1 + "fg": { + "properties": { + "centered": false, + "zLevel": 1 }, - "partStates" : { - "light" : { - "off" : { - "properties" : { - "image" : ":.off" + "partStates": { + "light": { + "off": { + "properties": { + "image": ":.off" } }, - "on" : { - "properties" : { - "image" : ":." + "on": { + "properties": { + "image": ":." } } } @@ -61,4 +61,4 @@ } } } -} \ No newline at end of file +} diff --git a/objects/biome/swamp/swampchest/swampchest.object.patch b/objects/biome/swamp/swampchest/swampchest.object.patch deleted file mode 100644 index 8c62194c..00000000 --- a/objects/biome/swamp/swampchest/swampchest.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/orientations/0/imagePosition/1","value":0},{"op":"replace","path":"/orientations/0/imagePosition/1","value":-1}]] \ No newline at end of file diff --git a/objects/boss/sb_ironbeacon.animation b/objects/boss/sb_ironbeacon.animation index b802d49f..e9f47150 100644 --- a/objects/boss/sb_ironbeacon.animation +++ b/objects/boss/sb_ironbeacon.animation @@ -1,39 +1,39 @@ { - "animatedParts" : { - "stateTypes" : { - "beaconState" : { - "default" : "idle", - "states" : { - "idle" : { - "frames" : 1, - "cycle" : 0.15 + "animatedParts": { + "stateTypes": { + "beaconState": { + "default": "idle", + "states": { + "idle": { + "frames": 1, + "cycle": 0.15 }, - "active" : { - "frames" : 12, - "cycle" : 0.7, - "mode" : "loop" + "active": { + "frames": 12, + "cycle": 0.7, + "mode": "loop" } } } }, - "parts" : { - "beacon" : { - "properties" : { - "centered" : false + "parts": { + "beacon": { + "properties": { + "centered": false }, - "partStates" : { - "beaconState" : { - "idle" : { - "properties" : { - "image" : ":default.default" + "partStates": { + "beaconState": { + "idle": { + "properties": { + "image": ":default.default" } }, - "active" : { - "properties" : { - "image" : ":default." + "active": { + "properties": { + "image": ":default." } } } @@ -41,7 +41,7 @@ } } }, - "sounds" : { - "noise" : [] + "sounds": { + "noise": [] } } diff --git a/objects/boss/sb_ironbeacon.lua b/objects/boss/sb_ironbeacon.lua index 64152d79..a546e536 100644 --- a/objects/boss/sb_ironbeacon.lua +++ b/objects/boss/sb_ironbeacon.lua @@ -30,7 +30,7 @@ function onInteraction(args) bosses[i][1], object.toAbsolutePosition(bosses[i][2]), { - level = config.getParameter("bossLevel",1) + object.level() - 1, + level = config.getParameter("bossLevel", 1) + ((object.level() - 1) / 2), aggressive = true, arguments = {aggressive = true} } diff --git a/objects/boss/sb_ironbeacon2.animation b/objects/boss/sb_ironbeacon2.animation index dbf2c6dc..32fa4296 100644 --- a/objects/boss/sb_ironbeacon2.animation +++ b/objects/boss/sb_ironbeacon2.animation @@ -1,39 +1,39 @@ { - "animatedParts" : { - "stateTypes" : { - "beaconState" : { - "default" : "idle", - "states" : { - "idle" : { - "frames" : 1, - "cycle" : 0.15 + "animatedParts": { + "stateTypes": { + "beaconState": { + "default": "idle", + "states": { + "idle": { + "frames": 1, + "cycle": 0.15 }, - "active" : { - "frames" : 1, - "cycle" : 0.7, - "mode" : "loop" + "active": { + "frames": 1, + "cycle": 0.7, + "mode": "loop" } } } }, - "parts" : { - "beacon" : { - "properties" : { - "centered" : false + "parts": { + "beacon": { + "properties": { + "centered": false }, - "partStates" : { - "beaconState" : { - "idle" : { - "properties" : { - "image" : "" + "partStates": { + "beaconState": { + "idle": { + "properties": { + "image": "" } }, - "active" : { - "properties" : { - "image" : "" + "active": { + "properties": { + "image": "" } } } @@ -41,7 +41,7 @@ } } }, - "sounds" : { - "noise" : [] + "sounds": { + "noise": [] } -} \ No newline at end of file +} diff --git a/objects/boss/sb_peanutbutter.object b/objects/boss/sb_peanutbutter.object index f7e1d9ea..3131a7e2 100644 --- a/objects/boss/sb_peanutbutter.object +++ b/objects/boss/sb_peanutbutter.object @@ -41,6 +41,6 @@ "scriptDelta": 5, "hasAnimation": true, "badReception": [0, "I should take it to the planet surface before trying to use it."], - "bossType": [["sb_jellyboss", [0, 40]], ["sb_skeye", [20, 40]], ["sb_skeye", [-20, 40]]], + "bossType": [["sb_jellyboss", [0, 25]], ["sb_skeye", [20, 25]], ["sb_skeye", [-20, 25]]], "bossLevel": 3 } diff --git a/objects/crafting/sb_cookingstation/cookingstation.frames b/objects/crafting/sb_cookingstation/cookingstation.frames deleted file mode 100644 index a34d4dc5..00000000 --- a/objects/crafting/sb_cookingstation/cookingstation.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - - "frameGrid" : { - "size" : [32, 32], - "dimensions" : [1, 1], - "names" : [ - [ "default" ] - ] - } -} diff --git a/objects/crafting/sb_cookingstation/cookingstation.png b/objects/crafting/sb_cookingstation/cookingstation.png deleted file mode 100644 index 97c25db6..00000000 Binary files a/objects/crafting/sb_cookingstation/cookingstation.png and /dev/null differ diff --git a/objects/crafting/sb_cookingstation/cookingstationicon.png b/objects/crafting/sb_cookingstation/cookingstationicon.png deleted file mode 100644 index d30a7ab3..00000000 Binary files a/objects/crafting/sb_cookingstation/cookingstationicon.png and /dev/null differ diff --git a/objects/crafting/sb_researchstation/researchstation.object b/objects/crafting/sb_researchstation/researchstation.object index 34ce4bdf..779d7069 100644 --- a/objects/crafting/sb_researchstation/researchstation.object +++ b/objects/crafting/sb_researchstation/researchstation.object @@ -6,7 +6,7 @@ "price": 6000, "tooltipKind": "sb_object", "interactAction": "ScriptPane", - "interactData": "/interface/windowconfig/sb_craftingresearch.config", + "interactData": "/interface/scripted/sb_research/research.config", "categoryButton": { "pressedOffset": [0,-1], "position": [22, 44], //-10,22,33,51,58,78 increasing by 11 seems good @@ -129,8 +129,11 @@ ], "weapons": [ + //forest + "sb_deathstick" + //desert - "sb_cactislammer" + ,"sb_cactislammer" //savannah ,"sb_thornyneedler" @@ -210,6 +213,9 @@ //slime ,"sb_slimestaff" ,"sb_cutarrh" + + //geometric + ,"sb_scistaff" //crystal ,"sb_hackman" @@ -685,8 +691,7 @@ ,"slimebed" ,"slimehide" ,"slimetorch" - - //OLD AND BUSTED + //sandstone ,"sandstonebed" ,"sandstonechair" diff --git a/objects/crafting/sb_woodencookingtable/woodencookingtable.object b/objects/crafting/sb_woodencookingtable/woodencookingtable.object index 80eaa377..b57824fa 100644 --- a/objects/crafting/sb_woodencookingtable/woodencookingtable.object +++ b/objects/crafting/sb_woodencookingtable/woodencookingtable.object @@ -14,7 +14,7 @@ }, "filter": ["sb_t1food"] }, - "description": "Used to prepare and combine raw ingredients, though it only offers a modest range of recipe options.", + "description": "Used to prepare and combine raw ingredients, though it only offers limited recipe options.", "shortdescription": "^orange;Wooden Cooking Table^reset;", "race": "generic", "category": "crafting", diff --git a/objects/crafting/sb_cookingstation/cookingstation.object b/objects/crafting/tier2cookingtable/sb_cookingstation.object similarity index 88% rename from objects/crafting/sb_cookingstation/cookingstation.object rename to objects/crafting/tier2cookingtable/sb_cookingstation.object index 77a13551..55b5370a 100644 --- a/objects/crafting/sb_cookingstation/cookingstation.object +++ b/objects/crafting/tier2cookingtable/sb_cookingstation.object @@ -3,7 +3,7 @@ "colonyTags": ["crafting", "cooking"], "printable": false, "price": 1300, - "rarity": "rare", + "rarity": "legendary", "interactAction": "OpenCraftingInterface", "interactData": { "config": "/interface/windowconfig/sb_craftingfood.config", @@ -23,19 +23,14 @@ "hylotlDescription": "Food preparation is an art and this is the paintbrush.", "novakidDescription": "I could cook up a good ol' stew storm on this 'ere thing.", - "inventoryIcon": "cookingstationicon.png", + "inventoryIcon": "tier2cookingtableicon.png", "orientations": [{ - "dualImage": "cookingstation.png:", - + "dualImage": "tier2cookingtable.png:", "imagePosition": [-16, 0], "frames": 1, - "animationCycle": 1.0, - + "animationCycle": 1, "spaceScan": 0.1, "anchors": ["bottom"] - } - ], - - "npcToy": {} + ] } diff --git a/objects/crafting/tier2cookingtable/tier2cookingtable.frames b/objects/crafting/tier2cookingtable/tier2cookingtable.frames new file mode 100644 index 00000000..5c7c661e --- /dev/null +++ b/objects/crafting/tier2cookingtable/tier2cookingtable.frames @@ -0,0 +1,9 @@ +{ + "frameGrid": { + "size": [32, 32], + "dimensions": [1, 1], + "names": [ + ["default"] + ] + } +} diff --git a/objects/crafting/uncrafter/sb_uncrafter.lua b/objects/crafting/uncrafter/sb_uncrafter.lua index a3c90290..32bcbe9b 100644 --- a/objects/crafting/uncrafter/sb_uncrafter.lua +++ b/objects/crafting/uncrafter/sb_uncrafter.lua @@ -1,6 +1,6 @@ -local ini = init or function() end +local originalInit = init or function() end -function init(a) ini(a) +function init(a) originalInit(a) if weaponLevelKinds then local b = {} b={"copperbar","copperbar"} sb_swapOutputs(1,"tungstenbar",b) diff --git a/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.animation.patch b/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.animation.patch deleted file mode 100644 index 0654b1bf..00000000 --- a/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.animation.patch +++ /dev/null @@ -1,42 +0,0 @@ -[ - [{ - "op": "test", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil/properties", - "inverse": true - }, { - "op": "add", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil/properties", - "value": {} - } - ], - [{ - "op": "test", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil2/properties", - "inverse": true - }, { - "op": "add", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil2/properties", - "value": {} - } - ], - [{ - "op": "test", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil/properties/offset", - "inverse": true - }, { - "op": "add", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil/properties/offset", - "value": [0, 0.25] - } - ], - [{ - "op": "test", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil2/properties/offset", - "inverse": true - }, { - "op": "add", - "path": "/animatedParts/parts/chassis/partStates/stage/craftinganvil2/properties/offset", - "value": [0, 0.25] - } - ] -] diff --git a/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.object.patch b/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.object.patch new file mode 100644 index 00000000..fac05663 --- /dev/null +++ b/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil.object.patch @@ -0,0 +1,14 @@ +[ + [{ + "op": "test", + "path": "/upgradeStages/2/itemSpawnParameters/rarity", + "value": "Rare" + },{ + "op": "test", + "path": "/upgradeStages/1/itemSpawnParameters/rarity", + "inverse": true + },{ + "op": "remove", + "path": "/upgradeStages/2/itemSpawnParameters/rarity" + }] +] \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil2.frames.patch b/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil2.frames.patch deleted file mode 100644 index 8b83a4b4..00000000 --- a/objects/crafting/upgradeablecraftingobjects/craftinganvil/craftinganvil2.frames.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/frameGrid/size/1","value":24},{"op":"replace","path":"/frameGrid/size/1","value":28}]] \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/craftinganvil/default.frames.patch b/objects/crafting/upgradeablecraftingobjects/craftinganvil/default.frames.patch deleted file mode 100644 index 8b83a4b4..00000000 --- a/objects/crafting/upgradeablecraftingobjects/craftinganvil/default.frames.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/frameGrid/size/1","value":24},{"op":"replace","path":"/frameGrid/size/1","value":28}]] \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/craftingfurnace/sb_craftingfurnaceicon.png b/objects/crafting/upgradeablecraftingobjects/craftingfurnace/sb_craftingfurnaceicon.png deleted file mode 100644 index 338b4085..00000000 Binary files a/objects/crafting/upgradeablecraftingobjects/craftingfurnace/sb_craftingfurnaceicon.png and /dev/null differ diff --git a/objects/crafting/upgradeablecraftingobjects/craftingmedical/craftingmedical.object.patch b/objects/crafting/upgradeablecraftingobjects/craftingmedical/craftingmedical.object.patch new file mode 100644 index 00000000..07c0415b --- /dev/null +++ b/objects/crafting/upgradeablecraftingobjects/craftingmedical/craftingmedical.object.patch @@ -0,0 +1,11 @@ +[ + [{ + "op": "test", + "path": "/rarity", + "value": "Uncommon" + },{ + "op": "replace", + "path": "/rarity", + "value": "Rare" + }] +] \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/sb_craftingtool/craftingtool.object b/objects/crafting/upgradeablecraftingobjects/sb_craftingtool/craftingtool.object index a40a4188..2aee079b 100644 --- a/objects/crafting/upgradeablecraftingobjects/sb_craftingtool/craftingtool.object +++ b/objects/crafting/upgradeablecraftingobjects/sb_craftingtool/craftingtool.object @@ -81,7 +81,6 @@ "animationState": "stage2", "itemSpawnParameters": { - "rarity": "rare", "price": 400, "inventoryIcon": "icon2.png", "placementImage": "tool2.png:default.default", @@ -129,7 +128,6 @@ "animationState": "stage3", "itemSpawnParameters": { - "rarity": "legendary", "inventoryIcon": "icon3.png", "placementImage": "tool3/tool3.png:default.default", diff --git a/objects/crafting/woodencookingtable/woodencookingtable.object.patch b/objects/crafting/woodencookingtable/woodencookingtable.object.patch new file mode 100644 index 00000000..07c0415b --- /dev/null +++ b/objects/crafting/woodencookingtable/woodencookingtable.object.patch @@ -0,0 +1,11 @@ +[ + [{ + "op": "test", + "path": "/rarity", + "value": "Uncommon" + },{ + "op": "replace", + "path": "/rarity", + "value": "Rare" + }] +] \ No newline at end of file diff --git a/objects/generic/datastation/datastationicon.png b/objects/generic/datastation/datastationicon.png deleted file mode 100644 index abccca41..00000000 Binary files a/objects/generic/datastation/datastationicon.png and /dev/null differ diff --git a/objects/generic/fossilpod/fossilpod.object.patch b/objects/generic/fossilpod/fossilpod.object.patch index 5c698da6..1da57719 100644 --- a/objects/generic/fossilpod/fossilpod.object.patch +++ b/objects/generic/fossilpod/fossilpod.object.patch @@ -1,13 +1,100 @@ [ -[{"op":"test","path":"/smashDropPool","inverse":true},{"op":"add","path":"/smashDropPool","value":"fossils"}], -[{"op":"test","path":"/smashDropPool","value":"fossils"},{"op":"test","path":"/fossilsExists","inverse":true},{"op":"replace","path":"/smashDropPool","value":"sb_fossils"}], -[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":0}],[{"op":"replace","path":"/price","value":160}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}], + [{ + "op": "test", + "path": "/smashDropPool", + "value": "fossils" + }, { + "op": "replace", + "path": "/smashDropPool", + "value": "sb_fossils" + } + ], + [{ + "op": "test", + "path": "/price", + "value": 0 + }, { + "op": "add", + "path": "/price", + "value": 25 + } + ], + [{ + "op": "test", + "path": "/tooltipKind", + "inverse": true + }, { + "op": "add", + "path": "/tooltipKind", + "value": "sb_object" + } + ], + [{ + "op": "test", + "path": "/rarity", + "value": "Common" + }, { + "op": "replace", + "path": "/rarity", + "value": "Uncommon" + } + ], -[{"op":"test","path":"/apexDescription","value":"-todo-"},{"op":"remove","path":"/apexDescription"}], -[{"op":"test","path":"/avianDescription","value":"-todo-"},{"op":"remove","path":"/avianDescription"}], -[{"op":"test","path":"/floranDescription","value":"-todo-"},{"op":"replace","path":"/floranDescription","value":"Sssmasssh. Find fosssil!"}], -[{"op":"test","path":"/glitchDescription","value":"-todo-"},{"op":"replace","path":"/glitchDescription","value":"Excited. I cannot wait to see what's inside."}], -[{"op":"test","path":"/humanDescription","value":"-todo-"},{"op":"remove","path":"/humanDescription"}], -[{"op":"test","path":"/hylotlDescription","value":"-todo-"},{"op":"remove","path":"/hylotlDescription"}] -] \ No newline at end of file + //Remove placeholder descriptions and add some new ones + [{ + "op": "test", + "path": "/apexDescription", + "value": "-todo-" + }, { + "op": "remove", + "path": "/apexDescription" + } + ], + [{ + "op": "test", + "path": "/avianDescription", + "value": "-todo-" + }, { + "op": "remove", + "path": "/avianDescription" + } + ], + [{ + "op": "test", + "path": "/floranDescription", + "value": "-todo-" + }, { + "op": "replace", + "path": "/floranDescription", + "value": "Sssmasssh. Find fosssil!" + } + ], + [{ + "op": "test", + "path": "/glitchDescription", + "value": "-todo-" + }, { + "op": "replace", + "path": "/glitchDescription", + "value": "Excited. I cannot wait to see what's inside." + } + ], + [{ + "op": "test", + "path": "/humanDescription", + "value": "-todo-" + }, { + "op": "remove", + "path": "/humanDescription" + } + ], + [{ + "op": "test", + "path": "/hylotlDescription", + "value": "-todo-" + }, { + "op": "remove", + "path": "/hylotlDescription" + } + ] +] diff --git a/objects/generic/nanostove/nanostove.object.patch b/objects/generic/nanostove/nanostove.object.patch index 4d0f7598..bf3a9138 100644 --- a/objects/generic/nanostove/nanostove.object.patch +++ b/objects/generic/nanostove/nanostove.object.patch @@ -1,6 +1,5 @@ [ [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], -[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], [{"op":"test","path":"/shortdescription","value":"Nanostove"},{"op":"replace","path":"/shortdescription","value":"^orange;Nanostove^reset;"}], [{"op":"test","path":"/description","value":"Provides exceptional heat and a great for cooking outdoors."},{"op":"replace","path":"/description","value":"Provides exceptional heat-- a great place to cook outdoors."}] ] \ No newline at end of file diff --git a/objects/generic/randomfountain/randomfountain.animation.patch b/objects/generic/randomfountain/randomfountain.animation.patch new file mode 100644 index 00000000..4c14272a --- /dev/null +++ b/objects/generic/randomfountain/randomfountain.animation.patch @@ -0,0 +1,26 @@ +[ + [{ + "op": "test", + "path": "/sounds", + "inverse": true + }, { + "op": "add", + "path": "/sounds", + "value": {} + } + ], + [{ + "op": "add", + "path": "/sounds/sb_use1", + "value": ["/sfx/humanoid/drink.ogg"] + },{ + "op": "add", + "path": "/sounds/sb_use2", + "value": ["/sfx/statuseffects/stimuse.ogg"] + },{ + "op": "add", + "path": "/sounds/sb_use3", + "value": ["/sfx/statuseffects/powerup.ogg"] + } + ] +] diff --git a/objects/generic/randomfountain/randomfountain.object.patch b/objects/generic/randomfountain/randomfountain.object.patch index 92b549b0..281cfef9 100644 --- a/objects/generic/randomfountain/randomfountain.object.patch +++ b/objects/generic/randomfountain/randomfountain.object.patch @@ -9,6 +9,16 @@ "value": "sb_object" } ], + [{ + "op": "test", + "path": "/category", + "value": "decorative" + }, { + "op": "replace", + "path": "/category", + "value": "other" + } + ], [{ "op": "test", "path": "/description", @@ -16,7 +26,7 @@ }, { "op": "replace", "path": "/description", - "value": "The most unpredictable of fountains." + "value": "The most unpredictable of fountains. ^red;Destroyed when broken while empty." } ], [{ @@ -28,5 +38,28 @@ "path": "/novakidDescription", "value": "It's just a fountain." } + ], + //Only add a script if another mod is NOT doing something with this object already + [{ + "op": "test", + "path": "/scripts", + "inverse": true + }, { + "op": "add", + "path": "/scripts", + "value": ["sb_randomfountain.lua"] + } + ], + [{ + //healing, jump, run, glow + "op": "add", + "path": "/sb_statusOptions", + "value": [ + ["regeneration4", 120], + ["jumpboost", 60], + ["runboost", 60], + ["glow", 60] + ] + } ] ] diff --git a/objects/generic/randomfountain/sb_randomfountain.lua b/objects/generic/randomfountain/sb_randomfountain.lua new file mode 100644 index 00000000..2e50dfd7 --- /dev/null +++ b/objects/generic/randomfountain/sb_randomfountain.lua @@ -0,0 +1,46 @@ +function init() + activationTime = config.getParameter("activationTime") or 600 + + if storage.active == nil then + toggle(true) + else + object.setSoundEffectEnabled(storage.active) + end + + animator.setAnimationState("podState", storage.active and "active" or "expire") +end + +function onInteraction(args) + if storage.active then + toggle(false) + for i = 1, 3 do + animator.playSound("sb_use"..i) + end + local statusOptions = config.getParameter("sb_statusOptions") + world.sendEntityMessage(args.sourceId, "sb_randomfountain", statusOptions[math.random(#statusOptions)]) + end +end + +function update(dt) + if isTimeToActivate() then + toggle(true) + end +end + +function isTimeToActivate() + return storage.lastActive and world.time() - storage.lastActive > activationTime +end + +function toggle(state) + animator.setAnimationState("podState", state and "active" or "expire") + storage.active = state + object.setInteractive(state) + object.setSoundEffectEnabled(state) + + if not state then + storage.lastActive = world.time() + object.setConfigParameter("smashOnBreak", true) + else + object.setConfigParameter("smashOnBreak", false) + end +end \ No newline at end of file diff --git a/objects/generic/sb_foodbowl/sb_foodbowl.animation b/objects/generic/sb_foodbowl/sb_foodbowl.animation index 95e20741..557bd86d 100644 --- a/objects/generic/sb_foodbowl/sb_foodbowl.animation +++ b/objects/generic/sb_foodbowl/sb_foodbowl.animation @@ -1,46 +1,40 @@ { - "animatedParts" : { - "stateTypes" : { - "bowl" : { - "priority" : 0, - "default" : "empty", - "states" : { - "empty" : { - "frames" : 1 + "animatedParts": { + "stateTypes": { + "bowl": { + "priority": 0, + "default": "empty", + "states": { + "empty": { + "frames": 1 }, - "full" : { - "frames" : 1 + "full": { + "frames": 1 } } } }, - "parts" : { - "foodbowl" : { - "properties" : { - "centered" : true + "parts": { + "foodbowl": { + "properties": { + "centered": true }, - "partStates" : { - "bowl" : { - "empty" : { - "properties" : { - "image" : ":empty" + "partStates": { + "bowl": { + "empty": { + "properties": { + "image": ":empty" } }, - "full" : { - "properties" : { - "image" : ":full" + "full": { + "properties": { + "image": ":full" } } } } } } - }, - - "sounds" : { - "turnHostile" : [ ], - "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ], - "petsound" : [] } } diff --git a/objects/generic/sb_steelelevator/steelelevator.animation b/objects/generic/sb_steelelevator/steelelevator.animation index 02ed729b..1b6beeba 100644 --- a/objects/generic/sb_steelelevator/steelelevator.animation +++ b/objects/generic/sb_steelelevator/steelelevator.animation @@ -1,48 +1,48 @@ { - "animatedParts" : { - "stateTypes" : { - "moving" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : { - "properties" : { - "persistentSound" : "/sfx/objects/steel_elevator_loop.ogg" + "animatedParts": { + "stateTypes": { + "moving": { + "default": "off", + "states": { + "off": {}, + "on": { + "properties": { + "persistentSound": "/sfx/objects/steel_elevator_loop.ogg" } } } } }, - "parts" : { - "base" : { - "properties" : { - "offset" : [-0.5, 0], - "centered" : false, - "image" : "" + "parts": { + "base": { + "properties": { + "offset": [-0.5, 0], + "centered": false, + "image": "" } }, - "platform" : { - "properties" : { - "centered" : true, - "transformationGroups" : ["platform"], - "image" : "", - "zLevel" : 1 + "platform": { + "properties": { + "centered": true, + "transformationGroups": ["platform"], + "image": "", + "zLevel": 1 } } } }, - "transformationGroups" : { - "platform" : { - "interpolated" : true + "transformationGroups": { + "platform": { + "interpolated": true } }, - "sounds" : { - "changeDir" : { - "pool" : [ "/sfx/objects/steel_elevator_hit.ogg" ] + "sounds": { + "changeDir": { + "pool": ["/sfx/objects/steel_elevator_hit.ogg"] } } } diff --git a/objects/generic/statuspod/statuspod.object.patch b/objects/generic/statuspod/statuspod.object.patch index 3651fb4f..65a91d7b 100644 --- a/objects/generic/statuspod/statuspod.object.patch +++ b/objects/generic/statuspod/statuspod.object.patch @@ -1,4 +1,6 @@ [ +[{"op":"test","path":"/scripts"},{"op":"add","path":"/scripts/-","value":"/scripts/sb_statusProjectileObject.lua"}], + //levitation/bouncy/lowgrav status projectiles have issues spawning. Tested out of hitbox range and on platforms [{"op":"add","path":"/projectileOptions/-","value":{"levelRange":[5,10],"projectileType":"platinumbombstatusprojectile"}}], [{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"runstatusprojectile"}}], @@ -6,9 +8,10 @@ [{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"glowstatusprojectile"}}], [{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"ragestatusprojectile"}}], [{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"sb_protectionbomb","projectileParams":{"speed":0,"timeToLive":0}}}], -//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"lowgravstatusprojectile"}}], -//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"bouncystatusprojectile"}}], -//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"levitationstatusprojectile","projectileParams":{"statusEffects":[{"effect":"levitation","duration":1.5}]}}}], -[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"clusterstatusprojectile"}}] +//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"lowgravstatusprojectile"}}], //seems like it could work but i think there were issues +//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"bouncystatusprojectile"}}], //seems unfun + pussplum exists +//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"levitationstatusprojectile","projectileParams":{"statusEffects":[{"effect":"levitation","duration":1.5}]}}}], //replaced by feather powder +//[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"clusterstatusprojectile"}}] //basically just insta-kills you if you're not at 100% health. bombs are better since they're not instant. I might change this one into a timed shrapnel bomb later //[{"op":"replace","path":"/projectileOptions","value":[{"projectileType":"bouncystatusprojectile"}]}] +[{"op":"add","path":"/projectileOptions/-","value":{"projectileType":"waterstatusprojectile","projectileParams":{"sb_positionOffset":[0,2]}}}] ] \ No newline at end of file diff --git a/objects/generic/wflowerpot/sb_wflowerpot.lua b/objects/generic/wflowerpot/sb_wflowerpot.lua index 3fd44af8..f35fd5ee 100644 --- a/objects/generic/wflowerpot/sb_wflowerpot.lua +++ b/objects/generic/wflowerpot/sb_wflowerpot.lua @@ -1,6 +1,6 @@ -local ini = init or function() end -function init() ini() - local a = storage.sb_frame or math.random(4) - storage.sb_frame = a - animator.setAnimationState("sb_flower",a) +local originalInit = init or function() end +function init() originalInit() + local frame = storage.sb_frame or math.random(4) + storage.sb_frame = frame + animator.setAnimationState("sb_flower", frame) end \ No newline at end of file diff --git a/objects/holiday/giftmonsterbox/sb_giftmonsterbox.lua b/objects/holiday/giftmonsterbox/sb_giftmonsterbox.lua index 226aee0c..cb3e445e 100644 --- a/objects/holiday/giftmonsterbox/sb_giftmonsterbox.lua +++ b/objects/holiday/giftmonsterbox/sb_giftmonsterbox.lua @@ -1,5 +1,5 @@ -local ini = init or function() end -function init() ini() - local smas = object.smash - object.smash = function() smas(true) end +local originalInit = init or function() end +function init() originalInit() + local originalObjectSmash = object.smash + object.smash = function() originalObjectSmash(true) end end \ No newline at end of file diff --git a/objects/holiday/holidaycraftingtable/holidaycraftingtable.object.patch b/objects/holiday/holidaycraftingtable/holidaycraftingtable.object.patch index dd06cee1..711dfc3b 100644 --- a/objects/holiday/holidaycraftingtable/holidaycraftingtable.object.patch +++ b/objects/holiday/holidaycraftingtable/holidaycraftingtable.object.patch @@ -1,14 +1,4 @@ [ - [{ - "op": "test", - "value": "Uncommon", - "path": "/rarity" - }, { - "op": "add", - "path": "/rarity", - "value": "legendary" - } - ], [{ "op": "test", "inverse": true, diff --git a/objects/human/basictv/basictvicon.png b/objects/human/basictv/basictvicon.png deleted file mode 100644 index 46d44632..00000000 Binary files a/objects/human/basictv/basictvicon.png and /dev/null differ diff --git a/objects/human/sb_bunkerrobotfactory/sb_vendingmachine.lua b/objects/human/sb_bunkerrobotfactory/sb_vendingmachine.lua index db849e6a..d2698856 100644 --- a/objects/human/sb_bunkerrobotfactory/sb_vendingmachine.lua +++ b/objects/human/sb_bunkerrobotfactory/sb_vendingmachine.lua @@ -1,2 +1,7 @@ ---local ini = init or function() end function init() ini() object.setInteractive = function() end end -local updat = update or function() end function update(...) updat(...) object.setConfigParameter("treasurePools",{"empty"}) storage = {} object.setInteractive(animator.animationState("light") == "on" or false) end +--local originalInit = init or function() end function init() originalInit() object.setInteractive = function() end end +local originalUpdate = update or function() end +function update(...) originalUpdate(...) + object.setConfigParameter("treasurePools",{"empty"}) + storage = {} + object.setInteractive(animator.animationState("light") == "on" or false) +end diff --git a/objects/human/vendingmachine/sb_vendingmachine.lua b/objects/human/vendingmachine/sb_vendingmachine.lua index d903ebfb..e39b5343 100644 --- a/objects/human/vendingmachine/sb_vendingmachine.lua +++ b/objects/human/vendingmachine/sb_vendingmachine.lua @@ -1,2 +1,7 @@ ---local ini = init or function() end function init() ini() object.setInteractive = function() end end -local updat = update or function() end function update(...) updat(...) object.setConfigParameter("treasurePools",{"empty"}) storage = {} object.setInteractive(animator.animationState("light") == "on" or false) end \ No newline at end of file +--local originalInit = init or function() end function init() originalInit() object.setInteractive = function() end end +local originalUpdate = update or function() end +function update(...) originalUpdate(...) + object.setConfigParameter("treasurePools",{"empty"}) + storage = {} + object.setInteractive(animator.animationState("light") == "on" or false) +end \ No newline at end of file diff --git a/objects/outpost/infinityexpress/sb_infinityexpress.lua b/objects/outpost/infinityexpress/sb_infinityexpress.lua index b4176e65..73819286 100644 --- a/objects/outpost/infinityexpress/sb_infinityexpress.lua +++ b/objects/outpost/infinityexpress/sb_infinityexpress.lua @@ -1,13 +1,13 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end -function init() ini() +function init() originalInit() sb_dir = "shop"..(object.direction() > 0 and "right" or "left") animator.setAnimationState(sb_dir, "close") sb_justClosed = true end -function update() updat() +function update() originalUpdate() if #world.entityQuery(object.position(), 5, {includedTypes = {"creature"}}) > 0 then animator.setAnimationState(sb_dir, "open") sb_justClosed = false diff --git a/objects/outpost/treasuredtrophies/sb_treasuredtrophies.lua b/objects/outpost/treasuredtrophies/sb_treasuredtrophies.lua index 8293e5c6..956ec220 100644 --- a/objects/outpost/treasuredtrophies/sb_treasuredtrophies.lua +++ b/objects/outpost/treasuredtrophies/sb_treasuredtrophies.lua @@ -1,5 +1,5 @@ -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() local i = config.getParameter("interactData") local r = config.getParameter("sb_treasuredtrophies") for n = 1, #r do diff --git a/objects/peacekeeper/peacekeepervendingmachine/peacekeepervendingmachine.object.patch b/objects/peacekeeper/peacekeepervendingmachine/peacekeepervendingmachine.object.patch index 2db269de..1c845dc7 100644 --- a/objects/peacekeeper/peacekeepervendingmachine/peacekeepervendingmachine.object.patch +++ b/objects/peacekeeper/peacekeepervendingmachine/peacekeepervendingmachine.object.patch @@ -1,5 +1,6 @@ [ [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Rare"}], +//TODO: remove everything but the rarity change once patch project accepts it [{"op":"test","path":"/shortdescription","value":"Peacekeeper Vending Machine"},{"op":"replace","path":"/shortdescription","value":"Donut Vending Machine"}], [{"op":"test","path":"/orientations/0/collisionSpaces","value":[[-1,3],[0,3]]},{"op":"remove","path":"/orientations/0/collisionSpaces"}], diff --git a/objects/sb_shops/starpawn.lua b/objects/sb_shops/starpawn.lua index dd1adf68..1f5464ae 100644 --- a/objects/sb_shops/starpawn.lua +++ b/objects/sb_shops/starpawn.lua @@ -1,7 +1,7 @@ -require("/scripts/util.lua") -local ini = init or function() end +require("/scripts/util.lua") --Yes, we are using this. It provides `copy` +local originalInit = init or function() end function init() - ini() + originalInit() interactable = interactable or true object.setConfigParameter("mouthPosition", config.getParameter("mouthPositions")[direction == "right" and 1 or 2]) shopInUseText = config.getParameter("shopInUseText") diff --git a/objects/spawner/sb_invisiblemonsterspawner.lua b/objects/spawner/sb_invisiblemonsterspawner.lua index 7ff99b19..88fa2060 100644 --- a/objects/spawner/sb_invisiblemonsterspawner.lua +++ b/objects/spawner/sb_invisiblemonsterspawner.lua @@ -1,10 +1,5 @@ -local ini = init or function() end -local spaw = spawn or function() end +local originalSpawn = spawn or function() end -function init() ini() - sb_dieAfterSpawning = config.getParameter("sb_dieAfterSpawning") -end - -function spawn() spaw() - if sb_dieAfterSpawning then object.smash(true) end +function spawn() originalSpawn() + if config.getParameter("sb_dieAfterSpawning") then object.smash(true) end end \ No newline at end of file diff --git a/objects/spawner/spawners/sb_spawner.lua b/objects/spawner/spawners/sb_spawner.lua index c101ef3e..8c15168c 100644 --- a/objects/spawner/spawners/sb_spawner.lua +++ b/objects/spawner/spawners/sb_spawner.lua @@ -1,7 +1,11 @@ -local ini = init or function() end -local sb_onInteraction = onInteraction or function() end +--[[Documentation +Change behavior of NPC spawner objects to spawn the NPC on interaction rather than on unload +]] +--I think it might be better to hook rather than change which script the object runs since other mods may try to hook into the object, expecting the original script +local originalInit = init or function() end +local originalOnInteraction = onInteraction or function() end -function init() ini() +function init() originalInit() script.setUpdateDelta(0) object.setInteractive(true) sb_scriptConfig = config.getParameter("spawner.sb_scriptConfig") @@ -25,6 +29,6 @@ function init() ini() end function onInteraction(args) - sb_onInteraction(args) + originalOnInteraction(args) update() end \ No newline at end of file diff --git a/objects/upgrade/sb_techstation/techstation.animation b/objects/upgrade/sb_techstation/techstation.animation index 958c6ca7..067739d7 100644 --- a/objects/upgrade/sb_techstation/techstation.animation +++ b/objects/upgrade/sb_techstation/techstation.animation @@ -1,103 +1,135 @@ { - "animatedParts" : { - "stateTypes" : { - "station" : { - "default" : "on", - "states" : { - "off" : {"frames":8,"mode":"loop","cycle":1}, - "on" : {"frames":8,"mode":"loop","cycle":1} + "animatedParts": { + "stateTypes": { + "station": { + "default": "on", + "states": { + "off": { + "frames": 8, + "mode": "loop", + "cycle": 1 + }, + "on": { + "frames": 8, + "mode": "loop", + "cycle": 1 + } } }, - "station0" : { - "default" : "on", - "states" : { - "off" : {"frames":8,"mode":"loop","cycle":1}, - "on" : {"frames":8,"mode":"loop","cycle":1} + "station0": { + "default": "on", + "states": { + "off": { + "frames": 8, + "mode": "loop", + "cycle": 1 + }, + "on": { + "frames": 8, + "mode": "loop", + "cycle": 1 + } } }, - "lit" : { - "default" : "on", - "states" : { - "off" : {"frames":8,"mode":"loop","cycle":1}, - "on" : {"frames":8,"mode":"loop","cycle":1} + "lit": { + "default": "on", + "states": { + "off": { + "frames": 8, + "mode": "loop", + "cycle": 1 + }, + "on": { + "frames": 8, + "mode": "loop", + "cycle": 1 + } } }, - "lit0" : { - "default" : "on", - "states" : { - "off" : {"frames":8,"mode":"loop","cycle":1}, - "on" : {"frames":8,"mode":"loop","cycle":1} + "lit0": { + "default": "on", + "states": { + "off": { + "frames": 8, + "mode": "loop", + "cycle": 1 + }, + "on": { + "frames": 8, + "mode": "loop", + "cycle": 1 + } } } }, - "parts" : { - "station" : { - "properties" : { - "centered" : false + "parts": { + "station": { + "properties": { + "centered": false }, - "partStates" : { - "station" : { - "off" : { - "properties" : {} + "partStates": { + "station": { + "off": { + "properties": {} }, - "on" : { - "properties" : { - "image" : ":.", - "fullbright" : true + "on": { + "properties": { + "image": ":.", + "fullbright": true } } } } }, - "station0" : { - "properties" : { - "centered" : false + "station0": { + "properties": { + "centered": false }, - "partStates" : { - "station0" : { - "off" : { - "properties" : { - "image" : ":.", - "fullbright" : true} - }, - "on" : { - "properties" : { + "partStates": { + "station0": { + "off": { + "properties": { + "image": ":.", + "fullbright": true } + }, + "on": { + "properties": {} } } } }, - "lit0" : { - "properties" : { - "zLevel" : 1, - "centered" : false + "lit0": { + "properties": { + "zLevel": 1, + "centered": false }, - "partStates" : { - "lit0" : { - "off" : { - "properties" : { - "image" : ":."} - }, - "on" : { - "properties" : { + "partStates": { + "lit0": { + "off": { + "properties": { + "image": ":." } + }, + "on": { + "properties": {} } } } }, - "lit" : { - "properties" : { - "zLevel" : 1, - "centered" : false + "lit": { + "properties": { + "zLevel": 1, + "centered": false }, - "partStates" : { - "lit" : { - "off" : { - "properties" : {} + "partStates": { + "lit": { + "off": { + "properties": {} }, - "on" : { - "properties" : { - "image" : ":." + "on": { + "properties": { + "image": ":." } } } @@ -105,4 +137,4 @@ } } } -} \ No newline at end of file +} diff --git a/objects/weaponassembly/weaponpainter/WA_weaponpainter.object.patch b/objects/weaponassembly/weaponpainter/WA_weaponpainter.object.patch new file mode 100644 index 00000000..b0afed8b --- /dev/null +++ b/objects/weaponassembly/weaponpainter/WA_weaponpainter.object.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/scripts","inverse":true},{"op":"add","path":"/scripts","value":[]}], +[{"op":"add","path":"/scripts/-","value":"/scripts/weaponassembly/betabound_painter.lua"}] +] \ No newline at end of file diff --git a/objects/wired/alarm/alarm.object.patch b/objects/wired/alarm/alarm.object.patch new file mode 100644 index 00000000..95ac617c --- /dev/null +++ b/objects/wired/alarm/alarm.object.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/description","value":"A big flashing light and blaring siren guaranteed to draw lots of attention."},{"op":"replace","path":"/description","value":"Weeeeoooweeeeoooo! A big flashing light and blaring siren guaranteed to draw lots of attention."}] +] \ No newline at end of file diff --git a/objects/wired/sb_pump/pump.animation b/objects/wired/sb_pump/pump.animation index 656d8cb7..28f3314b 100644 --- a/objects/wired/sb_pump/pump.animation +++ b/objects/wired/sb_pump/pump.animation @@ -1,74 +1,74 @@ { - "animatedParts" : { - "stateTypes" : { - "pumping" : { - "priority" : 0, - "default" : "idle", + "animatedParts": { + "stateTypes": { + "pumping": { + "priority": 0, + "default": "idle", - "states" : { - "idle" : { - "frames" : 1 + "states": { + "idle": { + "frames": 1 }, - "error" : { - "frames" : 1 + "error": { + "frames": 1 }, - "pump" : { - "frames" : 10, - "cycle" : 0.5, - "mode" : "loop" + "pump": { + "frames": 10, + "cycle": 0.5, + "mode": "loop" } } } }, - "parts" : { - "pump" : { - "properties" : { - "offset" : [0, 0], - "centered" : false, - "fullbright" : true, - "zLevel" : 3 + "parts": { + "pump": { + "properties": { + "offset": [0, 0], + "centered": false, + "fullbright": true, + "zLevel": 3 }, - "partStates" : { - "pumping" : { - "idle" : { - "properties" : { - "image" : ":idle" + "partStates": { + "pumping": { + "idle": { + "properties": { + "image": ":idle" } }, - "error" : { - "properties" : { - "image" : ":error" + "error": { + "properties": { + "image": ":error" } }, - "pump" : { - "properties" : { - "image" : ":pump." + "pump": { + "properties": { + "image": ":pump." } } } } }, - "pumplit" : { - "properties" : { - "offset" : [0, 0], - "centered" : false, - "zLevel" : 4 + "pumplit": { + "properties": { + "offset": [0, 0], + "centered": false, + "zLevel": 4 }, - "partStates" : { - "pumping" : { - "idle" : { - "properties" : { - "image" : ":idle" + "partStates": { + "pumping": { + "idle": { + "properties": { + "image": ":idle" } }, - "error" : { - "properties" : { - "image" : ":error" + "error": { + "properties": { + "image": ":error" } }, - "pump" : { - "properties" : { - "image" : ":pump." + "pump": { + "properties": { + "image": ":pump." } } } @@ -77,7 +77,7 @@ } }, - "sounds" : { - "switch" : ["/sfx/objects/tinywallswitch.ogg"] + "sounds": { + "switch": ["/sfx/objects/tinywallswitch.ogg"] } -} \ No newline at end of file +} diff --git a/objects/wired/sb_standingturret/standingturret.animation b/objects/wired/sb_standingturret/standingturret.animation index c74cdf7f..a3ba2d41 100644 --- a/objects/wired/sb_standingturret/standingturret.animation +++ b/objects/wired/sb_standingturret/standingturret.animation @@ -1,108 +1,132 @@ { - "animatedParts" : { - "stateTypes" : { - "attack" : { - "priority" : 0, - "default" : "dead", + "animatedParts": { + "stateTypes": { + "attack": { + "priority": 0, + "default": "dead", - "states" : { - "idle" : { - "frames" : 1 + "states": { + "idle": { + "frames": 1 }, - "dead" : { - "frames" : 1 + "dead": { + "frames": 1 }, - "attack" : { - "frames" : 4, - "cycle" : 0.25, - "mode" : "loop" + "attack": { + "frames": 4, + "cycle": 0.25, + "mode": "loop" } } }, - "energy" : { - "default" : "full", + "energy": { + "default": "full", - "states" : { - "full" : { "frames" : 1 }, - "high" : { "frames" : 1 }, - "medium" : { "frames" : 1 }, - "low" : { "frames" : 1 }, - "none" : { "frames" : 1 } + "states": { + "full": { + "frames": 1 + }, + "high": { + "frames": 1 + }, + "medium": { + "frames": 1 + }, + "low": { + "frames": 1 + }, + "none": { + "frames": 1 + } } }, - "opened" : { - "default" : "true", + "opened": { + "default": "true", - "states" : { - "true" : { "frames" : 1 }, - "false" : { "frames" : 1 } + "states": { + "true": { + "frames": 1 + }, + "false": { + "frames": 1 + } } } }, - "parts" : { - "gun" : { - "properties" : { - "offset" : [0.5, 0.0], - "projectileSource" : [2.0, 0.0], - "rotationGroup" : "gun", - "centered" : true, - "zLevel" : 3 + "parts": { + "gun": { + "properties": { + "offset": [0.5, 0], + "projectileSource": [2, 0], + "rotationGroup": "gun", + "centered": true, + "zLevel": 3 }, - "partStates" : { - "attack" : { - "idle" : { - "properties" : { - "image" : ":idle" + "partStates": { + "attack": { + "idle": { + "properties": { + "image": ":idle" } }, - "dead" : { - "properties" : { - "image" : ":dead" + "dead": { + "properties": { + "image": ":dead" } }, - "attack" : { - "properties" : { - "image" : ":attack." + "attack": { + "properties": { + "image": ":attack." } } } } }, - "stand" : { - "properties" : { - "offset" : [0, 0], - "image" : "", - "centered" : true, - "zLevel" : 1 + "stand": { + "properties": { + "offset": [0, 0], + "image": "", + "centered": true, + "zLevel": 1 } }, - "energy" : { - "properties" : { - "centered" : false, - "zLevel" : 2, - "transformationGroups" : [ "energy" ] + "energy": { + "properties": { + "centered": false, + "zLevel": 2, + "transformationGroups": ["energy"] }, - "partStates" : { - "energy" : { - "full" : { - "properties" : { "image" : ":full" } + "partStates": { + "energy": { + "full": { + "properties": { + "image": ":full" + } }, - "high" : { - "properties" : { "image" : ":high" } + "high": { + "properties": { + "image": ":high" + } }, - "medium" : { - "properties" : { "image" : ":medium" } + "medium": { + "properties": { + "image": ":medium" + } }, - "low" : { - "properties" : { "image" : ":low" } + "low": { + "properties": { + "image": ":low" + } }, - "none" : { - "properties" : { "image" : ":none" } + "none": { + "properties": { + "image": ":none" + } } } } @@ -110,22 +134,24 @@ } }, - "rotationGroups" : { - "gun" : { - "rotationCenter" : [0, 0], - "angularVelocity" : 1 + "rotationGroups": { + "gun": { + "rotationCenter": [0, 0], + "angularVelocity": 1 } }, - "transformationGroups" : { - "energy" : { "interpolated" : false } + "transformationGroups": { + "energy": { + "interpolated": false + } }, - "sounds" : { - "powerUp" : ["/sfx/tech/mech_jump3.ogg"], - "powerDown" : ["/sfx/tech/mech_powerdown2.ogg"], - "foundTarget" : ["/sfx/interface/nav_computer_on.ogg"], - "scan" : ["/sfx/interface/scan.ogg"], - "fire" : ["/sfx/gun/ar5.ogg"] + "sounds": { + "powerUp": ["/sfx/tech/mech_jump3.ogg"], + "powerDown": ["/sfx/tech/mech_powerdown2.ogg"], + "foundTarget": ["/sfx/interface/nav_computer_on.ogg"], + "scan": ["/sfx/interface/scan.ogg"], + "fire": ["/sfx/gun/ar5.ogg"] } } diff --git a/player.config.patch b/player.config.patch index 06cd365a..15296063 100644 --- a/player.config.patch +++ b/player.config.patch @@ -17,7 +17,7 @@ [{"op":"add","path":"/statusControllerSettings/resources/sb_forceFieldStrength","value":{"baseValue":0}}], [{"op":"test","path":"/statusControllerSettings/resources/stunned","inverse":true},{"op":"add","path":"/statusControllerSettings/resources/stunned","value":{"baseValue":0}}], -//misc +//inventory [{"op":"test","path":"/ageItemsEvery","value":10},{"op":"replace","path":"/ageItemsEvery","value":300}], [{"op":"test","path":"/inventoryFilters/autoAddToCustomBar/categoryBlacklist/0","value":"food"},{"op":"remove","path":"/inventoryFilters/autoAddToCustomBar/categoryBlacklist/0"}], [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"beamminingtool"}], @@ -25,6 +25,17 @@ [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"paintingbeamtool"}], [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"inspectiontool"}], + +//scripts +[{"op":"add","path":"/genericScriptContexts/sb_main","value":"/scripts/player/sb_main.lua"}], +[{"op":"add","path":"/genericScriptContexts/sb_versioning","value":"/scripts/sb_versioning/versioncheck.lua"}], +[{"op":"add","path":"/genericScriptContexts/sb_items","value":"/scripts/player/sb_items.lua"}], +[{"op":"add","path":"/genericScriptContexts/sb_events","value":"/events/sb_events.lua"}], +[{"op":"add","path":"/statusControllerSettings/primaryScriptSources/-","value":"/stats/sb_player_primary.lua"}], +[{"op":"add","path":"/companionsConfig/scripts/-","value":"/scripts/player/sb_ship.lua"}], +[{"op":"add","path":"/companionsConfig/scripts/-","value":"/scripts/player/sb_pets.lua"}], + +//recipes //reagent [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"coalore"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"platinumbar"}}], @@ -55,6 +66,8 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"skyrailbreak"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"skyrailplatform"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_tech","count":1,"parameters":{"techModule":"skyrail"}}}], + +//rails [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_solidrailplatform"}}], //crafting @@ -62,22 +75,20 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_woodencookingtable"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_cookingstation"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_codex"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_techconsole"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"fossilpod"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"spawnerstation"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"mechassemblystation"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"mechcraftingtable"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_wrappingtable"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_researchstation"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_metalworkstation"}}], +//misc stations +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_wrappingtable"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"mechassemblystation"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_codex"}}], + //bosses [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_ironbeacon"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"artificialbrain"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_peanutbutter"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_peanutbutterjar"}}], -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_butter"}}], //tools [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_stonepickaxe"}}], @@ -118,6 +129,7 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_flashfreeze"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_partypopper"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_hookshot"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_whistle"}}], //upgrades [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"upgrademodule"}}], @@ -134,6 +146,7 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_weaponupgrade5"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_weaponupgrade6"}}], +//fu prevents other mods from using player.upgradeShip so disable ship upgrades if it's present [{"op":"test","path":"/defaultCodexes/fumantizi","inverse":true}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_shipspeed1"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_maxfuel1"}}, @@ -220,7 +233,6 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"executivebed"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_tier6stechchest"}}], - //wire [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_forcepad"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"woodenelevatorshort"}}], @@ -394,12 +406,6 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_novakidlightstaff1"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_novakidlightstaff2"}}], -//end -[{"op":"add","path":"/genericScriptContexts/sb_main","value":"/scripts/player/sb_main.lua"}], -[{"op":"add","path":"/genericScriptContexts/sb_versioning","value":"/scripts/sb_versioning/versioncheck.lua"}], -//[{"op":"add","path":"/deploymentConfig/scripts/-","value":"/xrc/deployment/versioning/tech.lua"}], -[{"op":"add","path":"/genericScriptContexts/sb_blueprints","value":"/scripts/player/sb_blueprints.lua"}], -[{"op":"add","path":"/genericScriptContexts/sb_events","value":"/events/sb_events.lua"}], -[{"op":"add","path":"/statusControllerSettings/primaryScriptSources/-","value":"/stats/sb_player_primary.lua"}], -[{"op":"add","path":"/companionsConfig/scripts/-","value":"/scripts/player/sb_ship.lua"}] +//unsorted +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"fossilpod"}}] ] \ No newline at end of file diff --git a/projectiles/activeitems/grapplehook/sb_iceaxehook.lua b/projectiles/activeitems/grapplehook/sb_iceaxehook.lua index e6064acb..178b882b 100644 --- a/projectiles/activeitems/grapplehook/sb_iceaxehook.lua +++ b/projectiles/activeitems/grapplehook/sb_iceaxehook.lua @@ -1,6 +1,6 @@ -local ini = init or function() end +local originalInit = init or function() end function init() - ini() + originalInit() mcontroller.setRotation(45) end \ No newline at end of file diff --git a/projectiles/guns/arrows/sb_slingshot/slingshot.projectile b/projectiles/guns/arrows/sb_slingshot/slingshot.projectile index e709df15..d08ce627 100644 --- a/projectiles/guns/arrows/sb_slingshot/slingshot.projectile +++ b/projectiles/guns/arrows/sb_slingshot/slingshot.projectile @@ -1,24 +1,23 @@ { - "projectileName" : "sb_slingshot", - "physics" : "shrapnel", - "actionOnCollide" : [ - { - "action" : "sound", - "options" : [ + "projectileName": "sb_slingshot", + "physics": "shrapnel", + "actionOnCollide": [{ + "action": "sound", + "options": [ "/sfx/gun/impact_arrow.ogg" ] } ], - "image" : "slingshot.png", - "animationCycle" : 0.25, - "frameNumber" : 1, - "damageKind" : "bow", - "bounces" : 3, - "damagePoly" : [ [8, -0.2], [8.5, -0.2], [8.5, 0.2], [8, 0.2] ], - "timeToLive" : 10, - "pointLight" : false, - "power" : 5.0, - "knockback" : 20, - "knockbackDirectional" : true, - "speed" : 70 -} \ No newline at end of file + "image": "slingshot.png", + "animationCycle": 0.25, + "frameNumber": 1, + "damageKind": "bow", + "bounces": 3, + "damagePoly": [[8, -0.2], [8.5, -0.2], [8.5, 0.2], [8, 0.2]], + "timeToLive": 10, + "pointLight": false, + "power": 5, + "knockback": 20, + "knockbackDirectional": true, + "speed": 70 +} diff --git a/projectiles/guns/arrows/sb_slingshot/slingshot3.projectile b/projectiles/guns/arrows/sb_slingshot/slingshot3.projectile index ad71801b..e91df6e2 100644 --- a/projectiles/guns/arrows/sb_slingshot/slingshot3.projectile +++ b/projectiles/guns/arrows/sb_slingshot/slingshot3.projectile @@ -1,29 +1,30 @@ { - "projectileName" : "sb_slingshot3", - "physics" : "shrapnel", - "image" : "slingshot.png?multiply=0000", - "animationCycle" : 0.25, - "frameNumber" : 1, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_slingshot", - "inheritSpeedFactor" : 1, - "angleAdjust" : -5 - }, - { - "action" : "projectile", - "type" : "sb_slingshot", - "inheritSpeedFactor" : 1, - "angleAdjust" : 0 - }, - { - "action" : "projectile", - "type" : "sb_slingshot", - "inheritSpeedFactor" : 1, - "angleAdjust" : 5 + "projectileName": "sb_slingshot3", + "physics": "illusion", + "image": "slingshot.png?multiply=0000", + "animationCycle": 0.25, + "frameNumber": 1, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_slingshot", + "inheritSpeedFactor": 1, + "inheritDamageFactor": 0.75, + "angleAdjust": -5 + }, { + "action": "projectile", + "type": "sb_slingshot", + "inheritSpeedFactor": 1, + "inheritDamageFactor": 0.75, + "angleAdjust": 0 + }, { + "action": "projectile", + "type": "sb_slingshot", + "inheritSpeedFactor": 1, + "inheritDamageFactor": 0.75, + "angleAdjust": 5 } ], - "timeToLive" : 0, - "power" : 5 -} \ No newline at end of file + "timeToLive": 0, + "damageType": "NoDamage", + "damageKind": "default" +} diff --git a/projectiles/npcs/watergun/watersplash.projectile.patch b/projectiles/npcs/watergun/watersplash.projectile.patch new file mode 100644 index 00000000..9adcc136 --- /dev/null +++ b/projectiles/npcs/watergun/watersplash.projectile.patch @@ -0,0 +1,23 @@ +[ + [{ + "op": "test", + "path": "/actionOnReap", + "inverse": true + }, { + "op": "add", + "path": "/actionOnReap", + "value": [] + } + ], + [{ + "op": "add", + "path": "/actionOnReap/-", + "value": { + "action": "projectile", + "type": "watersprinkledroplet", + "inheritDamageFactor": 0, + "inheritSpeedFactor": 0 + } + } + ] +] diff --git a/projectiles/sb_boss/jelly/icon.png b/projectiles/sb_boss/jelly/icon.png deleted file mode 100644 index 347d4646..00000000 Binary files a/projectiles/sb_boss/jelly/icon.png and /dev/null differ diff --git a/projectiles/sb_boss/jelly/jellybossgoosplash.projectile b/projectiles/sb_boss/jelly/jellybossgoosplash.projectile index 08aed08f..cad75584 100644 --- a/projectiles/sb_boss/jelly/jellybossgoosplash.projectile +++ b/projectiles/sb_boss/jelly/jellybossgoosplash.projectile @@ -15,7 +15,7 @@ } ], // "damageTeam" : { "type" : "indiscriminate" }, - "damageType": "ignoresdef", + // "damageType": "ignoresdef", "damagePoly": [[-9, 0], [-6, -6], [0, -9], [6, -6], [9, 0], [6, 6], [0, 9], [-6, 6]], "damageKind": "default" } diff --git a/projectiles/sb_minibiomelegendaries/eye/eyesword.projectile b/projectiles/sb_minibiomelegendaries/eye/eyesword.projectile index b126e668..4e79494f 100644 --- a/projectiles/sb_minibiomelegendaries/eye/eyesword.projectile +++ b/projectiles/sb_minibiomelegendaries/eye/eyesword.projectile @@ -1,32 +1,29 @@ { - "projectileName" : "sb_eyesword", - "image" : "/projectiles/invisibleprojectile/invisibleprojectile.png", - "animationCycle" : 1, - "frameNumber" : 1, - "speed" : 0, - "timeToLive" : 0, - "animationLoops" : false, + "projectileName": "sb_eyesword", + "image": "/projectiles/invisibleprojectile/invisibleprojectile.png", + "animationCycle": 1, + "frameNumber": 1, + "speed": 0, + "timeToLive": 0, + "animationLoops": false, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_bloodcloud", - "inheritDamageFactor" : 0.2, - "angleAdjust" : 25 - }, - { - "action" : "projectile", - "type" : "sb_bloodcloud", - "inheritDamageFactor" : 0.2, - "angleAdjust" : -25 - }, - { - "action" : "projectile", - "type" : "sb_bloodcloud", - "inheritDamageFactor" : 0.2, - "angleAdjust" : 0 + "actionOnReap": [{ + "action": "projectile", + "type": "sb_bloodcloud", + "inheritDamageFactor": 0.2, + "angleAdjust": 25 + }, { + "action": "projectile", + "type": "sb_bloodcloud", + "inheritDamageFactor": 0.2, + "angleAdjust": -25 + }, { + "action": "projectile", + "type": "sb_bloodcloud", + "inheritDamageFactor": 0.2, + "angleAdjust": 0 } ], - "damageType" : "NoDamage", - "damageKind" : "default" -} \ No newline at end of file + "damageType": "NoDamage", + "damageKind": "default" +} diff --git a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.projectile b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.projectile index 74388c2f..0c36efd5 100644 --- a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.projectile +++ b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.projectile @@ -1,7 +1,6 @@ { "projectileName": "sb_slimeblob", "physics": "grenadezbomb", - "lightColor": [0, 50, 40], "pointLight": true, "image": "slimeblob.png", "timeToLive": 5, diff --git a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblobx.projectile b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblobx.projectile index 90e028a1..5bdd00cb 100644 --- a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblobx.projectile +++ b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblobx.projectile @@ -1,7 +1,6 @@ { "projectileName": "sb_slimeblobx", "physics": "grenadezbomb", - "lightColor": [0, 50, 40], "pointLight": true, "image": "slimeblobx.png", "timeToLive": 0.8, diff --git a/projectiles/sb_minibiomelegendaries/slime/cluster/slimecluster.projectile b/projectiles/sb_minibiomelegendaries/slime/cluster/slimecluster.projectile index 49caa91a..a050ab5a 100644 --- a/projectiles/sb_minibiomelegendaries/slime/cluster/slimecluster.projectile +++ b/projectiles/sb_minibiomelegendaries/slime/cluster/slimecluster.projectile @@ -1,7 +1,6 @@ { "projectileName": "sb_slimecluster", "physics": "stickybomb", - "lightColor": [0, 50, 40], "pointLight": true, "image": "slimecluster.png", "timeToLive": 2, diff --git a/projectiles/sb_minibiomelegendaries/slime/cluster/slimeclusterx.projectile b/projectiles/sb_minibiomelegendaries/slime/cluster/slimeclusterx.projectile index d2da5b89..2c44b9e4 100644 --- a/projectiles/sb_minibiomelegendaries/slime/cluster/slimeclusterx.projectile +++ b/projectiles/sb_minibiomelegendaries/slime/cluster/slimeclusterx.projectile @@ -1,7 +1,6 @@ { "projectileName": "sb_slimeclusterx", "physics": "stickybomb", - "lightColor": [0, 50, 40], "pointLight": true, "image": "slimeclusterx.png", "timeToLive": 2, diff --git a/projectiles/sb_staves/fleshseedspawn.frames b/projectiles/sb_staves/fleshseedspawn.frames deleted file mode 100644 index f67dd0ce..00000000 --- a/projectiles/sb_staves/fleshseedspawn.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [8, 8], - "dimensions" : [1, 1], - - "names" : [ - [ "0" ] - ] - } -} diff --git a/projectiles/sb_staves/fleshseedspawn.png b/projectiles/sb_staves/fleshseedspawn.png deleted file mode 100644 index 248db36d..00000000 Binary files a/projectiles/sb_staves/fleshseedspawn.png and /dev/null differ diff --git a/projectiles/sb_staves/fleshseedspawn.projectile b/projectiles/sb_staves/fleshseedspawn.projectile index 0a97d3e3..0cfeadeb 100644 --- a/projectiles/sb_staves/fleshseedspawn.projectile +++ b/projectiles/sb_staves/fleshseedspawn.projectile @@ -1,11 +1,10 @@ { "projectileName": "sb_fleshseedspawn", - "image": "fleshseedspawn.png", + "image": "/projectiles/invisibleprojectile/invisibleprojectile.png", "animationCycle": 1, "frameNumber": 1, "timeToLive": 0.01, "physics": "grenade", - "damageKindImage": "icon.png", "pointLight": false, "onlyHitTerrain": true, "actionOnReap": [{ diff --git a/projectiles/sb_staves/racialstaves/aqua/default.frames b/projectiles/sb_staves/racialstaves/aqua/default.frames new file mode 100644 index 00000000..2cac0364 --- /dev/null +++ b/projectiles/sb_staves/racialstaves/aqua/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid": { + "size": [16, 16], + "dimensions": [2, 1], + + "names": [ + ["0", "1"] + ] + } +} diff --git a/projectiles/sb_staves/racialstaves/aqua/splashdrop1.frames b/projectiles/sb_staves/racialstaves/aqua/splashdrop1.frames deleted file mode 100644 index 21d32ba8..00000000 --- a/projectiles/sb_staves/racialstaves/aqua/splashdrop1.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [2, 1], - - "names" : [ - [ "0", "1" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.frames b/projectiles/sb_staves/racialstaves/aqua/splashdrop2.frames deleted file mode 100644 index 21d32ba8..00000000 --- a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [2, 1], - - "names" : [ - [ "0", "1" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.frames b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.frames deleted file mode 100644 index abc8bdbe..00000000 --- a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [256, 32], - "dimensions" : [1, 1], - - "names" : [ - [ "0" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.png b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.png deleted file mode 100644 index 5a754e3d..00000000 Binary files a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.png and /dev/null differ diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile index 2e0f0df8..d14498d2 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile @@ -1,9 +1,9 @@ { "projectileName": "sb_splashspawner1", - "image": "splashspawner1.png", + "image": "/projectiles/invisibleprojectile/invisibleprojectile.png", "physics": "gas", - "animationCycle": 0.1, - "frameNumber": 8, + "animationCycle": 1, + "frameNumber": 1, "speed": 1, "pointLight": false, "timeToLive": 0, diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile b/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile index e96dc2f9..b8c4c871 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile @@ -1,9 +1,9 @@ { "projectileName": "sb_splashspawner2", - "image": "splashspawner1.png", + "image": "/projectiles/invisibleprojectile/invisibleprojectile.png", "physics": "gas", - "animationCycle": 0, - "frameNumber": 8, + "animationCycle": 1, + "frameNumber": 1, "speed": 1, "pointLight": false, "timeToLive": 0, diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.frames b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.frames deleted file mode 100644 index 30640f1b..00000000 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [40, 40], - "dimensions" : [8, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5", "6", "7" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.frames b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.frames deleted file mode 100644 index 24a8b597..00000000 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [41, 40], - "dimensions" : [6, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.frames b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.frames deleted file mode 100644 index 30640f1b..00000000 --- a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [40, 40], - "dimensions" : [8, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5", "6", "7" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.frames b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.frames deleted file mode 100644 index e9955b55..00000000 --- a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [44, 44], - "dimensions" : [8, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5", "6", "7" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchsword.frames b/projectiles/sb_staves/racialstaves/glitch/glitchsword.frames new file mode 100644 index 00000000..716b65f0 --- /dev/null +++ b/projectiles/sb_staves/racialstaves/glitch/glitchsword.frames @@ -0,0 +1,10 @@ +{ + "frameGrid": { + "size": [41, 40], + "dimensions": [6, 1], + + "names": [ + ["0", "1", "2", "3", "4", "5"] + ] + } +} diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png b/projectiles/sb_staves/racialstaves/glitch/glitchsword.png similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png rename to projectiles/sb_staves/racialstaves/glitch/glitchsword.png diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile b/projectiles/sb_staves/racialstaves/glitch/glitchsword.projectile similarity index 95% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile rename to projectiles/sb_staves/racialstaves/glitch/glitchsword.projectile index 3d497c6c..46e975d3 100644 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/glitchsword.projectile @@ -2,7 +2,7 @@ "projectileName": "sb_glitchsword", "physics": "stickybomb", "image": "glitchsword.png", - "animationCycle": 0.2, + "animationCycle": 1, "bounces": -1, "timeToLive": 2.5, "frameNumber": 6, diff --git a/projectiles/sb_staves/racialstaves/glitch/scratch/default.frames b/projectiles/sb_staves/racialstaves/glitch/scratch/default.frames new file mode 100644 index 00000000..6e4a847d --- /dev/null +++ b/projectiles/sb_staves/racialstaves/glitch/scratch/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid": { + "size": [40, 40], + "dimensions": [8, 1], + + "names": [ + ["0", "1", "2", "3", "4", "5", "6", "7"] + ] + } +} diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png b/projectiles/sb_staves/racialstaves/glitch/scratch/gamebreakerscratch.png similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png rename to projectiles/sb_staves/racialstaves/glitch/scratch/gamebreakerscratch.png diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile b/projectiles/sb_staves/racialstaves/glitch/scratch/gamebreakerscratch.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile rename to projectiles/sb_staves/racialstaves/glitch/scratch/gamebreakerscratch.projectile diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png b/projectiles/sb_staves/racialstaves/glitch/scratch/glitchscratch.png similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png rename to projectiles/sb_staves/racialstaves/glitch/scratch/glitchscratch.png diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile b/projectiles/sb_staves/racialstaves/glitch/scratch/glitchscratch.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile rename to projectiles/sb_staves/racialstaves/glitch/scratch/glitchscratch.projectile diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.frames b/projectiles/sb_staves/racialstaves/glitch/tear/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.frames rename to projectiles/sb_staves/racialstaves/glitch/tear/default.frames diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png b/projectiles/sb_staves/racialstaves/glitch/tear/gamebreakertear.png similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png rename to projectiles/sb_staves/racialstaves/glitch/tear/gamebreakertear.png diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile b/projectiles/sb_staves/racialstaves/glitch/tear/gamebreakertear.projectile similarity index 94% rename from projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile rename to projectiles/sb_staves/racialstaves/glitch/tear/gamebreakertear.projectile index 3f32e089..2be15ca8 100644 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/tear/gamebreakertear.projectile @@ -23,8 +23,6 @@ "file": "/projectiles/explosions/glitchexplosion/glitchexplosion.config" } ], - "statusEffects": [ - "crash" - ], + "statusEffects": ["crash"], "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png b/projectiles/sb_staves/racialstaves/glitch/tear/glitchtear.png similarity index 100% rename from projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png rename to projectiles/sb_staves/racialstaves/glitch/tear/glitchtear.png diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile b/projectiles/sb_staves/racialstaves/glitch/tear/glitchtear.projectile similarity index 93% rename from projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile rename to projectiles/sb_staves/racialstaves/glitch/tear/glitchtear.projectile index 218aa08b..6062855d 100644 --- a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/tear/glitchtear.projectile @@ -21,9 +21,7 @@ } ], - "statusEffects": [ - "crash" - ], + "statusEffects": ["crash"], "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.frames b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.frames index 21d32ba8..2cac0364 100644 --- a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.frames +++ b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.frames @@ -1,10 +1,10 @@ { - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [2, 1], + "frameGrid": { + "size": [16, 16], + "dimensions": [2, 1], - "names" : [ - [ "0", "1" ] + "names": [ + ["0", "1"] ] } } diff --git a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile index a1e8dba2..85642b11 100644 --- a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile @@ -15,7 +15,7 @@ "file": "/projectiles/explosions/leafexplosion/leafexplosion.config" } ], - "power": 1.0, + "power": 1, "damagePoly": [[-2, 2], [-2, -2], [2, -2], [2, 2]], "damageKind": "default", "emitters": ["lighttrailfast"] diff --git a/projectiles/sb_staves/racialstaves/leaf/default.frames b/projectiles/sb_staves/racialstaves/leaf/default.frames new file mode 100644 index 00000000..d745f163 --- /dev/null +++ b/projectiles/sb_staves/racialstaves/leaf/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid": { + "size": [32, 32], + "dimensions": [4, 1], + + "names": [ + ["0", "1", "2", "3"] + ] + } +} diff --git a/projectiles/sb_staves/racialstaves/leaf/leafcloud.frames b/projectiles/sb_staves/racialstaves/leaf/leafcloud.frames deleted file mode 100644 index 6bf5827f..00000000 --- a/projectiles/sb_staves/racialstaves/leaf/leafcloud.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [32, 32], - "dimensions" : [4, 1], - - "names" : [ - [ "0", "1", "2", "3" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile b/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile index fcfe5363..ff8200a3 100644 --- a/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile @@ -12,7 +12,7 @@ "delaySteps": 15, "repeat": false, "time": 0, - "options": ["/sfx/sb/npc/unique/gust1.ogg", "/sfx/sb/npc/unique/gust2.ogg", "/sfx/sb/npc/unique/gust3.ogg"] + "options": ["/sfx/projectiles/gust1.ogg", "/sfx/projectiles/gust2.ogg", "/sfx/projectiles/gust3.ogg"] }, { "action": "projectile", "type": "sb_cutterleaf", diff --git a/projectiles/sb_staves/racialstaves/leaf/petalcloud.frames b/projectiles/sb_staves/racialstaves/leaf/petalcloud.frames deleted file mode 100644 index 6bf5827f..00000000 --- a/projectiles/sb_staves/racialstaves/leaf/petalcloud.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [32, 32], - "dimensions" : [4, 1], - - "names" : [ - [ "0", "1", "2", "3" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile b/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile index 9d53d54d..6186a007 100644 --- a/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile @@ -11,7 +11,7 @@ "periodicActions": [{ "action": "sound", "delaySteps": 15, - "options": ["/sfx/sb/npc/unique/gustchime1.ogg", "/sfx/sb/npc/unique/gustchime2.ogg", "/sfx/sb/npc/unique/gustchime3.ogg"], + "options": ["/sfx/projectiles/gustchime1.ogg", "/sfx/projectiles/gustchime2.ogg", "/sfx/projectiles/gustchime3.ogg"], "time": 0, "repeat": false }, { diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.frames b/projectiles/sb_staves/racialstaves/light/giant/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/redgiant.frames rename to projectiles/sb_staves/racialstaves/light/giant/default.frames diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png b/projectiles/sb_staves/racialstaves/light/giant/redgiant.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png rename to projectiles/sb_staves/racialstaves/light/giant/redgiant.png diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile b/projectiles/sb_staves/racialstaves/light/giant/redgiant.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile rename to projectiles/sb_staves/racialstaves/light/giant/redgiant.projectile diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png b/projectiles/sb_staves/racialstaves/light/giant/supergiant.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png rename to projectiles/sb_staves/racialstaves/light/giant/supergiant.png diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile b/projectiles/sb_staves/racialstaves/light/giant/supergiant.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile rename to projectiles/sb_staves/racialstaves/light/giant/supergiant.projectile diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.frames b/projectiles/sb_staves/racialstaves/light/sunray/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/sunray.frames rename to projectiles/sb_staves/racialstaves/light/sunray/default.frames diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.png b/projectiles/sb_staves/racialstaves/light/sunray/sunray.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/redgiant/sunray.png rename to projectiles/sb_staves/racialstaves/light/sunray/sunray.png diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile b/projectiles/sb_staves/racialstaves/light/sunray/sunray.projectile similarity index 94% rename from projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile rename to projectiles/sb_staves/racialstaves/light/sunray/sunray.projectile index 261e0d64..2e50f99c 100644 --- a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile +++ b/projectiles/sb_staves/racialstaves/light/sunray/sunray.projectile @@ -3,18 +3,18 @@ "physics": "hover", "bounces": -1, "speed": 10, - "timeToLive": 1.0, + "timeToLive": 1, "lightColor": [165, 25, 0], "piercing": true, "image": "sunray.png", "animationCycle": 1, "frameNumber": 5, - "power": 0, "statusEffects": [{ "effect": "burning", "duration": 0.5 } ], + "power": 0, "damagePoly": [[15, 5], [60, 10], [60, -10], [15, -5]], "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png b/projectiles/sb_staves/racialstaves/light/sunray/supersunray.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png rename to projectiles/sb_staves/racialstaves/light/sunray/supersunray.png diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile b/projectiles/sb_staves/racialstaves/light/sunray/supersunray.projectile similarity index 95% rename from projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile rename to projectiles/sb_staves/racialstaves/light/sunray/supersunray.projectile index 124dd481..49fc93a4 100644 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile +++ b/projectiles/sb_staves/racialstaves/light/sunray/supersunray.projectile @@ -3,7 +3,7 @@ "physics": "hover", "bounces": -1, "speed": 10, - "timeToLive": 1.0, + "timeToLive": 1, "lightColor": [25, 100, 180], "piercing": true, "image": "supersunray.png", diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.frames b/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.frames deleted file mode 100644 index 8b4c9d7c..00000000 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [32, 32], - "dimensions" : [6, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.frames b/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.frames deleted file mode 100644 index 21d32ba8..00000000 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [2, 1], - - "names" : [ - [ "0", "1" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.frames b/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.frames deleted file mode 100644 index 2715c3aa..00000000 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [128, 20], - "dimensions" : [5, 1], - - "names" : [ - [ "0", "1", "2", "3", "4" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/light/supergiantember.frames b/projectiles/sb_staves/racialstaves/light/supergiantember.frames new file mode 100644 index 00000000..2cac0364 --- /dev/null +++ b/projectiles/sb_staves/racialstaves/light/supergiantember.frames @@ -0,0 +1,10 @@ +{ + "frameGrid": { + "size": [16, 16], + "dimensions": [2, 1], + + "names": [ + ["0", "1"] + ] + } +} diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png b/projectiles/sb_staves/racialstaves/light/supergiantember.png similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png rename to projectiles/sb_staves/racialstaves/light/supergiantember.png diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile b/projectiles/sb_staves/racialstaves/light/supergiantember.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile rename to projectiles/sb_staves/racialstaves/light/supergiantember.projectile diff --git a/projectiles/sb_staves/racialstaves/plasma/boomblast.frames b/projectiles/sb_staves/racialstaves/plasma/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/plasma/boomblast.frames rename to projectiles/sb_staves/racialstaves/plasma/default.frames diff --git a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.frames b/projectiles/sb_staves/racialstaves/plasma/plasmapulse.frames deleted file mode 100644 index e8794739..00000000 --- a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [18, 11], - "dimensions" : [4, 1], - - "names" : [ - [ "0", "1", "2", "3" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png b/projectiles/sb_staves/racialstaves/steel/drone/deadbolt.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png rename to projectiles/sb_staves/racialstaves/steel/drone/deadbolt.png diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile b/projectiles/sb_staves/racialstaves/steel/drone/deadbolt.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile rename to projectiles/sb_staves/racialstaves/steel/drone/deadbolt.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.frames b/projectiles/sb_staves/racialstaves/steel/drone/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.frames rename to projectiles/sb_staves/racialstaves/steel/drone/default.frames diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png b/projectiles/sb_staves/racialstaves/steel/drone/monkeynut.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png rename to projectiles/sb_staves/racialstaves/steel/drone/monkeynut.png diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile b/projectiles/sb_staves/racialstaves/steel/drone/monkeynut.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile rename to projectiles/sb_staves/racialstaves/steel/drone/monkeynut.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png b/projectiles/sb_staves/racialstaves/steel/laser/deadboltlaser.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png rename to projectiles/sb_staves/racialstaves/steel/laser/deadboltlaser.png diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile b/projectiles/sb_staves/racialstaves/steel/laser/deadboltlaser.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile rename to projectiles/sb_staves/racialstaves/steel/laser/deadboltlaser.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.frames b/projectiles/sb_staves/racialstaves/steel/laser/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.frames rename to projectiles/sb_staves/racialstaves/steel/laser/default.frames diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.png b/projectiles/sb_staves/racialstaves/steel/laser/monkeynutlaser.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.png rename to projectiles/sb_staves/racialstaves/steel/laser/monkeynutlaser.png diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile b/projectiles/sb_staves/racialstaves/steel/laser/monkeynutlaser.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile rename to projectiles/sb_staves/racialstaves/steel/laser/monkeynutlaser.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.frames b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.frames deleted file mode 100644 index 1d54a325..00000000 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [30, 26], - "dimensions" : [4, 1], - - "names" : [ - [ "0", "1", "2", "3" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.frames b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.frames deleted file mode 100644 index 3a148136..00000000 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [20, 8], - "dimensions" : [4, 1], - - "names" : [ - [ "0", "1", "2", "3" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.frames b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.frames deleted file mode 100644 index af1c82a6..00000000 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [30, 50], - "dimensions" : [7, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5", "6" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.frames b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.frames deleted file mode 100644 index af1c82a6..00000000 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [30, 50], - "dimensions" : [7, 1], - - "names" : [ - [ "0", "1", "2", "3", "4", "5", "6" ] - ] - } -} diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.projectile b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.projectile deleted file mode 100644 index ec49bb90..00000000 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.projectile +++ /dev/null @@ -1,19 +0,0 @@ -{ - "projectileName" : "sb_monkeynutteleportout", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 0.5, - "lightColor" : [150, 35, 15], - "piercing" : true, - "image" : "monkeynutteleportout.png", - "animationCycle" : 0.5, - "animationLoops" : false, - "orientationLocked" : false, - "flippable" : true, - "frameNumber" : 7, - "power" : 0, - "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], - "supportsProcessing" : true, - "damageKind" : "plasma" -} diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.png b/projectiles/sb_staves/racialstaves/steel/teleport/deadboltteleportin.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.png rename to projectiles/sb_staves/racialstaves/steel/teleport/deadboltteleportin.png diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile b/projectiles/sb_staves/racialstaves/steel/teleport/deadboltteleportin.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile rename to projectiles/sb_staves/racialstaves/steel/teleport/deadboltteleportin.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.frames b/projectiles/sb_staves/racialstaves/steel/teleport/default.frames similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.frames rename to projectiles/sb_staves/racialstaves/steel/teleport/default.frames diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png b/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportin.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png rename to projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportin.png diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile b/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportin.projectile similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile rename to projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportin.projectile diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png b/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportout.png similarity index 100% rename from projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png rename to projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportout.png diff --git a/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportout.projectile b/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportout.projectile new file mode 100644 index 00000000..af016cdd --- /dev/null +++ b/projectiles/sb_staves/racialstaves/steel/teleport/monkeynutteleportout.projectile @@ -0,0 +1,19 @@ +{ + "projectileName": "sb_monkeynutteleportout", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 0.5, + "lightColor": [150, 35, 15], + "piercing": true, + "image": "monkeynutteleportout.png", + "animationCycle": 0.5, + "animationLoops": false, + "orientationLocked": false, + "flippable": true, + "frameNumber": 7, + "power": 0, + "damagePoly": [[-3, 3], [-3, -3], [3, -3], [3, 3]], + "supportsProcessing": true, + "damageKind": "plasma" +} diff --git a/projectiles/status/waterstatusprojectile/waterstatusprojectile.projectile.patch b/projectiles/status/waterstatusprojectile/waterstatusprojectile.projectile.patch new file mode 100644 index 00000000..38dccc65 --- /dev/null +++ b/projectiles/status/waterstatusprojectile/waterstatusprojectile.projectile.patch @@ -0,0 +1,12 @@ +[ + [{ + "op": "test", + "path": "/periodicActions/0/inheritDamageFactor", + "inverse": true + }, { + "op": "add", + "path": "/periodicActions/0/inheritDamageFactor", + "value": 0 + } + ] +] diff --git a/quests/boss/sb_ironbeacon.questtemplate b/quests/boss/sb_ironbeacon.questtemplate index df8e1d97..f31c01d5 100644 --- a/quests/boss/sb_ironbeacon.questtemplate +++ b/quests/boss/sb_ironbeacon.questtemplate @@ -2,7 +2,7 @@ "id": "sb_ironbeacon", "prerequisites": [], "title": "^#9be3d6;First Contact", - "text": "Hey there! You seem pretty lost. How about we help each other out? I'm in need of a ^green;Molten Core^reset;. If you can get one for me, I'll share some of my survival resources with you. Eh? How to get a ^green;Molten Core^reset;? Easy! Just ^green;craft a ^orange;Distress Beacon ^green;and maybe you'll be able to make contact with a larger ship. ^reset;Make sure you're ready for anything before you do though; you never know who'll receive your signal.", + "text": "Hey there! You seem pretty lost. How about we help each other out? I'm in need of a ^green;Molten Core^reset;. If you can get one for me, I'll share some of my survival resources with you. Eh? How to get a ^green;Molten Core^reset;? Easy! Just ^green;craft a ^orange;Distress Beacon at an Inventor's Table ^green;and maybe you'll be able to make contact with a larger ship. ^reset;Make sure you're ready for anything before you do though; you never know who'll receive your signal.", "completionText": "Nicely done. This will be a great help for my studies. As promised, here's your share of my stash! ...Eh? What to do with the other ^green;Molten Cores^reset;? I'm sure you'll figure something out!", "speaker": "questGiver", "moneyRange": [300, 300], @@ -24,6 +24,7 @@ "requireTurnIn": true, "turnInDescription": "Speak to the ^orange;traveller^reset; at the ^orange;mineshaft entrance^reset;", "conditions": [{ + "description": "Craft ^orange;Iron Beacon^reset; to obtain ^orange;Molten Core^reset;", "type": "gatherItem", "itemName": "moltencore", "count": 1, diff --git a/quests/boss/sb_peanutbutter.questtemplate b/quests/boss/sb_peanutbutter.questtemplate new file mode 100644 index 00000000..aebd78f9 --- /dev/null +++ b/quests/boss/sb_peanutbutter.questtemplate @@ -0,0 +1,41 @@ +{ + "id": "sb_peanutbutter", + "prerequisites": ["sb_humanexcon2.gearup"], + "title": "^#9be3d6;The Missing Ingredient", + "text": "Oh, it's you again! Back when I was a USCM inmate, I overheard some guards talking about a 'Brian' incident... In a nutshell, the USCM found a way to lure a delicious monster out with some ^orange;peanut butter^reset;, and I'd love to use it in cooking. ^green;Please make a ^orange;Peanut Butter Trap^green; at an ^orange;Engineer's Table^green; and fight the monster! You can make ^orange;Peanut Butter^green; at a ^orange;Kitchen Counter^green;!^reset;", + "completionText": "So it was a giant jelly monster?! I've been craving a classic PB&J for a while now... You've helped me yet again, and I just can't thank you enough! Here- These are for you!", + "speaker": "questGiver", + "moneyRange": [300, 300], + "canBeAbandoned": true, + "rewards": [["sb_pbj", "upgrademodule", ["techcard", 3], ["rewardbag", 1, { + "treasure": { + "level": 3 + } + } + ]]], + + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquestnorewards.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" + }, + + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "sb_acceptBlueprints": ["sb_butter", "sb_peanutbutterjar", "sb_peanutbutter"], + "turnInDescription": "Speak to ^orange;the ex-convict^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "description": "Craft ^orange;Peanut Butter Trap^reset; to summon the beast", + "type": "gatherItem", + "itemName": "endomorphicjelly", + "count": 1, + "consume": true + } + ] + } +} diff --git a/quests/boss/sb_robot.questtemplate b/quests/boss/sb_robot.questtemplate index 3464b012..ad3176d0 100644 --- a/quests/boss/sb_robot.questtemplate +++ b/quests/boss/sb_robot.questtemplate @@ -2,12 +2,15 @@ "id": "sb_robot", "prerequisites": ["mechunlock"], "title": "^#9be3d6;One Person's Trash...", - "text": "Heya, friendo! I've got another task for you-- a two-for-one kinda deal. One of my suppliers found some sorta tattered robot blueprint in an old desert landfill. Now, normally I don't care much about other people's toys, but from what I can gather, ^green;the bot is capable of producing some sorta advanced ^orange;processor^reset;, and I'd very much like to get my flippers on one. ^green;Think you could build the bot and see what happens?^reset;", + "text": "Heya, friendo! I've got another task for you-- a two-for-one kinda deal. One of my suppliers found some sorta tattered robot blueprint in an old desert landfill. Now, normally I don't care much about other people's toys, but from what I gather, ^green;the bot produces some advanced ^orange;processor^reset;, and I'd very much like to get my flippers on one. ^green;Think you could build the ^orange;Inactive Robot^green; at an ^orange;Iron Tool Table^green; and see what happens?^reset;", //direct player to iron table instead of upgraded inventors b/c the robot parts are crafted there "completionText": "The bot attacked you?! I'm glad you survived, and you've even got the processor! The supplier and I did some more work on deciphering the blueprint notes; those processors are great for compact synchronized automation stations. This'll help a lot, thanks! Why don't you help yourself to some spare mech components I have laying around?", "speaker": "questGiver", "moneyRange": [300, 300], "canBeAbandoned": true, - "rewards": [[["salvagebody", 10], ["salvagelegs", 10], ["salvagebooster", 10], ["rewardbag", 1, {"level":3}]]], + "rewards": [[["salvagebody", 10], ["salvagelegs", 10], ["salvagebooster", 10], ["rewardbag", 1, { + "level": 3 + } + ]]], "guiConfigs": { "questComplete": "/interface/windowconfig/sb_questcomplete.config", @@ -20,11 +23,17 @@ "scriptConfig": { "portraits": { "questStarted": { - "portrait": [{"image":"/quests/outpost/penguinscientistportrait.png"}], + "portrait": [{ + "image": "/quests/outpost/penguinscientistportrait.png" + } + ], "title": "Dr. Akaggy" }, "questComplete": { - "portrait": [{"image":"/quests/outpost/penguinscientistportrait.png"}], + "portrait": [{ + "image": "/quests/outpost/penguinscientistportrait.png" + } + ], "title": "Dr. Akaggy" } }, @@ -32,6 +41,7 @@ "sb_acceptBlueprints": ["sb_robot", "sb_robotheadempty", "robothead", "robotarms", "robotchest", "robotlegs"], "turnInDescription": "Return to ^orange;Dr. Akaggy^reset; at the ^orange;Outpost^reset;", "conditions": [{ + "description": "Craft ^orange;Inactive Robot^reset; to obtain ^orange;Processor^reset;", "type": "gatherItem", "itemName": "processor", "count": 1, diff --git a/quests/phase2optional/sb_bountyhunter2.questtemplate b/quests/phase2optional/sb_bountyhunter2.questtemplate index 0cd40856..e9ab35aa 100644 --- a/quests/phase2optional/sb_bountyhunter2.questtemplate +++ b/quests/phase2optional/sb_bountyhunter2.questtemplate @@ -1,36 +1,43 @@ { - "id" : "sb_bountyhunter2.gearup", - "prerequisites" : ["floran_mission1", "sb_bountyhunter1.gearup","sb_floranfan1.gearup", "sb_hylotlperformer1.gearup"], - "title" : "^green;Taking out the Trash", - "text" : "Hey! Thanks for helping me before! I wondered... would you be able to dispose of this bag of... meat for me? ^green;Throw it in a furnace and bring me the ^orange;ashes ^green;and I'll give you a reward.", - "completionText" : "Good job! Take this, you've earned it.", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [[["commonassaultrifle",1,{"level":3}],"upgrademodule",["rewardbag",1,{"treasure":{"level":3}}]]], //todo: sb_commonassaultrifle - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "id": "sb_bountyhunter2.gearup", + "prerequisites": ["floran_mission1", "sb_bountyhunter1.gearup", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup"], + "title": "^green;Taking out the Trash", + "text": "Hey! Thanks for helping me before! I wondered... would you be able to dispose of this bag of... meat for me? ^green;Throw it in a furnace and bring me the ^orange;ashes ^green;and I'll give you a reward.", + "completionText": "Good job! Take this, you've earned it.", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [[["commonassaultrifle", 1, { + "level": 3 + } + ], "upgrademodule", ["rewardbag", 1, { + "treasure": { + "level": 3 + } + } + ]]], //todo: sb_commonassaultrifle + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "canBeAbandoned" : true, + "canBeAbandoned": true, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : { - "default" : "questGiver" + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" }, - "requireTurnIn" : true, - "acceptItems" : ["mysterioustrashbag"], - "turnInDescription" : "Speak to ^orange;the Bounty Hunter^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "mysteriousashes", - "count" : 1, - "consume" : true + "requireTurnIn": true, + "acceptItems": ["mysterioustrashbag"], + "turnInDescription": "Speak to ^orange;the Bounty Hunter^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "mysteriousashes", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase2optional/sb_floranscholar2.questtemplate b/quests/phase2optional/sb_floranscholar2.questtemplate index d597f1c2..a1cfb420 100644 --- a/quests/phase2optional/sb_floranscholar2.questtemplate +++ b/quests/phase2optional/sb_floranscholar2.questtemplate @@ -1,34 +1,33 @@ { - "id" : "sb_floranscholar2.gearup", - "prerequisites" : [ "floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup", "sb_radardish1.gearup", "sb_avianrefugee2part1.gearup","sb_examplequest.gearup" ], - "title" : "^green;Makin' Paper", - "text" : "So if you want me to show you how to make paper, ^green;first you need to bring me some ^orange;unrefined wood!", - "completionText" : "Here you go! Now you can make paper, wasn't too difficult was it?", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [["paper"]], + "id": "sb_floranscholar2.gearup", + "prerequisites": ["floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup", "sb_radardish1.gearup", "sb_avianrefugee2part1.gearup", "sb_examplequest.gearup"], + "title": "^green;Makin' Paper", + "text": "So if you want me to show you how to make paper, ^green;first you need to bring me some ^orange;unrefined wood!", + "completionText": "Here you go! Now you can make paper, wasn't too difficult was it?", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [["paper"]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : { - "default" : "questGiver" + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" }, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the human survivor^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "chocolate", - "count" : 1, - "consume" : true + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the human survivor^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "chocolate", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase2optional/sb_humanexcon2.questtemplate b/quests/phase2optional/sb_humanexcon2.questtemplate index 2d4c5ff1..d479fb62 100644 --- a/quests/phase2optional/sb_humanexcon2.questtemplate +++ b/quests/phase2optional/sb_humanexcon2.questtemplate @@ -1,34 +1,38 @@ { - "id" : "sb_humanexcon2.gearup", - "prerequisites" : ["floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup"], - "title" : "^green;Time for a Celebration!", - "text" : "I've come here after being released from a USCM prison and everyone has accepted me. I want to show them how much they mean to me. ^green;Bring me ^orange;5 units of gunpowder ^reset;so I can make fireworks ^orange;and show you how to make them too!", - "completionText" : "Wonderful! They're going to love my firework display. Here! Take this firework and I'll show you how to make more.", - "speaker" : "questGiver", - "moneyRange" : [300, 400], - "rewards" : [["firework","firework-recipe","fireworkblue-recipe","fireworkgreen-recipe",["rewardbag",1,{"treasure":{"level":3}}]]], + "id": "sb_humanexcon2.gearup", + "prerequisites": ["floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup"], + "title": "^green;Time for a Celebration!", + "text": "I've come here after being released from a USCM prison and everyone has accepted me. I want to show them how much they mean to me. ^green;Bring me ^orange;5 units of gunpowder ^reset;so I can make fireworks ^orange;and show you how to make them too!", + "completionText": "Wonderful! They're going to love my firework display. Here! Take this firework and I'll show you how to make more.", + "speaker": "questGiver", + "moneyRange": [300, 400], + "rewards": [["firework", "firework-recipe", "fireworkblue-recipe", "fireworkgreen-recipe", ["rewardbag", 1, { + "treasure": { + "level": 3 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : { - "default" : "questGiver" + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" }, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the ex-convict^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "sb_gunpowder", - "count" : 5, - "consume" : true + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the ex-convict^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "sb_gunpowder", + "count": 5, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase3optional/sb_avianexplorer3.questtemplate b/quests/phase3optional/sb_avianexplorer3.questtemplate index 06884941..e45ebc05 100644 --- a/quests/phase3optional/sb_avianexplorer3.questtemplate +++ b/quests/phase3optional/sb_avianexplorer3.questtemplate @@ -1,32 +1,38 @@ { - "id" : "sb_avianexplorer3.gearup", - "prerequisites" : [ "hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup" ], - "title" : "^green;One Small Step", - "text" : "Good eternal evening! You look like someone in need of adventure, would you like to go on an adventure for me? ^green;If you can find a ^orange;moon emblem^green; in an Avian tomb I'll give you this tech card and a manipulator module in return!", - "completionText" : "Beautiful! It's in perfect condition too!", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [["techcard","manipulatormodule",["rewardbag",1,{"treasure":{"level":4}}]]], + "id": "sb_avianexplorer3.gearup", + "prerequisites": ["hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup"], + "title": "^green;One Small Step", + "text": "Good eternal evening! You look like someone in need of adventure, would you like to go on an adventure for me? ^green;If you can find a ^orange;moon emblem^green; in an Avian tomb I'll give you this tech card and a manipulator module in return!", + "completionText": "Beautiful! It's in perfect condition too!", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [["techcard", "manipulatormodule", ["rewardbag", 1, { + "treasure": { + "level": 4 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : {"default" : "questGiver"}, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the Avian explorer^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "moonemblem", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the Avian explorer^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "moonemblem", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase3optional/sb_bountyhunter3.questtemplate b/quests/phase3optional/sb_bountyhunter3.questtemplate index 29c73e77..c0002156 100644 --- a/quests/phase3optional/sb_bountyhunter3.questtemplate +++ b/quests/phase3optional/sb_bountyhunter3.questtemplate @@ -1,38 +1,46 @@ { - "id" : "sb_bountyhunter3.gearup", - "prerequisites" : [ "hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup" ], - "title" : "^green;Pest Problem", - "text" : "I have a job I need taken care of... ^green;Do you think you could find me some ^orange;cheese and some liquid poison?", - "completionText" : "Excellent... Here, I don't need this anymore.", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [[["sb_uncommonshotgun",1,{"level":4}],"upgrademodule",["rewardbag",1,{"treasure":{"level":4}}]]], + "id": "sb_bountyhunter3.gearup", + "prerequisites": ["hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup"], + "title": "^green;Pest Problem", + "text": "I have a job I need taken care of... ^green;Do you think you could find me some ^orange;cheese and some liquid poison?", + "completionText": "Excellent... Here, I don't need this anymore.", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [[["sb_uncommonshotgun", 1, { + "level": 4 + } + ], "upgrademodule", ["rewardbag", 1, { + "treasure": { + "level": 4 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : {"default" : "questGiver"}, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the bounty hunter^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "cheese", - "count" : 1, - "consume" : true - }, - { - "type" : "gatherItem", - "itemName" : "liquidpoison", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the bounty hunter^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "cheese", + "count": 1, + "consume": true + }, { + "type": "gatherItem", + "itemName": "liquidpoison", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase3optional/sb_glitchsilenttype3.questtemplate b/quests/phase3optional/sb_glitchsilenttype3.questtemplate index 76d8c19a..4b704800 100644 --- a/quests/phase3optional/sb_glitchsilenttype3.questtemplate +++ b/quests/phase3optional/sb_glitchsilenttype3.questtemplate @@ -1,33 +1,39 @@ { - "id" : "sb_glitchsilenttype3.gearup", - "prerequisites" : [ "hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup" ], - "title" : "^green;The Good Book", - "text" : ".........\n(This person isn't talking. ^green;They have given me a drawing though, ^orange;perhaps this is something they want.)", - "completionText" : "Thankful. I can talk at last! That book contains a datachip I was able to use to restore my speech module. Thank you so much! Here, have these tech cards.", - "speaker" : "questGiver", - "moneyRange" : [200, 200], - "rewards" : [[["techcard",4],["rewardbag",1,{"treasure":{"level":4}}]]], + "id": "sb_glitchsilenttype3.gearup", + "prerequisites": ["hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup"], + "title": "^green;The Good Book", + "text": ".........\n(This person isn't talking. ^green;They have given me a drawing though, ^orange;perhaps this is something they want.)", + "completionText": "Thankful. I can talk at last! That book contains a datachip I was able to use to restore my speech module. Thank you so much! Here, have these tech cards.", + "speaker": "questGiver", + "moneyRange": [200, 200], + "rewards": [[["techcard", 4], ["rewardbag", 1, { + "treasure": { + "level": 4 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "acceptItems" : ["pleaseget"], - "portraits" : {"default" : "questGiver"}, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the mute Glitch^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "medievalcodex", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "acceptItems": ["pleaseget"], + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the mute Glitch^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "medievalcodex", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase3optional/sb_hylotlperformer3.questtemplate b/quests/phase3optional/sb_hylotlperformer3.questtemplate index 604584ff..d5d8ccaf 100644 --- a/quests/phase3optional/sb_hylotlperformer3.questtemplate +++ b/quests/phase3optional/sb_hylotlperformer3.questtemplate @@ -1,32 +1,33 @@ { - "id" : "sb_hylotlperformer3.gearup", - "prerequisites" : ["hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup"], - "title" : "^green;This is my Song!", - "text" : "I've had a great idea! I want to add music to my act! I have this wonderful guitar but ^green;one of the strings is broken. ^orange;Find me some string ^green;and I'll reward you!", - "completionText" : "Hmm... Actually, I can't play this at all! I don't know what I was thinking. Here, you may as well have this guitar.", - "speaker" : "questGiver", - "moneyRange" : [80, 80], - "rewards" : [["nylonguitar"]], + "id": "sb_hylotlperformer3.gearup", + "prerequisites": ["hylotl_mission1", "sb_bountyhunter2.gearup", "sb_glitchsilenttype2.gearup", "sb_humanexcon2.gearup", "sb_humansurvivor2.gearup"], + "title": "^green;This is my Song!", + "text": "I've had a great idea! I want to add music to my act! I have this wonderful guitar but ^green;one of the strings is broken. ^orange;Find me some string ^green;and I'll reward you!", + "completionText": "Hmm... Actually, I can't play this at all! I don't know what I was thinking. Here, you may as well have this guitar.", + "speaker": "questGiver", + "moneyRange": [80, 80], + "rewards": [["nylonguitar"]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : {"default" : "questGiver"}, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the comedian^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "string", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the comedian^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "string", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase4optional/sb_floranhunter4.questtemplate b/quests/phase4optional/sb_floranhunter4.questtemplate index 739960e6..3990e0fc 100644 --- a/quests/phase4optional/sb_floranhunter4.questtemplate +++ b/quests/phase4optional/sb_floranhunter4.questtemplate @@ -1,32 +1,41 @@ { - "id" : "sb_floranhunter4.gearup", - "prerequisites" : [ "hylotl_mission2", "sb_hylotlperformer3.gearup", "sb_bountyhunter3.gearup", "sb_avianexplorer3.gearup" ], - "title" : "^green;A Bone to Pick", - "text" : "Hello ssstranger. Back home Floran carve huge bone with pretty markingsss. Floran misss big bone. ^green;Bring Floran ^orange;big bone with carvings ^green;and Floran give ssstranger goodiess!", - "completionText" : "Big bone! Big bone! Big bone! Thanksss!", - "speaker" : "questGiver", - "moneyRange" : [200, 200], - "rewards" : [["techcard",["sb_uncommonspear",1,{"level":5}],"upgrademodule",["rewardbag",1,{"treasure":{"level":5}}]]], + "id": "sb_floranhunter4.gearup", + "prerequisites": ["hylotl_mission2", "sb_hylotlperformer3.gearup", "sb_bountyhunter3.gearup", "sb_avianexplorer3.gearup"], + "title": "^green;A Bone to Pick", + "text": "Hello ssstranger. Back home Floran carve huge bone with pretty markingsss. Floran misss big bone. ^green;Bring Floran ^orange;big bone with carvings ^green;and Floran give ssstranger goodiess!", + "completionText": "Big bone! Big bone! Big bone! Thanksss!", + "speaker": "questGiver", + "moneyRange": [200, 200], + "rewards": [["techcard", ["sb_uncommonspear", 1, { + "level": 5 + } + ], "upgrademodule", ["rewardbag", 1, { + "treasure": { + "level": 5 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : {"default" : "questGiver"}, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the Floran hunter^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "floranbonedisplay2", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the Floran hunter^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "floranbonedisplay2", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/phase4optional/sb_humanexcon4.questtemplate b/quests/phase4optional/sb_humanexcon4.questtemplate index 145974e9..deef1013 100644 --- a/quests/phase4optional/sb_humanexcon4.questtemplate +++ b/quests/phase4optional/sb_humanexcon4.questtemplate @@ -1,33 +1,40 @@ { - "id" : "sb_humanexcon4.gearup", - "prerequisites" : [ "hylotl_mission2", "sb_hylotlperformer3.gearup", "sb_bountyhunter3.gearup", "sb_avianexplorer3.gearup" ], - "title" : "^green;Jail House Rock", - "text" : "Hey again! My firework display was a big success! ^green;Do you think you could find me a ^orange;stone USCM Penal Colony sign? ^reset;I want it to remind me of where I came from.", - "completionText" : "This is just what I wanted! Thank you so much! Here, take these...", - "speaker" : "questGiver", - "moneyRange" : [400, 800], - "rewards" : [["techcard",["sb_uncommonaxe",1,{"level":5}],["rewardbag",1,{"treasure":{"level":5}}]]], + "id": "sb_humanexcon4.gearup", + "prerequisites": ["hylotl_mission2", "sb_hylotlperformer3.gearup", "sb_bountyhunter3.gearup", "sb_avianexplorer3.gearup"], + "title": "^green;Jail House Rock", + "text": "Hey again! My firework display was a big success! ^green;Do you think you could find me a ^orange;stone USCM Penal Colony sign? ^reset;I want it to remind me of where I came from.", + "completionText": "This is just what I wanted! Thank you so much! Here, take these...", + "speaker": "questGiver", + "moneyRange": [400, 800], + "rewards": [["techcard", ["sb_uncommonaxe", 1, { + "level": 5 + } + ], ["rewardbag", 1, { + "treasure": { + "level": 5 + } + } + ]]], - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquest.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquest.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/main.lua", - "scriptConfig" : { - "portraits" : { - "default" : "questGiver" + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" }, - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the ex-convict^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "prisonstonesign", - "count" : 1, - "consume" : true + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the ex-convict^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "prisonstonesign", + "count": 1, + "consume": true } ] } diff --git a/quests/scripts/story/sb_destroyruin.lua b/quests/scripts/story/sb_destroyruin.lua index f0853e66..d32f9726 100644 --- a/quests/scripts/story/sb_destroyruin.lua +++ b/quests/scripts/story/sb_destroyruin.lua @@ -16,6 +16,7 @@ function init() init = nil require(config.getParameter("sb_script")) + --These aren't local, so don't rename them to originalUpdate. We need prefixes here sb_update = update or function(...) end update = function(...) sb_update(...) sb_update2(...) end diff --git a/quests/scripts/story/sb_techunlocks.lua b/quests/scripts/story/sb_techunlocks.lua index 4775a5ee..9a469d3b 100644 --- a/quests/scripts/story/sb_techunlocks.lua +++ b/quests/scripts/story/sb_techunlocks.lua @@ -47,4 +47,4 @@ function player_makeSuitAvailable(suit) end function ownsTech(tech) return contains(player.availableTechs(), tech) end -function ownsSuit(tech) return (contains(player.getProperty("sb_bioimplants") or {}, tech) or contains(player.getProperty("sb_availableBioimplants") or {}, tech)) end --player.getProperty not returning the second value if the property exists even if it's nil :( \ No newline at end of file +function ownsSuit(tech) return (contains(player.getProperty("sb_bioimplants", {}), tech) or contains(player.getProperty("sb_availableBioimplants") or {}, tech)) end \ No newline at end of file diff --git a/quests/tutorial/sb_tutorial2b.questtemplate b/quests/tutorial/sb_tutorial2b.questtemplate index de9434be..b9a5f43f 100644 --- a/quests/tutorial/sb_tutorial2b.questtemplate +++ b/quests/tutorial/sb_tutorial2b.questtemplate @@ -1,37 +1,38 @@ { - "id" : "sb_tutorial2b.gearup", - "prerequisites" : ["sb_tutorial2.gearup" ], - "mainQuest" : true, - "title" : "^#9be3d6;Prepare Yourself", - "text" : "Plant fibres can be used to fashion bandages incase you get hurt. You should ^green;chop down some vines to obtain plant fibres.^reset; Better safe than sorry.\n\n\n(You can press the ^orange;reject^reset; button to ^#f00;decline this quest.^reset;)", - "completionText" : "That wasn't too bad! You could makes all sorts of things from plant fibres, from ropes to fabrics.", - "speaker" : "questGiver", - "moneyRange" : [20, 20], - "canBeAbandoned" : true, + "id": "sb_tutorial2b.gearup", + "prerequisites": ["sb_tutorial2.gearup"], + "mainQuest": true, + "title": "^#9be3d6;Prepare Yourself", + "text": "Plant fibres can be used to fashion bandages incase you get hurt. You should ^green;chop down some vines to obtain plant fibres.^reset; Better safe than sorry.\n\n\n(You can press the ^orange;reject^reset; button to ^#f00;decline this quest.^reset;)", + "completionText": "That wasn't too bad! You could makes all sorts of things from plant fibres, from ropes to fabrics.", + "speaker": "questGiver", + "moneyRange": [20, 20], + "canBeAbandoned": true, - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquestnorewards.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquestnorewards.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/sb_main.lua", - "scriptConfig" : { - "title" : "^#9be3d6;Prepare Yourself", - "missable" : true, - "itemIcon" : "/interface/sb_numbers.png:2", - "followUp" : "sb_tutorial3.gearup", - "giveBlueprints" : ["bandage"], - "portraits" : {"default" : "player"}, - "requireTurnIn" : false, - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "plantfibre", - "count" : 20, - "consume" : false + "updateDelta": 10, + "script": "/quests/scripts/sb_main.lua", + "scriptConfig": { + "title": "^#9be3d6;Prepare Yourself", + "missable": true, + "itemIcon": "/interface/sb_font.png:2", + "followUp": "sb_tutorial3.gearup", + "giveBlueprints": ["bandage"], + "portraits": { + "default": "player" + }, + "requireTurnIn": false, + "conditions": [{ + "type": "gatherItem", + "itemName": "plantfibre", + "count": 20, + "consume": false } ] } -} \ No newline at end of file +} diff --git a/quests/tutorial/sb_tutorial3.questtemplate b/quests/tutorial/sb_tutorial3.questtemplate index 7b47d09b..db13e446 100644 --- a/quests/tutorial/sb_tutorial3.questtemplate +++ b/quests/tutorial/sb_tutorial3.questtemplate @@ -1,37 +1,38 @@ { - "id" : "sb_tutorial3.gearup", - "prerequisites" : ["sb_tutorial2b.gearup" ], - "mainQuest" : true, - "title" : "^#9be3d6;Out of the frying pan...", - "text" : "^green;It's time to craft a ^orange;furnace. ^reset;You'll need to obtain some cobblestone and a campfire. If you'd like to know exactly how much of each you need, access a crafting table, ^green;untick 'materials available'^reset; and mouse over the recipe to see its ingredients.", - "completionText" : "Awesome, it's about time we play with fire. A furnace is used to smelt ores found underground to produce bars that are valuable for crafting.", - "speaker" : "questGiver", - "moneyRange" : [30, 30], - "canBeAbandoned" : true, + "id": "sb_tutorial3.gearup", + "prerequisites": ["sb_tutorial2b.gearup"], + "mainQuest": true, + "title": "^#9be3d6;Out of the frying pan...", + "text": "^green;It's time to craft a ^orange;furnace. ^reset;You'll need to obtain some cobblestone and a campfire. If you'd like to know exactly how much of each you need, access a crafting table, ^green;untick 'materials available'^reset; and mouse over the recipe to see its ingredients.", + "completionText": "Awesome, it's about time we play with fire. A furnace is used to smelt ores found underground to produce bars that are valuable for crafting.", + "speaker": "questGiver", + "moneyRange": [30, 30], + "canBeAbandoned": true, - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquestnorewards.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquestnorewards.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/sb_main.lua", - "scriptConfig" : { - "title" : "^#9be3d6;Out of the frying pan...", - "missable" : true, - "itemIcon" : "/interface/sb_numbers.png:3", - "followUp" : "sb_tutorial3b.gearup", - "giveBlueprints" : ["sb_stonefurnace","sb_stonepickaxe"], - "portraits" : {"default" : "player"}, - "requireTurnIn" : false, - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "sb_stonefurnace", - "count" : 1, - "consume" : false + "updateDelta": 10, + "script": "/quests/scripts/sb_main.lua", + "scriptConfig": { + "title": "^#9be3d6;Out of the frying pan...", + "missable": true, + "itemIcon": "/interface/sb_font.png:3", + "followUp": "sb_tutorial3b.gearup", + "giveBlueprints": ["sb_stonefurnace", "sb_stonepickaxe"], + "portraits": { + "default": "player" + }, + "requireTurnIn": false, + "conditions": [{ + "type": "gatherItem", + "itemName": "sb_stonefurnace", + "count": 1, + "consume": false } ] } -} \ No newline at end of file +} diff --git a/quests/tutorial/sb_tutorial3b.questtemplate b/quests/tutorial/sb_tutorial3b.questtemplate index 0281cd26..95fa9fc4 100644 --- a/quests/tutorial/sb_tutorial3b.questtemplate +++ b/quests/tutorial/sb_tutorial3b.questtemplate @@ -20,7 +20,7 @@ "scriptConfig": { "title": "^#9be3d6;Tools for the Job", "missable": true, - "itemIcon": "/interface/sb_numbers.png:4", + "itemIcon": "/interface/sb_font.png:4", "followUp": "sb_tutorial4.gearup", "giveBlueprints": ["copperbar", "copperpickaxe"], "portraits": { diff --git a/quests/tutorial/sb_tutorial4.questtemplate b/quests/tutorial/sb_tutorial4.questtemplate index cdfca7a1..6c22a3db 100644 --- a/quests/tutorial/sb_tutorial4.questtemplate +++ b/quests/tutorial/sb_tutorial4.questtemplate @@ -20,7 +20,7 @@ "scriptConfig": { "title": "^#9be3d6;Food Fight", "missable": true, - "itemIcon": "/interface/sb_numbers.png:5", + "itemIcon": "/interface/sb_font.png:5", "followUp": "sb_tutorial5.gearup", "giveBlueprints": ["campfire", "bow", "craftingfarm"], "portraits": { diff --git a/quests/tutorial/sb_tutorial5.questtemplate b/quests/tutorial/sb_tutorial5.questtemplate index b13f0428..41bcaeb4 100644 --- a/quests/tutorial/sb_tutorial5.questtemplate +++ b/quests/tutorial/sb_tutorial5.questtemplate @@ -20,7 +20,7 @@ "scriptConfig": { "title": "^#9be3d6;Forging Ahead (I)", "missable": true, - "itemIcon": "/interface/sb_numbers.png:6", + "itemIcon": "/interface/sb_font.png:6", "followUp": "sb_tutorial6.gearup", "giveBlueprints": ["ironbar"], "portraits": { diff --git a/quests/tutorial/sb_tutorial6.questtemplate b/quests/tutorial/sb_tutorial6.questtemplate index de6f9b55..23472caa 100644 --- a/quests/tutorial/sb_tutorial6.questtemplate +++ b/quests/tutorial/sb_tutorial6.questtemplate @@ -1,37 +1,38 @@ { - "id" : "sb_tutorial6.gearup", - "prerequisites" : ["sb_tutorial5.gearup" ], - "mainQuest" : true, - "title" : "^#9be3d6;Forging Ahead (II)", - "text" : "^green;To make use of stronger and more valuable ores, you need an ^orange;iron anvil.^reset; With an anvil, you can prepare yourself for the dangers ahead.", - "completionText" : "Perfect! Now you can craft all sorts of weapons and armor. You should craft some equipment...", - "speaker" : "questGiver", - "moneyRange" : [70, 70], - "canBeAbandoned" : true, + "id": "sb_tutorial6.gearup", + "prerequisites": ["sb_tutorial5.gearup"], + "mainQuest": true, + "title": "^#9be3d6;Forging Ahead (II)", + "text": "^green;To make use of stronger and more valuable ores, you need an ^orange;iron anvil.^reset; With an anvil, you can prepare yourself for the dangers ahead.", + "completionText": "Perfect! Now you can craft all sorts of weapons and armor. You should craft some equipment...", + "speaker": "questGiver", + "moneyRange": [70, 70], + "canBeAbandoned": true, - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquestnorewards.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquestnorewards.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/sb_main.lua", - "scriptConfig" : { - "title" : "^#9be3d6;Forging Ahead (II)", - "missable" : true, - "itemIcon" : "/interface/sb_numbers.png:7", - "followUp" : "sb_tutorial7.gearup", - "giveBlueprints" : ["sb_ironanvil"], - "portraits" : {"default" : "player"}, - "requireTurnIn" : false, - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "sb_ironanvil", - "count" : 1, - "consume" : false + "updateDelta": 10, + "script": "/quests/scripts/sb_main.lua", + "scriptConfig": { + "title": "^#9be3d6;Forging Ahead (II)", + "missable": true, + "itemIcon": "/interface/sb_font.png:7", + "followUp": "sb_tutorial7.gearup", + "giveBlueprints": ["sb_ironanvil"], + "portraits": { + "default": "player" + }, + "requireTurnIn": false, + "conditions": [{ + "type": "gatherItem", + "itemName": "sb_ironanvil", + "count": 1, + "consume": false } ] } -} \ No newline at end of file +} diff --git a/quests/tutorial/sb_tutorial7.questtemplate b/quests/tutorial/sb_tutorial7.questtemplate index 65bcd61e..8db836cc 100644 --- a/quests/tutorial/sb_tutorial7.questtemplate +++ b/quests/tutorial/sb_tutorial7.questtemplate @@ -1,36 +1,37 @@ { - "id" : "sb_tutorial7.gearup", - "prerequisites" : ["sb_tutorial6.gearup" ], - "mainQuest" : true, - "title" : "^#9be3d6;First Contact", - "text" : "Your anvil isn't yet strong enough to handle steel. ^green;Craft a ^orange;Distress Beacon ^green;and maybe you'll be able to make contact with a larger ship. ^reset;Make sure you're ready for anything before you do though!", - "completionText" : "Nicely done. I suggest you gear up before placing it. You never know who'll receive your signal.", - "speaker" : "questGiver", - "moneyRange" : [500, 500], - "canBeAbandoned" : true, + "id": "sb_tutorial7.gearup", + "prerequisites": ["sb_tutorial6.gearup"], + "mainQuest": true, + "title": "^#9be3d6;First Contact", + "text": "Your anvil isn't yet strong enough to handle steel. ^green;Craft a ^orange;Distress Beacon ^green;and maybe you'll be able to make contact with a larger ship. ^reset;Make sure you're ready for anything before you do though!", + "completionText": "Nicely done. I suggest you gear up before placing it. You never know who'll receive your signal.", + "speaker": "questGiver", + "moneyRange": [500, 500], + "canBeAbandoned": true, - "guiConfigs" : { - "questComplete" : "/interface/windowconfig/sb_questcomplete.config", - "newQuest" : "/interface/windowconfig/sb_newquestnorewards.config", - "questFailed" : "/interface/windowconfig/sb_questfailed.config" + "guiConfigs": { + "questComplete": "/interface/windowconfig/sb_questcomplete.config", + "newQuest": "/interface/windowconfig/sb_newquestnorewards.config", + "questFailed": "/interface/windowconfig/sb_questfailed.config" }, - "updateDelta" : 10, - "script" : "/quests/scripts/sb_main.lua", - "scriptConfig" : { - "title" : "^#9be3d6;First Contact", - "missable" : true, - "itemIcon" : "/interface/sb_numbers.png:8", - "giveBlueprints" : ["sb_ironbeacon"], - "portraits" : {"default" : "player"}, - "requireTurnIn" : false, - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "sb_ironbeacon", - "count" : 1, - "consume" : false + "updateDelta": 10, + "script": "/quests/scripts/sb_main.lua", + "scriptConfig": { + "title": "^#9be3d6;First Contact", + "missable": true, + "itemIcon": "/interface/sb_font.png:8", + "giveBlueprints": ["sb_ironbeacon"], + "portraits": { + "default": "player" + }, + "requireTurnIn": false, + "conditions": [{ + "type": "gatherItem", + "itemName": "sb_ironbeacon", + "count": 1, + "consume": false } ] } -} \ No newline at end of file +} diff --git a/recipes/farmtable2/survival/oredetector.recipe.patch b/recipes/farmtable2/survival/oredetector.recipe.patch deleted file mode 100644 index fdd1918d..00000000 --- a/recipes/farmtable2/survival/oredetector.recipe.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ - [ - {"op":"test","path":"/input/0/item","value":"refinedferozium"}, - {"op":"add","path":"/input/0","value":{"name":"sb_refinedrubium","count":5}} - ] -] \ No newline at end of file diff --git a/recipes/generic/crafting/seeder/nebulizermodule5.recipe.patch b/recipes/generic/crafting/seeder/nebulizermodule5.recipe.patch deleted file mode 100644 index 011158be..00000000 --- a/recipes/generic/crafting/seeder/nebulizermodule5.recipe.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ - [ - {"op":"test","path":"/input/1/item","value":"refinedferozium"}, - {"op":"add","path":"/input/1","value":"sb_refinedrubium"} - ] -] \ No newline at end of file diff --git a/recipes/generic/crafting/seeder/syncantentacle.recipe.patch b/recipes/generic/crafting/seeder/syncantentacle.recipe.patch deleted file mode 100644 index b608c3f0..00000000 --- a/recipes/generic/crafting/seeder/syncantentacle.recipe.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ - [ - {"op":"test","path":"/input/3/item","value":"refinedaegisalt"}, - {"op":"add","path":"/input/3","value":"sb_refinedrubium"} - ] -] \ No newline at end of file diff --git a/recipes/inventorstable3/duplicator.recipe.patch b/recipes/inventorstable3/duplicator.recipe.patch deleted file mode 100644 index ecbf5f5e..00000000 --- a/recipes/inventorstable3/duplicator.recipe.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ - [ - {"op":"test","path":"/input/1/item","value":"refinedaegisalt"}, - {"op":"add","path":"/input/1","value":["sb_refinedrubium",50]} - ] -] \ No newline at end of file diff --git a/recipes/inventorstable3/heatprotectionback.recipe.patch b/recipes/inventorstable3/heatprotectionback.recipe.patch deleted file mode 100644 index 0fd0c0f7..00000000 --- a/recipes/inventorstable3/heatprotectionback.recipe.patch +++ /dev/null @@ -1,19 +0,0 @@ -[ - [{ - "op": "test", - "path": "/input/0/item", - "value": "coldprotectionback" - }, { - "op": "test", - "path": "/input/1/item", - "value": "refinedaegisalt" - }, { - "op": "add", - "path": "/input/1", - "value": { - "name": "sb_refinedrubium", - "count": 2 - } - } - ] -] diff --git a/recipes/starbound/ammo/anvil/bouncybullet.recipe b/recipes/starbound/ammo/anvil/bouncybullet.recipe index a53f94e5..3d851cce 100644 --- a/recipes/starbound/ammo/anvil/bouncybullet.recipe +++ b/recipes/starbound/ammo/anvil/bouncybullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_gunpowder","lead"], - "output" : ["sb_ammo",30,{"projectileType":"bouncybullet"}], - "groups" : ["consumables","craftinganvil","all"] + "input": ["sb_gunpowder","lead"], + "output": ["sb_ammo",30,{"projectileType":"bouncybullet"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil/explosivebullet.recipe b/recipes/starbound/ammo/anvil/explosivebullet.recipe index 951a5c8c..b6a539ad 100644 --- a/recipes/starbound/ammo/anvil/explosivebullet.recipe +++ b/recipes/starbound/ammo/anvil/explosivebullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["corefragmentore","sb_gunpowder","lead"], - "output" : ["sb_ammo",50,{"projectileType":"explosivebullet"}], - "groups" : ["consumables","craftinganvil","all"] + "input": ["corefragmentore","sb_gunpowder","lead"], + "output": ["sb_ammo",50,{"projectileType":"explosivebullet"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil/fast.recipe b/recipes/starbound/ammo/anvil/fast.recipe index 52b83776..4f44d689 100644 --- a/recipes/starbound/ammo/anvil/fast.recipe +++ b/recipes/starbound/ammo/anvil/fast.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_gunpowder",2],"lead"], - "output" : ["sb_ammo",50,{"projectileType":"fast"}], - "groups" : ["consumables","craftinganvil","all"] + "input": [["sb_gunpowder",2],"lead"], + "output": ["sb_ammo",50,{"projectileType":"fast"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil/huntingbullet.recipe b/recipes/starbound/ammo/anvil/huntingbullet.recipe index da6a2cf1..dd6d339c 100644 --- a/recipes/starbound/ammo/anvil/huntingbullet.recipe +++ b/recipes/starbound/ammo/anvil/huntingbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","sb_gunpowder","lead"], - "output" : ["sb_ammo",50,{"projectileType":"huntingbullet"}], - "groups" : ["consumables","craftinganvil","all"] + "input": ["ironbar","sb_gunpowder","lead"], + "output": ["sb_ammo",50,{"projectileType":"huntingbullet"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil/piercingbullet.recipe b/recipes/starbound/ammo/anvil/piercingbullet.recipe index d8c67521..d08a520e 100644 --- a/recipes/starbound/ammo/anvil/piercingbullet.recipe +++ b/recipes/starbound/ammo/anvil/piercingbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["sharpenedclaw","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"piercingbullet"}], - "groups" : ["consumables","craftinganvil","all"] + "input": ["sharpenedclaw","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"piercingbullet"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil/standardbullet.recipe b/recipes/starbound/ammo/anvil/standardbullet.recipe index 00de9cd9..e66db90f 100644 --- a/recipes/starbound/ammo/anvil/standardbullet.recipe +++ b/recipes/starbound/ammo/anvil/standardbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_gunpowder","lead"], - "output" : ["sb_ammo",50,{"projectileType":"standardbullet"}], - "groups" : ["consumables","craftinganvil","all"] + "input": ["sb_gunpowder","lead"], + "output": ["sb_ammo",50,{"projectileType":"standardbullet"}], + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe b/recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe index 986129bc..14fc9cd4 100644 --- a/recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe +++ b/recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["staticcell","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"airburstelectricbullet"}], - "groups" : ["consumables","craftinganvil2","all"] + "input": ["staticcell","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"airburstelectricbullet"}], + "groups": ["consumables","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil2/airburstfirebullet.recipe b/recipes/starbound/ammo/anvil2/airburstfirebullet.recipe index 03a04d88..81e985cc 100644 --- a/recipes/starbound/ammo/anvil2/airburstfirebullet.recipe +++ b/recipes/starbound/ammo/anvil2/airburstfirebullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["scorchedcore","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"airburstfirebullet"}], - "groups" : ["consumables","craftinganvil2","all"] + "input": ["scorchedcore","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"airburstfirebullet"}], + "groups": ["consumables","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil2/airbursticebullet.recipe b/recipes/starbound/ammo/anvil2/airbursticebullet.recipe index 03be2bfa..3a37ffa2 100644 --- a/recipes/starbound/ammo/anvil2/airbursticebullet.recipe +++ b/recipes/starbound/ammo/anvil2/airbursticebullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["cryonicextract","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"airbursticebullet"}], - "groups" : ["consumables","craftinganvil2","all"] + "input": ["cryonicextract","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"airbursticebullet"}], + "groups": ["consumables","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe b/recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe index 215ad8e7..6a1ba4c0 100644 --- a/recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe +++ b/recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["venomsample","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"airburstpoisonbullet"}], - "groups" : ["consumables","craftinganvil2","all"] + "input": ["venomsample","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"airburstpoisonbullet"}], + "groups": ["consumables","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/ammo/anvil2/homingbullet.recipe b/recipes/starbound/ammo/anvil2/homingbullet.recipe index 00da7178..92025cc1 100644 --- a/recipes/starbound/ammo/anvil2/homingbullet.recipe +++ b/recipes/starbound/ammo/anvil2/homingbullet.recipe @@ -1,5 +1,5 @@ { - "input" : ["stickofram","sb_gunpowder","lead"], - "output" : ["sb_ammo",75,{"projectileType":"sb_homingbullet"}], - "groups" : ["consumables","craftinganvil2","all"] + "input": ["stickofram","sb_gunpowder","lead"], + "output": ["sb_ammo",75,{"projectileType":"sb_homingbullet"}], + "groups": ["consumables","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/bioluminescence/sb_glowchest.recipe b/recipes/starbound/biomes/bioluminescence/sb_glowchest.recipe index 8bf4a03a..87d7a5af 100644 --- a/recipes/starbound/biomes/bioluminescence/sb_glowchest.recipe +++ b/recipes/starbound/biomes/bioluminescence/sb_glowchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["glowfibre",15]], - "output" : "sb_glowchest", - "groups" : ["craftingfurniture","storage","all"] + "input": [["glowfibre",15]], + "output": "sb_glowchest", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowpainting.recipe b/recipes/starbound/biomes/colourful/rainbowpainting.recipe index b648ee4e..d242cc31 100644 --- a/recipes/starbound/biomes/colourful/rainbowpainting.recipe +++ b/recipes/starbound/biomes/colourful/rainbowpainting.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",20],"reddye","greendye","bluedye"], - "output" : "rainbowpainting", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rainbowwood",20],"reddye","greendye","bluedye"], + "output": "rainbowpainting", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowunicornstatue.recipe b/recipes/starbound/biomes/colourful/rainbowunicornstatue.recipe index 553d2d9a..6cf542e4 100644 --- a/recipes/starbound/biomes/colourful/rainbowunicornstatue.recipe +++ b/recipes/starbound/biomes/colourful/rainbowunicornstatue.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50]], - "output" : "rainbowunicornstatue", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rainbowwood",50]], + "output": "rainbowunicornstatue", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowwoodbed.recipe b/recipes/starbound/biomes/colourful/rainbowwoodbed.recipe index 03a923bd..bc1b7d98 100644 --- a/recipes/starbound/biomes/colourful/rainbowwoodbed.recipe +++ b/recipes/starbound/biomes/colourful/rainbowwoodbed.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",15],["fabric",10]], - "output" : "rainbowwoodbed", - "groups" : ["craftingfurniture","beds","all"] + "input": [["rainbowwood",15],["fabric",10]], + "output": "rainbowwoodbed", + "groups": ["craftingfurniture","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowwoodchair.recipe b/recipes/starbound/biomes/colourful/rainbowwoodchair.recipe index 81036388..15279a20 100644 --- a/recipes/starbound/biomes/colourful/rainbowwoodchair.recipe +++ b/recipes/starbound/biomes/colourful/rainbowwoodchair.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",10],"silverbar"], - "output" : "rainbowwoodchair", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rainbowwood",10],"silverbar"], + "output": "rainbowwoodchair", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowwooddoor.recipe b/recipes/starbound/biomes/colourful/rainbowwooddoor.recipe index e010e2a2..e1bad6b0 100644 --- a/recipes/starbound/biomes/colourful/rainbowwooddoor.recipe +++ b/recipes/starbound/biomes/colourful/rainbowwooddoor.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",15],"silverbar"], - "output" : "rainbowwooddoor", - "groups" : ["craftingfurniture","doors","all"] + "input": [["rainbowwood",15],"silverbar"], + "output": "rainbowwooddoor", + "groups": ["craftingfurniture","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowwoodsafe.recipe b/recipes/starbound/biomes/colourful/rainbowwoodsafe.recipe index 0e24be9d..d0d35f11 100644 --- a/recipes/starbound/biomes/colourful/rainbowwoodsafe.recipe +++ b/recipes/starbound/biomes/colourful/rainbowwoodsafe.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",30],"silverbar"], - "output" : "rainbowwoodsafe", - "groups" : ["craftingfurniture","storage","all"] + "input": [["rainbowwood",30],"silverbar"], + "output": "rainbowwoodsafe", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/colourful/rainbowwoodtable.recipe b/recipes/starbound/biomes/colourful/rainbowwoodtable.recipe index 86643c92..70301fc2 100644 --- a/recipes/starbound/biomes/colourful/rainbowwoodtable.recipe +++ b/recipes/starbound/biomes/colourful/rainbowwoodtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",25]], - "output" : "rainbowwoodtable", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rainbowwood",25]], + "output": "rainbowwoodtable", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/eyes/eyebed.recipe b/recipes/starbound/biomes/eyes/eyebed.recipe index ccba429e..b7dfb895 100644 --- a/recipes/starbound/biomes/eyes/eyebed.recipe +++ b/recipes/starbound/biomes/eyes/eyebed.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",50],["goldbar",2],["leather",3]], - "output" : "sb_eyebed", - "groups" : ["craftingfurniture","beds","objects","all"] + "input": [["eyepiles",50],["goldbar",2],["leather",3]], + "output": "sb_eyebed", + "groups": ["craftingfurniture","beds","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/eyes/eyechair.recipe b/recipes/starbound/biomes/eyes/eyechair.recipe index 99b2e138..5e064c5d 100644 --- a/recipes/starbound/biomes/eyes/eyechair.recipe +++ b/recipes/starbound/biomes/eyes/eyechair.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",25],"leather"], - "output" : "sb_eyechair", - "groups" : ["craftingfurniture","decoration","objects","all"] + "input": [["eyepiles",25],"leather"], + "output": "sb_eyechair", + "groups": ["craftingfurniture","decoration","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/eyes/eyechest.recipe b/recipes/starbound/biomes/eyes/eyechest.recipe index c8f8f4e9..abf820d5 100644 --- a/recipes/starbound/biomes/eyes/eyechest.recipe +++ b/recipes/starbound/biomes/eyes/eyechest.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",30]], - "output" : "sb_eyechest", - "groups" : ["craftingfurniture","storage","objects","all"] + "input": [["eyepiles",30]], + "output": "sb_eyechest", + "groups": ["craftingfurniture","storage","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/eyes/eyedoor.recipe b/recipes/starbound/biomes/eyes/eyedoor.recipe index 66af4929..9aa17f5c 100644 --- a/recipes/starbound/biomes/eyes/eyedoor.recipe +++ b/recipes/starbound/biomes/eyes/eyedoor.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",35],"goldbar"], - "output" : "sb_eyedoor", - "groups" : ["craftingfurniture","doors","objects","all"] + "input": [["eyepiles",35],"goldbar"], + "output": "sb_eyedoor", + "groups": ["craftingfurniture","doors","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/eyes/eyetable.recipe b/recipes/starbound/biomes/eyes/eyetable.recipe index 57061e2c..d4fcf76e 100644 --- a/recipes/starbound/biomes/eyes/eyetable.recipe +++ b/recipes/starbound/biomes/eyes/eyetable.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",40]],//monsterplating - "output" : "sb_eyetable", - "groups" : ["craftingfurniture","decoration","objects","all"] + "input": [["eyepiles",40]],//monsterplating + "output": "sb_eyetable", + "groups": ["craftingfurniture","decoration","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/geometric/geometricbed.recipe b/recipes/starbound/biomes/geometric/geometricbed.recipe index 8af4e9c2..8b260a22 100644 --- a/recipes/starbound/biomes/geometric/geometricbed.recipe +++ b/recipes/starbound/biomes/geometric/geometricbed.recipe @@ -1,5 +1,5 @@ { - "input" : [["icecrystal",25],["leather",3]], - "output" : "sb_geometricbed", - "groups" : ["craftingfurniture","beds","all"] + "input": [["icecrystal",25],["leather",3]], + "output": "sb_geometricbed", + "groups": ["craftingfurniture","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/geometric/geometricchair.recipe b/recipes/starbound/biomes/geometric/geometricchair.recipe index 7c3901f0..87c7cef1 100644 --- a/recipes/starbound/biomes/geometric/geometricchair.recipe +++ b/recipes/starbound/biomes/geometric/geometricchair.recipe @@ -1,5 +1,5 @@ { - "input" : [["icecrystal",15],["snowball",5]], - "output" : "sb_geometricchair", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["icecrystal",15],["snowball",5]], + "output": "sb_geometricchair", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/geometric/geometricchest.recipe b/recipes/starbound/biomes/geometric/geometricchest.recipe index 23b5cb50..5dbd51a3 100644 --- a/recipes/starbound/biomes/geometric/geometricchest.recipe +++ b/recipes/starbound/biomes/geometric/geometricchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["icecrystal",20],["snowball",3]], - "output" : "sb_geometricchest", - "groups" : ["craftingfurniture","storage","all"] + "input": [["icecrystal",20],["snowball",3]], + "output": "sb_geometricchest", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/geometric/geometricscreen.recipe b/recipes/starbound/biomes/geometric/geometricscreen.recipe index dfafe461..4dc37383 100644 --- a/recipes/starbound/biomes/geometric/geometricscreen.recipe +++ b/recipes/starbound/biomes/geometric/geometricscreen.recipe @@ -1,5 +1,5 @@ { - "input" : [["icecrystal",20],["glass",3],"sb_steelbar","wire","smallbattery"], - "output" : "sb_geometricscreen", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["icecrystal",20],["glass",3],"sb_steelbar","wire","smallbattery"], + "output": "sb_geometricscreen", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/geometric/geometrictable.recipe b/recipes/starbound/biomes/geometric/geometrictable.recipe index 73222e07..437569d9 100644 --- a/recipes/starbound/biomes/geometric/geometrictable.recipe +++ b/recipes/starbound/biomes/geometric/geometrictable.recipe @@ -1,5 +1,5 @@ { - "input" : [["icecrystal",30],"ironbar"], - "output" : "sb_geometrictable", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["icecrystal",30],"ironbar"], + "output": "sb_geometrictable", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/gnome/smallchurch.recipe b/recipes/starbound/biomes/gnome/smallchurch.recipe index 1ae1f890..f8ad3be3 100644 --- a/recipes/starbound/biomes/gnome/smallchurch.recipe +++ b/recipes/starbound/biomes/gnome/smallchurch.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallchurch", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallchurch", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallclocktower.recipe b/recipes/starbound/biomes/gnome/smallclocktower.recipe index b720b649..1eadde54 100644 --- a/recipes/starbound/biomes/gnome/smallclocktower.recipe +++ b/recipes/starbound/biomes/gnome/smallclocktower.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallclocktower", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallclocktower", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse1.recipe b/recipes/starbound/biomes/gnome/smallhouse1.recipe index 2d8ef77e..a85d4b08 100644 --- a/recipes/starbound/biomes/gnome/smallhouse1.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse1.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse1", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse1", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse10.recipe b/recipes/starbound/biomes/gnome/smallhouse10.recipe index 09508e6b..49a4854f 100644 --- a/recipes/starbound/biomes/gnome/smallhouse10.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse10.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse10", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse10", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse11.recipe b/recipes/starbound/biomes/gnome/smallhouse11.recipe index 69ae2af2..2ccf6946 100644 --- a/recipes/starbound/biomes/gnome/smallhouse11.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse11.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse11", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse11", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse2.recipe b/recipes/starbound/biomes/gnome/smallhouse2.recipe index aeaa6505..c97a23c0 100644 --- a/recipes/starbound/biomes/gnome/smallhouse2.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse2.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse2", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse2", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse3.recipe b/recipes/starbound/biomes/gnome/smallhouse3.recipe index 7ca93075..0cfc7d80 100644 --- a/recipes/starbound/biomes/gnome/smallhouse3.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse3.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse3", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse3", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse4.recipe b/recipes/starbound/biomes/gnome/smallhouse4.recipe index 1809f1f7..ab8160a3 100644 --- a/recipes/starbound/biomes/gnome/smallhouse4.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse4.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse4", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse4", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse5.recipe b/recipes/starbound/biomes/gnome/smallhouse5.recipe index 58307c09..f6d91209 100644 --- a/recipes/starbound/biomes/gnome/smallhouse5.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse5.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse5", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse5", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse6.recipe b/recipes/starbound/biomes/gnome/smallhouse6.recipe index 73c79f97..35648265 100644 --- a/recipes/starbound/biomes/gnome/smallhouse6.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse6.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse6", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse6", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse7.recipe b/recipes/starbound/biomes/gnome/smallhouse7.recipe index 2129f266..5d6170bb 100644 --- a/recipes/starbound/biomes/gnome/smallhouse7.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse7.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse7", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse7", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse8.recipe b/recipes/starbound/biomes/gnome/smallhouse8.recipe index d108e527..5229560e 100644 --- a/recipes/starbound/biomes/gnome/smallhouse8.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse8.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse8", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse8", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallhouse9.recipe b/recipes/starbound/biomes/gnome/smallhouse9.recipe index c8fdf8eb..8075320d 100644 --- a/recipes/starbound/biomes/gnome/smallhouse9.recipe +++ b/recipes/starbound/biomes/gnome/smallhouse9.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallhouse9", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallhouse9", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallinn.recipe b/recipes/starbound/biomes/gnome/smallinn.recipe index 7a263ba7..85a59527 100644 --- a/recipes/starbound/biomes/gnome/smallinn.recipe +++ b/recipes/starbound/biomes/gnome/smallinn.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallinn", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallinn", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smalllamppost.recipe b/recipes/starbound/biomes/gnome/smalllamppost.recipe index 91fcecad..15c1ae1e 100644 --- a/recipes/starbound/biomes/gnome/smalllamppost.recipe +++ b/recipes/starbound/biomes/gnome/smalllamppost.recipe @@ -1,6 +1,6 @@ { - "input" : [//"lightbulb3", + "input": [//"lightbulb3", "ironbar"], - "output" : "smalllamppost", - "groups" : ["craftingfurniture","decoration","all"] + "output": "smalllamppost", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/gnome/smallwindmill.recipe b/recipes/starbound/biomes/gnome/smallwindmill.recipe index cd68adbe..300794e8 100644 --- a/recipes/starbound/biomes/gnome/smallwindmill.recipe +++ b/recipes/starbound/biomes/gnome/smallwindmill.recipe @@ -1,5 +1,5 @@ { - "input" : [["gnome",14]], - "output" : "smallwindmill", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["gnome",14]], + "output": "smallwindmill", + "groups": ["craftingfurniture","decoration","all"] } diff --git a/recipes/starbound/biomes/icesphere/icespherechest.recipe b/recipes/starbound/biomes/icesphere/icespherechest.recipe index 8ef7148f..ab70983a 100644 --- a/recipes/starbound/biomes/icesphere/icespherechest.recipe +++ b/recipes/starbound/biomes/icesphere/icespherechest.recipe @@ -1,5 +1,5 @@ { - "input" : [["iceblock",9]], - "output" : "icespherechest", - "groups" : ["craftingfurniture","storage","all"] + "input": [["iceblock",9]], + "output": "icespherechest", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/mushroom/shroomstatue.recipe b/recipes/starbound/biomes/mushroom/shroomstatue.recipe index 4ad448b8..86391112 100644 --- a/recipes/starbound/biomes/mushroom/shroomstatue.recipe +++ b/recipes/starbound/biomes/mushroom/shroomstatue.recipe @@ -1,5 +1,5 @@ { - "input" : [["cobblestonematerial",150]], - "output" : "shroomstatue", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["cobblestonematerial",150]], + "output": "shroomstatue", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonebed.recipe b/recipes/starbound/biomes/sandstone/sandstonebed.recipe index 3e63303f..73e0ff6c 100644 --- a/recipes/starbound/biomes/sandstone/sandstonebed.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonebed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",45],["leather",3]], - "output" : "sandstonebed", - "groups" : ["craftingfurniture","beds","objects","all"] + "input": [["sandstoneblock",45],["leather",3]], + "output": "sandstonebed", + "groups": ["craftingfurniture","beds","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonechair.recipe b/recipes/starbound/biomes/sandstone/sandstonechair.recipe index cafc0c71..47fe1d53 100644 --- a/recipes/starbound/biomes/sandstone/sandstonechair.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonechair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",25]], - "output" : "sandstonechair", - "groups" : ["craftingfurniture","decoration","objects","all"] + "input": [["sandstoneblock",25]], + "output": "sandstonechair", + "groups": ["craftingfurniture","decoration","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonechest.recipe b/recipes/starbound/biomes/sandstone/sandstonechest.recipe index 7511f6e1..4c173195 100644 --- a/recipes/starbound/biomes/sandstone/sandstonechest.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonechest.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",35]], - "output" : "sandstonechest", - "groups" : ["craftingfurniture","storage","objects","all"] + "input": [["sandstoneblock",35]], + "output": "sandstonechest", + "groups": ["craftingfurniture","storage","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonedoor.recipe b/recipes/starbound/biomes/sandstone/sandstonedoor.recipe index 40f82ee2..c206cc57 100644 --- a/recipes/starbound/biomes/sandstone/sandstonedoor.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonedoor.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",20]], - "output" : "sandstonedoor", - "groups" : ["craftingfurniture","doors","objects","all"] + "input": [["sandstoneblock",20]], + "output": "sandstonedoor", + "groups": ["craftingfurniture","doors","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonetable.recipe b/recipes/starbound/biomes/sandstone/sandstonetable.recipe index c6f133af..e60f2056 100644 --- a/recipes/starbound/biomes/sandstone/sandstonetable.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonetable.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",35]], - "output" : "sandstonetable", - "groups" : ["craftingfurniture","decoration","objects","all"] + "input": [["sandstoneblock",35]], + "output": "sandstonetable", + "groups": ["craftingfurniture","decoration","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/sandstone/sandstonetorch.recipe b/recipes/starbound/biomes/sandstone/sandstonetorch.recipe index 7d9e197b..69eb5786 100644 --- a/recipes/starbound/biomes/sandstone/sandstonetorch.recipe +++ b/recipes/starbound/biomes/sandstone/sandstonetorch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sandstoneblock",2],"torch"], - "output" : "sandstonetorch", - "groups" : ["craftingfurniture","lights","objects","all"] + "input": [["sandstoneblock",2],"torch"], + "output": "sandstonetorch", + "groups": ["craftingfurniture","lights","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/slime/slimehide.recipe b/recipes/starbound/biomes/slime/slimehide.recipe index 290c7e74..19f9afbc 100644 --- a/recipes/starbound/biomes/slime/slimehide.recipe +++ b/recipes/starbound/biomes/slime/slimehide.recipe @@ -1,5 +1,5 @@ { - "input" : [["greenslime",20]], - "output" : "sb_slimehide", - "groups" : ["craftingfurniture","storage","all"] + "input": [["greenslime",20]], + "output": "sb_slimehide", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/spring/flowerstatue.recipe b/recipes/starbound/biomes/spring/flowerstatue.recipe index 0f2608d4..d92141b4 100644 --- a/recipes/starbound/biomes/spring/flowerstatue.recipe +++ b/recipes/starbound/biomes/spring/flowerstatue.recipe @@ -1,5 +1,5 @@ { - "input" : [["cobblestonematerial",50]], - "output" : "flowerstatue", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["cobblestonematerial",50]], + "output": "flowerstatue", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/biomes/tentacle/organictorch.recipe b/recipes/starbound/biomes/tentacle/organictorch.recipe index 09b1ab61..3b6ef0e4 100644 --- a/recipes/starbound/biomes/tentacle/organictorch.recipe +++ b/recipes/starbound/biomes/tentacle/organictorch.recipe @@ -1,5 +1,5 @@ { - "input" : [["tentacleblock",2],"torch"], - "output" : "organictorch", - "groups" : ["craftingfurniture","lights","objects","all"] + "input": [["tentacleblock",2],"torch"], + "output": "organictorch", + "groups": ["craftingfurniture","lights","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/ironbeacon.recipe b/recipes/starbound/boss/ironbeacon.recipe index e0d42d82..176692d7 100644 --- a/recipes/starbound/boss/ironbeacon.recipe +++ b/recipes/starbound/boss/ironbeacon.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",10],["ironbar",10],["silverbar",2],"copperbar"], - "output" : "sb_ironbeacon", - "groups" : ["inventorstable","craftingstations","all"] + "input": [["darkwoodmaterial",10],["ironbar",10],["silverbar",2],"copperbar"], + "output": "sb_ironbeacon", + "groups": ["inventorstable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/peanutbutter.recipe b/recipes/starbound/boss/peanutbutter.recipe index b8938713..eacf9a3b 100644 --- a/recipes/starbound/boss/peanutbutter.recipe +++ b/recipes/starbound/boss/peanutbutter.recipe @@ -1,6 +1,6 @@ //Would use cardboard1 but stored item mods { - "input" : [["paper",18],"sb_peanutbutterjar"], - "output" : "sb_peanutbutter", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["paper",18],"sb_peanutbutterjar"], + "output": "sb_peanutbutter", + "groups": ["inventorstable2","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot.recipe b/recipes/starbound/boss/robot.recipe index b31b4f65..0b56d929 100644 --- a/recipes/starbound/boss/robot.recipe +++ b/recipes/starbound/boss/robot.recipe @@ -1,5 +1,5 @@ { - "input" : ["robothead","robotchest","robotlegs","robotarms"], - "output" : "sb_robot", - "groups" : ["sb_ironcraftingtable","sb_other","inventorstable2","all"] + "input": ["robothead","robotchest","robotlegs","robotarms"], + "output": "sb_robot", + "groups": ["sb_ironcraftingtable","sb_other","inventorstable2","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot/artificialbrain.recipe b/recipes/starbound/boss/robot/artificialbrain.recipe index 77e6a45e..78ea5c49 100644 --- a/recipes/starbound/boss/robot/artificialbrain.recipe +++ b/recipes/starbound/boss/robot/artificialbrain.recipe @@ -1,5 +1,5 @@ { - "input" : ["copperbar","brain"], - "output" : "artificialbrain", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": ["copperbar","brain"], + "output": "artificialbrain", + "groups": ["sb_ironcraftingtable","sb_other","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot/brain.recipe b/recipes/starbound/boss/robot/brain.recipe index 5312d929..a6af0c7b 100644 --- a/recipes/starbound/boss/robot/brain.recipe +++ b/recipes/starbound/boss/robot/brain.recipe @@ -1,5 +1,5 @@ { - "input" : [["inferiorbrain",10]], - "output" : "brain", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": [["inferiorbrain",10]], + "output": "brain", + "groups": ["sb_ironcraftingtable","sb_other","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot/brainextractor.recipe b/recipes/starbound/boss/robot/brainextractor.recipe index 1bbc0e67..342c5527 100644 --- a/recipes/starbound/boss/robot/brainextractor.recipe +++ b/recipes/starbound/boss/robot/brainextractor.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",4]], - "output" : "sb_brainextractor", - "groups" : ["craftinganvil","weapons","all"] + "input": [["sb_steelbar",4]], + "output": "sb_brainextractor", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot/emptyrobothead.recipe b/recipes/starbound/boss/robot/emptyrobothead.recipe index 74b01ffb..c60e5fec 100644 --- a/recipes/starbound/boss/robot/emptyrobothead.recipe +++ b/recipes/starbound/boss/robot/emptyrobothead.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",4],["glass",2]], - "output" : "sb_robotheadempty", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": [["sb_steelbar",4],["glass",2]], + "output": "sb_robotheadempty", + "groups": ["sb_ironcraftingtable","sb_other","all"] } diff --git a/recipes/starbound/boss/robot/robotarms.recipe b/recipes/starbound/boss/robot/robotarms.recipe index 25b60927..652a6c82 100644 --- a/recipes/starbound/boss/robot/robotarms.recipe +++ b/recipes/starbound/boss/robot/robotarms.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",4],"copperbar"], - "output" : "robotarms", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": [["sb_steelbar",4],"copperbar"], + "output": "robotarms", + "groups": ["sb_ironcraftingtable","sb_other","all"] } diff --git a/recipes/starbound/boss/robot/robotchest.recipe b/recipes/starbound/boss/robot/robotchest.recipe index 1d9d46b4..1773583d 100644 --- a/recipes/starbound/boss/robot/robotchest.recipe +++ b/recipes/starbound/boss/robot/robotchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],"goldbar"], - "output" : "robotchest", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": [["sb_steelbar",6],"goldbar"], + "output": "robotchest", + "groups": ["sb_ironcraftingtable","sb_other","all"] } \ No newline at end of file diff --git a/recipes/starbound/boss/robot/robothead.recipe b/recipes/starbound/boss/robot/robothead.recipe index 51eb5f7e..1ca8d463 100644 --- a/recipes/starbound/boss/robot/robothead.recipe +++ b/recipes/starbound/boss/robot/robothead.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_robotheadempty","artificialbrain"], - "output" : "robothead", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": ["sb_robotheadempty","artificialbrain"], + "output": "robothead", + "groups": ["sb_ironcraftingtable","sb_other","all"] } diff --git a/recipes/starbound/boss/robot/robotlegs.recipe b/recipes/starbound/boss/robot/robotlegs.recipe index 48d924e9..fda2f39a 100644 --- a/recipes/starbound/boss/robot/robotlegs.recipe +++ b/recipes/starbound/boss/robot/robotlegs.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",4],"copperbar"], - "output" : "robotlegs", - "groups" : ["sb_ironcraftingtable","sb_other","all"] + "input": [["sb_steelbar",4],"copperbar"], + "output": "robotlegs", + "groups": ["sb_ironcraftingtable","sb_other","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/condiments/crystaljam.recipe b/recipes/starbound/consumables/condiments/crystaljam.recipe index 2b0d7819..e039abc1 100644 --- a/recipes/starbound/consumables/condiments/crystaljam.recipe +++ b/recipes/starbound/consumables/condiments/crystaljam.recipe @@ -1,6 +1,6 @@ { - "input" : ["crystalplant","sugar"], - "output" : "sb_crystaljam", - "groups" : ["craftingfood","condiments","sb_healing","sb_glow","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_crystaljam"} + "input": ["crystalplant","sugar"], + "output": "sb_crystaljam", + "groups": ["craftingfood","condiments","sb_healing","sb_glow","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_crystaljam"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/condiments/orangejam.recipe b/recipes/starbound/consumables/condiments/orangejam.recipe index 6a525deb..fdfda502 100644 --- a/recipes/starbound/consumables/condiments/orangejam.recipe +++ b/recipes/starbound/consumables/condiments/orangejam.recipe @@ -1,6 +1,6 @@ { - "input" : ["orange","sugar"], - "output" : "sb_orangejam", - "groups" : ["craftingfood","condiments","sb_healing","sb_health","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_orangejam"} + "input": ["orange","sugar"], + "output": "sb_orangejam", + "groups": ["craftingfood","condiments","sb_healing","sb_health","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_orangejam"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/condiments/peanutbutterjar.recipe b/recipes/starbound/consumables/condiments/peanutbutterjar.recipe index f2d8d107..f0df0789 100644 --- a/recipes/starbound/consumables/condiments/peanutbutterjar.recipe +++ b/recipes/starbound/consumables/condiments/peanutbutterjar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_butter","pearlpea"], - "output" : "sb_peanutbutterjar", - "groups" : ["craftingfood","condiments","sb_healing","sb_protection","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_peanutbutterjar"} + "input": ["sb_butter","pearlpea",["shroom", 5]], + "output": "sb_peanutbutterjar", + "groups": ["craftingfood","condiments","sb_healing","sb_protection","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_peanutbutterjar"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/condiments/ricevinegar.recipe b/recipes/starbound/consumables/condiments/ricevinegar.recipe index 00a82746..9d9b04d7 100644 --- a/recipes/starbound/consumables/condiments/ricevinegar.recipe +++ b/recipes/starbound/consumables/condiments/ricevinegar.recipe @@ -1,6 +1,6 @@ { - "input" : ["liquidwater","rice"], - "output" : "sb_ricevinegar", - "groups" : ["craftingfood","condiments","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_ricevinegar"} + "input": ["liquidwater","rice"], + "output": "sb_ricevinegar", + "groups": ["craftingfood","condiments","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_ricevinegar"} } diff --git a/recipes/starbound/consumables/condiments/thornjam.recipe b/recipes/starbound/consumables/condiments/thornjam.recipe index 7d39d0e1..6967daf1 100644 --- a/recipes/starbound/consumables/condiments/thornjam.recipe +++ b/recipes/starbound/consumables/condiments/thornjam.recipe @@ -1,6 +1,6 @@ { - "input" : ["thornfruit","sugar"], - "output" : "sb_thornjam", - "groups" : ["craftingfood","condiments","sb_healing","sb_thorns","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_thornjam"} + "input": ["thornfruit","sugar"], + "output": "sb_thornjam", + "groups": ["craftingfood","condiments","sb_healing","sb_thorns","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_thornjam"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/applepie.recipe b/recipes/starbound/consumables/desserts/applepie.recipe index a41d2fe7..3cc0117d 100644 --- a/recipes/starbound/consumables/desserts/applepie.recipe +++ b/recipes/starbound/consumables/desserts/applepie.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","sugar","sb_butter","redapple","egg"], - "output" : "sb_applepie", - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","all"], - "collectables" : {"cooking":"sb_applepie"} + "input": ["wheat","sugar","sb_butter","redapple","egg"], + "output": "sb_applepie", + "groups": ["craftingfood","desserts","sb_healing","sb_energy","all"], + "collectables": {"cooking":"sb_applepie"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/bananabread.recipe b/recipes/starbound/consumables/desserts/bananabread.recipe index 2c564687..093885cc 100644 --- a/recipes/starbound/consumables/desserts/bananabread.recipe +++ b/recipes/starbound/consumables/desserts/bananabread.recipe @@ -1,6 +1,6 @@ { - "input" : ["banana","wheat"], - "output" : ["sb_bananabread", 2], - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_energyregen","sb_t1food","all"], - "collectables" : {"cooking":"sb_bananabread"} + "input": ["banana","wheat"], + "output": ["sb_bananabread", 2], + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_energyregen","sb_t1food","all"], + "collectables": {"cooking":"sb_bananabread"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/blackcurrentcrumble.recipe b/recipes/starbound/consumables/desserts/blackcurrentcrumble.recipe index 00789a34..9564a3bf 100644 --- a/recipes/starbound/consumables/desserts/blackcurrentcrumble.recipe +++ b/recipes/starbound/consumables/desserts/blackcurrentcrumble.recipe @@ -1,6 +1,6 @@ { - "input" : ["boltbulb","wheat","eggshoot","sugar"], - "output" : "sb_blackcurrentcrumble", - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_electrified","all"], - "collectables" : {"cooking":"sb_blackcurrentcrumble"} + "input": ["boltbulb","wheat","eggshoot","sugar"], + "output": "sb_blackcurrentcrumble", + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_electrified","all"], + "collectables": {"cooking":"sb_blackcurrentcrumble"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/brineapple.recipe b/recipes/starbound/consumables/desserts/brineapple.recipe index e36e470e..617aaa66 100644 --- a/recipes/starbound/consumables/desserts/brineapple.recipe +++ b/recipes/starbound/consumables/desserts/brineapple.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_poisoncreep","pineapple","sugar"], - "output" : "sb_brineapple", - "groups" : ["craftingfood","desserts","sb_runboost","sb_energy","sb_healing","all"], - "collectables" : {"cooking":"sb_brineapple"} + "input": ["sb_poisoncreep","pineapple","sugar"], + "output": "sb_brineapple", + "groups": ["craftingfood","desserts","sb_runboost","sb_energy","sb_healing","all"], + "collectables": {"cooking":"sb_brineapple"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/burningeyeballs.recipe b/recipes/starbound/consumables/desserts/burningeyeballs.recipe index 71b50858..72847e22 100644 --- a/recipes/starbound/consumables/desserts/burningeyeballs.recipe +++ b/recipes/starbound/consumables/desserts/burningeyeballs.recipe @@ -1,6 +1,6 @@ { - "input" : ["oculemon","toxictop","chili"], - "output" : "sb_burningeyeballs", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_nova","sb_other","all"], - "collectables" : {"cooking":"sb_burningeyeballs"} + "input": ["oculemon","toxictop","chili"], + "output": "sb_burningeyeballs", + "groups": ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_nova","sb_other","all"], + "collectables": {"cooking":"sb_burningeyeballs"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/butter.recipe b/recipes/starbound/consumables/desserts/butter.recipe index 7ab62d13..359c44d0 100644 --- a/recipes/starbound/consumables/desserts/butter.recipe +++ b/recipes/starbound/consumables/desserts/butter.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","liquidwater"], - "output" : ["sb_butter",2], - "groups" : ["craftingfood","desserts","craftingfood","sb_other","sb_t1food","all"], - "collectables" : {"cooking":"sb_butter"} + "input": ["milk","liquidwater"], + "output": ["sb_butter",2], + "groups": ["craftingfood","desserts","craftingfood","sb_other","sb_t1food","all"], + "collectables": {"cooking":"sb_butter"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/cake.recipe b/recipes/starbound/consumables/desserts/cake.recipe index 4d5db0c4..5222bf91 100644 --- a/recipes/starbound/consumables/desserts/cake.recipe +++ b/recipes/starbound/consumables/desserts/cake.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","sugar","milk","egg"], - "output" : ["sb_cake",2], - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_cake"} + "input": ["wheat","sugar","milk","egg"], + "output": ["sb_cake",2], + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_cake"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/candiedpearlpeas.recipe b/recipes/starbound/consumables/desserts/candiedpearlpeas.recipe index d95744cb..4b4de0ae 100644 --- a/recipes/starbound/consumables/desserts/candiedpearlpeas.recipe +++ b/recipes/starbound/consumables/desserts/candiedpearlpeas.recipe @@ -1,6 +1,6 @@ { - "input" : ["pearlpea","sugar"], - "output" : "sb_candiedpearlpeas", - "groups" : ["craftingfood","desserts","sb_energy","sb_protection","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_candiedpearlpeas"} + "input": ["pearlpea","sugar"], + "output": "sb_candiedpearlpeas", + "groups": ["craftingfood","desserts","sb_energy","sb_protection","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_candiedpearlpeas"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/candy.recipe b/recipes/starbound/consumables/desserts/candy.recipe index 5100cbcf..b4b0f4e5 100644 --- a/recipes/starbound/consumables/desserts/candy.recipe +++ b/recipes/starbound/consumables/desserts/candy.recipe @@ -1,6 +1,6 @@ { - "input" : ["sugar"], - "output" : ["sb_candy",3], - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_candy"} + "input": ["sugar"], + "output": ["sb_candy",3], + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_candy"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/carrotcake.recipe b/recipes/starbound/consumables/desserts/carrotcake.recipe index b1106fea..19135325 100644 --- a/recipes/starbound/consumables/desserts/carrotcake.recipe +++ b/recipes/starbound/consumables/desserts/carrotcake.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","sugar","carrot","eggshoot"], - "output" : ["sb_carrotcake",2], - "groups" : ["craftingfood","desserts","sb_energy","sb_healing","all"], - "collectables" : {"cooking":"sb_carrotcake"} + "input": ["wheat","sugar","carrot","eggshoot"], + "output": ["sb_carrotcake",2], + "groups": ["craftingfood","desserts","sb_energy","sb_healing","all"], + "collectables": {"cooking":"sb_carrotcake"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/chocolate.recipe b/recipes/starbound/consumables/desserts/chocolate.recipe index 6d4c4788..b3b22b0b 100644 --- a/recipes/starbound/consumables/desserts/chocolate.recipe +++ b/recipes/starbound/consumables/desserts/chocolate.recipe @@ -1,6 +1,6 @@ { - "input" : ["cocoa","milk","sugar"], - "output" : "sb_chocolate", - "groups" : ["craftingfood","sb_energy","sb_runboost","sb_healing","snacks","all"], - "collectables" : {"cooking":"sb_chocolate"} + "input": ["cocoa","milk","sugar"], + "output": "sb_chocolate", + "groups": ["craftingfood","sb_energy","sb_runboost","sb_healing","snacks","all"], + "collectables": {"cooking":"sb_chocolate"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/chocolatecoffeebeans.recipe b/recipes/starbound/consumables/desserts/chocolatecoffeebeans.recipe index cad21ee5..d992e51b 100644 --- a/recipes/starbound/consumables/desserts/chocolatecoffeebeans.recipe +++ b/recipes/starbound/consumables/desserts/chocolatecoffeebeans.recipe @@ -1,6 +1,6 @@ { - "input" : ["chocolate","coffeebeans"], - "output" : "sb_chocolatecoffeebeans", - "groups" : ["craftingfood","campfire","consumables","desserts","sb_runboost","sb_healing","sb_energy","sb_energyregen","desserts","sb_t1food","all"], - "collectables" : {"cooking":"sb_chocolatecoffeebeans"} + "input": ["chocolate","coffeebeans"], + "output": "sb_chocolatecoffeebeans", + "groups": ["craftingfood","campfire","consumables","desserts","sb_runboost","sb_healing","sb_energy","sb_energyregen","desserts","sb_t1food","all"], + "collectables": {"cooking":"sb_chocolatecoffeebeans"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/copperkeypie.recipe b/recipes/starbound/consumables/desserts/copperkeypie.recipe index 4bfe4461..f2fd0e59 100644 --- a/recipes/starbound/consumables/desserts/copperkeypie.recipe +++ b/recipes/starbound/consumables/desserts/copperkeypie.recipe @@ -1,6 +1,6 @@ { - "input" : ["kiwi","wheat","diodia"], - "output" : "sb_copperkeypie", - "groups" : ["craftingfood","desserts","sb_energy","sb_jumpboost","sb_electrified","sb_healing","all"], - "collectables" : {"cooking":"sb_copperkeypie"} + "input": ["kiwi","wheat","diodia"], + "output": "sb_copperkeypie", + "groups": ["craftingfood","desserts","sb_energy","sb_jumpboost","sb_electrified","sb_healing","all"], + "collectables": {"cooking":"sb_copperkeypie"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/crowncake.recipe b/recipes/starbound/consumables/desserts/crowncake.recipe index 9504671c..51146844 100644 --- a/recipes/starbound/consumables/desserts/crowncake.recipe +++ b/recipes/starbound/consumables/desserts/crowncake.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","pineapple","eggshoot","feathercrown"], - "output" : "sb_crowncake", - "groups" : ["craftingfood","desserts","sb_runboost","sb_jumpboost","sb_healing","all"], - "collectables" : {"cooking":"sb_crowncake"} + "input": ["wheat","pineapple","eggshoot","feathercrown"], + "output": "sb_crowncake", + "groups": ["craftingfood","desserts","sb_runboost","sb_jumpboost","sb_healing","all"], + "collectables": {"cooking":"sb_crowncake"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/crystalcandy.recipe b/recipes/starbound/consumables/desserts/crystalcandy.recipe index 75d4b069..06175a64 100644 --- a/recipes/starbound/consumables/desserts/crystalcandy.recipe +++ b/recipes/starbound/consumables/desserts/crystalcandy.recipe @@ -1,6 +1,6 @@ { - "input" : ["crystalplant","sugar"], - "output" : ["sb_crystalcandy",2], - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_glow","sb_t1food","all"], - "collectables" : {"cooking":"sb_crystalcandy"} + "input": ["crystalplant","sugar"], + "output": ["sb_crystalcandy",2], + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_glow","sb_t1food","all"], + "collectables": {"cooking":"sb_crystalcandy"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/crystalpie.recipe b/recipes/starbound/consumables/desserts/crystalpie.recipe index 1d3a2dd9..4ef211e5 100644 --- a/recipes/starbound/consumables/desserts/crystalpie.recipe +++ b/recipes/starbound/consumables/desserts/crystalpie.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","crystalplant","sb_butter"], - "output" : "sb_crystalpie", - "groups" : ["craftingfood","desserts","sb_glow","sb_healing","sb_energy","all"], - "collectables" : {"cooking":"sb_crystalpie"} + "input": ["wheat","crystalplant","sb_butter"], + "output": "sb_crystalpie", + "groups": ["craftingfood","desserts","sb_glow","sb_healing","sb_energy","all"], + "collectables": {"cooking":"sb_crystalpie"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/crystaltart.recipe b/recipes/starbound/consumables/desserts/crystaltart.recipe index ea4e2c72..347df4b8 100644 --- a/recipes/starbound/consumables/desserts/crystaltart.recipe +++ b/recipes/starbound/consumables/desserts/crystaltart.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","sb_crystaljam"], - "output" : "sb_crystaltart", - "groups" : ["craftingfood","desserts","sb_glow","sb_energy","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_crystaltart"} + "input": ["wheat","sb_crystaljam"], + "output": "sb_crystaltart", + "groups": ["craftingfood","desserts","sb_glow","sb_energy","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_crystaltart"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/icecream.recipe b/recipes/starbound/consumables/desserts/icecream.recipe index cc17dfd1..ec93f5ab 100644 --- a/recipes/starbound/consumables/desserts/icecream.recipe +++ b/recipes/starbound/consumables/desserts/icecream.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","sugar"], - "output" : "sb_icecream", - "groups" : ["craftingfood","desserts","sb_energy","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_icecream"} + "input": ["milk","sugar"], + "output": "sb_icecream", + "groups": ["craftingfood","desserts","sb_energy","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_icecream"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/jelly.recipe b/recipes/starbound/consumables/desserts/jelly.recipe index f9374ab1..5c003987 100644 --- a/recipes/starbound/consumables/desserts/jelly.recipe +++ b/recipes/starbound/consumables/desserts/jelly.recipe @@ -1,6 +1,6 @@ { - "input" : ["endomorphicjelly","sugar"], - "output" : ["sb_jelly",3], - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_bouncy","sb_runboost","sb_jumpboost","all"], - "collectables" : {"cooking":"sb_jelly"} + "input": ["endomorphicjelly","sugar"], + "output": ["sb_jelly",3], + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_bouncy","sb_runboost","sb_jumpboost","all"], + "collectables": {"cooking":"sb_jelly"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/lollypop.recipe b/recipes/starbound/consumables/desserts/lollypop.recipe index c47d0c16..b968b941 100644 --- a/recipes/starbound/consumables/desserts/lollypop.recipe +++ b/recipes/starbound/consumables/desserts/lollypop.recipe @@ -1,6 +1,6 @@ { - "input" : ["sugar","banana"], - "output" : "sb_lollypop", - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_energyregen","sb_t1food","all"], - "collectables" : {"cooking":"sb_lollypop"} + "input": ["sugar","banana"], + "output": "sb_lollypop", + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_energyregen","sb_t1food","all"], + "collectables": {"cooking":"sb_lollypop"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/orangepie.recipe b/recipes/starbound/consumables/desserts/orangepie.recipe index a6072854..c8d00a0d 100644 --- a/recipes/starbound/consumables/desserts/orangepie.recipe +++ b/recipes/starbound/consumables/desserts/orangepie.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","orange","egg"], - "output" : "sb_orangepie", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","all"], - "collectables" : {"cooking":"sb_orangepie"} + "input": ["wheat","orange","egg"], + "output": "sb_orangepie", + "groups": ["craftingfood","desserts","sb_healing","sb_health","all"], + "collectables": {"cooking":"sb_orangepie"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/orangetart.recipe b/recipes/starbound/consumables/desserts/orangetart.recipe index ff5c5e2b..f666d656 100644 --- a/recipes/starbound/consumables/desserts/orangetart.recipe +++ b/recipes/starbound/consumables/desserts/orangetart.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","sb_orangejam"], - "output" : "sb_orangetart", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_orangetart"} + "input": ["wheat","sb_orangejam"], + "output": "sb_orangetart", + "groups": ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_orangetart"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/pussplumpie.recipe b/recipes/starbound/consumables/desserts/pussplumpie.recipe index eb98bdba..280d688f 100644 --- a/recipes/starbound/consumables/desserts/pussplumpie.recipe +++ b/recipes/starbound/consumables/desserts/pussplumpie.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","pussplum","rawpoultry"], - "output" : "sb_pussplumpie", - "groups" : ["craftingfood","desserts","sb_healing","sb_bouncy","sb_health","sb_rage","all"], - "collectables" : {"cooking":"sb_pussplumpie"} + "input": ["wheat","pussplum","rawpoultry"], + "output": "sb_pussplumpie", + "groups": ["craftingfood","desserts","sb_healing","sb_bouncy","sb_health","sb_rage","all"], + "collectables": {"cooking":"sb_pussplumpie"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/sweetmeat.recipe b/recipes/starbound/consumables/desserts/sweetmeat.recipe index b7896982..04ca0551 100644 --- a/recipes/starbound/consumables/desserts/sweetmeat.recipe +++ b/recipes/starbound/consumables/desserts/sweetmeat.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_toffee","rawbacon"], - "output" : "sb_sweetmeat", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_sweetmeat"} + "input": ["sb_toffee","rawbacon"], + "output": "sb_sweetmeat", + "groups": ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_sweetmeat"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/sweettime.recipe b/recipes/starbound/consumables/desserts/sweettime.recipe index acf120d4..736d6e80 100644 --- a/recipes/starbound/consumables/desserts/sweettime.recipe +++ b/recipes/starbound/consumables/desserts/sweettime.recipe @@ -1,6 +1,6 @@ { - "input" : ["oculemon","sugar","diodia"], - "output" : "sb_sweettime", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_electrified","all"], - "collectables" : {"cooking":"sb_sweettime"} + "input": ["oculemon","sugar","diodia"], + "output": "sb_sweettime", + "groups": ["craftingfood","desserts","sb_healing","sb_health","sb_energy","sb_electrified","all"], + "collectables": {"cooking":"sb_sweettime"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/toffee.recipe b/recipes/starbound/consumables/desserts/toffee.recipe index 208f1484..56bd92b6 100644 --- a/recipes/starbound/consumables/desserts/toffee.recipe +++ b/recipes/starbound/consumables/desserts/toffee.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_butter","sugar"], - "output" : "sb_toffee", - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_toffee"} + "input": ["sb_butter","sugar"], + "output": "sb_toffee", + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_toffee"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/toffeeapple.recipe b/recipes/starbound/consumables/desserts/toffeeapple.recipe index d3a4834e..d9be861e 100644 --- a/recipes/starbound/consumables/desserts/toffeeapple.recipe +++ b/recipes/starbound/consumables/desserts/toffeeapple.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_toffee","redapple"], - "output" : "sb_toffeeapple", - "groups" : ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_toffeeapple"} + "input": ["sb_toffee","redapple"], + "output": "sb_toffeeapple", + "groups": ["craftingfood","desserts","sb_healing","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_toffeeapple"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/valentinechocolates.recipe b/recipes/starbound/consumables/desserts/valentinechocolates.recipe index 45ae0216..c7be3223 100644 --- a/recipes/starbound/consumables/desserts/valentinechocolates.recipe +++ b/recipes/starbound/consumables/desserts/valentinechocolates.recipe @@ -1,6 +1,6 @@ { - "input" : [["cocoa",4]], - "output" : "valentinechocolates", - "groups" : ["craftingfood","desserts","consumables","heartforge","sb_healing","sb_runboost","sb_t1food","all"], - "collectables" : {"cooking":"valentinechocolates"} + "input": [["cocoa",4]], + "output": "valentinechocolates", + "groups": ["craftingfood","desserts","consumables","heartforge","sb_healing","sb_runboost","sb_t1food","all"], + "collectables": {"cooking":"valentinechocolates"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/batteryacid.recipe b/recipes/starbound/consumables/drinks/batteryacid.recipe index 4ab5acca..5122c10d 100644 --- a/recipes/starbound/consumables/drinks/batteryacid.recipe +++ b/recipes/starbound/consumables/drinks/batteryacid.recipe @@ -1,6 +1,6 @@ { - "input" : ["currentcorn"], - "output" : "sb_batteryacid", - "groups" : ["craftingfood","drinks","sb_energy","sb_electrified","sb_t1food","all"], - "collectables" : {"cooking":"sb_batteryacid"} + "input": ["currentcorn"], + "output": "sb_batteryacid", + "groups": ["craftingfood","drinks","sb_energy","sb_electrified","sb_t1food","all"], + "collectables": {"cooking":"sb_batteryacid"} } diff --git a/recipes/starbound/consumables/drinks/boltedmilk.recipe b/recipes/starbound/consumables/drinks/boltedmilk.recipe index e02696ad..d9fe4af4 100644 --- a/recipes/starbound/consumables/drinks/boltedmilk.recipe +++ b/recipes/starbound/consumables/drinks/boltedmilk.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","boltbulb","currentcorn"], - "output" : "sb_boltedmilk", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_electrified","sb_t1food","all"], - "collectables" : {"cooking":"sb_boltedmilk"} + "input": ["milk","boltbulb","currentcorn"], + "output": "sb_boltedmilk", + "groups": ["craftingfood","drinks","sb_energy","sb_healing","sb_electrified","sb_t1food","all"], + "collectables": {"cooking":"sb_boltedmilk"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/coffee.recipe b/recipes/starbound/consumables/drinks/coffee.recipe index 6de60706..a102fa30 100644 --- a/recipes/starbound/consumables/drinks/coffee.recipe +++ b/recipes/starbound/consumables/drinks/coffee.recipe @@ -1,6 +1,6 @@ { - "input" : ["glasscoffeemug","sb_liquidcoffee"], - "output" : "coffee", - "groups" : ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","sb_t1food","plain","consumables","all"], - "collectables" : {"cooking":"coffee"} + "input": ["glasscoffeemug","sb_liquidcoffee"], + "output": "coffee", + "groups": ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","sb_t1food","plain","consumables","all"], + "collectables": {"cooking":"coffee"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/cordialbottle.recipe b/recipes/starbound/consumables/drinks/cordialbottle.recipe index 95746e13..88aebe15 100644 --- a/recipes/starbound/consumables/drinks/cordialbottle.recipe +++ b/recipes/starbound/consumables/drinks/cordialbottle.recipe @@ -1,6 +1,6 @@ { - "input" : ["avesmingo","banana","sugar"], - "output" : "sb_cordialbottle", - "groups" : ["craftingfood","drinks","sb_healing","sb_energy","sb_energyregen","sb_runboost","all"], - "collectables" : {"cooking":"sb_cordialbottle"} + "input": ["avesmingo","banana","sugar"], + "output": "sb_cordialbottle", + "groups": ["craftingfood","drinks","sb_healing","sb_energy","sb_energyregen","sb_runboost","all"], + "collectables": {"cooking":"sb_cordialbottle"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/cordialglass.recipe b/recipes/starbound/consumables/drinks/cordialglass.recipe index fb4ccec5..96c36457 100644 --- a/recipes/starbound/consumables/drinks/cordialglass.recipe +++ b/recipes/starbound/consumables/drinks/cordialglass.recipe @@ -1,6 +1,6 @@ { - "input" : ["avesmingo","sugar"], - "output" : "sb_cordialglass", - "groups" : ["craftingfood","drinks","sb_healing","sb_energy","sb_runboost","all"], - "collectables" : {"cooking":"sb_cordialglass"} + "input": ["avesmingo","sugar"], + "output": "sb_cordialglass", + "groups": ["craftingfood","drinks","sb_healing","sb_energy","sb_runboost","all"], + "collectables": {"cooking":"sb_cordialglass"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/dirtea.recipe b/recipes/starbound/consumables/drinks/dirtea.recipe index fdcb5fb8..46a81a9b 100644 --- a/recipes/starbound/consumables/drinks/dirtea.recipe +++ b/recipes/starbound/consumables/drinks/dirtea.recipe @@ -1,6 +1,6 @@ { - "input" : ["dirturchin"], - "output" : "sb_dirtea", - "groups" : ["campfire","craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_dirtea"} + "input": ["dirturchin"], + "output": "sb_dirtea", + "groups": ["campfire","craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_dirtea"} } diff --git a/recipes/starbound/consumables/drinks/flatwhite.recipe b/recipes/starbound/consumables/drinks/flatwhite.recipe index 7cd39a23..dfdb0d80 100644 --- a/recipes/starbound/consumables/drinks/flatwhite.recipe +++ b/recipes/starbound/consumables/drinks/flatwhite.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","sb_liquidcoffee","glasscoffeemug"], - "output" : "flatwhite", - "groups" : ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","all"], - "collectables" : {"cooking":"flatwhite"} + "input": ["milk","sb_liquidcoffee","glasscoffeemug"], + "output": "flatwhite", + "groups": ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","all"], + "collectables": {"cooking":"flatwhite"} } diff --git a/recipes/starbound/consumables/drinks/liquidcoffee.recipe b/recipes/starbound/consumables/drinks/liquidcoffee.recipe index a38ec88b..ccabc984 100644 --- a/recipes/starbound/consumables/drinks/liquidcoffee.recipe +++ b/recipes/starbound/consumables/drinks/liquidcoffee.recipe @@ -1,8 +1,8 @@ { - "input" : ["coffeebeans"], - "duration" : 0.5, - "output" : ["sb_liquidcoffee",2], - "groups" : [ + "input": ["coffeebeans"], + "duration": 0.5, + "output": ["sb_liquidcoffee",2], + "groups": [ "sb_coffee","all", /*MFM*/ "coffeeMFM","ExcludeFromRecipeBook", /*FU*/ "coffeemachine" diff --git a/recipes/starbound/consumables/drinks/liquifiedcrystal.recipe b/recipes/starbound/consumables/drinks/liquifiedcrystal.recipe index 96a48c93..aa679740 100644 --- a/recipes/starbound/consumables/drinks/liquifiedcrystal.recipe +++ b/recipes/starbound/consumables/drinks/liquifiedcrystal.recipe @@ -1,6 +1,6 @@ { - "input" : ["crystalplant"], - "output" : "sb_liquifiedcrystal", - "groups" : ["craftingfood","drinks","sb_healing","sb_glow","sb_t1food","all"], - "collectables" : {"cooking":"sb_liquifiedcrystal"} + "input": ["crystalplant"], + "output": "sb_liquifiedcrystal", + "groups": ["craftingfood","drinks","sb_healing","sb_glow","sb_t1food","all"], + "collectables": {"cooking":"sb_liquifiedcrystal"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/meatjuice.recipe b/recipes/starbound/consumables/drinks/meatjuice.recipe index 57282b89..6c10ab73 100644 --- a/recipes/starbound/consumables/drinks/meatjuice.recipe +++ b/recipes/starbound/consumables/drinks/meatjuice.recipe @@ -1,6 +1,6 @@ { - "input" : ["alienmeat","boneboo"], - "output" : "sb_meatjuice", - "groups" : ["craftingfood","drinks","sb_rage","sb_healing","sb_health","all"], - "collectables" : {"cooking":"sb_meatjuice"} + "input": ["alienmeat","boneboo"], + "output": "sb_meatjuice", + "groups": ["craftingfood","drinks","sb_rage","sb_healing","sb_health","all"], + "collectables": {"cooking":"sb_meatjuice"} } diff --git a/recipes/starbound/consumables/drinks/meatwine.recipe b/recipes/starbound/consumables/drinks/meatwine.recipe index 6fe7d839..7c500967 100644 --- a/recipes/starbound/consumables/drinks/meatwine.recipe +++ b/recipes/starbound/consumables/drinks/meatwine.recipe @@ -1,6 +1,6 @@ { - "input" : ["alienmeat","boneboo","grapes"], - "output" : "sb_meatwine", - "groups" : ["craftingfood","drinks","sb_runboost","sb_health","sb_rage","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_meatwine"} + "input": ["alienmeat","boneboo","grapes"], + "output": "sb_meatwine", + "groups": ["craftingfood","drinks","sb_runboost","sb_health","sb_rage","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_meatwine"} } diff --git a/recipes/starbound/consumables/drinks/milk.recipe b/recipes/starbound/consumables/drinks/milk.recipe index 4bafa203..80cc7acc 100644 --- a/recipes/starbound/consumables/drinks/milk.recipe +++ b/recipes/starbound/consumables/drinks/milk.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidmilk",3],"liquidwater","sugar"], - "output" : ["milk",3], - "groups" : ["craftingfood","drinks","sb_healing","all"] + "input": [["liquidmilk",3],"liquidwater","sugar"], + "output": ["milk",3], + "groups": ["craftingfood","drinks","sb_healing","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/mocha.recipe b/recipes/starbound/consumables/drinks/mocha.recipe index 00f6db24..58776980 100644 --- a/recipes/starbound/consumables/drinks/mocha.recipe +++ b/recipes/starbound/consumables/drinks/mocha.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","chocolate","sb_liquidcoffee","glasscoffeemug"], - "output" : "mocha", - "groups" : ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","all"], - "collectables" : {"cooking":"mocha"} + "input": ["milk","chocolate","sb_liquidcoffee","glasscoffeemug"], + "output": "mocha", + "groups": ["craftingfood","drinks","coffee","coffeemachine","sb_healing","sb_energy","sb_energyregen","all"], + "collectables": {"cooking":"mocha"} } diff --git a/recipes/starbound/consumables/drinks/oculemonade.recipe b/recipes/starbound/consumables/drinks/oculemonade.recipe index 7c24dc1a..47040f31 100644 --- a/recipes/starbound/consumables/drinks/oculemonade.recipe +++ b/recipes/starbound/consumables/drinks/oculemonade.recipe @@ -1,6 +1,6 @@ { - "input" : ["oculemon","sugar"], - "output" : "sb_oculemonade", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_health","sb_t1food","all"], - "collectables" : {"cooking":"sb_oculemonade"} + "input": ["oculemon","sugar"], + "output": "sb_oculemonade", + "groups": ["craftingfood","drinks","sb_energy","sb_healing","sb_health","sb_t1food","all"], + "collectables": {"cooking":"sb_oculemonade"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/orangejuice.recipe b/recipes/starbound/consumables/drinks/orangejuice.recipe index b52f2c94..0b7c502a 100644 --- a/recipes/starbound/consumables/drinks/orangejuice.recipe +++ b/recipes/starbound/consumables/drinks/orangejuice.recipe @@ -1,6 +1,6 @@ { - "input" : ["orange"], - "output" : "sb_orangejuice", - "groups" : ["craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_orangejuice"} + "input": ["orange"], + "output": "sb_orangejuice", + "groups": ["craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_orangejuice"} } diff --git a/recipes/starbound/consumables/drinks/orangenergyglass.recipe b/recipes/starbound/consumables/drinks/orangenergyglass.recipe index 253240e0..1c53ecb7 100644 --- a/recipes/starbound/consumables/drinks/orangenergyglass.recipe +++ b/recipes/starbound/consumables/drinks/orangenergyglass.recipe @@ -1,6 +1,6 @@ { - "input" : ["orange","neonmelon"], - "output" : ["sb_orangenergyglass",3], - "groups" : ["craftingfood","drinks","sb_health","sb_healing","sb_runboost","sb_t1food","all"], - "collectables" : {"cooking":"sb_orangenergyglass"} + "input": ["orange","neonmelon"], + "output": ["sb_orangenergyglass",3], + "groups": ["craftingfood","drinks","sb_health","sb_healing","sb_runboost","sb_t1food","all"], + "collectables": {"cooking":"sb_orangenergyglass"} } diff --git a/recipes/starbound/consumables/drinks/pickledpoisoncreep.recipe b/recipes/starbound/consumables/drinks/pickledpoisoncreep.recipe index ec537227..1c59350d 100644 --- a/recipes/starbound/consumables/drinks/pickledpoisoncreep.recipe +++ b/recipes/starbound/consumables/drinks/pickledpoisoncreep.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ricevinegar","sb_poisoncreep"], - "output" : "sb_pickledpoisoncreep", - "groups" : ["craftingfood","drinks","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_pickledpoisoncreep"} + "input": ["sb_ricevinegar","sb_poisoncreep"], + "output": "sb_pickledpoisoncreep", + "groups": ["craftingfood","drinks","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_pickledpoisoncreep"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/ricewine.recipe b/recipes/starbound/consumables/drinks/ricewine.recipe index 3a212bc4..2525e69c 100644 --- a/recipes/starbound/consumables/drinks/ricewine.recipe +++ b/recipes/starbound/consumables/drinks/ricewine.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ricevinegar","wheat"], - "output" : "sb_ricewine", - "groups" : ["craftingfood","drinks","sb_rage","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_ricewine"} + "input": ["sb_ricevinegar","wheat"], + "output": "sb_ricewine", + "groups": ["craftingfood","drinks","sb_rage","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_ricewine"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/rootpopbottle.recipe b/recipes/starbound/consumables/drinks/rootpopbottle.recipe index 97279f49..ed946bc7 100644 --- a/recipes/starbound/consumables/drinks/rootpopbottle.recipe +++ b/recipes/starbound/consumables/drinks/rootpopbottle.recipe @@ -1,6 +1,6 @@ { - "input" : ["liquidwater",["sugar",2]], - "output" : "sb_rootpopbottle", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_rootpopbottle"} + "input": ["liquidwater",["sugar",2]], + "output": "sb_rootpopbottle", + "groups": ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_rootpopbottle"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/rootpopflask.recipe b/recipes/starbound/consumables/drinks/rootpopflask.recipe index 0d029bfb..8a81834f 100644 --- a/recipes/starbound/consumables/drinks/rootpopflask.recipe +++ b/recipes/starbound/consumables/drinks/rootpopflask.recipe @@ -1,6 +1,6 @@ { - "input" : ["liquidwater","sugar"], - "output" : "sb_rootpopflask", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_rootpopflask"} + "input": ["liquidwater","sugar"], + "output": "sb_rootpopflask", + "groups": ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_rootpopflask"} } diff --git a/recipes/starbound/consumables/drinks/wartjuice.recipe b/recipes/starbound/consumables/drinks/wartjuice.recipe index 4e390a32..fe112694 100644 --- a/recipes/starbound/consumables/drinks/wartjuice.recipe +++ b/recipes/starbound/consumables/drinks/wartjuice.recipe @@ -1,6 +1,6 @@ { - "input" : ["wartweed"], - "output" : "sb_wartjuice", - "groups" : ["craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_wartjuice"} + "input": ["wartweed"], + "output": "sb_wartjuice", + "groups": ["craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_wartjuice"} } diff --git a/recipes/starbound/consumables/drinks/wartwine.recipe b/recipes/starbound/consumables/drinks/wartwine.recipe index a6f463b1..9ffb2446 100644 --- a/recipes/starbound/consumables/drinks/wartwine.recipe +++ b/recipes/starbound/consumables/drinks/wartwine.recipe @@ -1,6 +1,6 @@ { - "input" : ["wartweed","grapes"], - "output" : "sb_wartwine", - "groups" : ["craftingfood","drinks","sb_runboost","sb_rage","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_wartwine"} + "input": ["wartweed","grapes"], + "output": "sb_wartwine", + "groups": ["craftingfood","drinks","sb_runboost","sb_rage","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_wartwine"} } diff --git a/recipes/starbound/consumables/drinks/weyene.recipe b/recipes/starbound/consumables/drinks/weyene.recipe index febe26be..f9a28f57 100644 --- a/recipes/starbound/consumables/drinks/weyene.recipe +++ b/recipes/starbound/consumables/drinks/weyene.recipe @@ -1,6 +1,6 @@ { - "input" : ["oculemon","grapes"], - "output" : "sb_weyene", - "groups" : ["craftingfood","drinks","sb_health","sb_runboost","sb_rage","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_weyene"} + "input": ["oculemon","grapes"], + "output": "sb_weyene", + "groups": ["craftingfood","drinks","sb_health","sb_runboost","sb_rage","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_weyene"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/whiskeybottle.recipe b/recipes/starbound/consumables/drinks/whiskeybottle.recipe index 8984d5ef..2c2fe889 100644 --- a/recipes/starbound/consumables/drinks/whiskeybottle.recipe +++ b/recipes/starbound/consumables/drinks/whiskeybottle.recipe @@ -1,6 +1,6 @@ { - "input" : [["wheat",2],"rice","liquidwater"], - "output" : "sb_whiskeybottle", - "groups" : ["craftingfood","drinks","sb_other","sb_health","sb_rage","sb_healing","all"], - "collectables" : {"cooking":"sb_whiskeybottle"} + "input": [["wheat",2],"rice","liquidwater"], + "output": "sb_whiskeybottle", + "groups": ["craftingfood","drinks","sb_other","sb_health","sb_rage","sb_healing","all"], + "collectables": {"cooking":"sb_whiskeybottle"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/whiskeyflask.recipe b/recipes/starbound/consumables/drinks/whiskeyflask.recipe index 5c7216b3..194088c2 100644 --- a/recipes/starbound/consumables/drinks/whiskeyflask.recipe +++ b/recipes/starbound/consumables/drinks/whiskeyflask.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","rice","liquidwater"], - "output" : "sb_whiskeyflask", - "groups" : ["craftingfood","drinks","sb_other","sb_rage","sb_healing","sb_health","all"], - "collectables" : {"cooking":"sb_whiskeyflask"} + "input": ["wheat","rice","liquidwater"], + "output": "sb_whiskeyflask", + "groups": ["craftingfood","drinks","sb_other","sb_rage","sb_healing","sb_health","all"], + "collectables": {"cooking":"sb_whiskeyflask"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/winebottle.recipe b/recipes/starbound/consumables/drinks/winebottle.recipe index d067639c..c7cf8241 100644 --- a/recipes/starbound/consumables/drinks/winebottle.recipe +++ b/recipes/starbound/consumables/drinks/winebottle.recipe @@ -1,6 +1,6 @@ { - "input" : ["pussplum","grapes","sugar"], - "output" : "sb_winebottle", - "groups" : ["craftingfood","drinks","sb_rage","sb_healing","sb_energy","sb_runboost","sb_bouncy","all"], - "collectables" : {"cooking":"sb_winebottle"} + "input": ["pussplum","grapes","sugar"], + "output": "sb_winebottle", + "groups": ["craftingfood","drinks","sb_rage","sb_healing","sb_energy","sb_runboost","sb_bouncy","all"], + "collectables": {"cooking":"sb_winebottle"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/drinks/wineglass.recipe b/recipes/starbound/consumables/drinks/wineglass.recipe index f44b0a27..388a34f6 100644 --- a/recipes/starbound/consumables/drinks/wineglass.recipe +++ b/recipes/starbound/consumables/drinks/wineglass.recipe @@ -1,6 +1,6 @@ { - "input" : ["grapes","sugar"], - "output" : "sb_wineglass", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_runboost","sb_rage","all"], - "collectables" : {"cooking":"sb_wineglass"} + "input": ["grapes","sugar"], + "output": "sb_wineglass", + "groups": ["craftingfood","drinks","sb_energy","sb_healing","sb_runboost","sb_rage","all"], + "collectables": {"cooking":"sb_wineglass"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/alienburger.recipe b/recipes/starbound/consumables/entrees/alienburger.recipe index 8dcacf06..24ded487 100644 --- a/recipes/starbound/consumables/entrees/alienburger.recipe +++ b/recipes/starbound/consumables/entrees/alienburger.recipe @@ -1,6 +1,6 @@ { - "input" : ["alienmeat","bread"], - "output" : "sb_alienburger", - "groups" : ["craftingfood","mains","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_alienburger"} + "input": ["alienmeat","bread"], + "output": "sb_alienburger", + "groups": ["craftingfood","mains","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_alienburger"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/automatostew.recipe b/recipes/starbound/consumables/entrees/automatostew.recipe index 6cd6587b..b4a2929d 100644 --- a/recipes/starbound/consumables/entrees/automatostew.recipe +++ b/recipes/starbound/consumables/entrees/automatostew.recipe @@ -1,6 +1,6 @@ { - "input" : ["automato","diodia","sb_meatchunks"], - "output" : "sb_automatostew", - "groups" : ["craftingfood","mains","sb_energy","sb_electrified","sb_healing","all"], - "collectables" : {"cooking":"sb_automatostew"} + "input": ["automato","diodia","sb_meatchunks"], + "output": "sb_automatostew", + "groups": ["craftingfood","mains","sb_energy","sb_electrified","sb_healing","all"], + "collectables": {"cooking":"sb_automatostew"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/burrito.recipe b/recipes/starbound/consumables/entrees/burrito.recipe index 96d0ab55..3255fec7 100644 --- a/recipes/starbound/consumables/entrees/burrito.recipe +++ b/recipes/starbound/consumables/entrees/burrito.recipe @@ -1,6 +1,6 @@ { - "input" : ["cheese","wheat","alienmeat"], - "output" : "sb_burrito", - "groups" : ["craftingfood","mains","sb_health","sb_healing","all"], - "collectables" : {"cooking":"sb_burrito"} + "input": ["cheese","wheat","alienmeat"], + "output": "sb_burrito", + "groups": ["craftingfood","mains","sb_health","sb_healing","all"], + "collectables": {"cooking":"sb_burrito"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/chilistew.recipe b/recipes/starbound/consumables/entrees/chilistew.recipe index c738b0f2..0846f5f9 100644 --- a/recipes/starbound/consumables/entrees/chilistew.recipe +++ b/recipes/starbound/consumables/entrees/chilistew.recipe @@ -1,6 +1,6 @@ { - "input" : ["tomato","chili","alienmeat"], - "output" : "sb_chilistew", - "groups" : ["craftingfood","mains","sb_health","sb_healing","sb_nova","sb_other","all"], - "collectables" : {"cooking":"sb_chilistew"} + "input": ["tomato","chili","alienmeat"], + "output": "sb_chilistew", + "groups": ["craftingfood","mains","sb_health","sb_healing","sb_nova","sb_other","all"], + "collectables": {"cooking":"sb_chilistew"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/crystalnachos.recipe b/recipes/starbound/consumables/entrees/crystalnachos.recipe index 7354b486..575f2312 100644 --- a/recipes/starbound/consumables/entrees/crystalnachos.recipe +++ b/recipes/starbound/consumables/entrees/crystalnachos.recipe @@ -1,6 +1,6 @@ { - "input" : ["crystalplant","wheat","tomato","cheese"], - "output" : "sb_crystalnachos", - "groups" : ["craftingfood","mains","sb_healing","sb_glow","all"], - "collectables" : {"cooking":"sb_crystalnachos"} + "input": ["crystalplant","wheat","tomato","cheese"], + "output": "sb_crystalnachos", + "groups": ["craftingfood","mains","sb_healing","sb_glow","all"], + "collectables": {"cooking":"sb_crystalnachos"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/curriedbeakseed.recipe b/recipes/starbound/consumables/entrees/curriedbeakseed.recipe index da63395a..9efb93e6 100644 --- a/recipes/starbound/consumables/entrees/curriedbeakseed.recipe +++ b/recipes/starbound/consumables/entrees/curriedbeakseed.recipe @@ -1,6 +1,6 @@ { - "input" : ["beakseed","chili"], - "output" : "sb_curriedbeakseed", - "groups" : ["craftingfood","mains","sb_jumpboost","sb_healing","sb_nova","sb_other","sb_t1food","all"], - "collectables" : {"cooking":"sb_curriedbeakseed"} + "input": ["beakseed","chili"], + "output": "sb_curriedbeakseed", + "groups": ["craftingfood","mains","sb_jumpboost","sb_healing","sb_nova","sb_other","sb_t1food","all"], + "collectables": {"cooking":"sb_curriedbeakseed"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/hamsandwich.recipe b/recipes/starbound/consumables/entrees/hamsandwich.recipe index 0f69db84..eca919e4 100644 --- a/recipes/starbound/consumables/entrees/hamsandwich.recipe +++ b/recipes/starbound/consumables/entrees/hamsandwich.recipe @@ -1,6 +1,6 @@ { - "input" : ["rawham","bread"], - "output" : "sb_hamsandwich", - "groups" : ["craftingfood","mains","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_hamsandwich"} + "input": ["rawham","bread"], + "output": "sb_hamsandwich", + "groups": ["craftingfood","mains","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_hamsandwich"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/meatandmarrow.recipe b/recipes/starbound/consumables/entrees/meatandmarrow.recipe index 3b40a29f..ec245b9d 100644 --- a/recipes/starbound/consumables/entrees/meatandmarrow.recipe +++ b/recipes/starbound/consumables/entrees/meatandmarrow.recipe @@ -1,6 +1,6 @@ { - "input" : ["tomato","boneboo","alienmeat"], - "output" : "sb_meatandmarrow", - "groups" : ["craftingfood","mains","sb_healing","sb_health","sb_rage","all"], - "collectables" : {"cooking":"sb_meatandmarrow"} + "input": ["tomato","boneboo","alienmeat"], + "output": "sb_meatandmarrow", + "groups": ["craftingfood","mains","sb_healing","sb_health","sb_rage","all"], + "collectables": {"cooking":"sb_meatandmarrow"} } diff --git a/recipes/starbound/consumables/entrees/meatwich.recipe b/recipes/starbound/consumables/entrees/meatwich.recipe index 451ffea2..ca091f1e 100644 --- a/recipes/starbound/consumables/entrees/meatwich.recipe +++ b/recipes/starbound/consumables/entrees/meatwich.recipe @@ -1,6 +1,6 @@ { - "input" : ["rawbacon","sb_meatchunks","rawribmeat"], - "output" : "sb_meatwich", - "groups" : ["craftingfood","mains","sb_healing","sb_health","all"], - "collectables" : {"cooking":"sb_meatwich"} + "input": ["rawbacon","sb_meatchunks","rawribmeat"], + "output": "sb_meatwich", + "groups": ["craftingfood","mains","sb_healing","sb_health","all"], + "collectables": {"cooking":"sb_meatwich"} } diff --git a/recipes/starbound/consumables/entrees/pbj.recipe b/recipes/starbound/consumables/entrees/pbj.recipe new file mode 100644 index 00000000..735f3c7a --- /dev/null +++ b/recipes/starbound/consumables/entrees/pbj.recipe @@ -0,0 +1,6 @@ +{ + "input": ["bread", "sb_peanutbutterjar", "endomorphicjelly"], + "output": ["sb_pbj", 2], + "groups": ["craftingfood","mains","sb_healing","sb_protection","sb_runboost","sb_jumpboost","all"], + "collectables": {"cooking":"sb_pbj"} +} \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/pizza.recipe b/recipes/starbound/consumables/entrees/pizza.recipe index 821431e9..66092145 100644 --- a/recipes/starbound/consumables/entrees/pizza.recipe +++ b/recipes/starbound/consumables/entrees/pizza.recipe @@ -1,6 +1,6 @@ { - "input" : [["pizzaslice",5]], - "output" : "pizza", - "groups" : ["craftingfood","mains","sb_entree","sb_health","sb_healing","sb_other","all"], - "collectables" : {"cooking":"pizza"} + "input": [["pizzaslice",5]], + "output": "pizza", + "groups": ["craftingfood","mains","sb_entree","sb_health","sb_healing","sb_other","all"], + "collectables": {"cooking":"pizza"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/poachedavesmingo.recipe b/recipes/starbound/consumables/entrees/poachedavesmingo.recipe index 17142802..17e52ee7 100644 --- a/recipes/starbound/consumables/entrees/poachedavesmingo.recipe +++ b/recipes/starbound/consumables/entrees/poachedavesmingo.recipe @@ -1,6 +1,6 @@ { - "input" : ["avesmingo","sb_wartwine"], - "output" : "sb_poachedavesmingo", - "groups" : ["craftingfood","mains","sb_rage","sb_runboost","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_poachedavesmingo"} + "input": ["avesmingo","sb_wartwine"], + "output": "sb_poachedavesmingo", + "groups": ["craftingfood","mains","sb_rage","sb_runboost","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_poachedavesmingo"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/roastpoultry.recipe b/recipes/starbound/consumables/entrees/roastpoultry.recipe index cf729be9..703dbdf3 100644 --- a/recipes/starbound/consumables/entrees/roastpoultry.recipe +++ b/recipes/starbound/consumables/entrees/roastpoultry.recipe @@ -1,6 +1,6 @@ { - "input" : ["rawpoultry","oculemon","chili"], - "output" : "sb_roastpoultry", - "groups" : ["craftingfood","mains","sb_health","sb_nova","sb_other","sb_healing","all"], - "collectables" : {"cooking":"sb_roastpoultry"} + "input": ["rawpoultry","oculemon","chili"], + "output": "sb_roastpoultry", + "groups": ["craftingfood","mains","sb_health","sb_nova","sb_other","sb_healing","all"], + "collectables": {"cooking":"sb_roastpoultry"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/thespecial.recipe b/recipes/starbound/consumables/entrees/thespecial.recipe index c2d8e307..3ef3035d 100644 --- a/recipes/starbound/consumables/entrees/thespecial.recipe +++ b/recipes/starbound/consumables/entrees/thespecial.recipe @@ -1,6 +1,6 @@ { - "input" : ["rawribmeat","boneboo","sb_rawfleshlump"], - "output" : "sb_thespecial", - "groups" : ["craftingfood","mains","sb_health","sb_rage","sb_healing","all"], - "collectables" : {"cooking":"sb_thespecial"} + "input": ["rawribmeat","boneboo","sb_rawfleshlump"], + "output": "sb_thespecial", + "groups": ["craftingfood","mains","sb_health","sb_rage","sb_healing","all"], + "collectables": {"cooking":"sb_thespecial"} } diff --git a/recipes/starbound/consumables/entrees/vegetablesoup.recipe b/recipes/starbound/consumables/entrees/vegetablesoup.recipe index 0617d939..38e35df2 100644 --- a/recipes/starbound/consumables/entrees/vegetablesoup.recipe +++ b/recipes/starbound/consumables/entrees/vegetablesoup.recipe @@ -1,6 +1,6 @@ { - "input" : ["carrot","potato","tomato"], - "output" : "sb_vegetablesoup", - "groups" : ["craftingfood","mains","sb_health","sb_healing","all"], - "collectables" : {"cooking":"sb_vegetablesoup"} + "input": ["carrot","potato","tomato"], + "output": "sb_vegetablesoup", + "groups": ["craftingfood","mains","sb_health","sb_healing","all"], + "collectables": {"cooking":"sb_vegetablesoup"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical1/gauze.recipe b/recipes/starbound/consumables/medical1/gauze.recipe index 16cfb3d5..3e76f6c6 100644 --- a/recipes/starbound/consumables/medical1/gauze.recipe +++ b/recipes/starbound/consumables/medical1/gauze.recipe @@ -1,5 +1,5 @@ { - "input" : ["cottonwool"], - "output" : "sb_gauze", - "groups" : ["craftingmedical","healing","all"] + "input": ["cottonwool"], + "output": "sb_gauze", + "groups": ["craftingmedical","healing","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical1/grassremedy.recipe b/recipes/starbound/consumables/medical1/grassremedy.recipe index 4426042c..e66188f2 100644 --- a/recipes/starbound/consumables/medical1/grassremedy.recipe +++ b/recipes/starbound/consumables/medical1/grassremedy.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidwater",10],["wildvines",5],["plantfibre",5],"bottle"], - "output" : "grassremedy", - "groups" : ["craftingmedical","healing","all"] + "input": [["liquidwater",10],["wildvines",5],["plantfibre",5],"bottle"], + "output": "grassremedy", + "groups": ["craftingmedical","healing","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical1/shroomremedy.recipe b/recipes/starbound/consumables/medical1/shroomremedy.recipe index 5b5924e8..a5b42af2 100644 --- a/recipes/starbound/consumables/medical1/shroomremedy.recipe +++ b/recipes/starbound/consumables/medical1/shroomremedy.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidhealing",10],["shroom",5],"bottle"], - "output" : "shroomremedy", - "groups" : ["craftingmedical","healing","all"] + "input": [["liquidhealing",10],["shroom",5],"bottle"], + "output": "shroomremedy", + "groups": ["craftingmedical","healing","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical2/fungusstim.recipe b/recipes/starbound/consumables/medical2/fungusstim.recipe index d1b5811d..2cd22f16 100644 --- a/recipes/starbound/consumables/medical2/fungusstim.recipe +++ b/recipes/starbound/consumables/medical2/fungusstim.recipe @@ -1,5 +1,5 @@ { - "input" : [["shroom",5],["plantfibre",5],"livingroot","syringe"], - "output" : "fungusstim", - "groups" : ["craftingmedical2","buffs","all"] + "input": [["shroom",5],["plantfibre",5],"livingroot","syringe"], + "output": "fungusstim", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical2/greystim.recipe b/recipes/starbound/consumables/medical2/greystim.recipe index e8716c0f..10783d24 100644 --- a/recipes/starbound/consumables/medical2/greystim.recipe +++ b/recipes/starbound/consumables/medical2/greystim.recipe @@ -1,5 +1,5 @@ { - "input" : ["petalred",["petalblue",2],"petalyellow","hardenedcarapace","syringe"], - "output" : "sb_greystim", - "groups" : ["craftingmedical2","buffs","all"] + "input": ["petalred",["petalblue",2],"petalyellow","hardenedcarapace","syringe"], + "output": "sb_greystim", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical2/heatingbag.recipe b/recipes/starbound/consumables/medical2/heatingbag.recipe index 7229c1ab..ff6a42cf 100644 --- a/recipes/starbound/consumables/medical2/heatingbag.recipe +++ b/recipes/starbound/consumables/medical2/heatingbag.recipe @@ -1,5 +1,5 @@ { - "input" : ["scorchedcore","ironbar",["glass",2]], - "output" : "sb_heatingbag", - "groups" : ["craftingmedical2","healing","all"] + "input": ["scorchedcore","ironbar",["glass",2]], + "output": "sb_heatingbag", + "groups": ["craftingmedical2","healing","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/medical2/synthesisstim.recipe b/recipes/starbound/consumables/medical2/synthesisstim.recipe index 30dd5432..944c2884 100644 --- a/recipes/starbound/consumables/medical2/synthesisstim.recipe +++ b/recipes/starbound/consumables/medical2/synthesisstim.recipe @@ -1,5 +1,5 @@ { - "input" : [["biosample",2],["alienwoodsap",2],"syringe"], - "output" : "synthesisstim", - "groups" : ["craftingmedical2","buffs","all"] + "input": [["biosample",2],["alienwoodsap",2],"syringe"], + "output": "synthesisstim", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/boneboomarrow.recipe b/recipes/starbound/consumables/sides/boneboomarrow.recipe index 313f21b9..02ea8ba3 100644 --- a/recipes/starbound/consumables/sides/boneboomarrow.recipe +++ b/recipes/starbound/consumables/sides/boneboomarrow.recipe @@ -1,6 +1,6 @@ { - "input" : ["boneboo"], - "output" : "sb_boneboomarrow", - "groups" : ["craftingfood","sides","sb_healing","sb_rage","sb_t1food","all"], - "collectables" : {"cooking":"sb_boneboomarrow"} + "input": ["boneboo"], + "output": "sb_boneboomarrow", + "groups": ["craftingfood","sides","sb_healing","sb_rage","sb_t1food","all"], + "collectables": {"cooking":"sb_boneboomarrow"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/cornontheblob.recipe b/recipes/starbound/consumables/sides/cornontheblob.recipe index 003daf18..b9f8f158 100644 --- a/recipes/starbound/consumables/sides/cornontheblob.recipe +++ b/recipes/starbound/consumables/sides/cornontheblob.recipe @@ -1,6 +1,6 @@ { - "input" : ["dirturchin","corn"], - "output" : "sb_cornontheblob", - "groups" : ["craftingfood","sides","sb_healing","sb_health","sb_t1food","all"], - "collectables" : {"cooking":"sb_cornontheblob"} + "input": ["dirturchin","corn"], + "output": "sb_cornontheblob", + "groups": ["craftingfood","sides","sb_healing","sb_health","sb_t1food","all"], + "collectables": {"cooking":"sb_cornontheblob"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/corntent.recipe b/recipes/starbound/consumables/sides/corntent.recipe index 96392ed1..f2b68aea 100644 --- a/recipes/starbound/consumables/sides/corntent.recipe +++ b/recipes/starbound/consumables/sides/corntent.recipe @@ -1,6 +1,6 @@ { - "input" : ["corn","rawtentacle"], - "output" : "sb_corntent", - "groups" : ["craftingfood","sides","sb_health","sb_healing","sb_t1food","all"], - "collectables" : {"cooking":"sb_corntent"} + "input": ["corn","rawtentacle"], + "output": "sb_corntent", + "groups": ["craftingfood","sides","sb_health","sb_healing","sb_t1food","all"], + "collectables": {"cooking":"sb_corntent"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/crystalchips.recipe b/recipes/starbound/consumables/sides/crystalchips.recipe index dc2e98a1..98a2a457 100644 --- a/recipes/starbound/consumables/sides/crystalchips.recipe +++ b/recipes/starbound/consumables/sides/crystalchips.recipe @@ -1,6 +1,6 @@ { - "input" : ["crystalplant","seaweed"], - "output" : "sb_crystalchips", - "groups" : ["craftingfood","sides","sb_healing","sb_glow","sb_t1food","all"], - "collectables" : {"cooking":"sb_crystalchips"} + "input": ["crystalplant","seaweed"], + "output": "sb_crystalchips", + "groups": ["craftingfood","sides","sb_healing","sb_glow","sb_t1food","all"], + "collectables": {"cooking":"sb_crystalchips"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/eggfriedrice.recipe b/recipes/starbound/consumables/sides/eggfriedrice.recipe index 1a92883f..a2be5cdb 100644 --- a/recipes/starbound/consumables/sides/eggfriedrice.recipe +++ b/recipes/starbound/consumables/sides/eggfriedrice.recipe @@ -1,6 +1,6 @@ { - "input" : ["rice","eggshoot"], - "output" : "sb_eggfriedrice", - "groups" : ["craftingfood","sides","sb_healing","sb_health","sb_t1food","all"], - "collectables" : {"cooking":"sb_eggfriedrice"} + "input": ["rice","eggshoot"], + "output": "sb_eggfriedrice", + "groups": ["craftingfood","sides","sb_healing","sb_health","sb_t1food","all"], + "collectables": {"cooking":"sb_eggfriedrice"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/offal.recipe b/recipes/starbound/consumables/sides/offal.recipe index a88fc3e1..78c716f4 100644 --- a/recipes/starbound/consumables/sides/offal.recipe +++ b/recipes/starbound/consumables/sides/offal.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_meatchunks",2],"rawribmeat"], - "output" : "sb_offal", - "groups" : ["craftingfood","sides","sb_other","sb_t1food","all"], - "collectables" : {"cooking":"sb_offal"} + "input": [["sb_meatchunks",2],"rawribmeat"], + "output": "sb_offal", + "groups": ["craftingfood","sides","sb_other","sb_t1food","all"], + "collectables": {"cooking":"sb_offal"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/rawtentacle.recipe b/recipes/starbound/consumables/sides/rawtentacle.recipe index 0fed5b7b..5cda547e 100644 --- a/recipes/starbound/consumables/sides/rawtentacle.recipe +++ b/recipes/starbound/consumables/sides/rawtentacle.recipe @@ -1,5 +1,5 @@ { - "input" : ["alienmeat",["sb_liquidtentaclejuice",10]], - "output" : ["rawtentacle",2], - "groups" : ["craftingfood","sides","sb_other","sb_t1food","all"] + "input": ["alienmeat",["sb_liquidtentaclejuice",10]], + "output": ["rawtentacle",2], + "groups": ["craftingfood","sides","sb_other","sb_t1food","all"] } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/revoltingstew.recipe b/recipes/starbound/consumables/sides/revoltingstew.recipe index 22394a75..3c19772a 100644 --- a/recipes/starbound/consumables/sides/revoltingstew.recipe +++ b/recipes/starbound/consumables/sides/revoltingstew.recipe @@ -1,6 +1,6 @@ { - "input" : ["swampwater",["rottenfood",2]], - "output" : "sb_revoltingstew", - "groups" : ["craftingfood","sides","sb_other","nouncrafting","sb_t1food","all"], - "collectables" : {"cooking":"sb_revoltingstew"} + "input": ["swampwater",["rottenfood",2]], + "output": "sb_revoltingstew", + "groups": ["craftingfood","sides","sb_other","nouncrafting","sb_t1food","all"], + "collectables": {"cooking":"sb_revoltingstew"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/revoltingstew_2.recipe b/recipes/starbound/consumables/sides/revoltingstew_2.recipe index bf3e6b39..0d85853b 100644 --- a/recipes/starbound/consumables/sides/revoltingstew_2.recipe +++ b/recipes/starbound/consumables/sides/revoltingstew_2.recipe @@ -1,6 +1,6 @@ { - "input" : [["rottenfood",3]], - "output" : "sb_revoltingstew", - "groups" : ["craftingfood","sides","sb_other","nouncrafting","sb_t1food","all"], - "collectables" : {"cooking":"sb_revoltingstew"} + "input": [["rottenfood",3]], + "output": "sb_revoltingstew", + "groups": ["craftingfood","sides","sb_other","nouncrafting","sb_t1food","all"], + "collectables": {"cooking":"sb_revoltingstew"} } \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/toast.recipe b/recipes/starbound/consumables/sides/toast.recipe index ff42a268..568be78e 100644 --- a/recipes/starbound/consumables/sides/toast.recipe +++ b/recipes/starbound/consumables/sides/toast.recipe @@ -1,6 +1,6 @@ { - "input" : ["bread","sb_butter"], - "output" : "sb_toast", - "groups" : ["craftingfood","sides","sb_healing","sb_health","sb_energy","sb_t1food","all"], - "collectables" : {"cooking":"sb_toast"} + "input": ["bread","sb_butter"], + "output": "sb_toast", + "groups": ["craftingfood","sides","sb_healing","sb_health","sb_energy","sb_t1food","all"], + "collectables": {"cooking":"sb_toast"} } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors/craftingtool.recipe b/recipes/starbound/crafting/inventors/craftingtool.recipe index 0abc7757..08d7e2ff 100644 --- a/recipes/starbound/crafting/inventors/craftingtool.recipe +++ b/recipes/starbound/crafting/inventors/craftingtool.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",35]], - "output" : "sb_craftingtool", - "groups" : ["inventorstable","craftingstations","all"] + "input": [["darkwoodmaterial",35]], + "output": "sb_craftingtool", + "groups": ["inventorstable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors/lectern.recipe b/recipes/starbound/crafting/inventors/lectern.recipe index bf62f9bf..abac38f2 100644 --- a/recipes/starbound/crafting/inventors/lectern.recipe +++ b/recipes/starbound/crafting/inventors/lectern.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",4],"ironbar"], - "output" : "sb_codex", - "groups" : ["inventorstable","craftingstations","all"] + "input": [["darkwoodmaterial",4],"ironbar"], + "output": "sb_codex", + "groups": ["inventorstable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors/woodencookingtable.recipe b/recipes/starbound/crafting/inventors/woodencookingtable.recipe index dce31273..b38b04e2 100644 --- a/recipes/starbound/crafting/inventors/woodencookingtable.recipe +++ b/recipes/starbound/crafting/inventors/woodencookingtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",15],["logblock",4],["copperbar",4]], - "output" : "sb_woodencookingtable", - "groups" : ["inventorstable","craftingstations","all"] + "input": [["darkwoodmaterial",15],["logblock",4],["copperbar",4]], + "output": "sb_woodencookingtable", + "groups": ["inventorstable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors/wrappingtable.recipe b/recipes/starbound/crafting/inventors/wrappingtable.recipe index b47efe92..98691912 100644 --- a/recipes/starbound/crafting/inventors/wrappingtable.recipe +++ b/recipes/starbound/crafting/inventors/wrappingtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",15]], - "output" : "sb_wrappingtable", - "groups" : ["inventorstable","holidaycraftingtable","craftingstations","all"] + "input": [["darkwoodmaterial",15]], + "output": "sb_wrappingtable", + "groups": ["inventorstable","holidaycraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors2/metalworkstation.recipe b/recipes/starbound/crafting/inventors2/metalworkstation.recipe index 6b2d715d..6d24b69b 100644 --- a/recipes/starbound/crafting/inventors2/metalworkstation.recipe +++ b/recipes/starbound/crafting/inventors2/metalworkstation.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",5],["glass",5],["corefragmentore",10]], - "output" : "sb_metalworkstation", - "groups" : ["inventorstable2","craftingstations","all"] + "input": [["sb_steelbar",5],["glass",5],["corefragmentore",10]], + "output": "sb_metalworkstation", + "groups": ["inventorstable2","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors3/cookingstation.recipe b/recipes/starbound/crafting/inventors3/cookingstation.recipe index f613a9eb..db8f0931 100644 --- a/recipes/starbound/crafting/inventors3/cookingstation.recipe +++ b/recipes/starbound/crafting/inventors3/cookingstation.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],["glass",4],"battery","siliconboard"], - "output" : "sb_cookingstation", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["titaniumbar",6],["glass",4],"battery","siliconboard"], + "output": "sb_cookingstation", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors3/mechassemblystation.recipe b/recipes/starbound/crafting/inventors3/mechassemblystation.recipe index cd1afa56..9c4f1e3a 100644 --- a/recipes/starbound/crafting/inventors3/mechassemblystation.recipe +++ b/recipes/starbound/crafting/inventors3/mechassemblystation.recipe @@ -1,5 +1,5 @@ { - "input" : [["salvagetier4",10],["platinumbar",15],["goldbar",20]], - "output" : "mechassemblystation", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["salvagetier4",10],["platinumbar",15],["goldbar",20]], + "output": "mechassemblystation", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors3/mechcraftingtable.recipe b/recipes/starbound/crafting/inventors3/mechcraftingtable.recipe index 3f102876..fca399d0 100644 --- a/recipes/starbound/crafting/inventors3/mechcraftingtable.recipe +++ b/recipes/starbound/crafting/inventors3/mechcraftingtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["salvagetier5",10],["platinumbar",15],["goldbar",20]], - "output" : "mechcraftingtable", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["salvagetier5",10],["platinumbar",15],["goldbar",20]], + "output": "mechcraftingtable", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors3/researchstation.recipe b/recipes/starbound/crafting/inventors3/researchstation.recipe index e3028887..43451bc0 100644 --- a/recipes/starbound/crafting/inventors3/researchstation.recipe +++ b/recipes/starbound/crafting/inventors3/researchstation.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",15],"siliconboard"], - "output" : "sb_researchstation", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["platinumbar",15],"siliconboard"], + "output": "sb_researchstation", + "groups": ["inventorstable3","craftingstations","all"] } diff --git a/recipes/starbound/crafting/inventors3/spawnerstation.recipe b/recipes/starbound/crafting/inventors3/spawnerstation.recipe index 7b15c489..f20cee09 100644 --- a/recipes/starbound/crafting/inventors3/spawnerstation.recipe +++ b/recipes/starbound/crafting/inventors3/spawnerstation.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",10],"siliconboard"], - "output" : "spawnerstation", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["platinumbar",10],"siliconboard"], + "output": "spawnerstation", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/inventors3/techconsole.recipe b/recipes/starbound/crafting/inventors3/techconsole.recipe index 64406581..acdef225 100644 --- a/recipes/starbound/crafting/inventors3/techconsole.recipe +++ b/recipes/starbound/crafting/inventors3/techconsole.recipe @@ -1,5 +1,5 @@ { - "input" : ["siliconboard",["glass",5],["wire",5],["platinumbar",5]], - "output" : "sb_techconsole", - "groups" : ["inventorstable3","craftingstations","all"] + "input": ["siliconboard",["glass",5],["wire",5],["platinumbar",5]], + "output": "sb_techconsole", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/apexfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/apexfuel.recipe index 55b013c1..dc6ba788 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/apexfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/apexfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_apexfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_apexfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/avianfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/avianfuel.recipe index a47e9298..45a2e6ee 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/avianfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/avianfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_avianfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_avianfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/floranfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/floranfuel.recipe index ccad6180..a11d7bab 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/floranfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/floranfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_floranfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_floranfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/glitchfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/glitchfuel.recipe index 62a4b4e5..cb874010 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/glitchfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/glitchfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_glitchfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_glitchfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/humanfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/humanfuel.recipe index 160f14cf..cc6b3393 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/humanfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/humanfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_humanfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_humanfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/hylotlfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/hylotlfuel.recipe index 6a9aa7ab..970f0f91 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/hylotlfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/hylotlfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_hylotlfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_hylotlfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/fuelhatch/novakidfuel.recipe b/recipes/starbound/crafting/tool3/fuelhatch/novakidfuel.recipe index 13f7cef2..36359fe9 100644 --- a/recipes/starbound/crafting/tool3/fuelhatch/novakidfuel.recipe +++ b/recipes/starbound/crafting/tool3/fuelhatch/novakidfuel.recipe @@ -1,5 +1,5 @@ { - "input" : [["moonstoneore",5],["platinumbar",5],["wire",10]], - "output" : "sb_novakidfuelhatch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["moonstoneore",5],["platinumbar",5],["wire",10]], + "output": "sb_novakidfuelhatch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/crafting/tool3/techstation/apextech.recipe b/recipes/starbound/crafting/tool3/techstation/apextech.recipe index c927fc45..af98da13 100644 --- a/recipes/starbound/crafting/tool3/techstation/apextech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/apextech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/aviantech.recipe b/recipes/starbound/crafting/tool3/techstation/aviantech.recipe index cd88cc48..89180875 100644 --- a/recipes/starbound/crafting/tool3/techstation/aviantech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/aviantech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_avian", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_avian", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/florantech.recipe b/recipes/starbound/crafting/tool3/techstation/florantech.recipe index caae91a4..499e2de2 100644 --- a/recipes/starbound/crafting/tool3/techstation/florantech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/florantech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_floran", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_floran", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/glitchtech.recipe b/recipes/starbound/crafting/tool3/techstation/glitchtech.recipe index 23c68085..78c595e8 100644 --- a/recipes/starbound/crafting/tool3/techstation/glitchtech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/glitchtech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_glitch", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_glitch", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/humantech.recipe b/recipes/starbound/crafting/tool3/techstation/humantech.recipe index f894d81f..0ff1d332 100644 --- a/recipes/starbound/crafting/tool3/techstation/humantech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/humantech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_human", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_human", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/hylotltech.recipe b/recipes/starbound/crafting/tool3/techstation/hylotltech.recipe index 9ad493db..f62b1479 100644 --- a/recipes/starbound/crafting/tool3/techstation/hylotltech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/hylotltech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_hylotl", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_hylotl", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/crafting/tool3/techstation/novakidtech.recipe b/recipes/starbound/crafting/tool3/techstation/novakidtech.recipe index 511e676d..44499dcc 100644 --- a/recipes/starbound/crafting/tool3/techstation/novakidtech.recipe +++ b/recipes/starbound/crafting/tool3/techstation/novakidtech.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], - "output" : "sb_techstation_novakid", - "groups" : ["sb_roboticcraftingtable","craftingstations","all"] + "input": [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output": "sb_techstation_novakid", + "groups": ["sb_roboticcraftingtable","craftingstations","all"] } diff --git a/recipes/starbound/creaturecapture/whistle.recipe b/recipes/starbound/creaturecapture/whistle.recipe new file mode 100644 index 00000000..1b91ceed --- /dev/null +++ b/recipes/starbound/creaturecapture/whistle.recipe @@ -0,0 +1,5 @@ +{ + "input": ["copperbar", ["polymer", 2]], + "output": "sb_whistle", + "groups": ["capturestation", "all"] +} diff --git a/recipes/starbound/fossilstation/fossilpod.recipe b/recipes/starbound/fossilstation/fossilpod.recipe index f94eece2..db4197ff 100644 --- a/recipes/starbound/fossilstation/fossilpod.recipe +++ b/recipes/starbound/fossilstation/fossilpod.recipe @@ -1,5 +1,5 @@ { - "input" : ["fossilore"], - "output" : "fossilpod", - "groups" : ["craftingfossils","consumables","all"] + "input": ["fossilore"], + "output": "fossilpod", + "groups": ["craftingfossils","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/fossilstation/fossiltool.recipe b/recipes/starbound/fossilstation/fossiltool.recipe index 06b2c383..275d5d26 100644 --- a/recipes/starbound/fossilstation/fossiltool.recipe +++ b/recipes/starbound/fossilstation/fossiltool.recipe @@ -1,5 +1,5 @@ { - "input" : ["titaniumbar",["wire",2]], - "output" : "fossiltool", - "groups" : ["craftingfossils","consumables","nouncrafting","all"] + "input": ["titaniumbar",["wire",2]], + "output": "fossiltool", + "groups": ["craftingfossils","consumables","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/bars/coalore.recipe b/recipes/starbound/furnace/furnace1/bars/coalore.recipe index d470813f..42cefa00 100644 --- a/recipes/starbound/furnace/furnace1/bars/coalore.recipe +++ b/recipes/starbound/furnace/furnace1/bars/coalore.recipe @@ -1,6 +1,6 @@ { - "input" : [["logblock",10]], - "output" : "coalore", - "duration" : 0.3, - "groups" : ["craftingfurnace","bars","all"] + "input": [["logblock",10]], + "output": "coalore", + "duration": 0.3, + "groups": ["craftingfurnace","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/bars/diamond.recipe b/recipes/starbound/furnace/furnace1/bars/diamond.recipe index 201240a2..5c3ce6fb 100644 --- a/recipes/starbound/furnace/furnace1/bars/diamond.recipe +++ b/recipes/starbound/furnace/furnace1/bars/diamond.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_diamondore",2]], - "output" : "diamond", - "duration" : 0.15, - "groups" : ["craftingfurnace","bars","all"] + "input": [["sb_diamondore",2]], + "output": "diamond", + "duration": 0.15, + "groups": ["craftingfurnace","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/bars/platinumbar.recipe b/recipes/starbound/furnace/furnace1/bars/platinumbar.recipe index 141e3c74..5eebd71e 100644 --- a/recipes/starbound/furnace/furnace1/bars/platinumbar.recipe +++ b/recipes/starbound/furnace/furnace1/bars/platinumbar.recipe @@ -1,6 +1,6 @@ { - "input" : [["platinumore",2]], - "output" : "platinumbar", - "duration" : 0.15, - "groups" : ["craftingfurnace","bars","all"] + "input": [["platinumore",2]], + "output": "platinumbar", + "duration": 0.15, + "groups": ["craftingfurnace","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/glass.recipe b/recipes/starbound/furnace/furnace1/ingredients/glass.recipe index e0e27c7d..18e90323 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/glass.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/glass.recipe @@ -1,5 +1,5 @@ { - "input" : [["sand",2]], - "output" : "glass", - "groups" : ["craftingfurnace","ingredients","all"] + "input": [["sand",2]], + "output": "glass", + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe b/recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe index 4c1b8472..0c5ac47c 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe @@ -1,6 +1,6 @@ { - "input" : [["glass",2]], - "output" : "glasscoffeemug", - "duration" : 0.5, - "groups" : ["craftingfurnace","ingredients","all"] + "input": [["glass",2]], + "output": "glasscoffeemug", + "duration": 0.5, + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe b/recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe index 3b46dcce..d5885011 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe @@ -1,5 +1,5 @@ { - "input" : ["coalore","sulphur"], - "output" : ["sb_gunpowder",2], - "groups" : ["ingredients","craftingfurnace","all"] + "input": ["coalore","sulphur"], + "output": ["sb_gunpowder",2], + "groups": ["ingredients","craftingfurnace","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/leather.recipe b/recipes/starbound/furnace/furnace1/ingredients/leather.recipe index 5a29627c..1bc7aced 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/leather.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/leather.recipe @@ -1,5 +1,5 @@ { - "input" : [["basic",5]], - "output" : "leather", - "groups" : ["craftingfurnace","ingredients","all"] + "input": [["basic",5]], + "output": "leather", + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe b/recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe index d84c1dcf..2a0aee20 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe @@ -1,6 +1,6 @@ { - "input" : ["mysterioustrashbag"], - "output" : "mysteriousashes", - "duration" : 3, - "groups" : ["craftingfurnace","ingredients","all"] + "input": ["mysterioustrashbag"], + "output": "mysteriousashes", + "duration": 3, + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/screws.recipe b/recipes/starbound/furnace/furnace1/ingredients/screws.recipe index 9b7e153c..92cc94a4 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/screws.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/screws.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : ["screws",8], - "groups" : ["craftingfurnace","ingredients","all"] + "input": ["ironbar"], + "output": ["screws",8], + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe b/recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe index 72c77fe8..cf1c30ea 100644 --- a/recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe +++ b/recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe @@ -1,5 +1,5 @@ { - "input" : ["coralfragment"], - "output" : ["volatilepowder",3], - "groups" : ["craftingfurnace","ingredients","all"] + "input": ["coralfragment"], + "output": ["volatilepowder",3], + "groups": ["craftingfurnace","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe index 988f06cc..a08e9f03 100644 --- a/recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe +++ b/recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","coalore"], - "output" : "sb_steelbar", - "groups" : ["craftingfurnace2","bars","all"] + "input": ["ironbar","coalore"], + "output": "sb_steelbar", + "groups": ["craftingfurnace2","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe index ecadb2dd..79224e51 100644 --- a/recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe +++ b/recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "sb_steelbar", - "groups" : ["craftingfurnace2","bars","all"] + "input": ["ironbar","copperbar"], + "output": "sb_steelbar", + "groups": ["craftingfurnace2","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe index 64d51a66..78b219ca 100644 --- a/recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe +++ b/recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar",["liquidoil",3]], - "output" : "sb_steelbar", - "groups" : ["craftingfurnace2","bars","all"] + "input": ["ironbar",["liquidoil",3]], + "output": "sb_steelbar", + "groups": ["craftingfurnace2","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe b/recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe index a90cf41c..5b85bc29 100644 --- a/recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe +++ b/recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe @@ -1,6 +1,6 @@ { - "input" : [["uraniumore",2]], - "output" : "uraniumrod", - "duration" : 0.15, - "groups" : ["craftingfurnace2","bars","all"] + "input": [["uraniumore",2]], + "output": "uraniumrod", + "duration": 0.15, + "groups": ["craftingfurnace2","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe b/recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe index c9f03fea..547b1eef 100644 --- a/recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe +++ b/recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe @@ -1,5 +1,5 @@ { - "input" : ["copperbar",["coalore",2]], - "output" : "polymer", - "groups" : ["craftingfurnace2","ingredients","all"] + "input": ["copperbar",["coalore",2]], + "output": "polymer", + "groups": ["craftingfurnace2","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe b/recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe index 7d50af42..a4f9fd40 100644 --- a/recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe +++ b/recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe @@ -1,5 +1,5 @@ { - "input" : ["copperbar",["liquidoil",2]], - "output" : "polymer", - "groups" : ["craftingfurnace2","ingredients","all"] + "input": ["copperbar",["liquidoil",2]], + "output": "polymer", + "groups": ["craftingfurnace2","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe index 20371b5e..f78c0f30 100644 --- a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe +++ b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_ceruliumore",2],"plutoniumrod"], - "output" : "sb_ceruliumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["sb_ceruliumore",2],"plutoniumrod"], + "output": "sb_ceruliumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_aegisalt.recipe b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_aegisalt.recipe new file mode 100644 index 00000000..c3b1b47d --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_aegisalt.recipe @@ -0,0 +1,6 @@ +{ + "input": [["refinedaegisalt",2],"solariumstar"], + "output": "sb_ceruliumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe deleted file mode 100644 index 4f787053..00000000 --- a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["sb_refinedrubium",2],"solariumstar"], - "output" : "sb_ceruliumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe index 6adb4216..85cd8e23 100644 --- a/recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe +++ b/recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumbar",["silverbar",2]], - "output" : "durasteelbar", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": ["titaniumbar",["silverbar",2]], + "output": "durasteelbar", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe index 23711380..351722bf 100644 --- a/recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe +++ b/recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumbar","sb_steelbar"], - "output" : "durasteelbar", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": ["titaniumbar","sb_steelbar"], + "output": "durasteelbar", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe index b1ce7595..eafa8737 100644 --- a/recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumbar","uraniumrod"], - "output" : "durasteelbar", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": ["titaniumbar","uraniumrod"], + "output": "durasteelbar", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe index cd660b34..9890f381 100644 --- a/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe @@ -1,6 +1,6 @@ { - "input" : [["refinedferozium",2],"plutoniumrod"], - "output" : "sb_feroziumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["refinedferozium",2],"plutoniumrod"], + "output": "sb_feroziumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/feroziumcompound_solarium.recipe b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_solarium.recipe index be79ef06..b2661ff1 100644 --- a/recipes/starbound/furnace/furnace3/bars/feroziumcompound_solarium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_solarium.recipe @@ -1,6 +1,6 @@ { - "input" : [["refinedferozium",2],"solariumstar"], - "output" : "sb_feroziumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["refinedferozium",2],"solariumstar"], + "output": "sb_feroziumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/imperviumcompound_plutonium.recipe b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_plutonium.recipe index 8d7fc4aa..396a3a1d 100644 --- a/recipes/starbound/furnace/furnace3/bars/imperviumcompound_plutonium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_plutonium.recipe @@ -1,6 +1,6 @@ { - "input" : [["refinedviolium",2],"plutoniumrod"], - "output" : "sb_imperviumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["refinedviolium",2],"plutoniumrod"], + "output": "sb_imperviumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/imperviumcompound_solarium.recipe b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_solarium.recipe index 686fdb77..e120f72c 100644 --- a/recipes/starbound/furnace/furnace3/bars/imperviumcompound_solarium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_solarium.recipe @@ -1,6 +1,6 @@ { - "input" : [["refinedviolium",2],"solariumstar"], - "output" : "sb_imperviumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["refinedviolium",2],"solariumstar"], + "output": "sb_imperviumcompound", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe b/recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe index eae8cc42..7391f38b 100644 --- a/recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe +++ b/recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe @@ -1,6 +1,6 @@ { - "input" : [["plutoniumore",2]], - "output" : "plutoniumrod", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["plutoniumore",2]], + "output": "plutoniumrod", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe b/recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe index e3847870..a523e4bc 100644 --- a/recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_rubiumore",2]], - "output" : "sb_refinedrubium", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] + "input": [["sb_rubiumore",2]], + "output": "sb_refinedrubium", + "duration": 0.15, + "groups": ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe index a3d7ba2b..ce8d82c4 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["refinedaegisalt"], - "output" : ["sb_aegisaltbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["refinedaegisalt"], + "output": ["sb_aegisaltbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/battery.recipe b/recipes/starbound/furnace/furnace3/ingredients/battery.recipe index a90f5479..b052a222 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/battery.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/battery.recipe @@ -1,5 +1,5 @@ { - "input" : [["wire",4],"titaniumbar","staticcell"], - "output" : "battery", - "groups" : ["craftingfurnace3","ingredients","all"] + "input": [["wire",4],"titaniumbar","staticcell"], + "output": "battery", + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe index 43660e2b..92d382d7 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_ceruliumcompound"], - "output" : ["sb_ceruliumbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["sb_ceruliumcompound"], + "output": ["sb_ceruliumbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe index 7697b7eb..49504a33 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_feroziumcompound"], - "output" : ["sb_feroziumbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["sb_feroziumcompound"], + "output": ["sb_feroziumbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe index 6b356423..f6e91e34 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_imperviumcompound"], - "output" : ["sb_imperviumbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["sb_imperviumcompound"], + "output": ["sb_imperviumbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe index f614b3de..c1842589 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_refinedrubium"], - "output" : ["sb_rubiumbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["sb_refinedrubium"], + "output": ["sb_rubiumbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe b/recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe index 27483fe4..930d1460 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe @@ -1,5 +1,5 @@ { - "input" : ["staticcell"], - "output" : ["smallbattery",5], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["staticcell"], + "output": ["smallbattery",5], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe index 6c59ebdd..897566ee 100644 --- a/recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe +++ b/recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe @@ -1,5 +1,5 @@ { - "input" : ["refinedviolium"], - "output" : ["sb_violiumbar",10], - "groups" : ["craftingfurnace3","ingredients","all"] + "input": ["refinedviolium"], + "output": ["sb_violiumbar",10], + "groups": ["craftingfurnace3","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds/ironbed.recipe b/recipes/starbound/furniture/beds/ironbed.recipe index 721ec999..3aa96a2b 100644 --- a/recipes/starbound/furniture/beds/ironbed.recipe +++ b/recipes/starbound/furniture/beds/ironbed.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar",["fabric",10]], - "output" : "ironbed", - "groups" : ["craftingfurniture","beds","all"] + "input": ["ironbar","copperbar",["fabric",10]], + "output": "ironbed", + "groups": ["craftingfurniture","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier10bed.recipe b/recipes/starbound/furniture/beds2/tier10bed.recipe index 6c3e6e5e..00fff8c8 100644 --- a/recipes/starbound/furniture/beds2/tier10bed.recipe +++ b/recipes/starbound/furniture/beds2/tier10bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2],["fabric",10],["silk",3]], - "output" : "executivebed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_imperviumbar",2],["fabric",10],["silk",3]], + "output": "executivebed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier5bed.recipe b/recipes/starbound/furniture/beds2/tier5bed.recipe index 4995a64b..24a9e670 100644 --- a/recipes/starbound/furniture/beds2/tier5bed.recipe +++ b/recipes/starbound/furniture/beds2/tier5bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2],["fabric",10],["silk",3]], - "output" : "serenebed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_aegisaltbar",2],["fabric",10],["silk",3]], + "output": "serenebed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier6bed.recipe b/recipes/starbound/furniture/beds2/tier6bed.recipe index fb2a556e..ac76dc58 100644 --- a/recipes/starbound/furniture/beds2/tier6bed.recipe +++ b/recipes/starbound/furniture/beds2/tier6bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2],["fabric",10],["silk",3]], - "output" : "geometricbed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_feroziumbar",2],["fabric",10],["silk",3]], + "output": "geometricbed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier7bed.recipe b/recipes/starbound/furniture/beds2/tier7bed.recipe index 0e36ca0c..ac58c9a4 100644 --- a/recipes/starbound/furniture/beds2/tier7bed.recipe +++ b/recipes/starbound/furniture/beds2/tier7bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2],["fabric",10],["silk",3]], - "output" : "wavebed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_ceruliumbar",2],["fabric",10],["silk",3]], + "output": "wavebed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier8bed.recipe b/recipes/starbound/furniture/beds2/tier8bed.recipe index 2ec1f8c9..d6b58744 100644 --- a/recipes/starbound/furniture/beds2/tier8bed.recipe +++ b/recipes/starbound/furniture/beds2/tier8bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2],["fabric",10],["silk",3]], - "output" : "opulentbed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_violiumbar",2],["fabric",10],["silk",3]], + "output": "opulentbed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/beds2/tier9bed.recipe b/recipes/starbound/furniture/beds2/tier9bed.recipe index 6bb93087..e98934a5 100644 --- a/recipes/starbound/furniture/beds2/tier9bed.recipe +++ b/recipes/starbound/furniture/beds2/tier9bed.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2],["fabric",10],["silk",3]], - "output" : "doombed", - "groups" : ["craftingfurniture2","beds","all"] + "input": [["sb_rubiumbar",2],["fabric",10],["silk",3]], + "output": "doombed", + "groups": ["craftingfurniture2","beds","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/irontable.recipe b/recipes/starbound/furniture/decorative/irontable.recipe index 0cb8b18d..2d633587 100644 --- a/recipes/starbound/furniture/decorative/irontable.recipe +++ b/recipes/starbound/furniture/decorative/irontable.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "irontable", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar","copperbar"], + "output": "irontable", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/irontoilet.recipe b/recipes/starbound/furniture/decorative/irontoilet.recipe index 2af22fd3..fd4b1f92 100644 --- a/recipes/starbound/furniture/decorative/irontoilet.recipe +++ b/recipes/starbound/furniture/decorative/irontoilet.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "irontoilet", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar","copperbar"], + "output": "irontoilet", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/markerwallplaque1.recipe b/recipes/starbound/furniture/decorative/markerwallplaque1.recipe index 228898b3..9b0dabc1 100644 --- a/recipes/starbound/furniture/decorative/markerwallplaque1.recipe +++ b/recipes/starbound/furniture/decorative/markerwallplaque1.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "markerwallplaque1", - "groups" : ["objects","all","decoration","craftingfurniture"] + "input": ["ironbar"], + "output": "markerwallplaque1", + "groups": ["objects","all","decoration","craftingfurniture"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/markerwallplaque2.recipe b/recipes/starbound/furniture/decorative/markerwallplaque2.recipe index a122bdf7..4bc443e5 100644 --- a/recipes/starbound/furniture/decorative/markerwallplaque2.recipe +++ b/recipes/starbound/furniture/decorative/markerwallplaque2.recipe @@ -1,5 +1,5 @@ { - "input" : [["cobblestonematerial",10]], - "output" : "markerwallplaque2", - "groups" : ["objects","all","decoration","craftingfurniture"] + "input": [["cobblestonematerial",10]], + "output": "markerwallplaque2", + "groups": ["objects","all","decoration","craftingfurniture"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/markerwallplaque3.recipe b/recipes/starbound/furniture/decorative/markerwallplaque3.recipe index 1266c4b2..64245cb4 100644 --- a/recipes/starbound/furniture/decorative/markerwallplaque3.recipe +++ b/recipes/starbound/furniture/decorative/markerwallplaque3.recipe @@ -1,5 +1,5 @@ { - "input" : ["goldbar"], - "output" : "markerwallplaque3", - "groups" : ["objects","all","decoration","craftingfurniture"] + "input": ["goldbar"], + "output": "markerwallplaque3", + "groups": ["objects","all","decoration","craftingfurniture"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/pipes1.recipe b/recipes/starbound/furniture/decorative/pipes1.recipe index 9f986ee2..1219e0d7 100644 --- a/recipes/starbound/furniture/decorative/pipes1.recipe +++ b/recipes/starbound/furniture/decorative/pipes1.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_pipes1", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar"], + "output": "sb_pipes1", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/pipes2.recipe b/recipes/starbound/furniture/decorative/pipes2.recipe index 4f0dc3f1..63ed5192 100644 --- a/recipes/starbound/furniture/decorative/pipes2.recipe +++ b/recipes/starbound/furniture/decorative/pipes2.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_pipes2", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar"], + "output": "sb_pipes2", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/pipes3.recipe b/recipes/starbound/furniture/decorative/pipes3.recipe index 8be6d6e2..68bcdf2c 100644 --- a/recipes/starbound/furniture/decorative/pipes3.recipe +++ b/recipes/starbound/furniture/decorative/pipes3.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_pipes3", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar"], + "output": "sb_pipes3", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/pipes4.recipe b/recipes/starbound/furniture/decorative/pipes4.recipe index d0bfd88a..9b69716c 100644 --- a/recipes/starbound/furniture/decorative/pipes4.recipe +++ b/recipes/starbound/furniture/decorative/pipes4.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_pipes4", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar"], + "output": "sb_pipes4", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/pipes5.recipe b/recipes/starbound/furniture/decorative/pipes5.recipe index 0e60e67a..daf3a260 100644 --- a/recipes/starbound/furniture/decorative/pipes5.recipe +++ b/recipes/starbound/furniture/decorative/pipes5.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_pipes5", - "groups" : ["craftingfurniture","decoration","all"] + "input": ["ironbar"], + "output": "sb_pipes5", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/plate.recipe b/recipes/starbound/furniture/decorative/plate.recipe index cb9f13ae..c398e73d 100644 --- a/recipes/starbound/furniture/decorative/plate.recipe +++ b/recipes/starbound/furniture/decorative/plate.recipe @@ -1,5 +1,5 @@ { - "input" : ["silverbar"], - "output" : ["sb_plate",3], - "groups" : ["craftingfurniture","decoration","all"] + "input": ["silverbar"], + "output": ["sb_plate",3], + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/tallchair.recipe b/recipes/starbound/furniture/decorative/tallchair.recipe index cfe56c5b..4b0c926b 100644 --- a/recipes/starbound/furniture/decorative/tallchair.recipe +++ b/recipes/starbound/furniture/decorative/tallchair.recipe @@ -1,6 +1,6 @@ { - "input" : [["woodenchair",32]], - "output" : "tallchair", - "duration" : 3.2, - "groups" : ["decoration","craftingfurniture","all"] + "input": [["woodenchair",32]], + "output": "tallchair", + "duration": 3.2, + "groups": ["decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/woodenendtable.recipe b/recipes/starbound/furniture/decorative/woodenendtable.recipe index 01b2b819..5e07b452 100644 --- a/recipes/starbound/furniture/decorative/woodenendtable.recipe +++ b/recipes/starbound/furniture/decorative/woodenendtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",8],["logblock",2]], - "output" : "sb_woodenendtable", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["darkwoodmaterial",8],["logblock",2]], + "output": "sb_woodenendtable", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/woodenshelf.recipe b/recipes/starbound/furniture/decorative/woodenshelf.recipe index 91c63af2..82d2eb25 100644 --- a/recipes/starbound/furniture/decorative/woodenshelf.recipe +++ b/recipes/starbound/furniture/decorative/woodenshelf.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",10],"ironbar"], - "output" : "sb_woodenshelf", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["darkwoodmaterial",10],"ironbar"], + "output": "sb_woodenshelf", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/woodenwallfan.recipe b/recipes/starbound/furniture/decorative/woodenwallfan.recipe index 6a5b6dbc..7af50a00 100644 --- a/recipes/starbound/furniture/decorative/woodenwallfan.recipe +++ b/recipes/starbound/furniture/decorative/woodenwallfan.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",15]], - "output" : "sb_woodenwallfan", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["darkwoodmaterial",15]], + "output": "sb_woodenwallfan", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/wreckchains1.recipe b/recipes/starbound/furniture/decorative/wreckchains1.recipe index 0d1c28aa..5bc64e27 100644 --- a/recipes/starbound/furniture/decorative/wreckchains1.recipe +++ b/recipes/starbound/furniture/decorative/wreckchains1.recipe @@ -1,5 +1,5 @@ { - "input" : [["rustymetal",10]], - "output" : "sb_wreckchains1", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rustymetal",10]], + "output": "sb_wreckchains1", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/wreckchains2.recipe b/recipes/starbound/furniture/decorative/wreckchains2.recipe index 43e8ef74..ac0dce85 100644 --- a/recipes/starbound/furniture/decorative/wreckchains2.recipe +++ b/recipes/starbound/furniture/decorative/wreckchains2.recipe @@ -1,5 +1,5 @@ { - "input" : [["rustymetal",15]], - "output" : "sb_wreckchains2", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rustymetal",15]], + "output": "sb_wreckchains2", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative/wreckchains3.recipe b/recipes/starbound/furniture/decorative/wreckchains3.recipe index ab6f6bc0..21879fc3 100644 --- a/recipes/starbound/furniture/decorative/wreckchains3.recipe +++ b/recipes/starbound/furniture/decorative/wreckchains3.recipe @@ -1,5 +1,5 @@ { - "input" : [["rustymetal",20]], - "output" : "sb_wreckchains3", - "groups" : ["craftingfurniture","decoration","all"] + "input": [["rustymetal",20]], + "output": "sb_wreckchains3", + "groups": ["craftingfurniture","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier10chair.recipe b/recipes/starbound/furniture/decorative2/tier10chair.recipe index 6e94ee08..adea476c 100644 --- a/recipes/starbound/furniture/decorative2/tier10chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier10chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2],["leather",5]], - "output" : "executivechair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_imperviumbar",2],["leather",5]], + "output": "executivechair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier10table.recipe b/recipes/starbound/furniture/decorative2/tier10table.recipe index 5d06a2c0..9b54b5a8 100644 --- a/recipes/starbound/furniture/decorative2/tier10table.recipe +++ b/recipes/starbound/furniture/decorative2/tier10table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2]], - "output" : "executivetable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_imperviumbar",2]], + "output": "executivetable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier5chair.recipe b/recipes/starbound/furniture/decorative2/tier5chair.recipe index f8af8dbc..8e6b0254 100644 --- a/recipes/starbound/furniture/decorative2/tier5chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier5chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2],["leather",5]], - "output" : "serenechair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_aegisaltbar",2],["leather",5]], + "output": "serenechair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier5table.recipe b/recipes/starbound/furniture/decorative2/tier5table.recipe index 54f0d128..2c7485f5 100644 --- a/recipes/starbound/furniture/decorative2/tier5table.recipe +++ b/recipes/starbound/furniture/decorative2/tier5table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2]], - "output" : "serenetable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_aegisaltbar",2]], + "output": "serenetable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier6chair.recipe b/recipes/starbound/furniture/decorative2/tier6chair.recipe index 5c80429e..d065ba39 100644 --- a/recipes/starbound/furniture/decorative2/tier6chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier6chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2],["leather",5]], - "output" : "geometricchair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_feroziumbar",2],["leather",5]], + "output": "geometricchair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier6table.recipe b/recipes/starbound/furniture/decorative2/tier6table.recipe index 22d32866..89658f21 100644 --- a/recipes/starbound/furniture/decorative2/tier6table.recipe +++ b/recipes/starbound/furniture/decorative2/tier6table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2]], - "output" : "geometrictable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_feroziumbar",2]], + "output": "geometrictable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier7chair.recipe b/recipes/starbound/furniture/decorative2/tier7chair.recipe index ebebaa8b..3a5a178e 100644 --- a/recipes/starbound/furniture/decorative2/tier7chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier7chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2],["leather",5]], - "output" : "wavechair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_ceruliumbar",2],["leather",5]], + "output": "wavechair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier7table.recipe b/recipes/starbound/furniture/decorative2/tier7table.recipe index 01d6a9c5..afef0f1e 100644 --- a/recipes/starbound/furniture/decorative2/tier7table.recipe +++ b/recipes/starbound/furniture/decorative2/tier7table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2]], - "output" : "wavetable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_ceruliumbar",2]], + "output": "wavetable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier8chair.recipe b/recipes/starbound/furniture/decorative2/tier8chair.recipe index a7fc0879..e08c9d83 100644 --- a/recipes/starbound/furniture/decorative2/tier8chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier8chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2],["leather",5]], - "output" : "opulentchair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_violiumbar",2],["leather",5]], + "output": "opulentchair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier8table.recipe b/recipes/starbound/furniture/decorative2/tier8table.recipe index 02295ea9..b2254fc1 100644 --- a/recipes/starbound/furniture/decorative2/tier8table.recipe +++ b/recipes/starbound/furniture/decorative2/tier8table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2]], - "output" : "opulenttable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_violiumbar",2]], + "output": "opulenttable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier9chair.recipe b/recipes/starbound/furniture/decorative2/tier9chair.recipe index 0b4d433e..10691590 100644 --- a/recipes/starbound/furniture/decorative2/tier9chair.recipe +++ b/recipes/starbound/furniture/decorative2/tier9chair.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2],["leather",5]], - "output" : "doomchair", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_rubiumbar",2],["leather",5]], + "output": "doomchair", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/decorative2/tier9table.recipe b/recipes/starbound/furniture/decorative2/tier9table.recipe index 317e47e8..887d3f11 100644 --- a/recipes/starbound/furniture/decorative2/tier9table.recipe +++ b/recipes/starbound/furniture/decorative2/tier9table.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2]], - "output" : "doomtable", - "groups" : ["craftingfurniture2","decoration","all"] + "input": [["sb_rubiumbar",2]], + "output": "doomtable", + "groups": ["craftingfurniture2","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/doors/irondoor.recipe b/recipes/starbound/furniture/doors/irondoor.recipe index d860e98a..e677a6f4 100644 --- a/recipes/starbound/furniture/doors/irondoor.recipe +++ b/recipes/starbound/furniture/doors/irondoor.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "irondoor", - "groups" : ["craftingfurniture","doors","all"] + "input": ["ironbar","copperbar"], + "output": "irondoor", + "groups": ["craftingfurniture","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/doors2/apexcooldoor.recipe b/recipes/starbound/furniture/doors2/apexcooldoor.recipe index 32bd0d4f..3bf6b52d 100644 --- a/recipes/starbound/furniture/doors2/apexcooldoor.recipe +++ b/recipes/starbound/furniture/doors2/apexcooldoor.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_steelbar","smallbattery",["wire",5]], - "output" : "apexcooldoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": ["sb_steelbar","smallbattery",["wire",5]], + "output": "apexcooldoor", + "groups": ["craftingfurniture2","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe b/recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe index 15b4315d..d2ed606a 100644 --- a/recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe +++ b/recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_steelbar","smallbattery",["wire",5]], - "output" : "sb_apexcoolverticaldoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": ["sb_steelbar","smallbattery",["wire",5]], + "output": "sb_apexcoolverticaldoor", + "groups": ["craftingfurniture2","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/doors2/tier10door.recipe b/recipes/starbound/furniture/doors2/tier10door.recipe index 2204216d..95987d8f 100644 --- a/recipes/starbound/furniture/doors2/tier10door.recipe +++ b/recipes/starbound/furniture/doors2/tier10door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2]], - "output" : "executivedoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_imperviumbar",2]], + "output": "executivedoor", + "groups": ["craftingfurniture2","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/doors2/tier5door.recipe b/recipes/starbound/furniture/doors2/tier5door.recipe index 9a08ab3d..e3000e40 100644 --- a/recipes/starbound/furniture/doors2/tier5door.recipe +++ b/recipes/starbound/furniture/doors2/tier5door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2]], - "output" : "serenedoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_aegisaltbar",2]], + "output": "serenedoor", + "groups": ["craftingfurniture2","doors","all"] } diff --git a/recipes/starbound/furniture/doors2/tier6door.recipe b/recipes/starbound/furniture/doors2/tier6door.recipe index 054ffd2c..74f1244b 100644 --- a/recipes/starbound/furniture/doors2/tier6door.recipe +++ b/recipes/starbound/furniture/doors2/tier6door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2]], - "output" : "geometricdoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_feroziumbar",2]], + "output": "geometricdoor", + "groups": ["craftingfurniture2","doors","all"] } diff --git a/recipes/starbound/furniture/doors2/tier7door.recipe b/recipes/starbound/furniture/doors2/tier7door.recipe index 7c44becd..06a2d468 100644 --- a/recipes/starbound/furniture/doors2/tier7door.recipe +++ b/recipes/starbound/furniture/doors2/tier7door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2]], - "output" : "wavedoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_ceruliumbar",2]], + "output": "wavedoor", + "groups": ["craftingfurniture2","doors","all"] } diff --git a/recipes/starbound/furniture/doors2/tier8door.recipe b/recipes/starbound/furniture/doors2/tier8door.recipe index 59bfb2be..e9d44ada 100644 --- a/recipes/starbound/furniture/doors2/tier8door.recipe +++ b/recipes/starbound/furniture/doors2/tier8door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2]], - "output" : "opulentdoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_violiumbar",2]], + "output": "opulentdoor", + "groups": ["craftingfurniture2","doors","all"] } diff --git a/recipes/starbound/furniture/doors2/tier9door.recipe b/recipes/starbound/furniture/doors2/tier9door.recipe index 9301e8fc..efe9a52d 100644 --- a/recipes/starbound/furniture/doors2/tier9door.recipe +++ b/recipes/starbound/furniture/doors2/tier9door.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2]], - "output" : "doomdoor", - "groups" : ["craftingfurniture2","doors","all"] + "input": [["sb_rubiumbar",2]], + "output": "doomdoor", + "groups": ["craftingfurniture2","doors","all"] } diff --git a/recipes/starbound/furniture/lights/ironlight.recipe b/recipes/starbound/furniture/lights/ironlight.recipe index 7b11df83..b83e8332 100644 --- a/recipes/starbound/furniture/lights/ironlight.recipe +++ b/recipes/starbound/furniture/lights/ironlight.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar","torch","glass"], - "output" : "ironlight", - "groups" : ["craftingfurniture","lights","all"] + "input": ["ironbar","copperbar","torch","glass"], + "output": "ironlight", + "groups": ["craftingfurniture","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier10light.recipe b/recipes/starbound/furniture/lights2/tier10light.recipe index d7b479a2..7d9aab07 100644 --- a/recipes/starbound/furniture/lights2/tier10light.recipe +++ b/recipes/starbound/furniture/lights2/tier10light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2],["glass",2],"smallbattery"], - "output" : "executivelight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_imperviumbar",2],["glass",2],"smallbattery"], + "output": "executivelight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier5light.recipe b/recipes/starbound/furniture/lights2/tier5light.recipe index 8342c44c..557db761 100644 --- a/recipes/starbound/furniture/lights2/tier5light.recipe +++ b/recipes/starbound/furniture/lights2/tier5light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2],["glass",2],"smallbattery"], - "output" : "serenelight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_aegisaltbar",2],["glass",2],"smallbattery"], + "output": "serenelight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier6light.recipe b/recipes/starbound/furniture/lights2/tier6light.recipe index a0dd6fd6..16e75543 100644 --- a/recipes/starbound/furniture/lights2/tier6light.recipe +++ b/recipes/starbound/furniture/lights2/tier6light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2],["glass",2],"smallbattery"], - "output" : "geometriclight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_feroziumbar",2],["glass",2],"smallbattery"], + "output": "geometriclight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier7light.recipe b/recipes/starbound/furniture/lights2/tier7light.recipe index 84a3baa2..f8d9d069 100644 --- a/recipes/starbound/furniture/lights2/tier7light.recipe +++ b/recipes/starbound/furniture/lights2/tier7light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2],["glass",2],"smallbattery"], - "output" : "wavelight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_ceruliumbar",2],["glass",2],"smallbattery"], + "output": "wavelight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier8light.recipe b/recipes/starbound/furniture/lights2/tier8light.recipe index 836c0f1c..3ff4128d 100644 --- a/recipes/starbound/furniture/lights2/tier8light.recipe +++ b/recipes/starbound/furniture/lights2/tier8light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2],["glass",2],"smallbattery"], - "output" : "opulentlight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_violiumbar",2],["glass",2],"smallbattery"], + "output": "opulentlight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/lights2/tier9light.recipe b/recipes/starbound/furniture/lights2/tier9light.recipe index bbfde981..fb0c96ca 100644 --- a/recipes/starbound/furniture/lights2/tier9light.recipe +++ b/recipes/starbound/furniture/lights2/tier9light.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2],["glass",2],"smallbattery"], - "output" : "doomlight", - "groups" : ["craftingfurniture2","lights","all"] + "input": [["sb_rubiumbar",2],["glass",2],"smallbattery"], + "output": "doomlight", + "groups": ["craftingfurniture2","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/blackblock.recipe b/recipes/starbound/furniture/materials/blackblock.recipe index bef6cbe1..058f9023 100644 --- a/recipes/starbound/furniture/materials/blackblock.recipe +++ b/recipes/starbound/furniture/materials/blackblock.recipe @@ -1,6 +1,6 @@ { - "input" : [["shadowblock",10]], - "output" : ["blackblock",5], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": [["shadowblock",10]], + "output": ["blackblock",5], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/cloudblock.recipe b/recipes/starbound/furniture/materials/cloudblock.recipe index e4750996..640f9218 100644 --- a/recipes/starbound/furniture/materials/cloudblock.recipe +++ b/recipes/starbound/furniture/materials/cloudblock.recipe @@ -1,6 +1,6 @@ { - "input" : [["liquidwater",5],["snow",5]], - "output" : ["cloudblock",15], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": [["liquidwater",5],["snow",5]], + "output": ["cloudblock",15], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/coconutblock.recipe b/recipes/starbound/furniture/materials/coconutblock.recipe index 6ed4bc1c..5759b96c 100644 --- a/recipes/starbound/furniture/materials/coconutblock.recipe +++ b/recipes/starbound/furniture/materials/coconutblock.recipe @@ -1,6 +1,6 @@ { - "input" : [["sand2",5],["coconut",5]], - "output" : ["coconutblock",20], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": [["sand2",5],["coconut",5]], + "output": ["coconutblock",20], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/darkwoodmaterial.recipe b/recipes/starbound/furniture/materials/darkwoodmaterial.recipe index 974b38a2..9f7a322a 100644 --- a/recipes/starbound/furniture/materials/darkwoodmaterial.recipe +++ b/recipes/starbound/furniture/materials/darkwoodmaterial.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_unrefinedwood"], - "output" : ["darkwoodmaterial",5], - "groups" : ["plain","materials","craftingfurniture","all"], - "duration" : 0.05 + "input": ["sb_unrefinedwood"], + "output": ["darkwoodmaterial",5], + "groups": ["plain","materials","craftingfurniture","all"], + "duration": 0.05 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/ridgebrick.recipe b/recipes/starbound/furniture/materials/ridgebrick.recipe index 9d96a459..8fc38e1e 100644 --- a/recipes/starbound/furniture/materials/ridgebrick.recipe +++ b/recipes/starbound/furniture/materials/ridgebrick.recipe @@ -1,6 +1,6 @@ { - "input" : ["brickmaterial","cobblestonematerial"], - "output" : ["ridgebrick",50], - "duration" : 0.5, - "groups" : ["craftingfurniture","materials","all"] + "input": ["brickmaterial","cobblestonematerial"], + "output": ["ridgebrick",50], + "duration": 0.5, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock01.recipe b/recipes/starbound/furniture/materials/rock01.recipe index f8a5e933..b2d01902 100644 --- a/recipes/starbound/furniture/materials/rock01.recipe +++ b/recipes/starbound/furniture/materials/rock01.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock01", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock01", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock02.recipe b/recipes/starbound/furniture/materials/rock02.recipe index 814680f6..b7b3d814 100644 --- a/recipes/starbound/furniture/materials/rock02.recipe +++ b/recipes/starbound/furniture/materials/rock02.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock02", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock02", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock03.recipe b/recipes/starbound/furniture/materials/rock03.recipe index ccd25caf..2f74881b 100644 --- a/recipes/starbound/furniture/materials/rock03.recipe +++ b/recipes/starbound/furniture/materials/rock03.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock03", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock03", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock04.recipe b/recipes/starbound/furniture/materials/rock04.recipe index 2bfc73d9..736e25ee 100644 --- a/recipes/starbound/furniture/materials/rock04.recipe +++ b/recipes/starbound/furniture/materials/rock04.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock04", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock04", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock12.recipe b/recipes/starbound/furniture/materials/rock12.recipe index a4e90809..2327e4da 100644 --- a/recipes/starbound/furniture/materials/rock12.recipe +++ b/recipes/starbound/furniture/materials/rock12.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock12", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock12", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock14.recipe b/recipes/starbound/furniture/materials/rock14.recipe index bcb02ec7..3e570d73 100644 --- a/recipes/starbound/furniture/materials/rock14.recipe +++ b/recipes/starbound/furniture/materials/rock14.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock14", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock14", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock15.recipe b/recipes/starbound/furniture/materials/rock15.recipe index d1fac3b3..de8767ad 100644 --- a/recipes/starbound/furniture/materials/rock15.recipe +++ b/recipes/starbound/furniture/materials/rock15.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock15", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock15", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock17.recipe b/recipes/starbound/furniture/materials/rock17.recipe index a2d2064b..bb7c9c3a 100644 --- a/recipes/starbound/furniture/materials/rock17.recipe +++ b/recipes/starbound/furniture/materials/rock17.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock17", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock17", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock19.recipe b/recipes/starbound/furniture/materials/rock19.recipe index 8feb225b..460bfdf7 100644 --- a/recipes/starbound/furniture/materials/rock19.recipe +++ b/recipes/starbound/furniture/materials/rock19.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock19", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock19", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/rock20.recipe b/recipes/starbound/furniture/materials/rock20.recipe index 7e85907e..2bb2923e 100644 --- a/recipes/starbound/furniture/materials/rock20.recipe +++ b/recipes/starbound/furniture/materials/rock20.recipe @@ -1,6 +1,6 @@ { - "input" : ["cobblestonematerial"], - "output" : "rock20", - "groups" : ["craftingfurniture","materials","all"], - "duration" : 0.1 + "input": ["cobblestonematerial"], + "output": "rock20", + "groups": ["craftingfurniture","materials","all"], + "duration": 0.1 } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/slopedglasspanel.recipe b/recipes/starbound/furniture/materials/slopedglasspanel.recipe index b054c092..f3301e48 100644 --- a/recipes/starbound/furniture/materials/slopedglasspanel.recipe +++ b/recipes/starbound/furniture/materials/slopedglasspanel.recipe @@ -1,6 +1,6 @@ { - "input" : ["glass"], - "output" : ["slopedglasspanel",10], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": ["glass"], + "output": ["slopedglasspanel",10], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/smoothconcrete.recipe b/recipes/starbound/furniture/materials/smoothconcrete.recipe index 320e74fc..71f2e3a9 100644 --- a/recipes/starbound/furniture/materials/smoothconcrete.recipe +++ b/recipes/starbound/furniture/materials/smoothconcrete.recipe @@ -1,6 +1,6 @@ { - "input" : ["clay","sand2","liquidwater"], - "output" : ["sb_smoothconcrete",20], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": ["clay","sand2","liquidwater"], + "output": ["sb_smoothconcrete",20], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials/waste.recipe b/recipes/starbound/furniture/materials/waste.recipe index e07f07e7..af399e7f 100644 --- a/recipes/starbound/furniture/materials/waste.recipe +++ b/recipes/starbound/furniture/materials/waste.recipe @@ -1,6 +1,6 @@ { - "input" : [["toxicwaste",3]], - "output" : ["waste",20], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": [["toxicwaste",3]], + "output": ["waste",20], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials2/outpost.recipe b/recipes/starbound/furniture/materials2/outpost.recipe index 5fdffcb9..6d24c9b9 100644 --- a/recipes/starbound/furniture/materials2/outpost.recipe +++ b/recipes/starbound/furniture/materials2/outpost.recipe @@ -1,6 +1,6 @@ { - "input" : ["tungstenbar","outpostwall1"], - "output" : ["outpost",50], - "duration" : 0.2, - "groups" : ["craftingfurniture2","materials","all"] + "input": ["tungstenbar","outpostwall1"], + "output": ["outpost",50], + "duration": 0.2, + "groups": ["craftingfurniture2","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials2/platinum.recipe b/recipes/starbound/furniture/materials2/platinum.recipe index 8673c7e7..b9d7ff75 100644 --- a/recipes/starbound/furniture/materials2/platinum.recipe +++ b/recipes/starbound/furniture/materials2/platinum.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar"], - "output" : ["platinumblock",50], - "groups" : ["craftingfurniture2","all","materials"] + "input": ["platinumbar"], + "output": ["platinumblock",50], + "groups": ["craftingfurniture2","all","materials"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/materials2/sb_chain.recipe b/recipes/starbound/furniture/materials2/sb_chain.recipe index 6a406318..32c51c52 100644 --- a/recipes/starbound/furniture/materials2/sb_chain.recipe +++ b/recipes/starbound/furniture/materials2/sb_chain.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_steelbar"], - "output" : ["sb_chain",20], - "duration" : 0.5, - "groups" : ["craftingfurniture2","materials","all"] + "input": ["sb_steelbar"], + "output": ["sb_chain",20], + "duration": 0.5, + "groups": ["craftingfurniture2","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/cardboard1.recipe b/recipes/starbound/furniture/storage/cardboard1.recipe index cbbe2523..98b19e13 100644 --- a/recipes/starbound/furniture/storage/cardboard1.recipe +++ b/recipes/starbound/furniture/storage/cardboard1.recipe @@ -1,5 +1,5 @@ { - "input" : [["paper",18],["darkwoodmaterial",6]], - "output" : "cardboard1", - "groups" : ["craftingfurniture","storage","all"] + "input": [["paper",18],["darkwoodmaterial",6]], + "output": "cardboard1", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/cardboard2.recipe b/recipes/starbound/furniture/storage/cardboard2.recipe index 65aa54b1..1b186d89 100644 --- a/recipes/starbound/furniture/storage/cardboard2.recipe +++ b/recipes/starbound/furniture/storage/cardboard2.recipe @@ -1,5 +1,5 @@ { - "input" : [["paper",18],["darkwoodmaterial",6]], - "output" : "cardboard2", - "groups" : ["craftingfurniture","storage","all"] + "input": [["paper",18],["darkwoodmaterial",6]], + "output": "cardboard2", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/cardboard3.recipe b/recipes/starbound/furniture/storage/cardboard3.recipe index 1b55991a..df956cd8 100644 --- a/recipes/starbound/furniture/storage/cardboard3.recipe +++ b/recipes/starbound/furniture/storage/cardboard3.recipe @@ -1,5 +1,5 @@ { - "input" : [["paper",18],["darkwoodmaterial",6]], - "output" : "cardboard3", - "groups" : ["craftingfurniture","storage","all"] + "input": [["paper",18],["darkwoodmaterial",6]], + "output": "cardboard3", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/locker1.recipe b/recipes/starbound/furniture/storage/locker1.recipe index 86ba22a2..51ab8f2a 100644 --- a/recipes/starbound/furniture/storage/locker1.recipe +++ b/recipes/starbound/furniture/storage/locker1.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "locker1", - "groups" : ["craftingfurniture","storage","all"] + "input": ["ironbar"], + "output": "locker1", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/locker2.recipe b/recipes/starbound/furniture/storage/locker2.recipe index 8d651ee2..a936aa32 100644 --- a/recipes/starbound/furniture/storage/locker2.recipe +++ b/recipes/starbound/furniture/storage/locker2.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "locker2", - "groups" : ["craftingfurniture","storage","all"] + "input": ["ironbar"], + "output": "locker2", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/tieredchests/t1.recipe b/recipes/starbound/furniture/storage/tieredchests/t1.recipe index 991ffd5b..cff1cd32 100644 --- a/recipes/starbound/furniture/storage/tieredchests/t1.recipe +++ b/recipes/starbound/furniture/storage/tieredchests/t1.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : "sb_tier1techchest", - "groups" : ["craftingfurniture","storage","all"] + "input": ["ironbar"], + "output": "sb_tier1techchest", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/tieredchests/t2.recipe b/recipes/starbound/furniture/storage/tieredchests/t2.recipe index f3999d12..2b050bc0 100644 --- a/recipes/starbound/furniture/storage/tieredchests/t2.recipe +++ b/recipes/starbound/furniture/storage/tieredchests/t2.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_steelbar"], - "output" : "sb_tier2techchest", - "groups" : ["craftingfurniture","storage","all"] + "input": ["sb_steelbar"], + "output": "sb_tier2techchest", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/woodenlocker.recipe b/recipes/starbound/furniture/storage/woodenlocker.recipe index 3de0af5d..041a6896 100644 --- a/recipes/starbound/furniture/storage/woodenlocker.recipe +++ b/recipes/starbound/furniture/storage/woodenlocker.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",15],"copperbar"], - "output" : "sb_woodenlocker", - "groups" : ["craftingfurniture","storage","all"] + "input": [["darkwoodmaterial",15],"copperbar"], + "output": "sb_woodenlocker", + "groups": ["craftingfurniture","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe index 3ccf8412..6cc8a835 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "apexshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "apexshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe index 0350a0f4..5f1832e3 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "avianshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "avianshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe index c384e0a0..cbc88b7d 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "floranshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "floranshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe index b3a00b71..4ae97f12 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "glitchshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "glitchshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe index 96d779e1..d730efa5 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "humanshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "humanshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe index 8a3eca74..1ac5ffed 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "hylotlshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "hylotlshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe index 2a182491..8f3d64ae 100644 --- a/recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe +++ b/recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar","platinumbar","wire"], - "output" : "novakidshiplocker", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar","platinumbar","wire"], + "output": "novakidshiplocker", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t3.recipe b/recipes/starbound/furniture/storage2/tieredchests/t3.recipe index 31f9252f..f9f1c0f6 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t3.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t3.recipe @@ -1,5 +1,5 @@ { - "input" : ["titaniumbar"], - "output" : "sb_tier3techchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["titaniumbar"], + "output": "sb_tier3techchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t4.recipe b/recipes/starbound/furniture/storage2/tieredchests/t4.recipe index 34c0d66b..8dee5314 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t4.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t4.recipe @@ -1,5 +1,5 @@ { - "input" : ["durasteelbar"], - "output" : "sb_tier4techchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["durasteelbar"], + "output": "sb_tier4techchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t5a.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5a.recipe index 0d4aad69..d1dff2e1 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t5a.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_aegisaltbar"], - "output" : "sb_tier5atechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_aegisaltbar"], + "output": "sb_tier5atechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t5m.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5m.recipe index f216864b..c0fb8cef 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t5m.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_rubiumbar"], - "output" : "sb_tier5mtechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_rubiumbar"], + "output": "sb_tier5mtechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t5s.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5s.recipe index 3aff3141..b5f5978f 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t5s.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_violiumbar"], - "output" : "sb_tier5stechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_violiumbar"], + "output": "sb_tier5stechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t6a.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6a.recipe index 0662a1d4..6c0dda5f 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t6a.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_feroziumbar"], - "output" : "sb_tier6atechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_feroziumbar"], + "output": "sb_tier6atechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t6m.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6m.recipe index c93b414f..7b6bac56 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t6m.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_ceruliumbar"], - "output" : "sb_tier6mtechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_ceruliumbar"], + "output": "sb_tier6mtechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/furniture/storage2/tieredchests/t6s.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6s.recipe index b15e7c99..2defd808 100644 --- a/recipes/starbound/furniture/storage2/tieredchests/t6s.recipe +++ b/recipes/starbound/furniture/storage2/tieredchests/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_imperviumbar"], - "output" : "sb_tier6stechchest", - "groups" : ["craftingfurniture2","storage","all"] + "input": ["sb_imperviumbar"], + "output": "sb_tier6stechchest", + "groups": ["craftingfurniture2","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/candyblock.recipe b/recipes/starbound/holidaycraftingtable/candyblock.recipe index a61b594c..21756103 100644 --- a/recipes/starbound/holidaycraftingtable/candyblock.recipe +++ b/recipes/starbound/holidaycraftingtable/candyblock.recipe @@ -1,6 +1,6 @@ { - "input" : ["holidayspirit"], - "output" : ["candyblock",50], - "duration" : 0, - "groups" : ["holidaycraftingtable","materials","all"] + "input": ["holidayspirit"], + "output": ["candyblock",50], + "duration": 0, + "groups": ["holidaycraftingtable","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/greendye.recipe b/recipes/starbound/holidaycraftingtable/greendye.recipe index 83529d29..047797dc 100644 --- a/recipes/starbound/holidaycraftingtable/greendye.recipe +++ b/recipes/starbound/holidaycraftingtable/greendye.recipe @@ -1,6 +1,6 @@ { - "input" : ["holidayspirit","bottle"], - "output" : "greendye", - "duration" : 0, - "groups" : ["holidaycraftingtable","consumables","all","nouncrafting"] + "input": ["holidayspirit","bottle"], + "output": "greendye", + "duration": 0, + "groups": ["holidaycraftingtable","consumables","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/holidaycraftingtable.recipe b/recipes/starbound/holidaycraftingtable/holidaycraftingtable.recipe index 92bb0df8..78bccaa2 100644 --- a/recipes/starbound/holidaycraftingtable/holidaycraftingtable.recipe +++ b/recipes/starbound/holidaycraftingtable/holidaycraftingtable.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",5]], - "output" : "holidaycraftingtable", - "groups" : ["inventorstable","holidaycraftingtable","craftingstations","all"] + "input": [["ironbar",5]], + "output": "holidaycraftingtable", + "groups": ["inventorstable","holidaycraftingtable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/reddye.recipe b/recipes/starbound/holidaycraftingtable/reddye.recipe index 66c675bd..8d667835 100644 --- a/recipes/starbound/holidaycraftingtable/reddye.recipe +++ b/recipes/starbound/holidaycraftingtable/reddye.recipe @@ -1,6 +1,6 @@ { - "input" : ["holidayspirit","bottle"], - "output" : "reddye", - "duration" : 0, - "groups" : ["holidaycraftingtable","consumables","all","nouncrafting"] + "input": ["holidayspirit","bottle"], + "output": "reddye", + "duration": 0, + "groups": ["holidaycraftingtable","consumables","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/wazlights.recipe b/recipes/starbound/holidaycraftingtable/wazlights.recipe index 5d604707..f35f5ed6 100644 --- a/recipes/starbound/holidaycraftingtable/wazlights.recipe +++ b/recipes/starbound/holidaycraftingtable/wazlights.recipe @@ -1,6 +1,6 @@ { - "input" : [["holidayspirit",7]], - "output" : "wazlights", - "duration" : 0, - "groups" : ["holidaycraftingtable","objects","all"] + "input": [["holidayspirit",7]], + "output": "wazlights", + "duration": 0, + "groups": ["holidaycraftingtable","objects","all"] } \ No newline at end of file diff --git a/recipes/starbound/holidaycraftingtable/whitedye.recipe b/recipes/starbound/holidaycraftingtable/whitedye.recipe index 7791a285..83b2713b 100644 --- a/recipes/starbound/holidaycraftingtable/whitedye.recipe +++ b/recipes/starbound/holidaycraftingtable/whitedye.recipe @@ -1,6 +1,6 @@ { - "input" : ["holidayspirit","bottle"], - "output" : "whitedye", - "duration" : 0, - "groups" : ["holidaycraftingtable","consumables","all","nouncrafting"] + "input": ["holidayspirit","bottle"], + "output": "whitedye", + "duration": 0, + "groups": ["holidaycraftingtable","consumables","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/acousticguitar.recipe b/recipes/starbound/instruments/tool/acousticguitar.recipe index a2a4d61f..ffc435ed 100644 --- a/recipes/starbound/instruments/tool/acousticguitar.recipe +++ b/recipes/starbound/instruments/tool/acousticguitar.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar"], - "output" : "acousticguitar", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar"], + "output": "acousticguitar", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/banjo.recipe b/recipes/starbound/instruments/tool/banjo.recipe index 3567beef..2fb71067 100644 --- a/recipes/starbound/instruments/tool/banjo.recipe +++ b/recipes/starbound/instruments/tool/banjo.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"leather"], - "output" : "banjo", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"leather"], + "output": "banjo", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/bassguitar.recipe b/recipes/starbound/instruments/tool/bassguitar.recipe index 84366580..8ff45d7f 100644 --- a/recipes/starbound/instruments/tool/bassguitar.recipe +++ b/recipes/starbound/instruments/tool/bassguitar.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar"], - "output" : "bassguitar", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar"], + "output": "bassguitar", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/bones.recipe b/recipes/starbound/instruments/tool/bones.recipe index 53833b5a..33354d66 100644 --- a/recipes/starbound/instruments/tool/bones.recipe +++ b/recipes/starbound/instruments/tool/bones.recipe @@ -1,5 +1,5 @@ { - "input" : [["bone",5],["plantfibre",5]], - "output" : "bones", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["bone",5],["plantfibre",5]], + "output": "bones", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/dulcimer.recipe b/recipes/starbound/instruments/tool/dulcimer.recipe index 789eaebe..d8db21e4 100644 --- a/recipes/starbound/instruments/tool/dulcimer.recipe +++ b/recipes/starbound/instruments/tool/dulcimer.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar"], - "output" : "dulcimer", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar"], + "output": "dulcimer", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/electricbass.recipe b/recipes/starbound/instruments/tool/electricbass.recipe index 105e76cc..ca5fdcf1 100644 --- a/recipes/starbound/instruments/tool/electricbass.recipe +++ b/recipes/starbound/instruments/tool/electricbass.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar"], - "output" : "electricbass", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar"], + "output": "electricbass", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/harp.recipe b/recipes/starbound/instruments/tool/harp.recipe index c90ad2c1..fb8d3b18 100644 --- a/recipes/starbound/instruments/tool/harp.recipe +++ b/recipes/starbound/instruments/tool/harp.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["string",10],"ironbar"], - "output" : "harp", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["string",10],"ironbar"], + "output": "harp", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/koto.recipe b/recipes/starbound/instruments/tool/koto.recipe index 0366ad36..dbf4df69 100644 --- a/recipes/starbound/instruments/tool/koto.recipe +++ b/recipes/starbound/instruments/tool/koto.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5]], - "output" : "koto", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5]], + "output": "koto", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/leadguitar.recipe b/recipes/starbound/instruments/tool/leadguitar.recipe index cf53c595..d53a7f12 100644 --- a/recipes/starbound/instruments/tool/leadguitar.recipe +++ b/recipes/starbound/instruments/tool/leadguitar.recipe @@ -1,5 +1,5 @@ { - "input" : [["lead",5],["string",5],"ironbar"], - "output" : "leadguitar", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["lead",5],["string",5],"ironbar"], + "output": "leadguitar", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/oboe.recipe b/recipes/starbound/instruments/tool/oboe.recipe index 80cfe725..33c55131 100644 --- a/recipes/starbound/instruments/tool/oboe.recipe +++ b/recipes/starbound/instruments/tool/oboe.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",3],"silverbar"], - "output" : "oboe", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",3],"silverbar"], + "output": "oboe", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/ocarina.recipe b/recipes/starbound/instruments/tool/ocarina.recipe index da76c727..a01e8318 100644 --- a/recipes/starbound/instruments/tool/ocarina.recipe +++ b/recipes/starbound/instruments/tool/ocarina.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",10],["clay",5],"ironbar"], - "output" : "ocarina", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",10],["clay",5],"ironbar"], + "output": "ocarina", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/saxophone.recipe b/recipes/starbound/instruments/tool/saxophone.recipe index 4d42cf2d..906b6cce 100644 --- a/recipes/starbound/instruments/tool/saxophone.recipe +++ b/recipes/starbound/instruments/tool/saxophone.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",2]], - "output" : "saxophone", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["copperbar",2]], + "output": "saxophone", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/trumpet.recipe b/recipes/starbound/instruments/tool/trumpet.recipe index 8aaac057..fff3ac1f 100644 --- a/recipes/starbound/instruments/tool/trumpet.recipe +++ b/recipes/starbound/instruments/tool/trumpet.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",2]], - "output" : "trumpet", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["copperbar",2]], + "output": "trumpet", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool/violin.recipe b/recipes/starbound/instruments/tool/violin.recipe index b6ce3e26..f5e86fa2 100644 --- a/recipes/starbound/instruments/tool/violin.recipe +++ b/recipes/starbound/instruments/tool/violin.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar"], - "output" : "violin", - "groups" : ["sb_craftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar"], + "output": "violin", + "groups": ["sb_craftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/accordion.recipe b/recipes/starbound/instruments/tool2/accordion.recipe index 5945cc55..90b2fbc6 100644 --- a/recipes/starbound/instruments/tool2/accordion.recipe +++ b/recipes/starbound/instruments/tool2/accordion.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",15],["polymer",3],"leather","ironbar"], - "output" : "accordion", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",15],["polymer",3],"leather","ironbar"], + "output": "accordion", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/brightpiano.recipe b/recipes/starbound/instruments/tool2/brightpiano.recipe index 448ac6ab..e1daa672 100644 --- a/recipes/starbound/instruments/tool2/brightpiano.recipe +++ b/recipes/starbound/instruments/tool2/brightpiano.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"ironbar"], - "output" : "brightpiano", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"ironbar"], + "output": "brightpiano", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/clarinet.recipe b/recipes/starbound/instruments/tool2/clarinet.recipe index a6364e07..07b701ea 100644 --- a/recipes/starbound/instruments/tool2/clarinet.recipe +++ b/recipes/starbound/instruments/tool2/clarinet.recipe @@ -1,5 +1,5 @@ { - "input" : [["silverbar",2]], - "output" : "clarinet", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["silverbar",2]], + "output": "clarinet", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/drumkit.recipe b/recipes/starbound/instruments/tool2/drumkit.recipe index 55e186df..e67e36c8 100644 --- a/recipes/starbound/instruments/tool2/drumkit.recipe +++ b/recipes/starbound/instruments/tool2/drumkit.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["polymer",3]], - "output" : "drumkit", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["ironbar",3],["polymer",3]], + "output": "drumkit", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/flute.recipe b/recipes/starbound/instruments/tool2/flute.recipe index 7a9086b8..67d70e92 100644 --- a/recipes/starbound/instruments/tool2/flute.recipe +++ b/recipes/starbound/instruments/tool2/flute.recipe @@ -1,5 +1,5 @@ { - "input" : ["silverbar"], - "output" : "flute", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": ["silverbar"], + "output": "flute", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/harmonica.recipe b/recipes/starbound/instruments/tool2/harmonica.recipe index ef511ff1..99b9aa82 100644 --- a/recipes/starbound/instruments/tool2/harmonica.recipe +++ b/recipes/starbound/instruments/tool2/harmonica.recipe @@ -1,5 +1,5 @@ { - "input" : ["silverbar"], - "output" : "harmonica", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": ["silverbar"], + "output": "harmonica", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/keyboard.recipe b/recipes/starbound/instruments/tool2/keyboard.recipe index 5188411b..7689fde5 100644 --- a/recipes/starbound/instruments/tool2/keyboard.recipe +++ b/recipes/starbound/instruments/tool2/keyboard.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"sb_steelbar"], - "output" : "keyboard", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"sb_steelbar"], + "output": "keyboard", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/musicbox.recipe b/recipes/starbound/instruments/tool2/musicbox.recipe index bdff1d52..c4159e80 100644 --- a/recipes/starbound/instruments/tool2/musicbox.recipe +++ b/recipes/starbound/instruments/tool2/musicbox.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"ironbar"], - "output" : "musicbox", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"ironbar"], + "output": "musicbox", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/nylonguitar.recipe b/recipes/starbound/instruments/tool2/nylonguitar.recipe index 2b76fb35..e595c9d7 100644 --- a/recipes/starbound/instruments/tool2/nylonguitar.recipe +++ b/recipes/starbound/instruments/tool2/nylonguitar.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"ironbar","polymer"], - "output" : "nylonguitar", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"ironbar","polymer"], + "output": "nylonguitar", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/piano.recipe b/recipes/starbound/instruments/tool2/piano.recipe index 7df58aee..010c0062 100644 --- a/recipes/starbound/instruments/tool2/piano.recipe +++ b/recipes/starbound/instruments/tool2/piano.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"ironbar"], - "output" : "piano", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"ironbar"], + "output": "piano", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/reedorgan.recipe b/recipes/starbound/instruments/tool2/reedorgan.recipe index 76a6997b..25e6edf0 100644 --- a/recipes/starbound/instruments/tool2/reedorgan.recipe +++ b/recipes/starbound/instruments/tool2/reedorgan.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"ironbar"], - "output" : "reedorgan", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"ironbar"], + "output": "reedorgan", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool2/steeldrum.recipe b/recipes/starbound/instruments/tool2/steeldrum.recipe index eccb9a99..f9cd875c 100644 --- a/recipes/starbound/instruments/tool2/steeldrum.recipe +++ b/recipes/starbound/instruments/tool2/steeldrum.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["polymer",3]], - "output" : "steeldrum", - "groups" : ["sb_ironcraftingtable","sb_instruments","all"] + "input": [["sb_steelbar",3],["polymer",3]], + "output": "steeldrum", + "groups": ["sb_ironcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/microphone.recipe b/recipes/starbound/instruments/tool3/microphone.recipe index 4f6c29a4..e881f5c8 100644 --- a/recipes/starbound/instruments/tool3/microphone.recipe +++ b/recipes/starbound/instruments/tool3/microphone.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_steelbar","siliconboard","wire"], - "output" : "microphone", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": ["sb_steelbar","siliconboard","wire"], + "output": "microphone", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/microphonefem.recipe b/recipes/starbound/instruments/tool3/microphonefem.recipe index a692fa33..65905ec5 100644 --- a/recipes/starbound/instruments/tool3/microphonefem.recipe +++ b/recipes/starbound/instruments/tool3/microphonefem.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_steelbar","siliconboard","wire"], - "output" : "microphonefem", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": ["sb_steelbar","siliconboard","wire"], + "output": "microphonefem", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/overdriveguitar.recipe b/recipes/starbound/instruments/tool3/overdriveguitar.recipe index 888240b5..b8db1946 100644 --- a/recipes/starbound/instruments/tool3/overdriveguitar.recipe +++ b/recipes/starbound/instruments/tool3/overdriveguitar.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",20],["string",5],"sb_steelbar","siliconboard"], - "output" : "overdriveguitar", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",20],["string",5],"sb_steelbar","siliconboard"], + "output": "overdriveguitar", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/rockorgan.recipe b/recipes/starbound/instruments/tool3/rockorgan.recipe index 32c574f1..a8b30aa8 100644 --- a/recipes/starbound/instruments/tool3/rockorgan.recipe +++ b/recipes/starbound/instruments/tool3/rockorgan.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], - "output" : "rockorgan", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], + "output": "rockorgan", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/spaceorgan.recipe b/recipes/starbound/instruments/tool3/spaceorgan.recipe index cdf29680..ad94a8ad 100644 --- a/recipes/starbound/instruments/tool3/spaceorgan.recipe +++ b/recipes/starbound/instruments/tool3/spaceorgan.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], - "output" : "spaceorgan", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], + "output": "spaceorgan", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/instruments/tool3/squareorgan.recipe b/recipes/starbound/instruments/tool3/squareorgan.recipe index 72c7b278..aaacecba 100644 --- a/recipes/starbound/instruments/tool3/squareorgan.recipe +++ b/recipes/starbound/instruments/tool3/squareorgan.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], - "output" : "squarewave", - "groups" : ["sb_roboticcraftingtable","sb_instruments","all"] + "input": [["darkwoodmaterial",5],["polymer",5],"sb_steelbar","siliconboard"], + "output": "squarewave", + "groups": ["sb_roboticcraftingtable","sb_instruments","all"] } \ No newline at end of file diff --git a/recipes/starbound/ladders/copperladder.recipe b/recipes/starbound/ladders/copperladder.recipe index f56f17f2..7a9d22a0 100644 --- a/recipes/starbound/ladders/copperladder.recipe +++ b/recipes/starbound/ladders/copperladder.recipe @@ -1,6 +1,6 @@ { - "input" : ["copperbar"], - "output" : ["sb_copperladder",75], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","all"] + "input": ["copperbar"], + "output": ["sb_copperladder",75], + "duration": 0.25, + "groups": ["craftingfurniture","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/ladders/medievalladder.recipe b/recipes/starbound/ladders/medievalladder.recipe index 5cc9f13f..d0bc0dec 100644 --- a/recipes/starbound/ladders/medievalladder.recipe +++ b/recipes/starbound/ladders/medievalladder.recipe @@ -1,6 +1,6 @@ { - "input" : ["darkwoodmaterial","plantfibre"], - "output" : ["sb_medievalladder",15], - "duration" : 0.25, - "groups" : ["craftingfurniture","materials","tools","all","plain"] + "input": ["darkwoodmaterial","plantfibre"], + "output": ["sb_medievalladder",15], + "duration": 0.25, + "groups": ["craftingfurniture","materials","tools","all","plain"] } \ No newline at end of file diff --git a/recipes/starbound/ladders/modernladder.recipe b/recipes/starbound/ladders/modernladder.recipe index a2026309..08d6526a 100644 --- a/recipes/starbound/ladders/modernladder.recipe +++ b/recipes/starbound/ladders/modernladder.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumbar"], - "output" : ["sb_modernladder",65], - "duration" : 0.25, - "groups" : ["craftingfurniture2","materials","all"] + "input": ["titaniumbar"], + "output": ["sb_modernladder",65], + "duration": 0.25, + "groups": ["craftingfurniture2","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/metalworkstation/basic/gun/bouncingshot.recipe b/recipes/starbound/metalworkstation/basic/gun/bouncingshot.recipe index 621491d2..dafcca12 100644 --- a/recipes/starbound/metalworkstation/basic/gun/bouncingshot.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/bouncingshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"bouncingshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"bouncingshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/burstshot.recipe b/recipes/starbound/metalworkstation/basic/gun/burstshot.recipe index 7e2d761d..3d3d31b8 100644 --- a/recipes/starbound/metalworkstation/basic/gun/burstshot.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/burstshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"burstshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"burstshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/explosiveshot.recipe b/recipes/starbound/metalworkstation/basic/gun/explosiveshot.recipe index 4554cac2..d9c55f39 100644 --- a/recipes/starbound/metalworkstation/basic/gun/explosiveshot.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/explosiveshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"explosiveshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"explosiveshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/flashlight.recipe b/recipes/starbound/metalworkstation/basic/gun/flashlight.recipe index 537e1b22..c7e44cef 100644 --- a/recipes/starbound/metalworkstation/basic/gun/flashlight.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/flashlight.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"flashlight"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"flashlight"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/grenadelauncher.recipe b/recipes/starbound/metalworkstation/basic/gun/grenadelauncher.recipe index 589a49ff..bf47bf07 100644 --- a/recipes/starbound/metalworkstation/basic/gun/grenadelauncher.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/grenadelauncher.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"grenadelauncher"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"grenadelauncher"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/guidedrocket.recipe b/recipes/starbound/metalworkstation/basic/gun/guidedrocket.recipe index eb4836ca..6d5e6d1c 100644 --- a/recipes/starbound/metalworkstation/basic/gun/guidedrocket.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/guidedrocket.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"guidedrocket"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"guidedrocket"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/homingrocket.recipe b/recipes/starbound/metalworkstation/basic/gun/homingrocket.recipe index df6e1873..5fa69f65 100644 --- a/recipes/starbound/metalworkstation/basic/gun/homingrocket.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/homingrocket.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"homingrocket"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"homingrocket"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/piercingshot.recipe b/recipes/starbound/metalworkstation/basic/gun/piercingshot.recipe index 9f284c5c..52632984 100644 --- a/recipes/starbound/metalworkstation/basic/gun/piercingshot.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/piercingshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"piercingshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"piercingshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/rocketburst.recipe b/recipes/starbound/metalworkstation/basic/gun/rocketburst.recipe index 14e96dfa..4c27b294 100644 --- a/recipes/starbound/metalworkstation/basic/gun/rocketburst.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/rocketburst.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"rocketburst"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"rocketburst"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/sb_physicallance.recipe b/recipes/starbound/metalworkstation/basic/gun/sb_physicallance.recipe index 856bc0a4..184a54e1 100644 --- a/recipes/starbound/metalworkstation/basic/gun/sb_physicallance.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/sb_physicallance.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"sb_physicallance"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"sb_physicallance"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/sb_vacuum.recipe b/recipes/starbound/metalworkstation/basic/gun/sb_vacuum.recipe index c4af5ee9..ef1364b2 100644 --- a/recipes/starbound/metalworkstation/basic/gun/sb_vacuum.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/sb_vacuum.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"sb_vacuum"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"sb_vacuum"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/shrapnelbomb.recipe b/recipes/starbound/metalworkstation/basic/gun/shrapnelbomb.recipe index d57224a9..604f1d66 100644 --- a/recipes/starbound/metalworkstation/basic/gun/shrapnelbomb.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/shrapnelbomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"shrapnelbomb"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"shrapnelbomb"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/spray.recipe b/recipes/starbound/metalworkstation/basic/gun/spray.recipe index dea59646..e947a4d6 100644 --- a/recipes/starbound/metalworkstation/basic/gun/spray.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/spray.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"spray"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"spray"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/gun/stickyshot.recipe b/recipes/starbound/metalworkstation/basic/gun/stickyshot.recipe index bd139f59..5f73a849 100644 --- a/recipes/starbound/metalworkstation/basic/gun/stickyshot.recipe +++ b/recipes/starbound/metalworkstation/basic/gun/stickyshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"stickyshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"stickyshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/bladecharge.recipe b/recipes/starbound/metalworkstation/basic/melee/bladecharge.recipe index ff1ac7c2..9598601d 100644 --- a/recipes/starbound/metalworkstation/basic/melee/bladecharge.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/bladecharge.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"bladecharge"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"bladecharge"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/downstab.recipe b/recipes/starbound/metalworkstation/basic/melee/downstab.recipe index a992775b..51c00a64 100644 --- a/recipes/starbound/metalworkstation/basic/melee/downstab.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/downstab.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"downstab"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"downstab"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/flurry.recipe b/recipes/starbound/metalworkstation/basic/melee/flurry.recipe index 4960205f..0b2ab1bb 100644 --- a/recipes/starbound/metalworkstation/basic/melee/flurry.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/flurry.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"flurry"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"flurry"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/groundslam.recipe b/recipes/starbound/metalworkstation/basic/melee/groundslam.recipe index e23be857..1477c97a 100644 --- a/recipes/starbound/metalworkstation/basic/melee/groundslam.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/groundslam.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"groundslam"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"groundslam"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/parry.recipe b/recipes/starbound/metalworkstation/basic/melee/parry.recipe index a1cfc14a..2be83ebf 100644 --- a/recipes/starbound/metalworkstation/basic/melee/parry.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/parry.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"parry"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"parry"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/physicalshockwave.recipe b/recipes/starbound/metalworkstation/basic/melee/physicalshockwave.recipe index e9bc5cc5..24c84ec8 100644 --- a/recipes/starbound/metalworkstation/basic/melee/physicalshockwave.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/physicalshockwave.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"physicalshockwave"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"physicalshockwave"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/risingslash.recipe b/recipes/starbound/metalworkstation/basic/melee/risingslash.recipe index f0359eb2..b418e83e 100644 --- a/recipes/starbound/metalworkstation/basic/melee/risingslash.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/risingslash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"risingslash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"risingslash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/spearspin.recipe b/recipes/starbound/metalworkstation/basic/melee/spearspin.recipe index 729e9df2..86e26e9f 100644 --- a/recipes/starbound/metalworkstation/basic/melee/spearspin.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/spearspin.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"spearspin"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"spearspin"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/spinslash.recipe b/recipes/starbound/metalworkstation/basic/melee/spinslash.recipe index 31a729fa..850407a4 100644 --- a/recipes/starbound/metalworkstation/basic/melee/spinslash.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/spinslash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"spinslash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"spinslash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/superspinslash.recipe b/recipes/starbound/metalworkstation/basic/melee/superspinslash.recipe index 9bde0a34..04f56950 100644 --- a/recipes/starbound/metalworkstation/basic/melee/superspinslash.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/superspinslash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"superspinslash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"superspinslash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/basic/melee/uppercut.recipe b/recipes/starbound/metalworkstation/basic/melee/uppercut.recipe index 08512835..2ce83e8f 100644 --- a/recipes/starbound/metalworkstation/basic/melee/uppercut.recipe +++ b/recipes/starbound/metalworkstation/basic/melee/uppercut.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"uppercut"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"uppercut"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/elements/electric.recipe b/recipes/starbound/metalworkstation/elements/electric.recipe index 4bc7bd8b..17236f1b 100644 --- a/recipes/starbound/metalworkstation/elements/electric.recipe +++ b/recipes/starbound/metalworkstation/elements/electric.recipe @@ -1,5 +1,5 @@ { - "input" : ["staticcell","diamond"], - "output" : ["sb_elementmod",1,{"element":"electric"}], - "groups" : ["sb_metalworkstation","sb_elements","all"] -} \ No newline at end of file + "input": ["staticcell","diamond"], + "output": ["sb_elementmod",1,{"element":"electric"}], + "groups": ["sb_metalworkstation","sb_elements","all"] +} diff --git a/recipes/starbound/metalworkstation/elements/fire.recipe b/recipes/starbound/metalworkstation/elements/fire.recipe index bc6d70c1..45fc5d94 100644 --- a/recipes/starbound/metalworkstation/elements/fire.recipe +++ b/recipes/starbound/metalworkstation/elements/fire.recipe @@ -1,5 +1,5 @@ { - "input" : ["scorchedcore","diamond"], - "output" : ["sb_elementmod",1,{"element":"fire"}], - "groups" : ["sb_metalworkstation","sb_elements","all"] -} \ No newline at end of file + "input": ["scorchedcore","diamond"], + "output": ["sb_elementmod",1,{"element":"fire"}], + "groups": ["sb_metalworkstation","sb_elements","all"] +} diff --git a/recipes/starbound/metalworkstation/elements/ice.recipe b/recipes/starbound/metalworkstation/elements/ice.recipe index 78e90c9f..7dc1a39b 100644 --- a/recipes/starbound/metalworkstation/elements/ice.recipe +++ b/recipes/starbound/metalworkstation/elements/ice.recipe @@ -1,5 +1,5 @@ { - "input" : ["cryonicextract","diamond"], - "output" : ["sb_elementmod",1,{"element":"ice"}], - "groups" : ["sb_metalworkstation","sb_elements","all"] -} \ No newline at end of file + "input": ["cryonicextract","diamond"], + "output": ["sb_elementmod",1,{"element":"ice"}], + "groups": ["sb_metalworkstation","sb_elements","all"] +} diff --git a/recipes/starbound/metalworkstation/elements/poison.recipe b/recipes/starbound/metalworkstation/elements/poison.recipe index c9a18e74..5e0ee0fa 100644 --- a/recipes/starbound/metalworkstation/elements/poison.recipe +++ b/recipes/starbound/metalworkstation/elements/poison.recipe @@ -1,5 +1,5 @@ { - "input" : ["venomsample","diamond"], - "output" : ["sb_elementmod",1,{"element":"poison"}], - "groups" : ["sb_metalworkstation","sb_elements","all"] -} \ No newline at end of file + "input": ["venomsample","diamond"], + "output": ["sb_elementmod",1,{"element":"poison"}], + "groups": ["sb_metalworkstation","sb_elements","all"] +} diff --git a/recipes/starbound/metalworkstation/random.recipe b/recipes/starbound/metalworkstation/random.recipe new file mode 100644 index 00000000..00017537 --- /dev/null +++ b/recipes/starbound/metalworkstation/random.recipe @@ -0,0 +1,5 @@ +{ + "input": [["platinumbar",3],"diamond"], + "output": "sb_randomabilitymod", + "groups": ["sb_metalworkstation","sb_melee","sb_gun","sb_wand","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/gun/deathbomb.recipe b/recipes/starbound/metalworkstation/special/gun/deathbomb.recipe index bc3a229f..440a6436 100644 --- a/recipes/starbound/metalworkstation/special/gun/deathbomb.recipe +++ b/recipes/starbound/metalworkstation/special/gun/deathbomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"deathbomb"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"deathbomb"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/special/gun/explosiveburst.recipe b/recipes/starbound/metalworkstation/special/gun/explosiveburst.recipe index 5c4b9734..1206a42c 100644 --- a/recipes/starbound/metalworkstation/special/gun/explosiveburst.recipe +++ b/recipes/starbound/metalworkstation/special/gun/explosiveburst.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"explosiveburst"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"explosiveburst"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/special/gun/lance.recipe b/recipes/starbound/metalworkstation/special/gun/lance.recipe index 5f94fb4c..fb30a8a6 100644 --- a/recipes/starbound/metalworkstation/special/gun/lance.recipe +++ b/recipes/starbound/metalworkstation/special/gun/lance.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"lance"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"lance"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/special/gun/markedshot.recipe b/recipes/starbound/metalworkstation/special/gun/markedshot.recipe index 771f77a8..48a2e569 100644 --- a/recipes/starbound/metalworkstation/special/gun/markedshot.recipe +++ b/recipes/starbound/metalworkstation/special/gun/markedshot.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"markedshot"}], - "groups" : ["sb_metalworkstation","sb_gun","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"markedshot"}], + "groups": ["sb_metalworkstation","sb_gun","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/barrier.recipe b/recipes/starbound/metalworkstation/special/melee/barrier.recipe index f6bb9ca2..5d21912f 100644 --- a/recipes/starbound/metalworkstation/special/melee/barrier.recipe +++ b/recipes/starbound/metalworkstation/special/melee/barrier.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"barrier"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"barrier"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/blinkexplosion.recipe b/recipes/starbound/metalworkstation/special/melee/blinkexplosion.recipe index 43ed2e60..49236094 100644 --- a/recipes/starbound/metalworkstation/special/melee/blinkexplosion.recipe +++ b/recipes/starbound/metalworkstation/special/melee/blinkexplosion.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"blinkexplosion"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"blinkexplosion"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/blinkslash.recipe b/recipes/starbound/metalworkstation/special/melee/blinkslash.recipe index af9f7319..abc7dac4 100644 --- a/recipes/starbound/metalworkstation/special/melee/blinkslash.recipe +++ b/recipes/starbound/metalworkstation/special/melee/blinkslash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"blinkslash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"blinkslash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/elementalaura.recipe b/recipes/starbound/metalworkstation/special/melee/elementalaura.recipe index d73c5944..d8dc1fa6 100644 --- a/recipes/starbound/metalworkstation/special/melee/elementalaura.recipe +++ b/recipes/starbound/metalworkstation/special/melee/elementalaura.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementalaura"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementalaura"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/elementalpillar.recipe b/recipes/starbound/metalworkstation/special/melee/elementalpillar.recipe index 746b6318..ca876ddb 100644 --- a/recipes/starbound/metalworkstation/special/melee/elementalpillar.recipe +++ b/recipes/starbound/metalworkstation/special/melee/elementalpillar.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementalpillar"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementalpillar"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/elementalspin.recipe b/recipes/starbound/metalworkstation/special/melee/elementalspin.recipe index 5bcf785b..e7cd2aba 100644 --- a/recipes/starbound/metalworkstation/special/melee/elementalspin.recipe +++ b/recipes/starbound/metalworkstation/special/melee/elementalspin.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementalspin"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementalspin"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/giantsword.recipe b/recipes/starbound/metalworkstation/special/melee/giantsword.recipe index 8ec3eb9f..a4295288 100644 --- a/recipes/starbound/metalworkstation/special/melee/giantsword.recipe +++ b/recipes/starbound/metalworkstation/special/melee/giantsword.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"giantsword"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"giantsword"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/rocketspear.recipe b/recipes/starbound/metalworkstation/special/melee/rocketspear.recipe index 0be149ff..beb44e5d 100644 --- a/recipes/starbound/metalworkstation/special/melee/rocketspear.recipe +++ b/recipes/starbound/metalworkstation/special/melee/rocketspear.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"rocketspear"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"rocketspear"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/shockwave.recipe b/recipes/starbound/metalworkstation/special/melee/shockwave.recipe index f9b127ca..9abb0342 100644 --- a/recipes/starbound/metalworkstation/special/melee/shockwave.recipe +++ b/recipes/starbound/metalworkstation/special/melee/shockwave.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"shockwave"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"shockwave"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/traildash.recipe b/recipes/starbound/metalworkstation/special/melee/traildash.recipe index 81e93882..cabfa196 100644 --- a/recipes/starbound/metalworkstation/special/melee/traildash.recipe +++ b/recipes/starbound/metalworkstation/special/melee/traildash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"traildash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"traildash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/melee/travelingslash.recipe b/recipes/starbound/metalworkstation/special/melee/travelingslash.recipe index 81473f52..bbd38196 100644 --- a/recipes/starbound/metalworkstation/special/melee/travelingslash.recipe +++ b/recipes/starbound/metalworkstation/special/melee/travelingslash.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"travelingslash"}], - "groups" : ["sb_metalworkstation","sb_melee","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"travelingslash"}], + "groups": ["sb_metalworkstation","sb_melee","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/energyzone.recipe b/recipes/starbound/metalworkstation/special/staff/energyzone.recipe index 19725b80..924a2695 100644 --- a/recipes/starbound/metalworkstation/special/staff/energyzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/energyzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"energyzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"energyzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/forcecage.recipe b/recipes/starbound/metalworkstation/special/staff/forcecage.recipe index 8718fb60..2edf3ce9 100644 --- a/recipes/starbound/metalworkstation/special/staff/forcecage.recipe +++ b/recipes/starbound/metalworkstation/special/staff/forcecage.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"forcecage"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"forcecage"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/healingzone.recipe b/recipes/starbound/metalworkstation/special/staff/healingzone.recipe index f933b599..53bf928a 100644 --- a/recipes/starbound/metalworkstation/special/staff/healingzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/healingzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"healingzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"healingzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/lowgravzone.recipe b/recipes/starbound/metalworkstation/special/staff/lowgravzone.recipe index c5d349b9..18e8cfac 100644 --- a/recipes/starbound/metalworkstation/special/staff/lowgravzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/lowgravzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"lowgravzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"lowgravzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/pullzone.recipe b/recipes/starbound/metalworkstation/special/staff/pullzone.recipe index 075a57ec..7ddf8606 100644 --- a/recipes/starbound/metalworkstation/special/staff/pullzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/pullzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"pullzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"pullzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/pushzone.recipe b/recipes/starbound/metalworkstation/special/staff/pushzone.recipe index 9780a9db..5da1aacd 100644 --- a/recipes/starbound/metalworkstation/special/staff/pushzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/pushzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"pushzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"pushzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/staff/slowzone.recipe b/recipes/starbound/metalworkstation/special/staff/slowzone.recipe index 92794de3..f3240f11 100644 --- a/recipes/starbound/metalworkstation/special/staff/slowzone.recipe +++ b/recipes/starbound/metalworkstation/special/staff/slowzone.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"slowzone"}], - "groups" : ["sb_metalworkstation","sb_staff","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"slowzone"}], + "groups": ["sb_metalworkstation","sb_staff","all"] +} diff --git a/recipes/starbound/metalworkstation/special/wand/elementbouncer.recipe b/recipes/starbound/metalworkstation/special/wand/elementbouncer.recipe index 48b5de38..6156de39 100644 --- a/recipes/starbound/metalworkstation/special/wand/elementbouncer.recipe +++ b/recipes/starbound/metalworkstation/special/wand/elementbouncer.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementbouncer"}], - "groups" : ["sb_metalworkstation","sb_wand","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementbouncer"}], + "groups": ["sb_metalworkstation","sb_wand","all"] +} diff --git a/recipes/starbound/metalworkstation/special/wand/elementorb.recipe b/recipes/starbound/metalworkstation/special/wand/elementorb.recipe index 0de3009d..e76320c7 100644 --- a/recipes/starbound/metalworkstation/special/wand/elementorb.recipe +++ b/recipes/starbound/metalworkstation/special/wand/elementorb.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementorb"}], - "groups" : ["sb_metalworkstation","sb_wand","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementorb"}], + "groups": ["sb_metalworkstation","sb_wand","all"] +} diff --git a/recipes/starbound/metalworkstation/special/wand/elementportal.recipe b/recipes/starbound/metalworkstation/special/wand/elementportal.recipe index 28f6b3aa..0d476d3a 100644 --- a/recipes/starbound/metalworkstation/special/wand/elementportal.recipe +++ b/recipes/starbound/metalworkstation/special/wand/elementportal.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementportal"}], - "groups" : ["sb_metalworkstation","sb_wand","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementportal"}], + "groups": ["sb_metalworkstation","sb_wand","all"] +} diff --git a/recipes/starbound/metalworkstation/special/wand/elementrain.recipe b/recipes/starbound/metalworkstation/special/wand/elementrain.recipe index 95dec115..84522705 100644 --- a/recipes/starbound/metalworkstation/special/wand/elementrain.recipe +++ b/recipes/starbound/metalworkstation/special/wand/elementrain.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementrain"}], - "groups" : ["sb_metalworkstation","sb_wand","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementrain"}], + "groups": ["sb_metalworkstation","sb_wand","all"] +} diff --git a/recipes/starbound/metalworkstation/special/wand/elementswarm.recipe b/recipes/starbound/metalworkstation/special/wand/elementswarm.recipe index 6ebde772..347718d7 100644 --- a/recipes/starbound/metalworkstation/special/wand/elementswarm.recipe +++ b/recipes/starbound/metalworkstation/special/wand/elementswarm.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","diamond"], - "output" : ["sb_abilitymod",1,{"ability":"elementswarm"}], - "groups" : ["sb_metalworkstation","sb_wand","all"] -} \ No newline at end of file + "input": [["platinumbar",3],"diamond"], + "output": ["sb_abilitymod",1,{"ability":"elementswarm"}], + "groups": ["sb_metalworkstation","sb_wand","all"] +} diff --git a/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe b/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe index 56294399..feb4a8ef 100644 --- a/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe +++ b/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_ceruliumore",3],"goldbar"], - "output" : ["sb_ceruliumcompound",2], - "duration" : 0.15, - "groups" : ["ivrpgminerstation","bars","all","nouncrafting"] + "input": [["sb_ceruliumore",3],"goldbar"], + "output": ["sb_ceruliumcompound",2], + "duration": 0.15, + "groups": ["ivrpgminerstation","bars","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe b/recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe index de27e21b..413bd9ac 100644 --- a/recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe +++ b/recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe @@ -1,6 +1,6 @@ { - "input" : [["platinumore",3]], - "output" : ["platinumbar",2], - "duration" : 0.15, - "groups" : ["ivrpgminerstation","bars","all","nouncrafting"] + "input": [["platinumore",3]], + "output": ["platinumbar",2], + "duration": 0.15, + "groups": ["ivrpgminerstation","bars","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe b/recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe index a72918fe..87dc1b39 100644 --- a/recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe +++ b/recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_rubiumore",3]], - "output" : ["sb_refinedrubium",2], - "duration" : 0.15, - "groups" : ["ivrpgminerstation","bars","all","nouncrafting"] + "input": [["sb_rubiumore",3]], + "output": ["sb_refinedrubium",2], + "duration": 0.15, + "groups": ["ivrpgminerstation","bars","all","nouncrafting"] } \ No newline at end of file diff --git a/recipes/starbound/mods/seeds/crystalplantseed.recipe b/recipes/starbound/mods/seeds/crystalplantseed.recipe index 20ea99c0..a71697ab 100644 --- a/recipes/starbound/mods/seeds/crystalplantseed.recipe +++ b/recipes/starbound/mods/seeds/crystalplantseed.recipe @@ -1,5 +1,5 @@ { - "input" : ["crystalplant",["plantfibre",4]], - "output" : "crystalplantseed", - "groups" : ["seedmaker","seedsMods","all"] + "input": ["crystalplant",["plantfibre",4]], + "output": "crystalplantseed", + "groups": ["seedmaker","seedsMods","all"] } \ No newline at end of file diff --git a/recipes/starbound/mods/seeds/poisoncreepseed.recipe b/recipes/starbound/mods/seeds/poisoncreepseed.recipe index 07be8f1b..837c2ba2 100644 --- a/recipes/starbound/mods/seeds/poisoncreepseed.recipe +++ b/recipes/starbound/mods/seeds/poisoncreepseed.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_poisoncreep",["plantfibre",4]], - "output" : "sb_poisoncreepseed", - "groups" : ["seedmaker","seedsMods","all"] + "input": ["sb_poisoncreep",["plantfibre",4]], + "output": "sb_poisoncreepseed", + "groups": ["seedmaker","seedsMods","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe index 28ece2d5..dea5d77f 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagearm",3], - "groups" : ["peacekeeper1","all"] + "input": ["peacecredit"], + "output": ["salvagearm",3], + "groups": ["peacekeeper1","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe index cee5fe9b..38163cc2 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagebody",3], - "groups" : ["peacekeeper1","all"] + "input": ["peacecredit"], + "output": ["salvagebody",3], + "groups": ["peacekeeper1","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe index 7ddba56a..33d0f812 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagebooster",3], - "groups" : ["peacekeeper1","all"] + "input": ["peacecredit"], + "output": ["salvagebooster",3], + "groups": ["peacekeeper1","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe index 7e699b5d..354c2de1 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagelegs",3], - "groups" : ["peacekeeper1","all"] + "input": ["peacecredit"], + "output": ["salvagelegs",3], + "groups": ["peacekeeper1","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe index cc510f6d..c38d8d5d 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",8]], - "output" : "sb_arrester", - "groups" : ["peacekeeper2","all"] + "input": [["peacecredit",8]], + "output": "sb_arrester", + "groups": ["peacekeeper2","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe index 918ce591..a952654d 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",3]], - "output" : ["sb_musicsheet",1,{"music":"dead-or-alive"}], - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": [["peacecredit",3]], + "output": ["sb_musicsheet",1,{"music":"dead-or-alive"}], + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe index 6d91ea1a..51958f3f 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",3]], - "output" : ["sb_musicsheet",1,{"music":"housecleaning"}], - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": [["peacecredit",3]], + "output": ["sb_musicsheet",1,{"music":"housecleaning"}], + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe index 9a996fbe..4961e83a 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : "sb_radio", - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": ["peacecredit"], + "output": "sb_radio", + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe index d7a84977..0a42c90a 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : "sb_songbook", - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": ["peacecredit"], + "output": "sb_songbook", + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe index 6a16844e..3c98a566 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["supermatter",5], - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": ["peacecredit"], + "output": ["supermatter",5], + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/the-peacekeepers.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/the-peacekeepers.recipe index b731dc2d..6c669880 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper2/the-peacekeepers.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/the-peacekeepers.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",3]], - "output" : ["sb_musicsheet",1,{"music":"the-peacekeepers"}], - "groups" : ["peacekeeper2","nouncrafting","all"] + "input": [["peacecredit",3]], + "output": ["sb_musicsheet",1,{"music":"the-peacekeepers"}], + "groups": ["peacekeeper2","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe index 61dcd4a7..19f4a9b8 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["sb_peacekeeper_repair",3], - "groups" : ["peacekeeper3","all"] + "input": ["peacecredit"], + "output": ["sb_peacekeeper_repair",3], + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe index 7d9bb861..c8d216c1 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",15],"teleportercore"], - "output" : "sb_peacekeeperteleporter", - "groups" : ["peacekeeper3","all"] + "input": [["peacecredit",15],"teleportercore"], + "output": "sb_peacekeeperteleporter", + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe index 5374dad4..dd8089b0 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",15],"teleportercore"], - "output" : "peacekeepervendingmachine", - "groups" : ["peacekeeper3","all"] + "input": [["peacecredit",15],"teleportercore"], + "output": "peacekeepervendingmachine", + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe index 406a2eab..4fc01e1b 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagetier4",3], - "groups" : ["peacekeeper3","all"] + "input": ["peacecredit"], + "output": ["salvagetier4",3], + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe index f9e90c86..17e7365e 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagetier5",3], - "groups" : ["peacekeeper3","all"] + "input": ["peacecredit"], + "output": ["salvagetier5",3], + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe index d731d9f5..e1f2675c 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe @@ -1,5 +1,5 @@ { - "input" : [["peacecredit",15],"teleportercore"], - "output" : "translocator", - "groups" : ["peacekeeper3","all"] + "input": [["peacecredit",15],"teleportercore"], + "output": "translocator", + "groups": ["peacekeeper3","all"] } \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe b/recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe index 9d2a0a2f..55f56e0f 100644 --- a/recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe +++ b/recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe @@ -1,5 +1,5 @@ { - "input" : ["peacecredit"], - "output" : ["salvagetier6",3], - "groups" : ["peacekeeper4","all"] + "input": ["peacecredit"], + "output": ["salvagetier6",3], + "groups": ["peacekeeper4","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/decoration/barvent.recipe b/recipes/starbound/portable3dprinter/decoration/barvent.recipe index 82f04311..93e889a5 100644 --- a/recipes/starbound/portable3dprinter/decoration/barvent.recipe +++ b/recipes/starbound/portable3dprinter/decoration/barvent.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",90]], - "output" : "barvent", - "groups" : ["sb_portable3dprinter","decoration","all"] + "input": [["money",90]], + "output": "barvent", + "groups": ["sb_portable3dprinter","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/decoration/vent.recipe b/recipes/starbound/portable3dprinter/decoration/vent.recipe index 7eb5efb3..567a62bf 100644 --- a/recipes/starbound/portable3dprinter/decoration/vent.recipe +++ b/recipes/starbound/portable3dprinter/decoration/vent.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",60]], - "output" : "vent", - "groups" : ["sb_portable3dprinter","decoration","all"] + "input": [["money",60]], + "output": "vent", + "groups": ["sb_portable3dprinter","decoration","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/doors/slidingdoor.recipe b/recipes/starbound/portable3dprinter/doors/slidingdoor.recipe index 0da7bc3c..f221d3b4 100644 --- a/recipes/starbound/portable3dprinter/doors/slidingdoor.recipe +++ b/recipes/starbound/portable3dprinter/doors/slidingdoor.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",140]],//setting this to 150 makes it not appear for some strange reason - "output" : "slidingdoor", - "groups" : ["sb_portable3dprinter","doors","all"] + "input": [["money",140]],//setting this to 150 makes it not appear for some strange reason + "output": "slidingdoor", + "groups": ["sb_portable3dprinter","doors","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/furniture/modernchair.recipe b/recipes/starbound/portable3dprinter/furniture/modernchair.recipe index 91a08796..24e7fdc9 100644 --- a/recipes/starbound/portable3dprinter/furniture/modernchair.recipe +++ b/recipes/starbound/portable3dprinter/furniture/modernchair.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",130]], - "output" : "modernchair", - "groups" : ["sb_portable3dprinter","furniture","all"] + "input": [["money",130]], + "output": "modernchair", + "groups": ["sb_portable3dprinter","furniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/furniture/moderntable.recipe b/recipes/starbound/portable3dprinter/furniture/moderntable.recipe index 1fc2e112..af4168c8 100644 --- a/recipes/starbound/portable3dprinter/furniture/moderntable.recipe +++ b/recipes/starbound/portable3dprinter/furniture/moderntable.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",160]], - "output" : "moderntable", - "groups" : ["sb_portable3dprinter","furniture","all"] + "input": [["money",160]], + "output": "moderntable", + "groups": ["sb_portable3dprinter","furniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/apexfightlantern.recipe b/recipes/starbound/portable3dprinter/lights/apexfightlantern.recipe index 6ddb9281..46c5e57d 100644 --- a/recipes/starbound/portable3dprinter/lights/apexfightlantern.recipe +++ b/recipes/starbound/portable3dprinter/lights/apexfightlantern.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",75]], - "output" : "apexfightlantern", - "groups" : ["sb_portable3dprinter","lights","all"] + "input": [["money",75]], + "output": "apexfightlantern", + "groups": ["sb_portable3dprinter","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/apexshiplight.recipe b/recipes/starbound/portable3dprinter/lights/apexshiplight.recipe index b7a61245..c8306701 100644 --- a/recipes/starbound/portable3dprinter/lights/apexshiplight.recipe +++ b/recipes/starbound/portable3dprinter/lights/apexshiplight.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",100]], - "output" : "apexshiplight", - "groups" : ["sb_portable3dprinter","lights","all"] + "input": [["money",100]], + "output": "apexshiplight", + "groups": ["sb_portable3dprinter","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/futurelight.recipe b/recipes/starbound/portable3dprinter/lights/futurelight.recipe index 0310d150..a93b3fdd 100644 --- a/recipes/starbound/portable3dprinter/lights/futurelight.recipe +++ b/recipes/starbound/portable3dprinter/lights/futurelight.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",80]], - "output" : "futurelight", - "groups" : ["sb_portable3dprinter","lights","all"] + "input": [["money",80]], + "output": "futurelight", + "groups": ["sb_portable3dprinter","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/nanostove.recipe b/recipes/starbound/portable3dprinter/lights/nanostove.recipe index 8243d1ad..36d33344 100644 --- a/recipes/starbound/portable3dprinter/lights/nanostove.recipe +++ b/recipes/starbound/portable3dprinter/lights/nanostove.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",200]], - "output" : "nanostove", - "groups" : ["sb_portable3dprinter","other","all"] + "input": [["money",200]], + "output": "nanostove", + "groups": ["sb_portable3dprinter","other","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/shiplight.recipe b/recipes/starbound/portable3dprinter/lights/shiplight.recipe index e0af6300..3dec6fa4 100644 --- a/recipes/starbound/portable3dprinter/lights/shiplight.recipe +++ b/recipes/starbound/portable3dprinter/lights/shiplight.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",75]], - "output" : "shiplight", - "groups" : ["sb_portable3dprinter","lights","all"] + "input": [["money",75]], + "output": "shiplight", + "groups": ["sb_portable3dprinter","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/lights/walllight.recipe b/recipes/starbound/portable3dprinter/lights/walllight.recipe index 5bd48f39..a8d72719 100644 --- a/recipes/starbound/portable3dprinter/lights/walllight.recipe +++ b/recipes/starbound/portable3dprinter/lights/walllight.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",150]], - "output" : "sb_walllight", - "groups" : ["sb_portable3dprinter","lights","all"] + "input": [["money",150]], + "output": "sb_walllight", + "groups": ["sb_portable3dprinter","lights","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/nanowrap.recipe b/recipes/starbound/portable3dprinter/nanowrap.recipe index 707aa46b..5a23ff79 100644 --- a/recipes/starbound/portable3dprinter/nanowrap.recipe +++ b/recipes/starbound/portable3dprinter/nanowrap.recipe @@ -1,5 +1,5 @@ { - "input" : [["bandage",4],["money",50]], - "output" : "nanowrap", - "groups" : ["sb_portable3dprinter","other","all"] + "input": [["bandage",4],["money",50]], + "output": "nanowrap", + "groups": ["sb_portable3dprinter","other","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/storage/podchest.recipe b/recipes/starbound/portable3dprinter/storage/podchest.recipe index b85e80ec..0bf4f5ca 100644 --- a/recipes/starbound/portable3dprinter/storage/podchest.recipe +++ b/recipes/starbound/portable3dprinter/storage/podchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",160]], - "output" : "podchest", - "groups" : ["sb_portable3dprinter","storage","all"] + "input": [["money",160]], + "output": "podchest", + "groups": ["sb_portable3dprinter","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/storage/techchest.recipe b/recipes/starbound/portable3dprinter/storage/techchest.recipe index b3350b88..710885f7 100644 --- a/recipes/starbound/portable3dprinter/storage/techchest.recipe +++ b/recipes/starbound/portable3dprinter/storage/techchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",130]], - "output" : "techchest", - "groups" : ["sb_portable3dprinter","storage","all"] + "input": [["money",130]], + "output": "techchest", + "groups": ["sb_portable3dprinter","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/storage/techchest2.recipe b/recipes/starbound/portable3dprinter/storage/techchest2.recipe index 42e61cd6..7838d892 100644 --- a/recipes/starbound/portable3dprinter/storage/techchest2.recipe +++ b/recipes/starbound/portable3dprinter/storage/techchest2.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",130]], - "output" : "techchest2", - "groups" : ["sb_portable3dprinter","storage","all"] + "input": [["money",130]], + "output": "techchest2", + "groups": ["sb_portable3dprinter","storage","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/teslaspike.recipe b/recipes/starbound/portable3dprinter/teslaspike.recipe index 2e6b21bb..1ff13d16 100644 --- a/recipes/starbound/portable3dprinter/teslaspike.recipe +++ b/recipes/starbound/portable3dprinter/teslaspike.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",90]], - "output" : "teslaspike", - "groups" : ["sb_portable3dprinter","other","all"] + "input": [["money",90]], + "output": "teslaspike", + "groups": ["sb_portable3dprinter","other","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/apexshipwall.recipe b/recipes/starbound/portable3dprinter/tiles/apexshipwall.recipe index 29a2bd32..38480748 100644 --- a/recipes/starbound/portable3dprinter/tiles/apexshipwall.recipe +++ b/recipes/starbound/portable3dprinter/tiles/apexshipwall.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "apexshipwall", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "apexshipwall", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/compositerail.recipe b/recipes/starbound/portable3dprinter/tiles/compositerail.recipe index 73f7498c..0d935b9c 100644 --- a/recipes/starbound/portable3dprinter/tiles/compositerail.recipe +++ b/recipes/starbound/portable3dprinter/tiles/compositerail.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "compositerail", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "compositerail", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/fallingblock.recipe b/recipes/starbound/portable3dprinter/tiles/fallingblock.recipe index 7556df15..3319f65c 100644 --- a/recipes/starbound/portable3dprinter/tiles/fallingblock.recipe +++ b/recipes/starbound/portable3dprinter/tiles/fallingblock.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",250]], - "output" : ["sb_fallingblock",5], - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",250]], + "output": ["sb_fallingblock",5], + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/lightmetal.recipe b/recipes/starbound/portable3dprinter/tiles/lightmetal.recipe index 714eec29..1b4e73dc 100644 --- a/recipes/starbound/portable3dprinter/tiles/lightmetal.recipe +++ b/recipes/starbound/portable3dprinter/tiles/lightmetal.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",25]], - "output" : "lightmetal", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",25]], + "output": "lightmetal", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/mediummetal.recipe b/recipes/starbound/portable3dprinter/tiles/mediummetal.recipe index 1ded0998..f4eb6ccc 100644 --- a/recipes/starbound/portable3dprinter/tiles/mediummetal.recipe +++ b/recipes/starbound/portable3dprinter/tiles/mediummetal.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "mediummetal", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "mediummetal", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/metallicmaterial.recipe b/recipes/starbound/portable3dprinter/tiles/metallicmaterial.recipe index 47351000..102f3de4 100644 --- a/recipes/starbound/portable3dprinter/tiles/metallicmaterial.recipe +++ b/recipes/starbound/portable3dprinter/tiles/metallicmaterial.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "metallicmaterial", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "metallicmaterial", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/modernladder.recipe b/recipes/starbound/portable3dprinter/tiles/modernladder.recipe index bd2ade3e..244daa0b 100644 --- a/recipes/starbound/portable3dprinter/tiles/modernladder.recipe +++ b/recipes/starbound/portable3dprinter/tiles/modernladder.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",25]], - "output" : "sb_modernladder", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",25]], + "output": "sb_modernladder", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/modernplatform.recipe b/recipes/starbound/portable3dprinter/tiles/modernplatform.recipe index 26bd0664..22b10593 100644 --- a/recipes/starbound/portable3dprinter/tiles/modernplatform.recipe +++ b/recipes/starbound/portable3dprinter/tiles/modernplatform.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",25]], - "output" : "modernplatform", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",25]], + "output": "modernplatform", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/platematerial.recipe b/recipes/starbound/portable3dprinter/tiles/platematerial.recipe index fcc2cd4b..2db8f3ec 100644 --- a/recipes/starbound/portable3dprinter/tiles/platematerial.recipe +++ b/recipes/starbound/portable3dprinter/tiles/platematerial.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "platematerial", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "platematerial", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/polygonplatform.recipe b/recipes/starbound/portable3dprinter/tiles/polygonplatform.recipe index 02c13eef..0a8d3b8c 100644 --- a/recipes/starbound/portable3dprinter/tiles/polygonplatform.recipe +++ b/recipes/starbound/portable3dprinter/tiles/polygonplatform.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",20]], - "output" : "polygonplatform", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",20]], + "output": "polygonplatform", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/redtoyblock.recipe b/recipes/starbound/portable3dprinter/tiles/redtoyblock.recipe index a0fa61bb..df737287 100644 --- a/recipes/starbound/portable3dprinter/tiles/redtoyblock.recipe +++ b/recipes/starbound/portable3dprinter/tiles/redtoyblock.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",5]], - "output" : "redtoyblock", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",5]], + "output": "redtoyblock", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/skyrailplatform.recipe b/recipes/starbound/portable3dprinter/tiles/skyrailplatform.recipe index 6e8ed89d..ea1b7f3d 100644 --- a/recipes/starbound/portable3dprinter/tiles/skyrailplatform.recipe +++ b/recipes/starbound/portable3dprinter/tiles/skyrailplatform.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "skyrailplatform", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "skyrailplatform", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/slopedpolygon.recipe b/recipes/starbound/portable3dprinter/tiles/slopedpolygon.recipe index 16786781..805eff5e 100644 --- a/recipes/starbound/portable3dprinter/tiles/slopedpolygon.recipe +++ b/recipes/starbound/portable3dprinter/tiles/slopedpolygon.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",20]], - "output" : "sb_slopedpolygon", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",20]], + "output": "sb_slopedpolygon", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/smoothmetal.recipe b/recipes/starbound/portable3dprinter/tiles/smoothmetal.recipe index 316d62bf..b3694668 100644 --- a/recipes/starbound/portable3dprinter/tiles/smoothmetal.recipe +++ b/recipes/starbound/portable3dprinter/tiles/smoothmetal.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "smoothmetal", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "smoothmetal", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/tiles/techhull1.recipe b/recipes/starbound/portable3dprinter/tiles/techhull1.recipe index 9363df5c..b25a9cf3 100644 --- a/recipes/starbound/portable3dprinter/tiles/techhull1.recipe +++ b/recipes/starbound/portable3dprinter/tiles/techhull1.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "techhull1", - "groups" : ["sb_portable3dprinter","materials","all"] + "input": [["money",50]], + "output": "techhull1", + "groups": ["sb_portable3dprinter","materials","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/drain.recipe b/recipes/starbound/portable3dprinter/wire/drain.recipe index 2a90a8fd..3e885ba1 100644 --- a/recipes/starbound/portable3dprinter/wire/drain.recipe +++ b/recipes/starbound/portable3dprinter/wire/drain.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",150]], - "output" : "drain", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",150]], + "output": "drain", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/hylotlredalert.recipe b/recipes/starbound/portable3dprinter/wire/hylotlredalert.recipe index e2b10c40..ce5e74d8 100644 --- a/recipes/starbound/portable3dprinter/wire/hylotlredalert.recipe +++ b/recipes/starbound/portable3dprinter/wire/hylotlredalert.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",170]], - "output" : "hylotlredalert", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",170]], + "output": "hylotlredalert", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/hylotlswitch.recipe b/recipes/starbound/portable3dprinter/wire/hylotlswitch.recipe index 8b2dc4ca..b27f8b4b 100644 --- a/recipes/starbound/portable3dprinter/wire/hylotlswitch.recipe +++ b/recipes/starbound/portable3dprinter/wire/hylotlswitch.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",100]], - "output" : "hylotlswitch", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",100]], + "output": "hylotlswitch", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/keypad.recipe b/recipes/starbound/portable3dprinter/wire/keypad.recipe index d644bf32..93837048 100644 --- a/recipes/starbound/portable3dprinter/wire/keypad.recipe +++ b/recipes/starbound/portable3dprinter/wire/keypad.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",50]], - "output" : "keypad", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",50]], + "output": "keypad", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/lasertripwire.recipe b/recipes/starbound/portable3dprinter/wire/lasertripwire.recipe index 74ce8d9e..bf4763ac 100644 --- a/recipes/starbound/portable3dprinter/wire/lasertripwire.recipe +++ b/recipes/starbound/portable3dprinter/wire/lasertripwire.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",30]], - "output" : "lasertripwire", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",30]], + "output": "lasertripwire", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/outpostbutton.recipe b/recipes/starbound/portable3dprinter/wire/outpostbutton.recipe index da0fec5b..dd9ee837 100644 --- a/recipes/starbound/portable3dprinter/wire/outpostbutton.recipe +++ b/recipes/starbound/portable3dprinter/wire/outpostbutton.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",170]], - "output" : "outpostbutton", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",170]], + "output": "outpostbutton", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/outpostkeypad.recipe b/recipes/starbound/portable3dprinter/wire/outpostkeypad.recipe index 741e1e3e..71105cbf 100644 --- a/recipes/starbound/portable3dprinter/wire/outpostkeypad.recipe +++ b/recipes/starbound/portable3dprinter/wire/outpostkeypad.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",180]], - "output" : "outpostkeypad", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",180]], + "output": "outpostkeypad", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/redalert.recipe b/recipes/starbound/portable3dprinter/wire/redalert.recipe index f0534216..3d68e75d 100644 --- a/recipes/starbound/portable3dprinter/wire/redalert.recipe +++ b/recipes/starbound/portable3dprinter/wire/redalert.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",170]], - "output" : "redalert", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",170]], + "output": "redalert", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/smallfloorbutton.recipe b/recipes/starbound/portable3dprinter/wire/smallfloorbutton.recipe index f0fb3e84..9eca8747 100644 --- a/recipes/starbound/portable3dprinter/wire/smallfloorbutton.recipe +++ b/recipes/starbound/portable3dprinter/wire/smallfloorbutton.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",80]], - "output" : "smallfloorbutton", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",80]], + "output": "smallfloorbutton", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/statuslight.recipe b/recipes/starbound/portable3dprinter/wire/statuslight.recipe index 93c8ded8..aea488b6 100644 --- a/recipes/starbound/portable3dprinter/wire/statuslight.recipe +++ b/recipes/starbound/portable3dprinter/wire/statuslight.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",145]], - "output" : "statuslight", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",145]], + "output": "statuslight", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/tinywallbutton.recipe b/recipes/starbound/portable3dprinter/wire/tinywallbutton.recipe index c234a9a3..197a74e9 100644 --- a/recipes/starbound/portable3dprinter/wire/tinywallbutton.recipe +++ b/recipes/starbound/portable3dprinter/wire/tinywallbutton.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",80]], - "output" : "tinywallbutton", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",80]], + "output": "tinywallbutton", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/tinywallswitch.recipe b/recipes/starbound/portable3dprinter/wire/tinywallswitch.recipe index 8476b04a..6682dd1b 100644 --- a/recipes/starbound/portable3dprinter/wire/tinywallswitch.recipe +++ b/recipes/starbound/portable3dprinter/wire/tinywallswitch.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",80]], - "output" : "tinywallswitch", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",80]], + "output": "tinywallswitch", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/wire/wiredtarget.recipe b/recipes/starbound/portable3dprinter/wire/wiredtarget.recipe index f2a5c5cc..9fcff07c 100644 --- a/recipes/starbound/portable3dprinter/wire/wiredtarget.recipe +++ b/recipes/starbound/portable3dprinter/wire/wiredtarget.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",180]], - "output" : "wiredtarget", - "groups" : ["sb_portable3dprinter","wire","all"] + "input": [["money",180]], + "output": "wiredtarget", + "groups": ["sb_portable3dprinter","wire","all"] } \ No newline at end of file diff --git a/recipes/starbound/rails/solidrailplatform.recipe b/recipes/starbound/rails/solidrailplatform.recipe index 0853481c..9341f6dd 100644 --- a/recipes/starbound/rails/solidrailplatform.recipe +++ b/recipes/starbound/rails/solidrailplatform.recipe @@ -1,6 +1,6 @@ { - "input" : [["wire",8],["smallbattery",2],["sb_steelbar",5]], - "output" : "sb_solidrailplatform", - "duration" : 3, - "groups" : ["rail","all"] + "input": [["wire",8],["smallbattery",2],["sb_steelbar",5]], + "output": "sb_solidrailplatform", + "duration": 3, + "groups": ["rail","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/aegisaltbar.recipe b/recipes/starbound/refinery/aegisaltbar.recipe index 18b14821..b88a4b36 100644 --- a/recipes/starbound/refinery/aegisaltbar.recipe +++ b/recipes/starbound/refinery/aegisaltbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_aegisaltbar"], - "output" : ["money",6], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_aegisaltbar"], + "output": ["money",6], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/ceruliumbar.recipe b/recipes/starbound/refinery/ceruliumbar.recipe index cbd4f7a8..3afcb25b 100644 --- a/recipes/starbound/refinery/ceruliumbar.recipe +++ b/recipes/starbound/refinery/ceruliumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ceruliumbar"], - "output" : ["money",15], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_ceruliumbar"], + "output": ["money",15], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/ceruliumcompound.recipe b/recipes/starbound/refinery/ceruliumcompound.recipe index 18af4720..6cfbe317 100644 --- a/recipes/starbound/refinery/ceruliumcompound.recipe +++ b/recipes/starbound/refinery/ceruliumcompound.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ceruliumcompound"], - "output" : ["money",150], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_ceruliumcompound"], + "output": ["money",150], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/ceruliumore.recipe b/recipes/starbound/refinery/ceruliumore.recipe index f21e535c..e3005601 100644 --- a/recipes/starbound/refinery/ceruliumore.recipe +++ b/recipes/starbound/refinery/ceruliumore.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ceruliumore"], - "output" : ["money",75], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_ceruliumore"], + "output": ["money",75], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/corefragment.recipe b/recipes/starbound/refinery/corefragment.recipe index cab3ad98..ae467280 100644 --- a/recipes/starbound/refinery/corefragment.recipe +++ b/recipes/starbound/refinery/corefragment.recipe @@ -1,6 +1,6 @@ { - "input" : ["corefragmentore"], - "output" : ["money",10], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["corefragmentore"], + "output": ["money",10], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/diamondore.recipe b/recipes/starbound/refinery/diamondore.recipe index 19d25a10..0bd5f79b 100644 --- a/recipes/starbound/refinery/diamondore.recipe +++ b/recipes/starbound/refinery/diamondore.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_diamondore"], - "output" : ["money",150], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_diamondore"], + "output": ["money",150], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/feroziumbar.recipe b/recipes/starbound/refinery/feroziumbar.recipe index 0d771a6e..534eafbc 100644 --- a/recipes/starbound/refinery/feroziumbar.recipe +++ b/recipes/starbound/refinery/feroziumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_feroziumbar"], - "output" : ["money",15], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_feroziumbar"], + "output": ["money",15], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/feroziumcompound.recipe b/recipes/starbound/refinery/feroziumcompound.recipe index ccbae136..54daa8cc 100644 --- a/recipes/starbound/refinery/feroziumcompound.recipe +++ b/recipes/starbound/refinery/feroziumcompound.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_feroziumcompound"], - "output" : ["money",150], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_feroziumcompound"], + "output": ["money",150], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/imperviumbar.recipe b/recipes/starbound/refinery/imperviumbar.recipe index 005a7814..a57229d0 100644 --- a/recipes/starbound/refinery/imperviumbar.recipe +++ b/recipes/starbound/refinery/imperviumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_imperviumbar"], - "output" : ["money",15], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_imperviumbar"], + "output": ["money",15], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/imperviumcompound.recipe b/recipes/starbound/refinery/imperviumcompound.recipe index 8bf89492..fb36591b 100644 --- a/recipes/starbound/refinery/imperviumcompound.recipe +++ b/recipes/starbound/refinery/imperviumcompound.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_imperviumcompound"], - "output" : ["money",150], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_imperviumcompound"], + "output": ["money",150], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/moonstoneore.recipe b/recipes/starbound/refinery/moonstoneore.recipe index 5ea29a22..a8f7fc73 100644 --- a/recipes/starbound/refinery/moonstoneore.recipe +++ b/recipes/starbound/refinery/moonstoneore.recipe @@ -1,6 +1,6 @@ { - "input" : ["moonstoneore"], - "output" : ["money",15], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["moonstoneore"], + "output": ["money",15], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/platinumbar.recipe b/recipes/starbound/refinery/platinumbar.recipe index 07f566c5..4913365f 100644 --- a/recipes/starbound/refinery/platinumbar.recipe +++ b/recipes/starbound/refinery/platinumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["platinumbar"], - "output" : ["money",50], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["platinumbar"], + "output": ["money",50], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/platinumore.recipe b/recipes/starbound/refinery/platinumore.recipe index e01b92e1..9affcd68 100644 --- a/recipes/starbound/refinery/platinumore.recipe +++ b/recipes/starbound/refinery/platinumore.recipe @@ -1,6 +1,6 @@ { - "input" : ["platinumore"], - "output" : ["money",25], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["platinumore"], + "output": ["money",25], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/plutoniumore.recipe b/recipes/starbound/refinery/plutoniumore.recipe index 160d3d15..beb1da0a 100644 --- a/recipes/starbound/refinery/plutoniumore.recipe +++ b/recipes/starbound/refinery/plutoniumore.recipe @@ -1,6 +1,6 @@ { - "input" : ["plutoniumore"], - "output" : ["money",10], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["plutoniumore"], + "output": ["money",10], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/plutoniumrod.recipe b/recipes/starbound/refinery/plutoniumrod.recipe index adaf0f81..af2f51ad 100644 --- a/recipes/starbound/refinery/plutoniumrod.recipe +++ b/recipes/starbound/refinery/plutoniumrod.recipe @@ -1,6 +1,6 @@ { - "input" : ["plutoniumrod"], - "output" : ["money",20], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["plutoniumrod"], + "output": ["money",20], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/blankblueprint.recipe b/recipes/starbound/refinery/recycle/blankblueprint.recipe index c0e82053..697bce83 100644 --- a/recipes/starbound/refinery/recycle/blankblueprint.recipe +++ b/recipes/starbound/refinery/recycle/blankblueprint.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_blueprint"], - "output" : "sb_blankblueprint", - "duration" : 0.15, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_blueprint"], + "output": "sb_blankblueprint", + "duration": 0.15, + "groups": ["refinery","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/blankscandata.recipe b/recipes/starbound/refinery/recycle/blankscandata.recipe index ad1a9a05..7c80e115 100644 --- a/recipes/starbound/refinery/recycle/blankscandata.recipe +++ b/recipes/starbound/refinery/recycle/blankscandata.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_scandata"], - "output" : "sb_blankscandata", - "duration" : 0.15, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_scandata"], + "output": "sb_blankscandata", + "duration": 0.15, + "groups": ["refinery","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/capturepod.recipe b/recipes/starbound/refinery/recycle/capturepod.recipe index 5a8a6578..3697e5f6 100644 --- a/recipes/starbound/refinery/recycle/capturepod.recipe +++ b/recipes/starbound/refinery/recycle/capturepod.recipe @@ -1,6 +1,6 @@ { - "input" : ["filledcapturepod"], - "output" : "capturepod", - "duration" : 0.8, - "groups" : ["refinery","nouncrafting","all"] + "input": ["filledcapturepod"], + "output": "capturepod", + "duration": 0.8, + "groups": ["refinery","nouncrafting","all"] } diff --git a/recipes/starbound/refinery/recycle/customcodex.recipe b/recipes/starbound/refinery/recycle/customcodex.recipe index edb15b28..f8d7543c 100644 --- a/recipes/starbound/refinery/recycle/customcodex.recipe +++ b/recipes/starbound/refinery/recycle/customcodex.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_customcodex"], - "output" : "sb_customcodex", - "duration" : 0.5, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_customcodex"], + "output": "sb_customcodex", + "duration": 0.5, + "groups": ["refinery","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/techcard_equip.recipe b/recipes/starbound/refinery/recycle/techcard_equip.recipe index 697f7703..1956c4cc 100644 --- a/recipes/starbound/refinery/recycle/techcard_equip.recipe +++ b/recipes/starbound/refinery/recycle/techcard_equip.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_equip"], - "output" : "techcard", - "duration" : 0.5, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_equip"], + "output": "techcard", + "duration": 0.5, + "groups": ["refinery","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/techcard_lockin.recipe b/recipes/starbound/refinery/recycle/techcard_lockin.recipe index 5594c41b..70d94d6c 100644 --- a/recipes/starbound/refinery/recycle/techcard_lockin.recipe +++ b/recipes/starbound/refinery/recycle/techcard_lockin.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_lockin"], - "output" : "techcard", - "duration" : 0.5, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_lockin"], + "output": "techcard", + "duration": 0.5, + "groups": ["refinery","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/techcard_tech.recipe b/recipes/starbound/refinery/recycle/techcard_tech.recipe index 095235ac..b35c3292 100644 --- a/recipes/starbound/refinery/recycle/techcard_tech.recipe +++ b/recipes/starbound/refinery/recycle/techcard_tech.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_tech"], - "output" : "techcard", - "duration" : 0.5, - "groups" : ["refinery","nouncrafting","all"] + "input": ["sb_tech"], + "output": "techcard", + "duration": 0.5, + "groups": ["refinery","nouncrafting","all"] } diff --git a/recipes/starbound/refinery/refinedrubium.recipe b/recipes/starbound/refinery/refinedrubium.recipe index 04f94b35..dd8a480e 100644 --- a/recipes/starbound/refinery/refinedrubium.recipe +++ b/recipes/starbound/refinery/refinedrubium.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_refinedrubium"], - "output" : ["money",60], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_refinedrubium"], + "output": ["money",60], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/rubiumbar.recipe b/recipes/starbound/refinery/rubiumbar.recipe index 343d81a6..7f64b453 100644 --- a/recipes/starbound/refinery/rubiumbar.recipe +++ b/recipes/starbound/refinery/rubiumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_rubiumbar"], - "output" : ["money",10], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_rubiumbar"], + "output": ["money",10], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/rubiumore.recipe b/recipes/starbound/refinery/rubiumore.recipe index 65bb7a08..6203fed4 100644 --- a/recipes/starbound/refinery/rubiumore.recipe +++ b/recipes/starbound/refinery/rubiumore.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_rubiumore"], - "output" : ["money",30], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_rubiumore"], + "output": ["money",30], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/solariumstar.recipe b/recipes/starbound/refinery/solariumstar.recipe index 6f4b452b..3aaf2ab4 100644 --- a/recipes/starbound/refinery/solariumstar.recipe +++ b/recipes/starbound/refinery/solariumstar.recipe @@ -1,6 +1,6 @@ { - "input" : ["solariumstar"], - "output" : ["money",30], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["solariumstar"], + "output": ["money",30], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/solidfuel.recipe b/recipes/starbound/refinery/solidfuel.recipe index 94192e88..7d7c697f 100644 --- a/recipes/starbound/refinery/solidfuel.recipe +++ b/recipes/starbound/refinery/solidfuel.recipe @@ -1,6 +1,6 @@ { - "input" : ["solidfuel"], - "output" : ["money",5], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["solidfuel"], + "output": ["money",5], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/steelbar.recipe b/recipes/starbound/refinery/steelbar.recipe index d0c1b42f..c54c8201 100644 --- a/recipes/starbound/refinery/steelbar.recipe +++ b/recipes/starbound/refinery/steelbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_steelbar"], - "output" : ["money",30], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["sb_steelbar"], + "output": ["money",30], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/uraniumore.recipe b/recipes/starbound/refinery/uraniumore.recipe index 0cbf0a58..53ecda49 100644 --- a/recipes/starbound/refinery/uraniumore.recipe +++ b/recipes/starbound/refinery/uraniumore.recipe @@ -1,6 +1,6 @@ { - "input" : ["uraniumore"], - "output" : ["money",5], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["uraniumore"], + "output": ["money",5], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/uraniumrod.recipe b/recipes/starbound/refinery/uraniumrod.recipe index 479fc3d5..e60091df 100644 --- a/recipes/starbound/refinery/uraniumrod.recipe +++ b/recipes/starbound/refinery/uraniumrod.recipe @@ -1,6 +1,6 @@ { - "input" : ["uraniumrod"], - "output" : ["money",10], - "duration" : 0.5, - "groups" : ["refinery","all"] + "input": ["uraniumrod"], + "output": ["money",10], + "duration": 0.5, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/refinery/violiumbar.recipe b/recipes/starbound/refinery/violiumbar.recipe index 99607081..924e3e4a 100644 --- a/recipes/starbound/refinery/violiumbar.recipe +++ b/recipes/starbound/refinery/violiumbar.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_violiumbar"], - "output" : ["money",6], - "duration" : 0.2, - "groups" : ["refinery","all"] + "input": ["sb_violiumbar"], + "output": ["money",6], + "duration": 0.2, + "groups": ["refinery","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/aegisalt.recipe b/recipes/starbound/repair/aegisalt.recipe index 90fcb42b..4f8a9f39 100644 --- a/recipes/starbound/repair/aegisalt.recipe +++ b/recipes/starbound/repair/aegisalt.recipe @@ -1,6 +1,6 @@ { - "input" : ["aegisaltore"], - "output" : "sb_aegisalt_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["aegisaltore"], + "output": "sb_aegisalt_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/cerulium.recipe b/recipes/starbound/repair/cerulium.recipe index 62aef118..bf35fbcb 100644 --- a/recipes/starbound/repair/cerulium.recipe +++ b/recipes/starbound/repair/cerulium.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_ceruliumore"], - "output" : "sb_cerulium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["sb_ceruliumore"], + "output": "sb_cerulium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/copper.recipe b/recipes/starbound/repair/copper.recipe index 1fb35a15..48bbc5d3 100644 --- a/recipes/starbound/repair/copper.recipe +++ b/recipes/starbound/repair/copper.recipe @@ -1,6 +1,6 @@ { - "input" : ["copperore"], - "output" : "sb_copper_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["copperore"], + "output": "sb_copper_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/diamond.recipe b/recipes/starbound/repair/diamond.recipe index 4c06a814..0133fd32 100644 --- a/recipes/starbound/repair/diamond.recipe +++ b/recipes/starbound/repair/diamond.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_diamondore"], - "output" : "sb_diamond_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["sb_diamondore"], + "output": "sb_diamond_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/durasteel.recipe b/recipes/starbound/repair/durasteel.recipe index 7fd0b407..965c3860 100644 --- a/recipes/starbound/repair/durasteel.recipe +++ b/recipes/starbound/repair/durasteel.recipe @@ -1,6 +1,6 @@ { - "input" : ["durasteelore"], - "output" : "sb_durasteel_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["durasteelore"], + "output": "sb_durasteel_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/ferozium.recipe b/recipes/starbound/repair/ferozium.recipe index a3500dc7..b34818d4 100644 --- a/recipes/starbound/repair/ferozium.recipe +++ b/recipes/starbound/repair/ferozium.recipe @@ -1,6 +1,6 @@ { - "input" : ["feroziumore"], - "output" : "sb_ferozium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["feroziumore"], + "output": "sb_ferozium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/gold.recipe b/recipes/starbound/repair/gold.recipe index a1fcd72f..78b5d528 100644 --- a/recipes/starbound/repair/gold.recipe +++ b/recipes/starbound/repair/gold.recipe @@ -1,6 +1,6 @@ { - "input" : ["goldore"], - "output" : "sb_gold_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["goldore"], + "output": "sb_gold_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/iron.recipe b/recipes/starbound/repair/iron.recipe index a4db91ef..3d344f94 100644 --- a/recipes/starbound/repair/iron.recipe +++ b/recipes/starbound/repair/iron.recipe @@ -1,6 +1,6 @@ { - "input" : ["ironore"], - "output" : "sb_iron_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["ironore"], + "output": "sb_iron_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/platinum.recipe b/recipes/starbound/repair/platinum.recipe index 0f41e78d..79839030 100644 --- a/recipes/starbound/repair/platinum.recipe +++ b/recipes/starbound/repair/platinum.recipe @@ -1,6 +1,6 @@ { - "input" : ["platinumore"], - "output" : "sb_platinum_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["platinumore"], + "output": "sb_platinum_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/rubium.recipe b/recipes/starbound/repair/rubium.recipe index 0495e13b..a8c6e578 100644 --- a/recipes/starbound/repair/rubium.recipe +++ b/recipes/starbound/repair/rubium.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_rubiumore"], - "output" : "sb_rubium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["sb_rubiumore"], + "output": "sb_rubium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/silver.recipe b/recipes/starbound/repair/silver.recipe index 9b9d661f..72e60441 100644 --- a/recipes/starbound/repair/silver.recipe +++ b/recipes/starbound/repair/silver.recipe @@ -1,6 +1,6 @@ { - "input" : ["silverore"], - "output" : "sb_silver_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["silverore"], + "output": "sb_silver_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/solarium.recipe b/recipes/starbound/repair/solarium.recipe index 2fc70e87..545d3d0b 100644 --- a/recipes/starbound/repair/solarium.recipe +++ b/recipes/starbound/repair/solarium.recipe @@ -1,6 +1,6 @@ { - "input" : ["solariumore"], - "output" : "sb_solarium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["solariumore"], + "output": "sb_solarium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/titanium.recipe b/recipes/starbound/repair/titanium.recipe index e0b7c138..5098873d 100644 --- a/recipes/starbound/repair/titanium.recipe +++ b/recipes/starbound/repair/titanium.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumore"], - "output" : "sb_titanium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["titaniumore"], + "output": "sb_titanium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/tungsten.recipe b/recipes/starbound/repair/tungsten.recipe index 57e46511..e53f459a 100644 --- a/recipes/starbound/repair/tungsten.recipe +++ b/recipes/starbound/repair/tungsten.recipe @@ -1,6 +1,6 @@ { - "input" : ["tungstenore"], - "output" : "sb_tungsten_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["tungstenore"], + "output": "sb_tungsten_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/violium.recipe b/recipes/starbound/repair/violium.recipe index be9f6745..931b663f 100644 --- a/recipes/starbound/repair/violium.recipe +++ b/recipes/starbound/repair/violium.recipe @@ -1,6 +1,6 @@ { - "input" : ["violiumore"], - "output" : "sb_violium_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": ["violiumore"], + "output": "sb_violium_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/repair/wreck.recipe b/recipes/starbound/repair/wreck.recipe index bee882dc..e9e9dd76 100644 --- a/recipes/starbound/repair/wreck.recipe +++ b/recipes/starbound/repair/wreck.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_dreadwreckage",5]], - "output" : "sb_wreck_repair", - "duration" : 0, - "groups" : ["plain","sb_augment","all"] + "input": [["sb_dreadwreckage",5]], + "output": "sb_wreck_repair", + "duration": 0, + "groups": ["plain","sb_augment","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/conversion/skyrail_asc.recipe b/recipes/starbound/skyrails/conversion/skyrail_asc.recipe index f2cb9d89..b280df70 100644 --- a/recipes/starbound/skyrails/conversion/skyrail_asc.recipe +++ b/recipes/starbound/skyrails/conversion/skyrail_asc.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrail_desc"], - "output" : "skyrail_asc", - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": ["skyrail_desc"], + "output": "skyrail_asc", + "groups": ["sb_skyrailtable","sb_skyrails","all"] } diff --git a/recipes/starbound/skyrails/conversion/skyrail_desc.recipe b/recipes/starbound/skyrails/conversion/skyrail_desc.recipe index 292f884e..7a349fa6 100644 --- a/recipes/starbound/skyrails/conversion/skyrail_desc.recipe +++ b/recipes/starbound/skyrails/conversion/skyrail_desc.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrail_asc"], - "output" : "skyrail_desc", - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": ["skyrail_asc"], + "output": "skyrail_desc", + "groups": ["sb_skyrailtable","sb_skyrails","all"] } diff --git a/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe b/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe index 5d3a737d..4b53913a 100644 --- a/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe +++ b/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrail_diodeR"], - "output" : "skyrail_diodeL", - "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] + "input": ["skyrail_diodeR"], + "output": "skyrail_diodeL", + "groups": ["sb_skyrailtable","sb_convert","nouncrafting","all"] } diff --git a/recipes/starbound/skyrails/conversion/skyrail_dioder.recipe b/recipes/starbound/skyrails/conversion/skyrail_dioder.recipe index 81ff7700..5f5f15c3 100644 --- a/recipes/starbound/skyrails/conversion/skyrail_dioder.recipe +++ b/recipes/starbound/skyrails/conversion/skyrail_dioder.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrail_diodeL"], - "output" : "skyrail_diodeR", - "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] + "input": ["skyrail_diodeL"], + "output": "skyrail_diodeR", + "groups": ["sb_skyrailtable","sb_convert","nouncrafting","all"] } diff --git a/recipes/starbound/skyrails/conversion/skyrailboost.recipe b/recipes/starbound/skyrails/conversion/skyrailboost.recipe index fc09fdc2..25553d7c 100644 --- a/recipes/starbound/skyrails/conversion/skyrailboost.recipe +++ b/recipes/starbound/skyrails/conversion/skyrailboost.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrailbreak"], - "output" : "skyrailboost", - "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] + "input": ["skyrailbreak"], + "output": "skyrailboost", + "groups": ["sb_skyrailtable","sb_convert","nouncrafting","all"] } diff --git a/recipes/starbound/skyrails/conversion/skyrailbreak.recipe b/recipes/starbound/skyrails/conversion/skyrailbreak.recipe index 76060406..fb90939a 100644 --- a/recipes/starbound/skyrails/conversion/skyrailbreak.recipe +++ b/recipes/starbound/skyrails/conversion/skyrailbreak.recipe @@ -1,5 +1,5 @@ { - "input" : ["skyrailboost"], - "output" : "skyrailbreak", - "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] + "input": ["skyrailboost"], + "output": "skyrailbreak", + "groups": ["sb_skyrailtable","sb_convert","nouncrafting","all"] } diff --git a/recipes/starbound/skyrails/skyrail_asc.recipe b/recipes/starbound/skyrails/skyrail_asc.recipe index dc289178..5b0eedc3 100644 --- a/recipes/starbound/skyrails/skyrail_asc.recipe +++ b/recipes/starbound/skyrails/skyrail_asc.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"goldbar"], - "output" : ["skyrail_asc",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"goldbar"], + "output": ["skyrail_asc",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrail_desc.recipe b/recipes/starbound/skyrails/skyrail_desc.recipe index d888dbf5..06617d72 100644 --- a/recipes/starbound/skyrails/skyrail_desc.recipe +++ b/recipes/starbound/skyrails/skyrail_desc.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"goldbar"], - "output" : ["skyrail_desc",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"goldbar"], + "output": ["skyrail_desc",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrail_diodel.recipe b/recipes/starbound/skyrails/skyrail_diodel.recipe index 1822c573..094e2241 100644 --- a/recipes/starbound/skyrails/skyrail_diodel.recipe +++ b/recipes/starbound/skyrails/skyrail_diodel.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"tungstenbar"], - "output" : ["skyrail_diodeL",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"tungstenbar"], + "output": ["skyrail_diodeL",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrail_dioder.recipe b/recipes/starbound/skyrails/skyrail_dioder.recipe index 26409ea2..2dd1a0e1 100644 --- a/recipes/starbound/skyrails/skyrail_dioder.recipe +++ b/recipes/starbound/skyrails/skyrail_dioder.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"tungstenbar"], - "output" : ["skyrail_diodeR",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"tungstenbar"], + "output": ["skyrail_diodeR",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrailboost.recipe b/recipes/starbound/skyrails/skyrailboost.recipe index 45325700..f538c50a 100644 --- a/recipes/starbound/skyrails/skyrailboost.recipe +++ b/recipes/starbound/skyrails/skyrailboost.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"ironbar"], - "output" : ["skyrailboost",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"ironbar"], + "output": ["skyrailboost",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrailbreak.recipe b/recipes/starbound/skyrails/skyrailbreak.recipe index 36845625..806d847b 100644 --- a/recipes/starbound/skyrails/skyrailbreak.recipe +++ b/recipes/starbound/skyrails/skyrailbreak.recipe @@ -1,5 +1,5 @@ { - "input" : [["skyrailplatform",20],"ironbar"], - "output" : ["skyrailbreak",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": [["skyrailplatform",20],"ironbar"], + "output": ["skyrailbreak",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/skyrailplatform.recipe b/recipes/starbound/skyrails/skyrailplatform.recipe index fa72c8da..d1ef5571 100644 --- a/recipes/starbound/skyrails/skyrailplatform.recipe +++ b/recipes/starbound/skyrails/skyrailplatform.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar"], - "output" : ["skyrailplatform",20], - "groups" : ["sb_skyrailtable","sb_skyrails","all"] + "input": ["platinumbar"], + "output": ["skyrailplatform",20], + "groups": ["sb_skyrailtable","sb_skyrails","all"] } \ No newline at end of file diff --git a/recipes/starbound/skyrails/tech.recipe b/recipes/starbound/skyrails/tech.recipe index b7a2cb04..3c01cb86 100644 --- a/recipes/starbound/skyrails/tech.recipe +++ b/recipes/starbound/skyrails/tech.recipe @@ -1,5 +1,5 @@ { - "input" : ["techcard"], - "output" : ["sb_tech",1,{"techModule":"skyrail"}], - "groups" : ["sb_skyrailtable","sb_skyrails","sb_techconsole","sb_tech_1","nouncrafting","all"] + "input": ["techcard"], + "output": ["sb_tech",1,{"techModule":"skyrail"}], + "groups": ["sb_skyrailtable","sb_skyrails","sb_techconsole","sb_tech_1","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/colonydeed.recipe b/recipes/starbound/spawner/colonydeed.recipe index 04903dd6..142e5d91 100644 --- a/recipes/starbound/spawner/colonydeed.recipe +++ b/recipes/starbound/spawner/colonydeed.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "colonydeed", - "groups" : ["spawnerstation","sb_villagers","sb_merchants","sb_guards","all"] + "input": [["money",750]], + "output": "colonydeed", + "groups": ["spawnerstation","sb_villagers","sb_merchants","sb_guards","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/guards/guard.recipe b/recipes/starbound/spawner/guards/guard.recipe index b869486a..2c215a51 100644 --- a/recipes/starbound/spawner/guards/guard.recipe +++ b/recipes/starbound/spawner/guards/guard.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerguard", - "groups" : ["spawnerstation","sb_guards","all"] + "input": [["money",750]], + "output": "spawnerguard", + "groups": ["spawnerstation","sb_guards","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/guards/pirate.recipe b/recipes/starbound/spawner/guards/pirate.recipe index 62a108b3..b83cb09e 100644 --- a/recipes/starbound/spawner/guards/pirate.recipe +++ b/recipes/starbound/spawner/guards/pirate.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnerpirate", - "groups" : ["spawnerstation","sb_guards","all"] + "input": [["money",750]], + "output": "sb_spawnerpirate", + "groups": ["spawnerstation","sb_guards","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/chef.recipe b/recipes/starbound/spawner/merchants/chef.recipe index 5d564ca8..38dc7df9 100644 --- a/recipes/starbound/spawner/merchants/chef.recipe +++ b/recipes/starbound/spawner/merchants/chef.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerchef", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "spawnerchef", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/clothes.recipe b/recipes/starbound/spawner/merchants/clothes.recipe index d3166df4..4e51a30b 100644 --- a/recipes/starbound/spawner/merchants/clothes.recipe +++ b/recipes/starbound/spawner/merchants/clothes.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnerclothes", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "sb_spawnerclothes", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/doctor.recipe b/recipes/starbound/spawner/merchants/doctor.recipe index fffc4985..bd0c11db 100644 --- a/recipes/starbound/spawner/merchants/doctor.recipe +++ b/recipes/starbound/spawner/merchants/doctor.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnerdoctor", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "sb_spawnerdoctor", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/gold.recipe b/recipes/starbound/spawner/merchants/gold.recipe index 96023aca..69bdf9e2 100644 --- a/recipes/starbound/spawner/merchants/gold.recipe +++ b/recipes/starbound/spawner/merchants/gold.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnergold", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "sb_spawnergold", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/stim.recipe b/recipes/starbound/spawner/merchants/stim.recipe index cd431c2b..fda7f919 100644 --- a/recipes/starbound/spawner/merchants/stim.recipe +++ b/recipes/starbound/spawner/merchants/stim.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnerstim", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "sb_spawnerstim", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/tools.recipe b/recipes/starbound/spawner/merchants/tools.recipe index c68c19d0..e7c35eb4 100644 --- a/recipes/starbound/spawner/merchants/tools.recipe +++ b/recipes/starbound/spawner/merchants/tools.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnertools", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "sb_spawnertools", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/merchants/wizard.recipe b/recipes/starbound/spawner/merchants/wizard.recipe index 7d80faa1..149ac987 100644 --- a/recipes/starbound/spawner/merchants/wizard.recipe +++ b/recipes/starbound/spawner/merchants/wizard.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerwizard", - "groups" : ["spawnerstation","sb_merchants","all"] + "input": [["money",750]], + "output": "spawnerwizard", + "groups": ["spawnerstation","sb_merchants","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/apex.recipe b/recipes/starbound/spawner/villagers/apex.recipe index e5524bbd..60dd2ada 100644 --- a/recipes/starbound/spawner/villagers/apex.recipe +++ b/recipes/starbound/spawner/villagers/apex.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerapex", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawnerapex", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/avian.recipe b/recipes/starbound/spawner/villagers/avian.recipe index c7de8f2c..f8a2b59a 100644 --- a/recipes/starbound/spawner/villagers/avian.recipe +++ b/recipes/starbound/spawner/villagers/avian.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawneravian", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawneravian", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/floran.recipe b/recipes/starbound/spawner/villagers/floran.recipe index 8044c95d..89c7778f 100644 --- a/recipes/starbound/spawner/villagers/floran.recipe +++ b/recipes/starbound/spawner/villagers/floran.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerfloran", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawnerfloran", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/glitch.recipe b/recipes/starbound/spawner/villagers/glitch.recipe index 78ee61e9..4c415e4e 100644 --- a/recipes/starbound/spawner/villagers/glitch.recipe +++ b/recipes/starbound/spawner/villagers/glitch.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerglitch", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawnerglitch", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/human.recipe b/recipes/starbound/spawner/villagers/human.recipe index 7f3cf817..89117eb9 100644 --- a/recipes/starbound/spawner/villagers/human.recipe +++ b/recipes/starbound/spawner/villagers/human.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerhuman", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawnerhuman", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/hylotl.recipe b/recipes/starbound/spawner/villagers/hylotl.recipe index 2f7c144a..4e7d6901 100644 --- a/recipes/starbound/spawner/villagers/hylotl.recipe +++ b/recipes/starbound/spawner/villagers/hylotl.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "spawnerhylotl", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "spawnerhylotl", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spawner/villagers/novakid.recipe b/recipes/starbound/spawner/villagers/novakid.recipe index 5d51e15a..b945ddd5 100644 --- a/recipes/starbound/spawner/villagers/novakid.recipe +++ b/recipes/starbound/spawner/villagers/novakid.recipe @@ -1,5 +1,5 @@ { - "input" : [["money",750]], - "output" : "sb_spawnernovakid", - "groups" : ["spawnerstation","sb_villagers","all"] + "input": [["money",750]], + "output": "sb_spawnernovakid", + "groups": ["spawnerstation","sb_villagers","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe index ccd6fe39..3c7b08f5 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["apexfossil1"], - "output" : "apexskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["apexfossil1"], + "output": "apexskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe index 50df375d..d660e684 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["avianfossil1"], - "output" : "avianskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["avianfossil1"], + "output": "avianskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe index a3198a85..6e73caf1 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_coolchest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",20],["cottonwool",2]], + "output": "sb_coolchest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe index ef30da19..1028372f 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",5]], - "output" : "sb_emptychest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",5]], + "output": "sb_emptychest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe index a8367a71..595f187d 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",5]], - "output" : "sb_emptyhead", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",5]], + "output": "sb_emptyhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe index 4e0560a7..9da97454 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",5]], - "output" : "sb_emptylegs", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",5]], + "output": "sb_emptylegs", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe index c083a68c..04fd519f 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe @@ -1,5 +1,5 @@ { - "input" : [["eyepiles",60],["fleshstrand",20]], - "output" : "eyehead", - "groups" : ["craftingwheel","clothes","all"] + "input": [["eyepiles",60],["fleshstrand",20]], + "output": "eyehead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe index 30d67725..5ffd1d78 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["floranfossil1"], - "output" : "floranskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["floranfossil1"], + "output": "floranskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe index 107de6e5..d1f8212a 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["glitchfossil1"], - "output" : "glitchskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["glitchfossil1"], + "output": "glitchskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe index 0b7b2ff0..02c475d2 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["humanfossil1"], - "output" : "humanskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["humanfossil1"], + "output": "humanskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe index bb8a428a..17523a5d 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe @@ -1,5 +1,5 @@ { - "input" : ["hylotlfossil1"], - "output" : "hylotlskullhead", - "groups" : ["craftingwheel","clothes","all"] + "input": ["hylotlfossil1"], + "output": "hylotlskullhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe index af9dc8cc..4f8406ad 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",5]], - "output" : "invisibleback", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",5]], + "output": "invisibleback", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe index 6ba052f8..4b59c64a 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_shirtlong1chest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",20],["cottonwool",2]], + "output": "sb_shirtlong1chest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe index e368f9ce..436901cd 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_shirtshort1chest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",20],["cottonwool",2]], + "output": "sb_shirtshort1chest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe index f3b9db22..dbaa6de6 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe @@ -1,5 +1,5 @@ { - "input" : [["leather",3],["fabric",2]], - "output" : "snowinfantrychest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["leather",3],["fabric",2]], + "output": "snowinfantrychest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe index 7f417e65..950f010e 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe @@ -1,5 +1,5 @@ { - "input" : [["leather",2],["fabric",2]], - "output" : "snowinfantryhead", - "groups" : ["craftingwheel","clothes","all"] + "input": [["leather",2],["fabric",2]], + "output": "snowinfantryhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe index 699e6bd1..3071d84e 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe @@ -1,5 +1,5 @@ { - "input" : [["leather",4],["fabric",2]], - "output" : "snowinfantrypants", - "groups" : ["craftingwheel","clothes","all"] + "input": [["leather",4],["fabric",2]], + "output": "snowinfantrypants", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe index 01bd5f3e..514321d6 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",12],["string",5]], - "output" : "winterscarfhead", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",12],["string",5]], + "output": "winterscarfhead", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe index 78c91f51..779241d6 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_workchest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",20],["cottonwool",2]], + "output": "sb_workchest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/worklegs.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/worklegs.recipe index 2773f48e..c0f3254a 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/worklegs.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/worklegs.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",10],"cottonwool"], - "output" : "sb_worklegs", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",10],"cottonwool"], + "output": "sb_worklegs", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe index bd75cf8f..5587d780 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe @@ -1,5 +1,5 @@ { - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_workoutchest", - "groups" : ["craftingwheel","clothes","all"] + "input": [["fabric",20],["cottonwool",2]], + "output": "sb_workoutchest", + "groups": ["craftingwheel","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt b/recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt index 5563ecd7..0a2c0c17 100644 --- a/recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt +++ b/recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt @@ -1,5 +1,5 @@ { - "input" : ["spidersilkblock"], - "output" : ["silkfibre",5], - "groups" : ["craftingwheel","ingredients","all"] + "input": ["spidersilkblock"], + "output": ["silkfibre",5], + "groups": ["craftingwheel","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe index 84f55f4e..fdefa564 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe @@ -1,5 +1,5 @@ { - "input" : [["silk",4]], - "output" : "wedding1chest", - "groups" : ["craftingwheel2","clothes","all"] + "input": [["silk",4]], + "output": "wedding1chest", + "groups": ["craftingwheel2","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe index c99cabe3..ec96bfa8 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe @@ -1,5 +1,5 @@ { - "input" : [["silk",6]], - "output" : "wedding1legs", - "groups" : ["craftingwheel2","clothes","all"] + "input": [["silk",6]], + "output": "wedding1legs", + "groups": ["craftingwheel2","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe index e3935394..90290407 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe @@ -1,5 +1,5 @@ { - "input" : [["silk",4]], - "output" : "wedding2chest", - "groups" : ["craftingwheel2","clothes","all"] + "input": [["silk",4]], + "output": "wedding2chest", + "groups": ["craftingwheel2","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe index 075d8dfa..9d28a9ad 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe @@ -1,5 +1,5 @@ { - "input" : [["silk",2]], - "output" : "wedding2head", - "groups" : ["craftingwheel2","clothes","all"] + "input": [["silk",2]], + "output": "wedding2head", + "groups": ["craftingwheel2","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe index e4ce7618..03ba6dfb 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe @@ -1,5 +1,5 @@ { - "input" : [["silk",6]], - "output" : "wedding2legs", - "groups" : ["craftingwheel2","clothes","all"] + "input": [["silk",6]], + "output": "wedding2legs", + "groups": ["craftingwheel2","clothes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe index d4e1ba9d..4aa0156c 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe @@ -1,5 +1,5 @@ { - "input" : ["greydye","bluedye"], - "output" : ["sb_greybluedye",2], - "groups" : ["craftingwheel2","dyes","all"] + "input": ["greydye","bluedye"], + "output": ["sb_greybluedye",2], + "groups": ["craftingwheel2","dyes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe index 2d9ed0fd..cb91052e 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe @@ -1,5 +1,5 @@ { - "input" : ["whitedye","greydye"], - "output" : ["sb_lightgreydye",2], - "groups" : ["craftingwheel2","dyes","all"] + "input": ["whitedye","greydye"], + "output": ["sb_lightgreydye",2], + "groups": ["craftingwheel2","dyes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe index 424289dd..d11933b0 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe @@ -1,5 +1,5 @@ { - "input" : ["whitedye","greendye"], - "output" : ["sb_limegreendye",2], - "groups" : ["craftingwheel2","dyes","all"] + "input": ["whitedye","greendye"], + "output": ["sb_limegreendye",2], + "groups": ["craftingwheel2","dyes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe index af5d3860..c6acccfc 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe @@ -1,5 +1,5 @@ { - "input" : ["whitedye","bluedye"], - "output" : ["sb_tealdye",2], - "groups" : ["craftingwheel2","dyes","all"] + "input": ["whitedye","bluedye"], + "output": ["sb_tealdye",2], + "groups": ["craftingwheel2","dyes","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe index 92796d9f..9e52be42 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe @@ -1,5 +1,5 @@ { - "input" : ["phasematter",["liquidoil",5]], - "output" : "syntheticmaterial", - "groups" : ["craftingwheel2","ingredients","all"] + "input": ["phasematter",["liquidoil",5]], + "output": "syntheticmaterial", + "groups": ["craftingwheel2","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe index 11cd3723..38c6d376 100644 --- a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe +++ b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe @@ -1,5 +1,5 @@ { - "input" : ["livingroot","string"], - "output" : "thread", - "groups" : ["craftingwheel2","ingredients","all"] + "input": ["livingroot","string"], + "output": "thread", + "groups": ["craftingwheel2","ingredients","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/tool/glasses2head.recipe b/recipes/starbound/spinningwheel/tool/glasses2head.recipe index 73c26747..8468ad53 100644 --- a/recipes/starbound/spinningwheel/tool/glasses2head.recipe +++ b/recipes/starbound/spinningwheel/tool/glasses2head.recipe @@ -1,5 +1,5 @@ { - "input" : ["glass","screws","string"], - "output" : "glasses2head", - "groups" : ["sb_craftingtable","armours","all"] + "input": ["glass","screws","string"], + "output": "glasses2head", + "groups": ["sb_craftingtable","armours","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/tool/glasses3eyes.recipe b/recipes/starbound/spinningwheel/tool/glasses3eyes.recipe index 1cfeaa26..2934b1b2 100644 --- a/recipes/starbound/spinningwheel/tool/glasses3eyes.recipe +++ b/recipes/starbound/spinningwheel/tool/glasses3eyes.recipe @@ -1,5 +1,5 @@ { - "input" : [["glass",3],["screws",2]], - "output" : "glasses3eyes", - "groups" : ["sb_craftingtable","armours","all"] + "input": [["glass",3],["screws",2]], + "output": "glasses3eyes", + "groups": ["sb_craftingtable","armours","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/tool/glasses4.recipe b/recipes/starbound/spinningwheel/tool/glasses4.recipe index 07dc30a6..c95b0f43 100644 --- a/recipes/starbound/spinningwheel/tool/glasses4.recipe +++ b/recipes/starbound/spinningwheel/tool/glasses4.recipe @@ -1,5 +1,5 @@ { - "input" : [["glass",2],["screws",2]], - "output" : "glasses4head", - "groups" : ["sb_craftingtable","armours","all"] + "input": [["glass",2],["screws",2]], + "output": "glasses4head", + "groups": ["sb_craftingtable","armours","all"] } \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/tool/glasses5.recipe b/recipes/starbound/spinningwheel/tool/glasses5.recipe index 891ca6b1..23d3e4a1 100644 --- a/recipes/starbound/spinningwheel/tool/glasses5.recipe +++ b/recipes/starbound/spinningwheel/tool/glasses5.recipe @@ -1,5 +1,5 @@ { - "input" : [["glass",2],["screws",2]], - "output" : "glasses5head", - "groups" : ["sb_craftingtable","sb_armors","all"] + "input": [["glass",2],["screws",2]], + "output": "glasses5head", + "groups": ["sb_craftingtable","sb_armors","all"] } \ No newline at end of file diff --git a/recipes/starbound/tech/head/waterball.recipe b/recipes/starbound/tech/head/waterball.recipe index 549f2309..cf4f2f46 100644 --- a/recipes/starbound/tech/head/waterball.recipe +++ b/recipes/starbound/tech/head/waterball.recipe @@ -1,6 +1,7 @@ { "input": [ - ["sb_tech",1,{"techModule":"distortionsphere"}],//not morphball: no bombs + ["sb_tech",1,{"techModule":"aquasphere"}],//not morphball: no bombs. aqua b/c water theme + ["sb_tech",1,{"techModule":"sb_bounce"}], ["sb_tech",1,{"techModule":"sb_groundsmash"}] ], "matchInputParameters": true, diff --git a/recipes/starbound/tech/suit/tank.recipe b/recipes/starbound/tech/suit/tank.recipe index 084e6483..2d02cb6a 100644 --- a/recipes/starbound/tech/suit/tank.recipe +++ b/recipes/starbound/tech/suit/tank.recipe @@ -1,6 +1,5 @@ { "input":[ - ["sb_tech",1,{"techModule":"sb_regeneration"}], ["sb_tech",1,{"techModule":"sb_protection"}], ["sb_tech",1,{"techModule":"sb_grit"}] ], diff --git a/recipes/starbound/teleporterstore/apexteleporter.recipe b/recipes/starbound/teleporterstore/apexteleporter.recipe index 001484a3..9a89ee43 100644 --- a/recipes/starbound/teleporterstore/apexteleporter.recipe +++ b/recipes/starbound/teleporterstore/apexteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_apexteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_apexteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/avianteleporter.recipe b/recipes/starbound/teleporterstore/avianteleporter.recipe index d5d49e8b..b898cf23 100644 --- a/recipes/starbound/teleporterstore/avianteleporter.recipe +++ b/recipes/starbound/teleporterstore/avianteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_avianteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_avianteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/floranteleporter.recipe b/recipes/starbound/teleporterstore/floranteleporter.recipe index 8d4e2dc3..45032d5a 100644 --- a/recipes/starbound/teleporterstore/floranteleporter.recipe +++ b/recipes/starbound/teleporterstore/floranteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_floranteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_floranteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/glitchteleporter.recipe b/recipes/starbound/teleporterstore/glitchteleporter.recipe index 2ff16e7c..c4e38039 100644 --- a/recipes/starbound/teleporterstore/glitchteleporter.recipe +++ b/recipes/starbound/teleporterstore/glitchteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_glitchteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_glitchteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/humanteleporter.recipe b/recipes/starbound/teleporterstore/humanteleporter.recipe index 1262b6ab..4ecb12d3 100644 --- a/recipes/starbound/teleporterstore/humanteleporter.recipe +++ b/recipes/starbound/teleporterstore/humanteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_humanteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_humanteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/hylotlteleporter.recipe b/recipes/starbound/teleporterstore/hylotlteleporter.recipe index cbca80f8..03e62e66 100644 --- a/recipes/starbound/teleporterstore/hylotlteleporter.recipe +++ b/recipes/starbound/teleporterstore/hylotlteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_hylotlteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_hylotlteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/mechplatform.recipe b/recipes/starbound/teleporterstore/mechplatform.recipe index 0bc07d01..3d4f981c 100644 --- a/recipes/starbound/teleporterstore/mechplatform.recipe +++ b/recipes/starbound/teleporterstore/mechplatform.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "mechplatform", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "mechplatform", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/teleporterstore/novakidteleporter.recipe b/recipes/starbound/teleporterstore/novakidteleporter.recipe index e16cd426..0b6f8761 100644 --- a/recipes/starbound/teleporterstore/novakidteleporter.recipe +++ b/recipes/starbound/teleporterstore/novakidteleporter.recipe @@ -1,6 +1,6 @@ { - "currencyInputs" : {"money":3000}, - "input" : ["teleportercore"], - "output" : "sb_novakidteleporter", - "groups" : ["teleshop","all"] + "currencyInputs": {"money":3000}, + "input": ["teleportercore"], + "output": "sb_novakidteleporter", + "groups": ["teleshop","all"] } \ No newline at end of file diff --git a/recipes/starbound/terraforge/terraformertentacle.recipe b/recipes/starbound/terraforge/terraformertentacle.recipe index 535d3c23..7dd902f1 100644 --- a/recipes/starbound/terraforge/terraformertentacle.recipe +++ b/recipes/starbound/terraforge/terraformertentacle.recipe @@ -1,7 +1,7 @@ { - "currencyInputs" : {"essence":3000}, - "input" : [["sb_liquidtentaclejuice",50]], - "output" : "sb_terraformertentacle", - "duration" : 0, - "groups" : ["terraforge","all"] + "currencyInputs": {"essence":3000}, + "input": [["sb_liquidtentaclejuice",50]], + "output": "sb_terraformertentacle", + "duration": 0, + "groups": ["terraforge","all"] } \ No newline at end of file diff --git a/recipes/starbound/terraforge/weaponupgradeanvil.recipe b/recipes/starbound/terraforge/weaponupgradeanvil.recipe index 453248b8..eec7346d 100644 --- a/recipes/starbound/terraforge/weaponupgradeanvil.recipe +++ b/recipes/starbound/terraforge/weaponupgradeanvil.recipe @@ -1,7 +1,7 @@ { - "currencyInputs" : {"essence":3000}, - "input" : [["ironbar",30]], - "output" : "weaponupgradeanvil", - "duration" : 0, - "groups" : ["terraforge","all"] + "currencyInputs": {"essence":3000}, + "input": [["ironbar",30]], + "output": "weaponupgradeanvil", + "duration": 0, + "groups": ["terraforge","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/cutterleaf.recipe b/recipes/starbound/throwing/anvil/cutterleaf.recipe index afa305f3..23cc1608 100644 --- a/recipes/starbound/throwing/anvil/cutterleaf.recipe +++ b/recipes/starbound/throwing/anvil/cutterleaf.recipe @@ -1,5 +1,5 @@ { - "input" : [["plantfibre",3]], - "output" : ["sb_cutterleaf",5], - "groups" : ["craftinganvil","consumables","all"] + "input": [["plantfibre",3]], + "output": ["sb_cutterleaf",5], + "groups": ["craftinganvil","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/handgrenade.recipe b/recipes/starbound/throwing/anvil/handgrenade.recipe index eef31971..bec38d6a 100644 --- a/recipes/starbound/throwing/anvil/handgrenade.recipe +++ b/recipes/starbound/throwing/anvil/handgrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",6],"sb_steelbar"], - "output" : "sb_handgrenade", - "groups" : ["consumables","craftinganvil","all"] + "input": [["volatilepowder",6],"sb_steelbar"], + "output": "sb_handgrenade", + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/smokegrenade.recipe b/recipes/starbound/throwing/anvil/smokegrenade.recipe index 8e480bd8..d00288b3 100644 --- a/recipes/starbound/throwing/anvil/smokegrenade.recipe +++ b/recipes/starbound/throwing/anvil/smokegrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",2],"string","ironbar"], - "output" : "sb_smokegrenade", - "groups" : ["consumables","craftinganvil","all"] + "input": [["volatilepowder",2],"string","ironbar"], + "output": "sb_smokegrenade", + "groups": ["consumables","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/thorngrenade.recipe b/recipes/starbound/throwing/anvil/thorngrenade.recipe index 323b4ae7..e82abcf8 100644 --- a/recipes/starbound/throwing/anvil/thorngrenade.recipe +++ b/recipes/starbound/throwing/anvil/thorngrenade.recipe @@ -1,6 +1,6 @@ { - "input" : [["volatilepowder",4],"thornfruit","sb_steelbar"], - "output" : "thorngrenade", - "duration" : 0.6, - "groups" : ["craftinganvil","consumables","all"] + "input": [["volatilepowder",4],"thornfruit","sb_steelbar"], + "output": "thorngrenade", + "duration": 0.6, + "groups": ["craftinganvil","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/throwingdagger.recipe b/recipes/starbound/throwing/anvil/throwingdagger.recipe index f37cdc06..bb0481a2 100644 --- a/recipes/starbound/throwing/anvil/throwingdagger.recipe +++ b/recipes/starbound/throwing/anvil/throwingdagger.recipe @@ -1,6 +1,6 @@ { - "input" : ["tungstenbar"], - "output" : ["throwingdagger",15], - "duration" : 0.3, - "groups" : ["craftinganvil","consumables","all"] + "input": ["tungstenbar"], + "output": ["throwingdagger",15], + "duration": 0.3, + "groups": ["craftinganvil","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil/throwingneedles.recipe b/recipes/starbound/throwing/anvil/throwingneedles.recipe index 21ccae13..77177db1 100644 --- a/recipes/starbound/throwing/anvil/throwingneedles.recipe +++ b/recipes/starbound/throwing/anvil/throwingneedles.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar"], - "output" : ["sb_throwingneedle",6], - "groups" : ["craftinganvil","consumables","all"] + "input": ["ironbar"], + "output": ["sb_throwingneedle",6], + "groups": ["craftinganvil","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/electrogrenade.recipe b/recipes/starbound/throwing/anvil2/electrogrenade.recipe index 3dfdc42e..2b20454d 100644 --- a/recipes/starbound/throwing/anvil2/electrogrenade.recipe +++ b/recipes/starbound/throwing/anvil2/electrogrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"staticcell","titaniumbar"], - "output" : "sb_electrogrenade", - "groups" : ["craftinganvil2","consumables","all"] + "input": [["volatilepowder",4],"staticcell","titaniumbar"], + "output": "sb_electrogrenade", + "groups": ["craftinganvil2","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/gasgrenade.recipe b/recipes/starbound/throwing/anvil2/gasgrenade.recipe index dceacfe4..b5177be9 100644 --- a/recipes/starbound/throwing/anvil2/gasgrenade.recipe +++ b/recipes/starbound/throwing/anvil2/gasgrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"venomsample","titaniumbar"], - "output" : ["sb_gasgrenade"], - "groups" : ["craftinganvil2","consumables","all"] + "input": [["volatilepowder",4],"venomsample","titaniumbar"], + "output": ["sb_gasgrenade"], + "groups": ["craftinganvil2","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/groundfirebomb.recipe b/recipes/starbound/throwing/anvil2/groundfirebomb.recipe index b2584993..1b85b36c 100644 --- a/recipes/starbound/throwing/anvil2/groundfirebomb.recipe +++ b/recipes/starbound/throwing/anvil2/groundfirebomb.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"string","scorchedcore","titaniumbar"], - "output" : "sb_groundfirebomb", - "groups" : ["craftinganvil2","consumables","all"] + "input": [["volatilepowder",4],"string","scorchedcore","titaniumbar"], + "output": "sb_groundfirebomb", + "groups": ["craftinganvil2","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/throwingaxe.recipe b/recipes/starbound/throwing/anvil2/throwingaxe.recipe index 67c94ac0..2deff2d2 100644 --- a/recipes/starbound/throwing/anvil2/throwingaxe.recipe +++ b/recipes/starbound/throwing/anvil2/throwingaxe.recipe @@ -1,6 +1,6 @@ { - "input" : ["titaniumbar"], - "output" : ["throwingaxe",5], - "duration" : 0.3, - "groups" : ["craftinganvil2","consumables","all"] + "input": ["titaniumbar"], + "output": ["throwingaxe",5], + "duration": 0.3, + "groups": ["craftinganvil2","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil3/corrosivegrenade.recipe b/recipes/starbound/throwing/anvil3/corrosivegrenade.recipe index d33710f3..5f533421 100644 --- a/recipes/starbound/throwing/anvil3/corrosivegrenade.recipe +++ b/recipes/starbound/throwing/anvil3/corrosivegrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],["alienwoodsap",4],"durasteelbar"], - "output" : "sb_corrosivegrenade", - "groups" : ["consumables","craftinganvil3","all"] + "input": [["volatilepowder",4],["alienwoodsap",4],"durasteelbar"], + "output": "sb_corrosivegrenade", + "groups": ["consumables","craftinganvil3","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil3/throwingstar.recipe b/recipes/starbound/throwing/anvil3/throwingstar.recipe index 7e2607ae..c726bb51 100644 --- a/recipes/starbound/throwing/anvil3/throwingstar.recipe +++ b/recipes/starbound/throwing/anvil3/throwingstar.recipe @@ -1,6 +1,6 @@ { - "input" : ["durasteelbar"], - "output" : ["throwingstar",15], - "duration" : 0.3, - "groups" : ["craftinganvil3","consumables","all"] + "input": ["durasteelbar"], + "output": ["throwingstar",15], + "duration": 0.3, + "groups": ["craftinganvil3","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil3/toxicbarrel.recipe b/recipes/starbound/throwing/anvil3/toxicbarrel.recipe index 86d9cde0..5e430f62 100644 --- a/recipes/starbound/throwing/anvil3/toxicbarrel.recipe +++ b/recipes/starbound/throwing/anvil3/toxicbarrel.recipe @@ -1,6 +1,6 @@ { - "input" : ["durasteelbar",["toxicwaste",5]], - "output" : "sb_toxicbarrel", - "duration" : 0.3, - "groups" : ["craftinganvil3","consumables","all"] + "input": ["durasteelbar",["toxicwaste",5]], + "output": "sb_toxicbarrel", + "duration": 0.3, + "groups": ["craftinganvil3","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/farm/throwingreed.recipe b/recipes/starbound/throwing/farm/throwingreed.recipe index e61db2d7..f6c51555 100644 --- a/recipes/starbound/throwing/farm/throwingreed.recipe +++ b/recipes/starbound/throwing/farm/throwingreed.recipe @@ -1,5 +1,5 @@ { - "input" : ["reed"], - "output" : ["sb_throwingreed",10], - "groups" : ["craftingfarm","hunting","all"] + "input": ["reed"], + "output": ["sb_throwingreed",10], + "groups": ["craftingfarm","hunting","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/farm/throwingspear.recipe b/recipes/starbound/throwing/farm/throwingspear.recipe index 017db98b..1d661c90 100644 --- a/recipes/starbound/throwing/farm/throwingspear.recipe +++ b/recipes/starbound/throwing/farm/throwingspear.recipe @@ -1,6 +1,6 @@ { - "input" : ["ironbar",["darkwoodmaterial",3]], - "output" : ["throwingspear",5], - "duration" : 0.3, - "groups" : ["craftingfarm","hunting","all"] + "input": ["ironbar",["darkwoodmaterial",3]], + "output": ["throwingspear",5], + "duration": 0.3, + "groups": ["craftingfarm","hunting","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/farm2/javelin.recipe b/recipes/starbound/throwing/farm2/javelin.recipe index 9dbf6f1f..85b58719 100644 --- a/recipes/starbound/throwing/farm2/javelin.recipe +++ b/recipes/starbound/throwing/farm2/javelin.recipe @@ -1,6 +1,6 @@ { - "input" : ["durasteelbar",["darkwoodmaterial",5]], - "output" : ["javelin",5], - "duration" : 0.3, - "groups" : ["craftingfarm2","hunting","all"] + "input": ["durasteelbar",["darkwoodmaterial",5]], + "output": ["javelin",5], + "duration": 0.3, + "groups": ["craftingfarm2","hunting","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/farm2/orangebomb.recipe b/recipes/starbound/throwing/farm2/orangebomb.recipe index 3b90bd89..8dca20d8 100644 --- a/recipes/starbound/throwing/farm2/orangebomb.recipe +++ b/recipes/starbound/throwing/farm2/orangebomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["orangestim","bottle"], - "output" : "sb_ragebomb", - "groups" : ["craftingmedical2","buffs","all"] + "input": ["orangestim","bottle"], + "output": "sb_ragebomb", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/medical/redbomb.recipe b/recipes/starbound/throwing/medical/redbomb.recipe index af5aa2bb..14d22e9f 100644 --- a/recipes/starbound/throwing/medical/redbomb.recipe +++ b/recipes/starbound/throwing/medical/redbomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["redstim", "bottle"], - "output" : "sb_healthbomb", - "groups" : ["craftingmedical","buffs","all"] + "input": ["redstim", "bottle"], + "output": "sb_healthbomb", + "groups": ["craftingmedical","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/medical/yellowbomb.recipe b/recipes/starbound/throwing/medical/yellowbomb.recipe index 8f71d1f4..1dd19c81 100644 --- a/recipes/starbound/throwing/medical/yellowbomb.recipe +++ b/recipes/starbound/throwing/medical/yellowbomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["yellowstim","bottle"], - "output" : "glowbomb", - "groups" : ["craftingmedical","buffs","all"] + "input": ["yellowstim","bottle"], + "output": "glowbomb", + "groups": ["craftingmedical","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/medical2/bluebomb.recipe b/recipes/starbound/throwing/medical2/bluebomb.recipe index 49a412e6..62ba3f5e 100644 --- a/recipes/starbound/throwing/medical2/bluebomb.recipe +++ b/recipes/starbound/throwing/medical2/bluebomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["bluestim","bottle"], - "output" : "sb_jumpbomb", - "groups" : ["craftingmedical2","buffs","all"] + "input": ["bluestim","bottle"], + "output": "sb_jumpbomb", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/medical2/greenbomb.recipe b/recipes/starbound/throwing/medical2/greenbomb.recipe index 376554c6..fe154494 100644 --- a/recipes/starbound/throwing/medical2/greenbomb.recipe +++ b/recipes/starbound/throwing/medical2/greenbomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["greenstim","bottle"], - "output" : "sb_runbomb", - "groups" : ["craftingmedical2","buffs","all"] + "input": ["greenstim","bottle"], + "output": "sb_runbomb", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/medical2/greybomb.recipe b/recipes/starbound/throwing/medical2/greybomb.recipe index b7422f3d..4fb4991f 100644 --- a/recipes/starbound/throwing/medical2/greybomb.recipe +++ b/recipes/starbound/throwing/medical2/greybomb.recipe @@ -1,5 +1,5 @@ { - "input" : ["sb_greystim", "bottle"], - "output" : "sb_protectionbomb", - "groups" : ["craftingmedical2","buffs","all"] + "input": ["sb_greystim", "bottle"], + "output": "sb_protectionbomb", + "groups": ["craftingmedical2","buffs","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/lavaballoon.recipe b/recipes/starbound/throwing/plain/lavaballoon.recipe index 28effe4b..801b9595 100644 --- a/recipes/starbound/throwing/plain/lavaballoon.recipe +++ b/recipes/starbound/throwing/plain/lavaballoon.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidlava",3],"polymer"], - "output" : "lavaballoon", - "groups" : ["plain","consumables","all"] + "input": [["liquidlava",3],"polymer"], + "output": "lavaballoon", + "groups": ["plain","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/molotov.recipe b/recipes/starbound/throwing/plain/molotov.recipe index 8d2bdaf5..bf12a3d7 100644 --- a/recipes/starbound/throwing/plain/molotov.recipe +++ b/recipes/starbound/throwing/plain/molotov.recipe @@ -1,6 +1,6 @@ { - "input" : ["sb_whiskeybottle","torch"], - "output" : "molotov", - "duration" : 0.3, - "groups" : ["craftinganvil2","consumables","plain","all"] + "input": ["sb_whiskeybottle","torch"], + "output": "molotov", + "duration": 0.3, + "groups": ["craftinganvil2","consumables","plain","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/paperplane.recipe b/recipes/starbound/throwing/plain/paperplane.recipe index 68b9fed7..8f9453f6 100644 --- a/recipes/starbound/throwing/plain/paperplane.recipe +++ b/recipes/starbound/throwing/plain/paperplane.recipe @@ -1,6 +1,6 @@ { - "input" : ["paper"], - "output" : "paperplane", - "duration" : 0, - "groups" : ["plain","consumables","all"] + "input": ["paper"], + "output": "paperplane", + "duration": 0, + "groups": ["plain","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/poisonballoon.recipe b/recipes/starbound/throwing/plain/poisonballoon.recipe index ec3ef7b7..eb30e7b5 100644 --- a/recipes/starbound/throwing/plain/poisonballoon.recipe +++ b/recipes/starbound/throwing/plain/poisonballoon.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidpoison",3],"polymer"], - "output" : "sb_poisonballoon", - "groups" : ["plain","consumables","all"] + "input": [["liquidpoison",3],"polymer"], + "output": "sb_poisonballoon", + "groups": ["plain","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/throwinggnomes.recipe b/recipes/starbound/throwing/plain/throwinggnomes.recipe index e48527ba..23ba2483 100644 --- a/recipes/starbound/throwing/plain/throwinggnomes.recipe +++ b/recipes/starbound/throwing/plain/throwinggnomes.recipe @@ -1,6 +1,6 @@ { - "input" : [["gnome",7]], - "output" : "throwinggnome", - "duration" : 0, - "groups" : ["plain","consumables","all"] + "input": [["gnome",7]], + "output": "throwinggnome", + "duration": 0, + "groups": ["plain","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/throwing/plain/waterballoon.recipe b/recipes/starbound/throwing/plain/waterballoon.recipe index 05764820..20c2b788 100644 --- a/recipes/starbound/throwing/plain/waterballoon.recipe +++ b/recipes/starbound/throwing/plain/waterballoon.recipe @@ -1,5 +1,5 @@ { - "input" : [["liquidwater",3],"polymer"], - "output" : "waterballoon", - "groups" : ["plain","consumables","all"] + "input": [["liquidwater",3],"polymer"], + "output": "waterballoon", + "groups": ["plain","consumables","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/hoe2.recipe b/recipes/starbound/tools/farm/farming/hoe2.recipe index 3112450a..5cf5d733 100644 --- a/recipes/starbound/tools/farm/farming/hoe2.recipe +++ b/recipes/starbound/tools/farm/farming/hoe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"sb_stonehoe"], - "output" : "hoe", - "groups" : ["nouncrafting","craftingfarm","farming","all"] + "input": [["tungstenbar",2],"sb_stonehoe"], + "output": "hoe", + "groups": ["nouncrafting","craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/ironaxe.recipe b/recipes/starbound/tools/farm/farming/ironaxe.recipe index 38e48c8a..ef422141 100644 --- a/recipes/starbound/tools/farm/farming/ironaxe.recipe +++ b/recipes/starbound/tools/farm/farming/ironaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",4],["darkwoodmaterial",12]], - "output" : "sb_ironaxe", - "groups" : ["craftingfarm","farming","all"] + "input": [["ironbar",4],["darkwoodmaterial",12]], + "output": "sb_ironaxe", + "groups": ["craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/ironaxe2.recipe b/recipes/starbound/tools/farm/farming/ironaxe2.recipe index 6bc2d9a8..18d22a7f 100644 --- a/recipes/starbound/tools/farm/farming/ironaxe2.recipe +++ b/recipes/starbound/tools/farm/farming/ironaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"sb_stoneaxe"], - "output" : "sb_ironaxe", - "groups" : ["nouncrafting","craftingfarm","farming","all"] + "input": [["ironbar",2],"sb_stoneaxe"], + "output": "sb_ironaxe", + "groups": ["nouncrafting","craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/tool/stoneaxe.recipe b/recipes/starbound/tools/farm/farming/tool/stoneaxe.recipe index 8d10c360..86d6ce4b 100644 --- a/recipes/starbound/tools/farm/farming/tool/stoneaxe.recipe +++ b/recipes/starbound/tools/farm/farming/tool/stoneaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",6],["cobblestonematerial",12],["plantfibre",3]], - "output" : "sb_stoneaxe", - "groups" : ["sb_craftingtable","tools","craftingfarm","farming","all"] + "input": [["darkwoodmaterial",6],["cobblestonematerial",12],["plantfibre",3]], + "output": "sb_stoneaxe", + "groups": ["sb_craftingtable","tools","craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/tool/stonehoe.recipe b/recipes/starbound/tools/farm/farming/tool/stonehoe.recipe index f2b00962..bdd5e1aa 100644 --- a/recipes/starbound/tools/farm/farming/tool/stonehoe.recipe +++ b/recipes/starbound/tools/farm/farming/tool/stonehoe.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",6],["cobblestonematerial",12],["plantfibre",3]], - "output" : "sb_stonehoe", - "groups" : ["sb_craftingtable","tools","craftingfarm","farming","all"] + "input": [["darkwoodmaterial",6],["cobblestonematerial",12],["plantfibre",3]], + "output": "sb_stonehoe", + "groups": ["sb_craftingtable","tools","craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/farming/wateringcan.recipe b/recipes/starbound/tools/farm/farming/wateringcan.recipe index a9e03862..1bb7de2c 100644 --- a/recipes/starbound/tools/farm/farming/wateringcan.recipe +++ b/recipes/starbound/tools/farm/farming/wateringcan.recipe @@ -1,5 +1,5 @@ { - "input" : ["woodenwateringcan",["polymer",3]], - "output" : "sb_wateringcan", - "groups" : ["craftingfarm","farming","all"] + "input": ["woodenwateringcan",["polymer",3]], + "output": "sb_wateringcan", + "groups": ["craftingfarm","farming","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/survival/iceaxe.recipe b/recipes/starbound/tools/farm/survival/iceaxe.recipe index ba0ebf72..cb5d5081 100644 --- a/recipes/starbound/tools/farm/survival/iceaxe.recipe +++ b/recipes/starbound/tools/farm/survival/iceaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"ironbar","climbingrope"], - "output" : "sb_iceaxe", - "groups" : ["craftingfarm","survival","all"] + "input": [["sb_steelbar",2],"ironbar","climbingrope"], + "output": "sb_iceaxe", + "groups": ["craftingfarm","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm/survival/preservatives.recipe b/recipes/starbound/tools/farm/survival/preservatives.recipe index 944c3196..8460e1d3 100644 --- a/recipes/starbound/tools/farm/survival/preservatives.recipe +++ b/recipes/starbound/tools/farm/survival/preservatives.recipe @@ -1,5 +1,5 @@ { - "input" : ["sulphur","seaweed",["bottle",2]], - "output" : ["sb_preservatives",2], - "groups" : ["craftingfarm","survival","all"] + "input": ["sulphur","seaweed",["bottle",2]], + "output": ["sb_preservatives",2], + "groups": ["craftingfarm","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm2/survival/flashfreeze.recipe b/recipes/starbound/tools/farm2/survival/flashfreeze.recipe index 22a41f8d..64be907b 100644 --- a/recipes/starbound/tools/farm2/survival/flashfreeze.recipe +++ b/recipes/starbound/tools/farm2/survival/flashfreeze.recipe @@ -1,5 +1,5 @@ { - "input" : ["bottle","cryonicextract"], - "output" : "sb_flashfreeze", //Just make a farm if you want more than one... - "groups" : ["craftingfarm2","survival","all"] + "input": ["bottle","cryonicextract"], + "output": "sb_flashfreeze", //Just make a farm if you want more than one... + "groups": ["craftingfarm2","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm2/survival/gps.recipe b/recipes/starbound/tools/farm2/survival/gps.recipe index c010f067..e6668bbe 100644 --- a/recipes/starbound/tools/farm2/survival/gps.recipe +++ b/recipes/starbound/tools/farm2/survival/gps.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","smallbattery","glass","wire"], - "output" : "sb_gps", - "groups" : ["craftingfarm2","survival","all"] + "input": ["platinumbar","smallbattery","glass","wire"], + "output": "sb_gps", + "groups": ["craftingfarm2","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm2/survival/healthmonitor.recipe b/recipes/starbound/tools/farm2/survival/healthmonitor.recipe index 49fbe779..4a03f70f 100644 --- a/recipes/starbound/tools/farm2/survival/healthmonitor.recipe +++ b/recipes/starbound/tools/farm2/survival/healthmonitor.recipe @@ -1,5 +1,5 @@ { - "input" : ["silverbar","smallbattery","glass","wire"], - "output" : "sb_healthmonitor", - "groups" : ["craftingfarm2","survival","all"] + "input": ["silverbar","smallbattery","glass","wire"], + "output": "sb_healthmonitor", + "groups": ["craftingfarm2","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/farm2/survival/spaceairtank.recipe b/recipes/starbound/tools/farm2/survival/spaceairtank.recipe index 53832b2d..64dca95d 100644 --- a/recipes/starbound/tools/farm2/survival/spaceairtank.recipe +++ b/recipes/starbound/tools/farm2/survival/spaceairtank.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],"livingroot"], - "output" : "sb_spaceairtank", - "groups" : ["craftingfarm2","survival","all"] + "input": [["durasteelbar",6],"livingroot"], + "output": "sb_spaceairtank", + "groups": ["craftingfarm2","survival","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/inventors3/portable3dprinter.recipe b/recipes/starbound/tools/inventors3/portable3dprinter.recipe index 5601f515..3e752855 100644 --- a/recipes/starbound/tools/inventors3/portable3dprinter.recipe +++ b/recipes/starbound/tools/inventors3/portable3dprinter.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",10],"smallbattery",["wire",3],"siliconboard"], - "output" : "sb_portable3dprinter", - "groups" : ["inventorstable3","craftingstations","all"] + "input": [["platinumbar",10],"smallbattery",["wire",3],"siliconboard"], + "output": "sb_portable3dprinter", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/beamaxe.recipe b/recipes/starbound/tools/mining/beamaxe.recipe index 75ac96ce..b28ba190 100644 --- a/recipes/starbound/tools/mining/beamaxe.recipe +++ b/recipes/starbound/tools/mining/beamaxe.recipe @@ -1,6 +1,6 @@ { - "input" : [["money",100]], - "output" : "sb_beamaxe", - "duration" : 0, - "groups" : ["sb_craftingtable","plain","tools","mining","all"] + "input": [["money",100]], + "output": "sb_beamaxe", + "duration": 0, + "groups": ["sb_craftingtable","plain","tools","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/copperdrill.recipe b/recipes/starbound/tools/mining/drills/copperdrill.recipe index d2a841d3..332d0c3a 100644 --- a/recipes/starbound/tools/mining/drills/copperdrill.recipe +++ b/recipes/starbound/tools/mining/drills/copperdrill.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",12],"sb_handdrill"], - "output" : "copperdrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": [["copperbar",12],"sb_handdrill"], + "output": "copperdrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/diamonddrill.recipe b/recipes/starbound/tools/mining/drills/diamonddrill.recipe index a7aba5a7..6baaa5cd 100644 --- a/recipes/starbound/tools/mining/drills/diamonddrill.recipe +++ b/recipes/starbound/tools/mining/drills/diamonddrill.recipe @@ -1,5 +1,5 @@ { - "input" : [["diamond",12],"sb_handdrill"], - "output" : "diamonddrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": [["diamond",12],"sb_handdrill"], + "output": "diamonddrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/diamonddrill2.recipe b/recipes/starbound/tools/mining/drills/diamonddrill2.recipe index e37545d4..d33b3738 100644 --- a/recipes/starbound/tools/mining/drills/diamonddrill2.recipe +++ b/recipes/starbound/tools/mining/drills/diamonddrill2.recipe @@ -1,5 +1,5 @@ { - "input" : [["diamond",8],"platinumdrill"], - "output" : "diamonddrill", - "groups" : ["sb_roboticcraftingtable","mining","nouncrafting","all"] + "input": [["diamond",8],"platinumdrill"], + "output": "diamonddrill", + "groups": ["sb_roboticcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/golddrill.recipe b/recipes/starbound/tools/mining/drills/golddrill.recipe index d7645681..2ff53b96 100644 --- a/recipes/starbound/tools/mining/drills/golddrill.recipe +++ b/recipes/starbound/tools/mining/drills/golddrill.recipe @@ -1,5 +1,5 @@ { - "input" : [["goldbar",12],"sb_handdrill"], - "output" : "golddrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": [["goldbar",12],"sb_handdrill"], + "output": "golddrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/golddrill2.recipe b/recipes/starbound/tools/mining/drills/golddrill2.recipe index 6963ba78..3586b1fb 100644 --- a/recipes/starbound/tools/mining/drills/golddrill2.recipe +++ b/recipes/starbound/tools/mining/drills/golddrill2.recipe @@ -1,5 +1,5 @@ { - "input" : [["goldbar",8],"silverdrill"], - "output" : "golddrill", - "groups" : ["sb_roboticcraftingtable","mining","nouncrafting","all"] + "input": [["goldbar",8],"silverdrill"], + "output": "golddrill", + "groups": ["sb_roboticcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/handdrill.recipe b/recipes/starbound/tools/mining/drills/handdrill.recipe index 9d7fe2fa..ac58c07e 100644 --- a/recipes/starbound/tools/mining/drills/handdrill.recipe +++ b/recipes/starbound/tools/mining/drills/handdrill.recipe @@ -1,5 +1,5 @@ { - "input" : ["battery",["sb_steelbar",6],["wire",4]], - "output" : "sb_handdrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": ["battery",["sb_steelbar",6],["wire",4]], + "output": "sb_handdrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/platinumdrill.recipe b/recipes/starbound/tools/mining/drills/platinumdrill.recipe index f18fd468..c174fdd0 100644 --- a/recipes/starbound/tools/mining/drills/platinumdrill.recipe +++ b/recipes/starbound/tools/mining/drills/platinumdrill.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",12],"sb_handdrill"], - "output" : "platinumdrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": [["platinumbar",12],"sb_handdrill"], + "output": "platinumdrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/platinumdrill2.recipe b/recipes/starbound/tools/mining/drills/platinumdrill2.recipe index 956ecd2c..3b2972ee 100644 --- a/recipes/starbound/tools/mining/drills/platinumdrill2.recipe +++ b/recipes/starbound/tools/mining/drills/platinumdrill2.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",8],"golddrill"], - "output" : "platinumdrill", - "groups" : ["sb_roboticcraftingtable","mining","nouncrafting","all"] + "input": [["platinumbar",8],"golddrill"], + "output": "platinumdrill", + "groups": ["sb_roboticcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/silverdrill.recipe b/recipes/starbound/tools/mining/drills/silverdrill.recipe index 48f9eec6..7b69d486 100644 --- a/recipes/starbound/tools/mining/drills/silverdrill.recipe +++ b/recipes/starbound/tools/mining/drills/silverdrill.recipe @@ -1,5 +1,5 @@ { - "input" : [["silverbar",12],"sb_handdrill"], - "output" : "silverdrill", - "groups" : ["sb_roboticcraftingtable","mining","all"] + "input": [["silverbar",12],"sb_handdrill"], + "output": "silverdrill", + "groups": ["sb_roboticcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/drills/silverdrill2.recipe b/recipes/starbound/tools/mining/drills/silverdrill2.recipe index 20a5f432..51a4230f 100644 --- a/recipes/starbound/tools/mining/drills/silverdrill2.recipe +++ b/recipes/starbound/tools/mining/drills/silverdrill2.recipe @@ -1,5 +1,5 @@ { - "input" : [["silverbar",8],"copperdrill"], - "output" : "silverdrill", - "groups" : ["sb_roboticcraftingtable","mining","nouncrafting","all"] + "input": [["silverbar",8],"copperdrill"], + "output": "silverdrill", + "groups": ["sb_roboticcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/copperpickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/copperpickaxe.recipe index ef084eff..a7b19108 100644 --- a/recipes/starbound/tools/mining/pickaxes/copperpickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/copperpickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",8],"sb_stonepickaxe"], - "output" : "copperpickaxe", - "groups" : ["sb_craftingtable","mining","all"] + "input": [["copperbar",8],"sb_stonepickaxe"], + "output": "copperpickaxe", + "groups": ["sb_craftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/diamondpickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe.recipe index c0fbaf2a..332c2236 100644 --- a/recipes/starbound/tools/mining/pickaxes/diamondpickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["diamond",8],"sb_stonepickaxe"], - "output" : "diamondpickaxe", - "groups" : ["sb_ironcraftingtable","mining","all"] + "input": [["diamond",8],"sb_stonepickaxe"], + "output": "diamondpickaxe", + "groups": ["sb_ironcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/diamondpickaxe2.recipe b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe2.recipe index ff62284b..ba31ca3e 100644 --- a/recipes/starbound/tools/mining/pickaxes/diamondpickaxe2.recipe +++ b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["diamond",4],"platinumpickaxe"], - "output" : "diamondpickaxe", - "groups" : ["sb_ironcraftingtable","mining","nouncrafting","all"] + "input": [["diamond",4],"platinumpickaxe"], + "output": "diamondpickaxe", + "groups": ["sb_ironcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/goldpickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/goldpickaxe.recipe index 4b5190a3..d6f01abe 100644 --- a/recipes/starbound/tools/mining/pickaxes/goldpickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/goldpickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["goldbar",8],"sb_stonepickaxe"], - "output" : "goldpickaxe", - "groups" : ["sb_ironcraftingtable","mining","all"] + "input": [["goldbar",8],"sb_stonepickaxe"], + "output": "goldpickaxe", + "groups": ["sb_ironcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/goldpickaxe2.recipe b/recipes/starbound/tools/mining/pickaxes/goldpickaxe2.recipe index f209c8a2..1dcb4f91 100644 --- a/recipes/starbound/tools/mining/pickaxes/goldpickaxe2.recipe +++ b/recipes/starbound/tools/mining/pickaxes/goldpickaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["goldbar",4],"silverpickaxe"], - "output" : "goldpickaxe", - "groups" : ["sb_ironcraftingtable","mining","nouncrafting","all"] + "input": [["goldbar",4],"silverpickaxe"], + "output": "goldpickaxe", + "groups": ["sb_ironcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/pickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/pickaxe.recipe index 701b116a..747d43a0 100644 --- a/recipes/starbound/tools/mining/pickaxes/pickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/pickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",8],"sb_stonepickaxe"], - "output" : "pickaxe", - "groups" : ["sb_craftingtable","mining","all"] + "input": [["ironbar",8],"sb_stonepickaxe"], + "output": "pickaxe", + "groups": ["sb_craftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/pickaxe2.recipe b/recipes/starbound/tools/mining/pickaxes/pickaxe2.recipe index f57a1fd5..4bf386ab 100644 --- a/recipes/starbound/tools/mining/pickaxes/pickaxe2.recipe +++ b/recipes/starbound/tools/mining/pickaxes/pickaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",4],"copperpickaxe"], - "output" : "pickaxe", - "groups" : ["sb_craftingtable","mining","nouncrafting","all"] + "input": [["ironbar",4],"copperpickaxe"], + "output": "pickaxe", + "groups": ["sb_craftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/platinumpickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe.recipe index 2eebb634..cde3ffd8 100644 --- a/recipes/starbound/tools/mining/pickaxes/platinumpickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",8],"sb_stonepickaxe"], - "output" : "platinumpickaxe", - "groups" : ["sb_ironcraftingtable","mining","all"] + "input": [["platinumbar",8],"sb_stonepickaxe"], + "output": "platinumpickaxe", + "groups": ["sb_ironcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/platinumpickaxe2.recipe b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe2.recipe index 735e7625..dacd87ff 100644 --- a/recipes/starbound/tools/mining/pickaxes/platinumpickaxe2.recipe +++ b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["platinumbar",4],"goldpickaxe"], - "output" : "platinumpickaxe", - "groups" : ["sb_ironcraftingtable","mining","nouncrafting","all"] + "input": [["platinumbar",4],"goldpickaxe"], + "output": "platinumpickaxe", + "groups": ["sb_ironcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/silverpickaxe.recipe b/recipes/starbound/tools/mining/pickaxes/silverpickaxe.recipe index d9189c84..0eb4d624 100644 --- a/recipes/starbound/tools/mining/pickaxes/silverpickaxe.recipe +++ b/recipes/starbound/tools/mining/pickaxes/silverpickaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["silverbar",8],"sb_stonepickaxe"], - "output" : "silverpickaxe", - "groups" : ["sb_ironcraftingtable","mining","all"] + "input": [["silverbar",8],"sb_stonepickaxe"], + "output": "silverpickaxe", + "groups": ["sb_ironcraftingtable","mining","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/silverpickaxe2.recipe b/recipes/starbound/tools/mining/pickaxes/silverpickaxe2.recipe index 87723ddc..74f00c24 100644 --- a/recipes/starbound/tools/mining/pickaxes/silverpickaxe2.recipe +++ b/recipes/starbound/tools/mining/pickaxes/silverpickaxe2.recipe @@ -1,5 +1,5 @@ { - "input" : [["silverbar",4],"pickaxe"], - "output" : "silverpickaxe", - "groups" : ["sb_ironcraftingtable","mining","nouncrafting","all"] + "input": [["silverbar",4],"pickaxe"], + "output": "silverpickaxe", + "groups": ["sb_ironcraftingtable","mining","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/mining/pickaxes/stonepick.recipe b/recipes/starbound/tools/mining/pickaxes/stonepick.recipe index 90cfbf5f..c8326ed0 100644 --- a/recipes/starbound/tools/mining/pickaxes/stonepick.recipe +++ b/recipes/starbound/tools/mining/pickaxes/stonepick.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",8],["cobblestonematerial",8]], - "output" : "sb_stonepickaxe", - "groups" : ["plain","all","mining","sb_craftingtable"] + "input": [["darkwoodmaterial",8],["cobblestonematerial",8]], + "output": "sb_stonepickaxe", + "groups": ["plain","all","mining","sb_craftingtable"] } \ No newline at end of file diff --git a/recipes/starbound/tools/plain/slimehandgrapple.recipe b/recipes/starbound/tools/plain/slimehandgrapple.recipe index 3cc5130b..c13df374 100644 --- a/recipes/starbound/tools/plain/slimehandgrapple.recipe +++ b/recipes/starbound/tools/plain/slimehandgrapple.recipe @@ -1,5 +1,5 @@ { - "input" : [["greenslime",2],"climbingrope"], - "output" : ["sb_slimehandgrapple",2], - "groups" : ["plain","tools","all"] + "input": [["greenslime",2],"climbingrope"], + "output": ["sb_slimehandgrapple",2], + "groups": ["plain","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/copybook.recipe b/recipes/starbound/tools/tool/copybook.recipe index 40673a48..503003a7 100644 --- a/recipes/starbound/tools/tool/copybook.recipe +++ b/recipes/starbound/tools/tool/copybook.recipe @@ -1,5 +1,5 @@ { - "input" : [["paper",3],"leather"], - "output" : "sb_copybook", - "groups" : ["sb_craftingtable","tools","all"] + "input": [["paper",3],"leather"], + "output": "sb_copybook", + "groups": ["sb_craftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/customcodex.recipe b/recipes/starbound/tools/tool/customcodex.recipe index eec9837e..1c6d589d 100644 --- a/recipes/starbound/tools/tool/customcodex.recipe +++ b/recipes/starbound/tools/tool/customcodex.recipe @@ -1,5 +1,5 @@ { - "input" : [["paper",3],"leather"], - "output" : "sb_customcodex", - "groups" : ["sb_craftingtable","tools","all"] + "input": [["paper",3],"leather"], + "output": "sb_customcodex", + "groups": ["sb_craftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/ladderdeployer.recipe b/recipes/starbound/tools/tool/ladderdeployer.recipe index 9b1f5930..037a691a 100644 --- a/recipes/starbound/tools/tool/ladderdeployer.recipe +++ b/recipes/starbound/tools/tool/ladderdeployer.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",5],["string",4],"ironbar"], - "output" : "sb_ladderdeployer", - "groups" : ["sb_craftingtable","tools","all"] + "input": [["darkwoodmaterial",5],["string",4],"ironbar"], + "output": "sb_ladderdeployer", + "groups": ["sb_craftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/partypopper.recipe b/recipes/starbound/tools/tool/partypopper.recipe index 29188cbb..4aab355d 100644 --- a/recipes/starbound/tools/tool/partypopper.recipe +++ b/recipes/starbound/tools/tool/partypopper.recipe @@ -1,5 +1,5 @@ { - "input" : ["paper","volatilepowder","string"], - "output" : "sb_partypopper", - "groups" : ["holidaycraftingtable","heartforge","sb_craftingtable","tools","other","all"] + "input": ["paper","volatilepowder","string"], + "output": "sb_partypopper", + "groups": ["holidaycraftingtable","heartforge","sb_craftingtable","tools","other","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/radio.recipe b/recipes/starbound/tools/tool/radio.recipe index 1dc72295..7e14b0a6 100644 --- a/recipes/starbound/tools/tool/radio.recipe +++ b/recipes/starbound/tools/tool/radio.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "sb_radio", - "groups" : ["all","sb_craftingtable","objects","craftingstations"] + "input": ["ironbar","copperbar"], + "output": "sb_radio", + "groups": ["all","sb_craftingtable","objects","craftingstations"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/songbook.recipe b/recipes/starbound/tools/tool/songbook.recipe index 1137f18f..84ecfec8 100644 --- a/recipes/starbound/tools/tool/songbook.recipe +++ b/recipes/starbound/tools/tool/songbook.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar"], - "output" : "sb_songbook", - "groups" : ["all","sb_craftingtable","tools","sb_instruments"] + "input": ["ironbar","copperbar"], + "output": "sb_songbook", + "groups": ["all","sb_craftingtable","tools","sb_instruments"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool/wrappingpaper.recipe b/recipes/starbound/tools/tool/wrappingpaper.recipe index fde78393..5a9bff9f 100644 --- a/recipes/starbound/tools/tool/wrappingpaper.recipe +++ b/recipes/starbound/tools/tool/wrappingpaper.recipe @@ -1,5 +1,5 @@ { - "input" : ["paper","darkwoodmaterial"], - "output" : "sb_wrappingpaper", - "groups" : ["holidaycraftingtable","heartforge","sb_craftingtable","tools","other","all"] + "input": ["paper","darkwoodmaterial"], + "output": "sb_wrappingpaper", + "groups": ["holidaycraftingtable","heartforge","sb_craftingtable","tools","other","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool3/draintool.recipe b/recipes/starbound/tools/tool3/draintool.recipe index 4069c3d9..4ce44d4f 100644 --- a/recipes/starbound/tools/tool3/draintool.recipe +++ b/recipes/starbound/tools/tool3/draintool.recipe @@ -1,5 +1,5 @@ { - "input" : ["manipulatormodule","bottle","goldbar","wire"], - "output" : "sb_draintool", - "groups" : ["sb_roboticcraftingtable","tools","all"] + "input": ["manipulatormodule","bottle","goldbar","wire"], + "output": "sb_draintool", + "groups": ["sb_roboticcraftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool3/painttool.recipe b/recipes/starbound/tools/tool3/painttool.recipe index dec46835..80f17fc4 100644 --- a/recipes/starbound/tools/tool3/painttool.recipe +++ b/recipes/starbound/tools/tool3/painttool.recipe @@ -1,5 +1,5 @@ { - "input" : ["manipulatormodule",["wire",3],"silverbar"], - "output" : "sb_painttool", - "groups" : ["sb_roboticcraftingtable","tools","all"] + "input": ["manipulatormodule",["wire",3],"silverbar"], + "output": "sb_painttool", + "groups": ["sb_roboticcraftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/tools/tool3/wiretool.recipe b/recipes/starbound/tools/tool3/wiretool.recipe index cd826323..6ebefd88 100644 --- a/recipes/starbound/tools/tool3/wiretool.recipe +++ b/recipes/starbound/tools/tool3/wiretool.recipe @@ -1,5 +1,5 @@ { - "input" : ["manipulatormodule",["wire",5],"silverbar"], - "output" : "sb_wiretool", - "groups" : ["sb_roboticcraftingtable","tools","all"] + "input": ["manipulatormodule",["wire",5],"silverbar"], + "output": "sb_wiretool", + "groups": ["sb_roboticcraftingtable","tools","all"] } \ No newline at end of file diff --git a/recipes/starbound/treasuredtrophies/shockhoppermki.recipe b/recipes/starbound/treasuredtrophies/shockhoppermki.recipe index 987d639e..1f1361aa 100644 --- a/recipes/starbound/treasuredtrophies/shockhoppermki.recipe +++ b/recipes/starbound/treasuredtrophies/shockhoppermki.recipe @@ -1,5 +1,5 @@ { - "input" : ["bossshockhopper-codex", "sb_bossshockhopper-codex"], - "output" : "shockhoppermkiaf", - "groups" : ["sb_treasuredtrophies_outpost_weaponshop","nouncrafting","all"] + "input": ["bossshockhopper-codex", "sb_bossshockhopper-codex"], + "output": "shockhoppermkiaf", + "groups": ["sb_treasuredtrophies_outpost_weaponshop","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/treasuredtrophies/soluskatana.recipe b/recipes/starbound/treasuredtrophies/soluskatana.recipe index 581dc26e..294e7586 100644 --- a/recipes/starbound/treasuredtrophies/soluskatana.recipe +++ b/recipes/starbound/treasuredtrophies/soluskatana.recipe @@ -1,5 +1,5 @@ { - "input" : [ + "input": [ "snorkelhead", "valoroushead", "valorouschest", @@ -9,6 +9,6 @@ "hylotlmission4-codex", "hylotlmission1-codex" ], - "output" : "soluskatana", - "groups" : ["sb_treasuredtrophies_outpost_mission3","nouncrafting","all"] + "output": "soluskatana", + "groups": ["sb_treasuredtrophies_outpost_mission3","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/treasuredtrophies/swansong.recipe b/recipes/starbound/treasuredtrophies/swansong.recipe index 78f2355e..c95bce0f 100644 --- a/recipes/starbound/treasuredtrophies/swansong.recipe +++ b/recipes/starbound/treasuredtrophies/swansong.recipe @@ -1,11 +1,11 @@ { - "input" : [ + "input": [ "armoredcultisthead", "armoredcultistback", ["cultistmission1-codex",1,{"shortdescription":"Occasus Lab Report: R"}], ["cultistmission2-codex",1,{"shortdescription":"Occasus Lab Report: A"}], "mecharmsoluskatana" ], - "output" : ["sb_itembox",1,{"items":"swansongaf","shortdescription":"Swangsong Figurine","directives":"?replace;ffca8a=d29ce7;e0975c=a451c4;a85636=6a2284"}], - "groups" : ["sb_treasuredtrophies_final_gate_key","nouncrafting","all"] + "output": ["sb_itembox",1,{"items":"swansongaf","shortdescription":"Swangsong Figurine","directives":"?replace;ffca8a=d29ce7;e0975c=a451c4;a85636=6a2284"}], + "groups": ["sb_treasuredtrophies_final_gate_key","nouncrafting","all"] } \ No newline at end of file diff --git a/recipes/starbound/treasuredtrophies/tieredrewardbag.recipe b/recipes/starbound/treasuredtrophies/tieredrewardbag.recipe index da3527d5..5f91a929 100644 --- a/recipes/starbound/treasuredtrophies/tieredrewardbag.recipe +++ b/recipes/starbound/treasuredtrophies/tieredrewardbag.recipe @@ -1,5 +1,5 @@ { - "input" : [["perfectlygenericitem",5]], - "output" : ["rewardbag",1,{"sb_useTechTier":true}], - "groups" : ["treasuredtrophies","nouncrafting","all"] + "input": [["perfectlygenericitem",5]], + "output": ["rewardbag",1,{"sb_useTechTier":true}], + "groups": ["treasuredtrophies","nouncrafting","all"] } diff --git a/recipes/starbound/upgrades/manipulatormodule.recipe b/recipes/starbound/upgrades/manipulatormodule.recipe index f8a8dc8a..9fe3df46 100644 --- a/recipes/starbound/upgrades/manipulatormodule.recipe +++ b/recipes/starbound/upgrades/manipulatormodule.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_mattermodulecomponent",10],"diamond"], - "output" : "manipulatormodule", - "groups" : ["sb_craftingtable","other","plain","upgrades","all"] + "input": [["sb_mattermodulecomponent",10],"diamond"], + "output": "manipulatormodule", + "groups": ["sb_craftingtable","other","plain","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/fuelefficiency1.recipe b/recipes/starbound/upgrades/shipupgrades/fuelefficiency1.recipe index 1590636d..acaae00a 100644 --- a/recipes/starbound/upgrades/shipupgrades/fuelefficiency1.recipe +++ b/recipes/starbound/upgrades/shipupgrades/fuelefficiency1.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",15],["refinedaegisalt",15]], - "output" : "sb_fuelefficiency1", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",15],["refinedaegisalt",15]], + "output": "sb_fuelefficiency1", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/maxfuel1.recipe b/recipes/starbound/upgrades/shipupgrades/maxfuel1.recipe index ccabdb7b..c10c2169 100644 --- a/recipes/starbound/upgrades/shipupgrades/maxfuel1.recipe +++ b/recipes/starbound/upgrades/shipupgrades/maxfuel1.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",20],["uraniumrod",20],["titaniumbar",10]], - "output" : "sb_maxfuel1", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",20],["uraniumrod",20],["titaniumbar",10]], + "output": "sb_maxfuel1", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/maxfuel2.recipe b/recipes/starbound/upgrades/shipupgrades/maxfuel2.recipe index 355aad1f..41536557 100644 --- a/recipes/starbound/upgrades/shipupgrades/maxfuel2.recipe +++ b/recipes/starbound/upgrades/shipupgrades/maxfuel2.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",20],["plutoniumrod",20],["durasteelbar",20]], - "output" : "sb_maxfuel2", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",20],["plutoniumrod",20],["durasteelbar",20]], + "output": "sb_maxfuel2", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/maxfuel3.recipe b/recipes/starbound/upgrades/shipupgrades/maxfuel3.recipe index 94cede78..dbae168f 100644 --- a/recipes/starbound/upgrades/shipupgrades/maxfuel3.recipe +++ b/recipes/starbound/upgrades/shipupgrades/maxfuel3.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",30],["solariumstar",20],["supermatter",20]], - "output" : "sb_maxfuel3", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",30],["solariumstar",20],["supermatter",20]], + "output": "sb_maxfuel3", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/shipspeed1.recipe b/recipes/starbound/upgrades/shipupgrades/shipspeed1.recipe index f15f9431..820adbdb 100644 --- a/recipes/starbound/upgrades/shipupgrades/shipspeed1.recipe +++ b/recipes/starbound/upgrades/shipupgrades/shipspeed1.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",10],["corefragmentore",10]], - "output" : "sb_shipspeed1", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",10],["corefragmentore",10]], + "output": "sb_shipspeed1", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/shipupgrades/shipspeed2.recipe b/recipes/starbound/upgrades/shipupgrades/shipspeed2.recipe index 0305778d..dde2e232 100644 --- a/recipes/starbound/upgrades/shipupgrades/shipspeed2.recipe +++ b/recipes/starbound/upgrades/shipupgrades/shipspeed2.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["moonstoneore",20],["corefragmentore",20]], - "output" : "sb_shipspeed2", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["moonstoneore",20],["corefragmentore",20]], + "output": "sb_shipspeed2", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/techcard.recipe b/recipes/starbound/upgrades/techcard.recipe index 4d582ade..4a664787 100644 --- a/recipes/starbound/upgrades/techcard.recipe +++ b/recipes/starbound/upgrades/techcard.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_techchip",3]], - "output" : "techcard", - "groups" : ["sb_craftingtable","other","plain","sb_techconsole","upgrades","all"] + "input": [["sb_techchip",3]], + "output": "techcard", + "groups": ["sb_craftingtable","other","plain","sb_techconsole","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/techupgrades/techupgrade1.recipe b/recipes/starbound/upgrades/techupgrades/techupgrade1.recipe index 85d50e87..25c4409b 100644 --- a/recipes/starbound/upgrades/techupgrades/techupgrade1.recipe +++ b/recipes/starbound/upgrades/techupgrades/techupgrade1.recipe @@ -1,5 +1,5 @@ { - "input" : ["moltencore",["tungstenbar",1]], - "output" : "sb_techupgrade1", - "groups" : ["inventorstable","craftingstations","all"] + "input": ["moltencore",["tungstenbar",1]], + "output": "sb_techupgrade1", + "groups": ["inventorstable","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/techupgrades/techupgrade2.recipe b/recipes/starbound/upgrades/techupgrades/techupgrade2.recipe index 88dffb4a..172a3771 100644 --- a/recipes/starbound/upgrades/techupgrades/techupgrade2.recipe +++ b/recipes/starbound/upgrades/techupgrades/techupgrade2.recipe @@ -1,5 +1,5 @@ { - "input" : ["endomorphicjelly",["durasteelbar",1]], - "output" : "sb_techupgrade2", - "groups" : ["inventorstable3","craftingstations","all"] + "input": ["endomorphicjelly",["durasteelbar",1]], + "output": "sb_techupgrade2", + "groups": ["inventorstable3","craftingstations","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/upgrademodule.recipe b/recipes/starbound/upgrades/upgrademodule.recipe index aeb281bb..36e80b07 100644 --- a/recipes/starbound/upgrades/upgrademodule.recipe +++ b/recipes/starbound/upgrades/upgrademodule.recipe @@ -1,5 +1,5 @@ { - "input" : [["corefragmentore",30],["diamond",3]], - "output" : "upgrademodule", - "groups" : ["sb_craftingtable","other","plain","upgrades","all"] + "input": [["corefragmentore",30],["diamond",3]], + "output": "upgrademodule", + "groups": ["sb_craftingtable","other","plain","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade2.recipe b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade2.recipe index 3641da70..2c59114d 100644 --- a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade2.recipe +++ b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade2.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["tungstenbar",10]], - "output" : "sb_weaponupgrade2", - "groups" : ["sb_ironcraftingtable","upgrades","all"] + "input": ["upgrademodule",["tungstenbar",10]], + "output": "sb_weaponupgrade2", + "groups": ["sb_ironcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade3.recipe b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade3.recipe index 403d95a5..e4d66f60 100644 --- a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade3.recipe +++ b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade3.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["titaniumbar",10]], - "output" : "sb_weaponupgrade3", - "groups" : ["sb_ironcraftingtable","upgrades","all"] + "input": ["upgrademodule",["titaniumbar",10]], + "output": "sb_weaponupgrade3", + "groups": ["sb_ironcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade4.recipe b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade4.recipe index 5d82741e..71ff343c 100644 --- a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade4.recipe +++ b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade4.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["durasteelbar",10]], - "output" : "sb_weaponupgrade4", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["durasteelbar",10]], + "output": "sb_weaponupgrade4", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade5.recipe b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade5.recipe index 8db578d7..859d9b63 100644 --- a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade5.recipe +++ b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade5.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["refinedaegisalt",2],["sb_refinedrubium",2],["refinedferozium",2],["refinedviolium",2]], - "output" : "sb_weaponupgrade5", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["refinedaegisalt",2],["refinedferozium",2],["refinedviolium",2]], + "output": "sb_weaponupgrade5", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade6.recipe b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade6.recipe index 080def37..ff884f65 100644 --- a/recipes/starbound/upgrades/weaponupgrades/weaponupgrade6.recipe +++ b/recipes/starbound/upgrades/weaponupgrades/weaponupgrade6.recipe @@ -1,5 +1,5 @@ { - "input" : ["upgrademodule",["solariumstar",5],["sb_ceruliumcompound",5]], - "output" : "sb_weaponupgrade6", - "groups" : ["sb_roboticcraftingtable","upgrades","all"] + "input": ["upgrademodule",["solariumstar",5],["sb_ceruliumcompound",5]], + "output": "sb_weaponupgrade6", + "groups": ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t1.recipe b/recipes/starbound/weapons/axes/apex/t1.recipe index 2cc5364b..56a44d2d 100644 --- a/recipes/starbound/weapons/axes/apex/t1.recipe +++ b/recipes/starbound/weapons/axes/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_apextier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_apextier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t2.recipe b/recipes/starbound/weapons/axes/apex/t2.recipe index ca9cabca..9445e0e6 100644 --- a/recipes/starbound/weapons/axes/apex/t2.recipe +++ b/recipes/starbound/weapons/axes/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_apextier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_apextier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t3.recipe b/recipes/starbound/weapons/axes/apex/t3.recipe index caa3f886..9634cecf 100644 --- a/recipes/starbound/weapons/axes/apex/t3.recipe +++ b/recipes/starbound/weapons/axes/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_apextier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_apextier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t4.recipe b/recipes/starbound/weapons/axes/apex/t4.recipe index 4f421380..7ac6a3a3 100644 --- a/recipes/starbound/weapons/axes/apex/t4.recipe +++ b/recipes/starbound/weapons/axes/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_apextier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_apextier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t5a.recipe b/recipes/starbound/weapons/axes/apex/t5a.recipe index ee6e0198..058b1f67 100644 --- a/recipes/starbound/weapons/axes/apex/t5a.recipe +++ b/recipes/starbound/weapons/axes/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_apextier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_apextier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t5m.recipe b/recipes/starbound/weapons/axes/apex/t5m.recipe index d5c92c7b..3bd0c734 100644 --- a/recipes/starbound/weapons/axes/apex/t5m.recipe +++ b/recipes/starbound/weapons/axes/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_apextier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_apextier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t5s.recipe b/recipes/starbound/weapons/axes/apex/t5s.recipe index 0cb16fa8..1a70f9e2 100644 --- a/recipes/starbound/weapons/axes/apex/t5s.recipe +++ b/recipes/starbound/weapons/axes/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_apextier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_apextier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t6a.recipe b/recipes/starbound/weapons/axes/apex/t6a.recipe index e6f39277..89c00e79 100644 --- a/recipes/starbound/weapons/axes/apex/t6a.recipe +++ b/recipes/starbound/weapons/axes/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_apextier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t6m.recipe b/recipes/starbound/weapons/axes/apex/t6m.recipe index 4aad864c..96072f4f 100644 --- a/recipes/starbound/weapons/axes/apex/t6m.recipe +++ b/recipes/starbound/weapons/axes/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_apextier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/apex/t6s.recipe b/recipes/starbound/weapons/axes/apex/t6s.recipe index 204f1dfa..6e615615 100644 --- a/recipes/starbound/weapons/axes/apex/t6s.recipe +++ b/recipes/starbound/weapons/axes/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_apextier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t1.recipe b/recipes/starbound/weapons/axes/avian/t1.recipe index a58e4e5f..6ddf1ac7 100644 --- a/recipes/starbound/weapons/axes/avian/t1.recipe +++ b/recipes/starbound/weapons/axes/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_aviantier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_aviantier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t2.recipe b/recipes/starbound/weapons/axes/avian/t2.recipe index e049ab5c..417d6d5c 100644 --- a/recipes/starbound/weapons/axes/avian/t2.recipe +++ b/recipes/starbound/weapons/axes/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_aviantier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_aviantier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t3.recipe b/recipes/starbound/weapons/axes/avian/t3.recipe index ef696815..9d9781db 100644 --- a/recipes/starbound/weapons/axes/avian/t3.recipe +++ b/recipes/starbound/weapons/axes/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_aviantier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_aviantier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t4.recipe b/recipes/starbound/weapons/axes/avian/t4.recipe index e1a89681..a38c0c24 100644 --- a/recipes/starbound/weapons/axes/avian/t4.recipe +++ b/recipes/starbound/weapons/axes/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_aviantier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_aviantier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t5a.recipe b/recipes/starbound/weapons/axes/avian/t5a.recipe index 52105cf6..f9176e3d 100644 --- a/recipes/starbound/weapons/axes/avian/t5a.recipe +++ b/recipes/starbound/weapons/axes/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_aviantier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_aviantier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t5m.recipe b/recipes/starbound/weapons/axes/avian/t5m.recipe index 8848e53a..61fb597d 100644 --- a/recipes/starbound/weapons/axes/avian/t5m.recipe +++ b/recipes/starbound/weapons/axes/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_aviantier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_aviantier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t5s.recipe b/recipes/starbound/weapons/axes/avian/t5s.recipe index f76e1d9b..90080cb2 100644 --- a/recipes/starbound/weapons/axes/avian/t5s.recipe +++ b/recipes/starbound/weapons/axes/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_aviantier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_aviantier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t6a.recipe b/recipes/starbound/weapons/axes/avian/t6a.recipe index 98e571ab..83e4efbc 100644 --- a/recipes/starbound/weapons/axes/avian/t6a.recipe +++ b/recipes/starbound/weapons/axes/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t6m.recipe b/recipes/starbound/weapons/axes/avian/t6m.recipe index 65806e27..04514ad0 100644 --- a/recipes/starbound/weapons/axes/avian/t6m.recipe +++ b/recipes/starbound/weapons/axes/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/avian/t6s.recipe b/recipes/starbound/weapons/axes/avian/t6s.recipe index 514021a8..07187d63 100644 --- a/recipes/starbound/weapons/axes/avian/t6s.recipe +++ b/recipes/starbound/weapons/axes/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/boneaxe.recipe b/recipes/starbound/weapons/axes/boneaxe.recipe index c9eca82b..74f5b958 100644 --- a/recipes/starbound/weapons/axes/boneaxe.recipe +++ b/recipes/starbound/weapons/axes/boneaxe.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",5],["bone",15]], - "output" : ["sb_boneaxe",1,{"crafted":true}], - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",5],["bone",15]], + "output": ["sb_boneaxe",1,{"crafted":true}], + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/coralcleaver.recipe b/recipes/starbound/weapons/axes/coralcleaver.recipe index 53f2c548..a76988ce 100644 --- a/recipes/starbound/weapons/axes/coralcleaver.recipe +++ b/recipes/starbound/weapons/axes/coralcleaver.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedferozium",5],["coralfragment",7],["coalore",7]], - "output" : ["sb_coralcleaver",1,{"crafted":true}], - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedferozium",5],["coralfragment",7],["coalore",7]], + "output": ["sb_coralcleaver",1,{"crafted":true}], + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t1.recipe b/recipes/starbound/weapons/axes/floran/t1.recipe index 816216f2..a9ac9dfd 100644 --- a/recipes/starbound/weapons/axes/floran/t1.recipe +++ b/recipes/starbound/weapons/axes/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_florantier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_florantier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t2.recipe b/recipes/starbound/weapons/axes/floran/t2.recipe index fb494747..9ea299f2 100644 --- a/recipes/starbound/weapons/axes/floran/t2.recipe +++ b/recipes/starbound/weapons/axes/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_florantier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_florantier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t3.recipe b/recipes/starbound/weapons/axes/floran/t3.recipe index 282b81fa..80667736 100644 --- a/recipes/starbound/weapons/axes/floran/t3.recipe +++ b/recipes/starbound/weapons/axes/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_florantier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_florantier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t4.recipe b/recipes/starbound/weapons/axes/floran/t4.recipe index 12289248..fbeb6ac3 100644 --- a/recipes/starbound/weapons/axes/floran/t4.recipe +++ b/recipes/starbound/weapons/axes/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_florantier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_florantier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t5a.recipe b/recipes/starbound/weapons/axes/floran/t5a.recipe index d7934017..541a4f83 100644 --- a/recipes/starbound/weapons/axes/floran/t5a.recipe +++ b/recipes/starbound/weapons/axes/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_florantier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_florantier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t5m.recipe b/recipes/starbound/weapons/axes/floran/t5m.recipe index 5a7ca3a2..757e3124 100644 --- a/recipes/starbound/weapons/axes/floran/t5m.recipe +++ b/recipes/starbound/weapons/axes/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_florantier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_florantier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t5s.recipe b/recipes/starbound/weapons/axes/floran/t5s.recipe index d7328b08..8ad50a25 100644 --- a/recipes/starbound/weapons/axes/floran/t5s.recipe +++ b/recipes/starbound/weapons/axes/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_florantier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_florantier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t6a.recipe b/recipes/starbound/weapons/axes/floran/t6a.recipe index c3989ffc..63d31c3b 100644 --- a/recipes/starbound/weapons/axes/floran/t6a.recipe +++ b/recipes/starbound/weapons/axes/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_florantier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t6m.recipe b/recipes/starbound/weapons/axes/floran/t6m.recipe index 65d00895..7cc99710 100644 --- a/recipes/starbound/weapons/axes/floran/t6m.recipe +++ b/recipes/starbound/weapons/axes/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_florantier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/floran/t6s.recipe b/recipes/starbound/weapons/axes/floran/t6s.recipe index de6d89d9..86793aeb 100644 --- a/recipes/starbound/weapons/axes/floran/t6s.recipe +++ b/recipes/starbound/weapons/axes/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_florantier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t1.recipe b/recipes/starbound/weapons/axes/glitch/t1.recipe index 7b1fec62..f91386cd 100644 --- a/recipes/starbound/weapons/axes/glitch/t1.recipe +++ b/recipes/starbound/weapons/axes/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_glitchtier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_glitchtier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t2.recipe b/recipes/starbound/weapons/axes/glitch/t2.recipe index 15d76462..edc8298e 100644 --- a/recipes/starbound/weapons/axes/glitch/t2.recipe +++ b/recipes/starbound/weapons/axes/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_glitchtier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_glitchtier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t3.recipe b/recipes/starbound/weapons/axes/glitch/t3.recipe index 27e03999..357bdff1 100644 --- a/recipes/starbound/weapons/axes/glitch/t3.recipe +++ b/recipes/starbound/weapons/axes/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_glitchtier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_glitchtier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t4.recipe b/recipes/starbound/weapons/axes/glitch/t4.recipe index 65497ab5..a01c5fb4 100644 --- a/recipes/starbound/weapons/axes/glitch/t4.recipe +++ b/recipes/starbound/weapons/axes/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_glitchtier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_glitchtier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t5a.recipe b/recipes/starbound/weapons/axes/glitch/t5a.recipe index 1f8dd473..dae053bd 100644 --- a/recipes/starbound/weapons/axes/glitch/t5a.recipe +++ b/recipes/starbound/weapons/axes/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_glitchtier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_glitchtier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t5m.recipe b/recipes/starbound/weapons/axes/glitch/t5m.recipe index e58d348b..e9bc37a6 100644 --- a/recipes/starbound/weapons/axes/glitch/t5m.recipe +++ b/recipes/starbound/weapons/axes/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_glitchtier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_glitchtier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t5s.recipe b/recipes/starbound/weapons/axes/glitch/t5s.recipe index ed209dd9..db8a0a1d 100644 --- a/recipes/starbound/weapons/axes/glitch/t5s.recipe +++ b/recipes/starbound/weapons/axes/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_glitchtier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_glitchtier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t6a.recipe b/recipes/starbound/weapons/axes/glitch/t6a.recipe index c2fba0e1..b08d3004 100644 --- a/recipes/starbound/weapons/axes/glitch/t6a.recipe +++ b/recipes/starbound/weapons/axes/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t6m.recipe b/recipes/starbound/weapons/axes/glitch/t6m.recipe index f4f62d6d..fe65cfc2 100644 --- a/recipes/starbound/weapons/axes/glitch/t6m.recipe +++ b/recipes/starbound/weapons/axes/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/glitch/t6s.recipe b/recipes/starbound/weapons/axes/glitch/t6s.recipe index 08848f85..3edb8c25 100644 --- a/recipes/starbound/weapons/axes/glitch/t6s.recipe +++ b/recipes/starbound/weapons/axes/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t1.recipe b/recipes/starbound/weapons/axes/human/t1.recipe index e4a4c383..9a89ddc9 100644 --- a/recipes/starbound/weapons/axes/human/t1.recipe +++ b/recipes/starbound/weapons/axes/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_humantier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_humantier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t2.recipe b/recipes/starbound/weapons/axes/human/t2.recipe index fcca8e5b..8981fa87 100644 --- a/recipes/starbound/weapons/axes/human/t2.recipe +++ b/recipes/starbound/weapons/axes/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_humantier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_humantier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t3.recipe b/recipes/starbound/weapons/axes/human/t3.recipe index c2f8c1e4..2a31e30e 100644 --- a/recipes/starbound/weapons/axes/human/t3.recipe +++ b/recipes/starbound/weapons/axes/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_humantier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_humantier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t4.recipe b/recipes/starbound/weapons/axes/human/t4.recipe index f0fa7a8a..c85943d3 100644 --- a/recipes/starbound/weapons/axes/human/t4.recipe +++ b/recipes/starbound/weapons/axes/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_humantier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_humantier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t5a.recipe b/recipes/starbound/weapons/axes/human/t5a.recipe index c2f9a125..bdd961fd 100644 --- a/recipes/starbound/weapons/axes/human/t5a.recipe +++ b/recipes/starbound/weapons/axes/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_humantier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_humantier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t5m.recipe b/recipes/starbound/weapons/axes/human/t5m.recipe index 05f1cfd6..e95300b7 100644 --- a/recipes/starbound/weapons/axes/human/t5m.recipe +++ b/recipes/starbound/weapons/axes/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_humantier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_humantier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t5s.recipe b/recipes/starbound/weapons/axes/human/t5s.recipe index 6fc8b954..80b1d94f 100644 --- a/recipes/starbound/weapons/axes/human/t5s.recipe +++ b/recipes/starbound/weapons/axes/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_humantier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_humantier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t6a.recipe b/recipes/starbound/weapons/axes/human/t6a.recipe index 88f532ab..100f50f1 100644 --- a/recipes/starbound/weapons/axes/human/t6a.recipe +++ b/recipes/starbound/weapons/axes/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_humantier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t6m.recipe b/recipes/starbound/weapons/axes/human/t6m.recipe index 1097648d..489e9af2 100644 --- a/recipes/starbound/weapons/axes/human/t6m.recipe +++ b/recipes/starbound/weapons/axes/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_humantier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/human/t6s.recipe b/recipes/starbound/weapons/axes/human/t6s.recipe index 0139a797..b6a7adc3 100644 --- a/recipes/starbound/weapons/axes/human/t6s.recipe +++ b/recipes/starbound/weapons/axes/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_humantier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t1.recipe b/recipes/starbound/weapons/axes/hylotl/t1.recipe index f88eb92e..725a65b7 100644 --- a/recipes/starbound/weapons/axes/hylotl/t1.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_hylotltier1axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_hylotltier1axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t2.recipe b/recipes/starbound/weapons/axes/hylotl/t2.recipe index f5fb3fe8..19818678 100644 --- a/recipes/starbound/weapons/axes/hylotl/t2.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_hylotltier2axe", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_hylotltier2axe", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t3.recipe b/recipes/starbound/weapons/axes/hylotl/t3.recipe index ce1c3c08..39218b16 100644 --- a/recipes/starbound/weapons/axes/hylotl/t3.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_hylotltier3axe", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_hylotltier3axe", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t4.recipe b/recipes/starbound/weapons/axes/hylotl/t4.recipe index 6dc26521..17832dc3 100644 --- a/recipes/starbound/weapons/axes/hylotl/t4.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_hylotltier4axe", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_hylotltier4axe", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t5a.recipe b/recipes/starbound/weapons/axes/hylotl/t5a.recipe index 9b46270f..ea43fd60 100644 --- a/recipes/starbound/weapons/axes/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_hylotltier5aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_hylotltier5aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t5m.recipe b/recipes/starbound/weapons/axes/hylotl/t5m.recipe index 83a97c6a..8d2dcbfb 100644 --- a/recipes/starbound/weapons/axes/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_hylotltier5maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_hylotltier5maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t5s.recipe b/recipes/starbound/weapons/axes/hylotl/t5s.recipe index 4a1bb846..e65e2c1c 100644 --- a/recipes/starbound/weapons/axes/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_hylotltier5saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_hylotltier5saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t6a.recipe b/recipes/starbound/weapons/axes/hylotl/t6a.recipe index 5a9a4f54..35a54c6d 100644 --- a/recipes/starbound/weapons/axes/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6aaxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6aaxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t6m.recipe b/recipes/starbound/weapons/axes/hylotl/t6m.recipe index 1f0ce2c9..64f945b0 100644 --- a/recipes/starbound/weapons/axes/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6maxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6maxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/hylotl/t6s.recipe b/recipes/starbound/weapons/axes/hylotl/t6s.recipe index 06eda4c8..558a9eb4 100644 --- a/recipes/starbound/weapons/axes/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/axes/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6saxe", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6saxe", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/aegisaltbow.recipe b/recipes/starbound/weapons/bows/aegisaltbow.recipe index da2bf5af..90dea7a7 100644 --- a/recipes/starbound/weapons/bows/aegisaltbow.recipe +++ b/recipes/starbound/weapons/bows/aegisaltbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],"thread",["liquidoil",3]], - "output" : "sb_aegisaltbow", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",6],"thread",["liquidoil",3]], + "output": "sb_aegisaltbow", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/feroziumbow.recipe b/recipes/starbound/weapons/bows/feroziumbow.recipe index 29ce7593..9a26819d 100644 --- a/recipes/starbound/weapons/bows/feroziumbow.recipe +++ b/recipes/starbound/weapons/bows/feroziumbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],"syntheticmaterial"], - "output" : "sb_feroziumbow", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",6],"syntheticmaterial"], + "output": "sb_feroziumbow", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/firebow.recipe b/recipes/starbound/weapons/bows/firebow.recipe index 80be1361..b53d59b2 100644 --- a/recipes/starbound/weapons/bows/firebow.recipe +++ b/recipes/starbound/weapons/bows/firebow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"thread","scorchedcore"], - "output" : ["sb_firebow",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",6],"thread","scorchedcore"], + "output": ["sb_firebow",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/frozenbow.recipe b/recipes/starbound/weapons/bows/frozenbow.recipe index a7a58e94..ddba9afa 100644 --- a/recipes/starbound/weapons/bows/frozenbow.recipe +++ b/recipes/starbound/weapons/bows/frozenbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"thread",["snowflake",15]], - "output" : "frozenbow", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",6],"thread",["snowflake",15]], + "output": "frozenbow", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/frozenfirebow.txt b/recipes/starbound/weapons/bows/frozenfirebow.txt index 81693eb5..5bf4d96c 100644 --- a/recipes/starbound/weapons/bows/frozenfirebow.txt +++ b/recipes/starbound/weapons/bows/frozenfirebow.txt @@ -1,5 +1,5 @@ { - "input" : ["frozenbow","sb_firebow",["solariumstar",6]], - "output" : "sb_frozenfirebow", - "groups" : ["craftingaccelerator","weapons","all"] + "input": ["frozenbow","sb_firebow",["solariumstar",6]], + "output": "sb_frozenfirebow", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/harpoongun.recipe b/recipes/starbound/weapons/bows/harpoongun.recipe index 91049016..726e0d99 100644 --- a/recipes/starbound/weapons/bows/harpoongun.recipe +++ b/recipes/starbound/weapons/bows/harpoongun.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",2],["copperbar",2]], - "output" : ["harpoongun",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",2],["copperbar",2]], + "output": ["harpoongun",1,{"sb_crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/lightbow.recipe b/recipes/starbound/weapons/bows/lightbow.recipe index 44b8539d..001acef8 100644 --- a/recipes/starbound/weapons/bows/lightbow.recipe +++ b/recipes/starbound/weapons/bows/lightbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"thread",["glowfibre",15]], - "output" : "lightbow", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",6],"thread",["glowfibre",15]], + "output": "lightbow", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/poisonbow.recipe b/recipes/starbound/weapons/bows/poisonbow.recipe index 71687dd0..e10c069f 100644 --- a/recipes/starbound/weapons/bows/poisonbow.recipe +++ b/recipes/starbound/weapons/bows/poisonbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],"venomsample","string",["liquidoil",3]], - "output" : "poisonbow", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],"venomsample","string",["liquidoil",3]], + "output": "poisonbow", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/pollenpump.recipe b/recipes/starbound/weapons/bows/pollenpump.recipe index bde6c207..12b9b5ed 100644 --- a/recipes/starbound/weapons/bows/pollenpump.recipe +++ b/recipes/starbound/weapons/bows/pollenpump.recipe @@ -1,6 +1,6 @@ { - "input" : [["tungstenbar",6],["wildvines",15]], + "input": [["tungstenbar",6],["wildvines",15]], //Better to use wildvines instead of putting people in a situation where they want the weapon but cant because they have have all but one color of petals - "output" : "pollenpump", - "groups" : ["craftinganvil","weapons","all"] + "output": "pollenpump", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/bows/slingshot.recipe b/recipes/starbound/weapons/bows/slingshot.recipe index 016ea71d..6f9c86d5 100644 --- a/recipes/starbound/weapons/bows/slingshot.recipe +++ b/recipes/starbound/weapons/bows/slingshot.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",6],"string"], - "output" : "sb_slingshot", - "groups" : ["plain","sb_craftingtable","craftinganvil","weapons","all"] + "input": [["darkwoodmaterial",6],"string"], + "output": "sb_slingshot", + "groups": ["plain","sb_craftingtable","craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t1.recipe b/recipes/starbound/weapons/broadswords/apex/t1.recipe index 4576d441..daedf7df 100644 --- a/recipes/starbound/weapons/broadswords/apex/t1.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_apextier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_apextier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t2.recipe b/recipes/starbound/weapons/broadswords/apex/t2.recipe index 94c2e8bb..0dd41ef3 100644 --- a/recipes/starbound/weapons/broadswords/apex/t2.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_apextier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_apextier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t3.recipe b/recipes/starbound/weapons/broadswords/apex/t3.recipe index 441d0ab4..dd28e801 100644 --- a/recipes/starbound/weapons/broadswords/apex/t3.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_apextier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_apextier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t4.recipe b/recipes/starbound/weapons/broadswords/apex/t4.recipe index c053df63..ca5379a8 100644 --- a/recipes/starbound/weapons/broadswords/apex/t4.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_apextier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_apextier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t5a.recipe b/recipes/starbound/weapons/broadswords/apex/t5a.recipe index 08e3cc15..0c7c91c6 100644 --- a/recipes/starbound/weapons/broadswords/apex/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_apextier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_apextier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t5m.recipe b/recipes/starbound/weapons/broadswords/apex/t5m.recipe index b5bb4436..e6a0f88e 100644 --- a/recipes/starbound/weapons/broadswords/apex/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_apextier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_apextier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t5s.recipe b/recipes/starbound/weapons/broadswords/apex/t5s.recipe index df66903a..bfd7f1ca 100644 --- a/recipes/starbound/weapons/broadswords/apex/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_apextier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_apextier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t6a.recipe b/recipes/starbound/weapons/broadswords/apex/t6a.recipe index 5292cf85..dbb1d36b 100644 --- a/recipes/starbound/weapons/broadswords/apex/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_apextier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t6m.recipe b/recipes/starbound/weapons/broadswords/apex/t6m.recipe index c1d250c9..b9dd1ffc 100644 --- a/recipes/starbound/weapons/broadswords/apex/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_apextier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/apex/t6s.recipe b/recipes/starbound/weapons/broadswords/apex/t6s.recipe index 176144bd..86356556 100644 --- a/recipes/starbound/weapons/broadswords/apex/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_apextier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t1.recipe b/recipes/starbound/weapons/broadswords/avian/t1.recipe index 3b9f20c5..6cbd4e81 100644 --- a/recipes/starbound/weapons/broadswords/avian/t1.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_aviantier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_aviantier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t2.recipe b/recipes/starbound/weapons/broadswords/avian/t2.recipe index 3b724e46..63b59d78 100644 --- a/recipes/starbound/weapons/broadswords/avian/t2.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_aviantier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_aviantier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t3.recipe b/recipes/starbound/weapons/broadswords/avian/t3.recipe index 08fd3311..1a0cad0b 100644 --- a/recipes/starbound/weapons/broadswords/avian/t3.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_aviantier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_aviantier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t4.recipe b/recipes/starbound/weapons/broadswords/avian/t4.recipe index f37710ff..aa45825b 100644 --- a/recipes/starbound/weapons/broadswords/avian/t4.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_aviantier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_aviantier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t5a.recipe b/recipes/starbound/weapons/broadswords/avian/t5a.recipe index 7a8b3721..97e2e18a 100644 --- a/recipes/starbound/weapons/broadswords/avian/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_aviantier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_aviantier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t5m.recipe b/recipes/starbound/weapons/broadswords/avian/t5m.recipe index 48235c1c..38dd9816 100644 --- a/recipes/starbound/weapons/broadswords/avian/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_aviantier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_aviantier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t5s.recipe b/recipes/starbound/weapons/broadswords/avian/t5s.recipe index 3f8f327c..abf03e49 100644 --- a/recipes/starbound/weapons/broadswords/avian/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_aviantier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_aviantier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t6a.recipe b/recipes/starbound/weapons/broadswords/avian/t6a.recipe index 73028167..1164829d 100644 --- a/recipes/starbound/weapons/broadswords/avian/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t6m.recipe b/recipes/starbound/weapons/broadswords/avian/t6m.recipe index e34de301..a9e81094 100644 --- a/recipes/starbound/weapons/broadswords/avian/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/avian/t6s.recipe b/recipes/starbound/weapons/broadswords/avian/t6s.recipe index fd1683b4..0e95a860 100644 --- a/recipes/starbound/weapons/broadswords/avian/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/deathstick.recipe b/recipes/starbound/weapons/broadswords/deathstick.recipe new file mode 100644 index 00000000..5804e48f --- /dev/null +++ b/recipes/starbound/weapons/broadswords/deathstick.recipe @@ -0,0 +1,5 @@ +{ + "input": [["titaniumbar",10],["hivebomb",5]], + "output": ["sb_deathstick",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t1.recipe b/recipes/starbound/weapons/broadswords/floran/t1.recipe index a6f54c37..423782fa 100644 --- a/recipes/starbound/weapons/broadswords/floran/t1.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_florantier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_florantier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t2.recipe b/recipes/starbound/weapons/broadswords/floran/t2.recipe index 91c5b104..0e56396f 100644 --- a/recipes/starbound/weapons/broadswords/floran/t2.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_florantier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_florantier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t3.recipe b/recipes/starbound/weapons/broadswords/floran/t3.recipe index e76cc674..ebaba4aa 100644 --- a/recipes/starbound/weapons/broadswords/floran/t3.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_florantier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_florantier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t4.recipe b/recipes/starbound/weapons/broadswords/floran/t4.recipe index d1a08b94..f6a19eeb 100644 --- a/recipes/starbound/weapons/broadswords/floran/t4.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_florantier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_florantier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t5a.recipe b/recipes/starbound/weapons/broadswords/floran/t5a.recipe index 692df57b..840d78fc 100644 --- a/recipes/starbound/weapons/broadswords/floran/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_florantier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_florantier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t5m.recipe b/recipes/starbound/weapons/broadswords/floran/t5m.recipe index d36ef65d..89a67111 100644 --- a/recipes/starbound/weapons/broadswords/floran/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_florantier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_florantier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t5s.recipe b/recipes/starbound/weapons/broadswords/floran/t5s.recipe index fd874119..736abe10 100644 --- a/recipes/starbound/weapons/broadswords/floran/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_florantier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_florantier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t6a.recipe b/recipes/starbound/weapons/broadswords/floran/t6a.recipe index 43688166..789d5fe0 100644 --- a/recipes/starbound/weapons/broadswords/floran/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_florantier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t6m.recipe b/recipes/starbound/weapons/broadswords/floran/t6m.recipe index 4351ffab..106f8a4d 100644 --- a/recipes/starbound/weapons/broadswords/floran/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_florantier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/floran/t6s.recipe b/recipes/starbound/weapons/broadswords/floran/t6s.recipe index 58557f4f..86a45a4b 100644 --- a/recipes/starbound/weapons/broadswords/floran/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_florantier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t1.recipe b/recipes/starbound/weapons/broadswords/glitch/t1.recipe index 08304843..f5563577 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t1.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_glitchtier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_glitchtier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t2.recipe b/recipes/starbound/weapons/broadswords/glitch/t2.recipe index fd89f8cd..54a0b1d1 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t2.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_glitchtier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_glitchtier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t3.recipe b/recipes/starbound/weapons/broadswords/glitch/t3.recipe index 7105eedd..7e0900a1 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t3.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_glitchtier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_glitchtier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t4.recipe b/recipes/starbound/weapons/broadswords/glitch/t4.recipe index 69cc528a..7d4d31af 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t4.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_glitchtier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_glitchtier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t5a.recipe b/recipes/starbound/weapons/broadswords/glitch/t5a.recipe index 147e12b6..fb34f9fc 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_glitchtier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_glitchtier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t5m.recipe b/recipes/starbound/weapons/broadswords/glitch/t5m.recipe index 7183a57b..2438f6e3 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_glitchtier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_glitchtier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t5s.recipe b/recipes/starbound/weapons/broadswords/glitch/t5s.recipe index 7091ee02..6825ca14 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_glitchtier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_glitchtier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t6a.recipe b/recipes/starbound/weapons/broadswords/glitch/t6a.recipe index c8902548..984dd754 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t6m.recipe b/recipes/starbound/weapons/broadswords/glitch/t6m.recipe index c4288ba5..3b20dc8e 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/glitch/t6s.recipe b/recipes/starbound/weapons/broadswords/glitch/t6s.recipe index 2b883384..00e93f82 100644 --- a/recipes/starbound/weapons/broadswords/glitch/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t1.recipe b/recipes/starbound/weapons/broadswords/human/t1.recipe index f73cf1e6..69fc6436 100644 --- a/recipes/starbound/weapons/broadswords/human/t1.recipe +++ b/recipes/starbound/weapons/broadswords/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_humantier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_humantier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t2.recipe b/recipes/starbound/weapons/broadswords/human/t2.recipe index 973bb7a8..5ebf654c 100644 --- a/recipes/starbound/weapons/broadswords/human/t2.recipe +++ b/recipes/starbound/weapons/broadswords/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_humantier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_humantier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t3.recipe b/recipes/starbound/weapons/broadswords/human/t3.recipe index 500472bd..bb6ce662 100644 --- a/recipes/starbound/weapons/broadswords/human/t3.recipe +++ b/recipes/starbound/weapons/broadswords/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_humantier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_humantier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t4.recipe b/recipes/starbound/weapons/broadswords/human/t4.recipe index 2c728968..0f298d76 100644 --- a/recipes/starbound/weapons/broadswords/human/t4.recipe +++ b/recipes/starbound/weapons/broadswords/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_humantier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_humantier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t5a.recipe b/recipes/starbound/weapons/broadswords/human/t5a.recipe index 6600ac65..74563a72 100644 --- a/recipes/starbound/weapons/broadswords/human/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_humantier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_humantier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t5m.recipe b/recipes/starbound/weapons/broadswords/human/t5m.recipe index a201cad9..52f84446 100644 --- a/recipes/starbound/weapons/broadswords/human/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_humantier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_humantier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t5s.recipe b/recipes/starbound/weapons/broadswords/human/t5s.recipe index 4c8b92af..b5d1e7f9 100644 --- a/recipes/starbound/weapons/broadswords/human/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_humantier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_humantier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t6a.recipe b/recipes/starbound/weapons/broadswords/human/t6a.recipe index e8790a36..ac8e7279 100644 --- a/recipes/starbound/weapons/broadswords/human/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_humantier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t6m.recipe b/recipes/starbound/weapons/broadswords/human/t6m.recipe index 3e4a9428..807addaa 100644 --- a/recipes/starbound/weapons/broadswords/human/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_humantier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/human/t6s.recipe b/recipes/starbound/weapons/broadswords/human/t6s.recipe index 557e536d..191d0440 100644 --- a/recipes/starbound/weapons/broadswords/human/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_humantier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t1.recipe b/recipes/starbound/weapons/broadswords/hylotl/t1.recipe index 537ee8a7..fcc95609 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t1.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_hylotltier1broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_hylotltier1broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t2.recipe b/recipes/starbound/weapons/broadswords/hylotl/t2.recipe index 19100c3a..1d8ad06b 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t2.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_hylotltier2broadsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_hylotltier2broadsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t3.recipe b/recipes/starbound/weapons/broadswords/hylotl/t3.recipe index e7828ce6..6854964d 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t3.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_hylotltier3broadsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_hylotltier3broadsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t4.recipe b/recipes/starbound/weapons/broadswords/hylotl/t4.recipe index 6c3ed771..b92a5cea 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t4.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_hylotltier4broadsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_hylotltier4broadsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t5a.recipe b/recipes/starbound/weapons/broadswords/hylotl/t5a.recipe index f58cf743..f984548a 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_hylotltier5abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_hylotltier5abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t5m.recipe b/recipes/starbound/weapons/broadswords/hylotl/t5m.recipe index e74014be..e46afa81 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_hylotltier5mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_hylotltier5mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t5s.recipe b/recipes/starbound/weapons/broadswords/hylotl/t5s.recipe index 7ab1ff11..5b4fe3c9 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_hylotltier5sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_hylotltier5sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t6a.recipe b/recipes/starbound/weapons/broadswords/hylotl/t6a.recipe index e91f196f..78f4557e 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6abroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6abroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t6m.recipe b/recipes/starbound/weapons/broadswords/hylotl/t6m.recipe index 45eb5cbb..f135ffa9 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6mbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6mbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/hylotl/t6s.recipe b/recipes/starbound/weapons/broadswords/hylotl/t6s.recipe index 4f6a2e38..0605ae60 100644 --- a/recipes/starbound/weapons/broadswords/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/broadswords/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6sbroadsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6sbroadsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t1.recipe b/recipes/starbound/weapons/daggers/apex/t1.recipe index af0bc85f..1831d025 100644 --- a/recipes/starbound/weapons/daggers/apex/t1.recipe +++ b/recipes/starbound/weapons/daggers/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_apextier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_apextier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t2.recipe b/recipes/starbound/weapons/daggers/apex/t2.recipe index cce39528..b3b1945d 100644 --- a/recipes/starbound/weapons/daggers/apex/t2.recipe +++ b/recipes/starbound/weapons/daggers/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_apextier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_apextier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t3.recipe b/recipes/starbound/weapons/daggers/apex/t3.recipe index 0fa98d91..5d1cda67 100644 --- a/recipes/starbound/weapons/daggers/apex/t3.recipe +++ b/recipes/starbound/weapons/daggers/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_apextier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_apextier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t4.recipe b/recipes/starbound/weapons/daggers/apex/t4.recipe index f09243f7..88577de8 100644 --- a/recipes/starbound/weapons/daggers/apex/t4.recipe +++ b/recipes/starbound/weapons/daggers/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_apextier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_apextier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t5a.recipe b/recipes/starbound/weapons/daggers/apex/t5a.recipe index 8bd1c347..b8139844 100644 --- a/recipes/starbound/weapons/daggers/apex/t5a.recipe +++ b/recipes/starbound/weapons/daggers/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_apextier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_apextier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t5m.recipe b/recipes/starbound/weapons/daggers/apex/t5m.recipe index 4e2dfff3..864027da 100644 --- a/recipes/starbound/weapons/daggers/apex/t5m.recipe +++ b/recipes/starbound/weapons/daggers/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_apextier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_apextier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t5s.recipe b/recipes/starbound/weapons/daggers/apex/t5s.recipe index ebed10c3..0534e68c 100644 --- a/recipes/starbound/weapons/daggers/apex/t5s.recipe +++ b/recipes/starbound/weapons/daggers/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_apextier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_apextier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t6a.recipe b/recipes/starbound/weapons/daggers/apex/t6a.recipe index 4022734b..b9f6ad71 100644 --- a/recipes/starbound/weapons/daggers/apex/t6a.recipe +++ b/recipes/starbound/weapons/daggers/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_apextier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_apextier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t6m.recipe b/recipes/starbound/weapons/daggers/apex/t6m.recipe index 286b0850..7d9834a7 100644 --- a/recipes/starbound/weapons/daggers/apex/t6m.recipe +++ b/recipes/starbound/weapons/daggers/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_apextier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_apextier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/apex/t6s.recipe b/recipes/starbound/weapons/daggers/apex/t6s.recipe index ecba2ab4..13901c22 100644 --- a/recipes/starbound/weapons/daggers/apex/t6s.recipe +++ b/recipes/starbound/weapons/daggers/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_apextier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_apextier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t1.recipe b/recipes/starbound/weapons/daggers/avian/t1.recipe index f818095c..96e685dd 100644 --- a/recipes/starbound/weapons/daggers/avian/t1.recipe +++ b/recipes/starbound/weapons/daggers/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_aviantier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_aviantier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t2.recipe b/recipes/starbound/weapons/daggers/avian/t2.recipe index a87ca5ae..df56c9cc 100644 --- a/recipes/starbound/weapons/daggers/avian/t2.recipe +++ b/recipes/starbound/weapons/daggers/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_aviantier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_aviantier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t3.recipe b/recipes/starbound/weapons/daggers/avian/t3.recipe index 60785d5c..28bab7e0 100644 --- a/recipes/starbound/weapons/daggers/avian/t3.recipe +++ b/recipes/starbound/weapons/daggers/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_aviantier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_aviantier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t4.recipe b/recipes/starbound/weapons/daggers/avian/t4.recipe index 979c2a3c..bfd93571 100644 --- a/recipes/starbound/weapons/daggers/avian/t4.recipe +++ b/recipes/starbound/weapons/daggers/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_aviantier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_aviantier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t5a.recipe b/recipes/starbound/weapons/daggers/avian/t5a.recipe index 974ee9f9..f5cb2382 100644 --- a/recipes/starbound/weapons/daggers/avian/t5a.recipe +++ b/recipes/starbound/weapons/daggers/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_aviantier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_aviantier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t5m.recipe b/recipes/starbound/weapons/daggers/avian/t5m.recipe index 4bb36afe..cb2bafba 100644 --- a/recipes/starbound/weapons/daggers/avian/t5m.recipe +++ b/recipes/starbound/weapons/daggers/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_aviantier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_aviantier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t5s.recipe b/recipes/starbound/weapons/daggers/avian/t5s.recipe index 90546576..75352844 100644 --- a/recipes/starbound/weapons/daggers/avian/t5s.recipe +++ b/recipes/starbound/weapons/daggers/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_aviantier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_aviantier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t6a.recipe b/recipes/starbound/weapons/daggers/avian/t6a.recipe index b9fc24dc..49e1df51 100644 --- a/recipes/starbound/weapons/daggers/avian/t6a.recipe +++ b/recipes/starbound/weapons/daggers/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_aviantier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_aviantier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t6m.recipe b/recipes/starbound/weapons/daggers/avian/t6m.recipe index 808492b1..375dd317 100644 --- a/recipes/starbound/weapons/daggers/avian/t6m.recipe +++ b/recipes/starbound/weapons/daggers/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_aviantier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_aviantier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/avian/t6s.recipe b/recipes/starbound/weapons/daggers/avian/t6s.recipe index 722eca39..2daa4122 100644 --- a/recipes/starbound/weapons/daggers/avian/t6s.recipe +++ b/recipes/starbound/weapons/daggers/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_aviantier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_aviantier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayonblue.recipe b/recipes/starbound/weapons/daggers/colorful/crayonblue.recipe index bf0bbb9d..ad47a195 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayonblue.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayonblue.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["bluedye",3]], - "output" : "sb_crayonblue", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["bluedye",3]], + "output": "sb_crayonblue", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayongreen.recipe b/recipes/starbound/weapons/daggers/colorful/crayongreen.recipe index 65dbc5aa..3c47e3ee 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayongreen.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayongreen.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["greendye",3]], - "output" : "sb_crayongreen", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["greendye",3]], + "output": "sb_crayongreen", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayonorange.recipe b/recipes/starbound/weapons/daggers/colorful/crayonorange.recipe index 6fd314cf..9f6ab099 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayonorange.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayonorange.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["orangedye",3]], - "output" : "sb_crayonorange", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["orangedye",3]], + "output": "sb_crayonorange", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayonpurple.recipe b/recipes/starbound/weapons/daggers/colorful/crayonpurple.recipe index 457653bb..474e22e2 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayonpurple.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayonpurple.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["purpledye",3]], - "output" : "sb_crayonpurple", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["purpledye",3]], + "output": "sb_crayonpurple", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayonred.recipe b/recipes/starbound/weapons/daggers/colorful/crayonred.recipe index bf7cd33e..7087852d 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayonred.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayonred.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["reddye",3]], - "output" : "sb_crayonred", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["reddye",3]], + "output": "sb_crayonred", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/colorful/crayonyellow.recipe b/recipes/starbound/weapons/daggers/colorful/crayonyellow.recipe index 6462f65a..3647add5 100644 --- a/recipes/starbound/weapons/daggers/colorful/crayonyellow.recipe +++ b/recipes/starbound/weapons/daggers/colorful/crayonyellow.recipe @@ -1,5 +1,5 @@ { - "input" : [["rainbowwood",50],["liquidoil",10],["yellowdye",3]], - "output" : "sb_crayonyellow", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["rainbowwood",50],["liquidoil",10],["yellowdye",3]], + "output": "sb_crayonyellow", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t1.recipe b/recipes/starbound/weapons/daggers/floran/t1.recipe index 74483336..625ba9df 100644 --- a/recipes/starbound/weapons/daggers/floran/t1.recipe +++ b/recipes/starbound/weapons/daggers/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_florantier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_florantier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t2.recipe b/recipes/starbound/weapons/daggers/floran/t2.recipe index dbdfb058..88b5da02 100644 --- a/recipes/starbound/weapons/daggers/floran/t2.recipe +++ b/recipes/starbound/weapons/daggers/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_florantier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_florantier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t3.recipe b/recipes/starbound/weapons/daggers/floran/t3.recipe index 2d8930fd..ad5eb35c 100644 --- a/recipes/starbound/weapons/daggers/floran/t3.recipe +++ b/recipes/starbound/weapons/daggers/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_florantier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_florantier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t4.recipe b/recipes/starbound/weapons/daggers/floran/t4.recipe index b584ccf8..0e61fe9d 100644 --- a/recipes/starbound/weapons/daggers/floran/t4.recipe +++ b/recipes/starbound/weapons/daggers/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_florantier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_florantier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t5a.recipe b/recipes/starbound/weapons/daggers/floran/t5a.recipe index b00f6c12..1eecd325 100644 --- a/recipes/starbound/weapons/daggers/floran/t5a.recipe +++ b/recipes/starbound/weapons/daggers/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_florantier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_florantier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t5m.recipe b/recipes/starbound/weapons/daggers/floran/t5m.recipe index 20c7f972..5d9eaceb 100644 --- a/recipes/starbound/weapons/daggers/floran/t5m.recipe +++ b/recipes/starbound/weapons/daggers/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_florantier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_florantier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t5s.recipe b/recipes/starbound/weapons/daggers/floran/t5s.recipe index 2f9c0ee5..838db87e 100644 --- a/recipes/starbound/weapons/daggers/floran/t5s.recipe +++ b/recipes/starbound/weapons/daggers/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_florantier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_florantier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t6a.recipe b/recipes/starbound/weapons/daggers/floran/t6a.recipe index c2eef8fc..cded5ac3 100644 --- a/recipes/starbound/weapons/daggers/floran/t6a.recipe +++ b/recipes/starbound/weapons/daggers/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_florantier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_florantier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t6m.recipe b/recipes/starbound/weapons/daggers/floran/t6m.recipe index 4cf05ee8..a8c89d72 100644 --- a/recipes/starbound/weapons/daggers/floran/t6m.recipe +++ b/recipes/starbound/weapons/daggers/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_florantier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_florantier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/floran/t6s.recipe b/recipes/starbound/weapons/daggers/floran/t6s.recipe index 548d8370..a7d6d81b 100644 --- a/recipes/starbound/weapons/daggers/floran/t6s.recipe +++ b/recipes/starbound/weapons/daggers/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_florantier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_florantier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t1.recipe b/recipes/starbound/weapons/daggers/glitch/t1.recipe index 18b27eb0..259f485c 100644 --- a/recipes/starbound/weapons/daggers/glitch/t1.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_glitchtier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_glitchtier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t2.recipe b/recipes/starbound/weapons/daggers/glitch/t2.recipe index feb7d43a..cb3e7290 100644 --- a/recipes/starbound/weapons/daggers/glitch/t2.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_glitchtier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_glitchtier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t3.recipe b/recipes/starbound/weapons/daggers/glitch/t3.recipe index 136079c3..b2bf3f7f 100644 --- a/recipes/starbound/weapons/daggers/glitch/t3.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_glitchtier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_glitchtier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t4.recipe b/recipes/starbound/weapons/daggers/glitch/t4.recipe index 3e8f1e3e..497952ea 100644 --- a/recipes/starbound/weapons/daggers/glitch/t4.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_glitchtier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_glitchtier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t5a.recipe b/recipes/starbound/weapons/daggers/glitch/t5a.recipe index 8e91702d..7b6eb408 100644 --- a/recipes/starbound/weapons/daggers/glitch/t5a.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_glitchtier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_glitchtier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t5m.recipe b/recipes/starbound/weapons/daggers/glitch/t5m.recipe index 9645d541..a10b03ec 100644 --- a/recipes/starbound/weapons/daggers/glitch/t5m.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_glitchtier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_glitchtier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t5s.recipe b/recipes/starbound/weapons/daggers/glitch/t5s.recipe index 040901bc..96b5815d 100644 --- a/recipes/starbound/weapons/daggers/glitch/t5s.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_glitchtier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_glitchtier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t6a.recipe b/recipes/starbound/weapons/daggers/glitch/t6a.recipe index 2e37c939..89596881 100644 --- a/recipes/starbound/weapons/daggers/glitch/t6a.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_glitchtier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_glitchtier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t6m.recipe b/recipes/starbound/weapons/daggers/glitch/t6m.recipe index 4595382e..75eec51d 100644 --- a/recipes/starbound/weapons/daggers/glitch/t6m.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_glitchtier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_glitchtier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/glitch/t6s.recipe b/recipes/starbound/weapons/daggers/glitch/t6s.recipe index f42d0fd7..b598e3b2 100644 --- a/recipes/starbound/weapons/daggers/glitch/t6s.recipe +++ b/recipes/starbound/weapons/daggers/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_glitchtier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_glitchtier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t1.recipe b/recipes/starbound/weapons/daggers/human/t1.recipe index fdbcf878..f80dbae1 100644 --- a/recipes/starbound/weapons/daggers/human/t1.recipe +++ b/recipes/starbound/weapons/daggers/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_humantier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_humantier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t2.recipe b/recipes/starbound/weapons/daggers/human/t2.recipe index 7a38514c..99348234 100644 --- a/recipes/starbound/weapons/daggers/human/t2.recipe +++ b/recipes/starbound/weapons/daggers/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_humantier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_humantier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t3.recipe b/recipes/starbound/weapons/daggers/human/t3.recipe index 14f58891..473ad9c3 100644 --- a/recipes/starbound/weapons/daggers/human/t3.recipe +++ b/recipes/starbound/weapons/daggers/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_humantier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_humantier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t4.recipe b/recipes/starbound/weapons/daggers/human/t4.recipe index e10e68d7..c24a0f16 100644 --- a/recipes/starbound/weapons/daggers/human/t4.recipe +++ b/recipes/starbound/weapons/daggers/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_humantier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_humantier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t5a.recipe b/recipes/starbound/weapons/daggers/human/t5a.recipe index a517c5fb..2671a456 100644 --- a/recipes/starbound/weapons/daggers/human/t5a.recipe +++ b/recipes/starbound/weapons/daggers/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_humantier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_humantier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t5m.recipe b/recipes/starbound/weapons/daggers/human/t5m.recipe index 93c2643e..93d1e417 100644 --- a/recipes/starbound/weapons/daggers/human/t5m.recipe +++ b/recipes/starbound/weapons/daggers/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_humantier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_humantier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t5s.recipe b/recipes/starbound/weapons/daggers/human/t5s.recipe index 09cb48a4..478c89a9 100644 --- a/recipes/starbound/weapons/daggers/human/t5s.recipe +++ b/recipes/starbound/weapons/daggers/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_humantier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_humantier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t6a.recipe b/recipes/starbound/weapons/daggers/human/t6a.recipe index edfc3e19..687b03c9 100644 --- a/recipes/starbound/weapons/daggers/human/t6a.recipe +++ b/recipes/starbound/weapons/daggers/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_humantier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_humantier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t6m.recipe b/recipes/starbound/weapons/daggers/human/t6m.recipe index cc699811..5de41d3d 100644 --- a/recipes/starbound/weapons/daggers/human/t6m.recipe +++ b/recipes/starbound/weapons/daggers/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_humantier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_humantier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/human/t6s.recipe b/recipes/starbound/weapons/daggers/human/t6s.recipe index cf5c664f..1b7be39b 100644 --- a/recipes/starbound/weapons/daggers/human/t6s.recipe +++ b/recipes/starbound/weapons/daggers/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_humantier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_humantier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t1.recipe b/recipes/starbound/weapons/daggers/hylotl/t1.recipe index 3da65ea6..f30d9aa2 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t1.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",2],"darkwoodmaterial"], - "output" : "sb_hylotltier1dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",2],"darkwoodmaterial"], + "output": "sb_hylotltier1dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t2.recipe b/recipes/starbound/weapons/daggers/hylotl/t2.recipe index 0a147777..3e10b9ed 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t2.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",2],"copperbar"], - "output" : "sb_hylotltier2dagger", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",2],"copperbar"], + "output": "sb_hylotltier2dagger", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t3.recipe b/recipes/starbound/weapons/daggers/hylotl/t3.recipe index 11703d29..13f87ec2 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t3.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"copperbar"], - "output" : "sb_hylotltier3dagger", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",2],"copperbar"], + "output": "sb_hylotltier3dagger", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t4.recipe b/recipes/starbound/weapons/daggers/hylotl/t4.recipe index 0e657889..4b0f23ee 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t4.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",2],"copperbar"], - "output" : "sb_hylotltier4dagger", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",2],"copperbar"], + "output": "sb_hylotltier4dagger", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t5a.recipe b/recipes/starbound/weapons/daggers/hylotl/t5a.recipe index da0dc5b8..806f43e8 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["durasteelbar",1]], - "output" : "sb_hylotltier5adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",2],["durasteelbar",1]], + "output": "sb_hylotltier5adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t5m.recipe b/recipes/starbound/weapons/daggers/hylotl/t5m.recipe index 484770b1..8f2c09a4 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",2],["durasteelbar",1]], - "output" : "sb_hylotltier5mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",2],["durasteelbar",1]], + "output": "sb_hylotltier5mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t5s.recipe b/recipes/starbound/weapons/daggers/hylotl/t5s.recipe index 8e8d4703..811b624a 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",2],["durasteelbar",1]], - "output" : "sb_hylotltier5sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",2],["durasteelbar",1]], + "output": "sb_hylotltier5sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t6a.recipe b/recipes/starbound/weapons/daggers/hylotl/t6a.recipe index 3be8f275..ed133968 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",2],["solariumstar",1]], - "output" : "sb_hylotltier6adagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",2],["solariumstar",1]], + "output": "sb_hylotltier6adagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t6m.recipe b/recipes/starbound/weapons/daggers/hylotl/t6m.recipe index c7ea9d08..015a5b84 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",2],["solariumstar",1]], - "output" : "sb_hylotltier6mdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",2],["solariumstar",1]], + "output": "sb_hylotltier6mdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/hylotl/t6s.recipe b/recipes/starbound/weapons/daggers/hylotl/t6s.recipe index fed4d40f..251fa287 100644 --- a/recipes/starbound/weapons/daggers/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/daggers/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",2],["solariumstar",1]], - "output" : "sb_hylotltier6sdagger", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",2],["solariumstar",1]], + "output": "sb_hylotltier6sdagger", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/poisondagger.recipe b/recipes/starbound/weapons/daggers/poisondagger.recipe index 55659cbc..de581d46 100644 --- a/recipes/starbound/weapons/daggers/poisondagger.recipe +++ b/recipes/starbound/weapons/daggers/poisondagger.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["biosample",15],"venomsample"], - "output" : ["sb_poisondagger",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["durasteelbar",3],["biosample",15],"venomsample"], + "output": ["sb_poisondagger",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/splatterknife.recipe b/recipes/starbound/weapons/daggers/splatterknife.recipe index 79d038c7..355f67d6 100644 --- a/recipes/starbound/weapons/daggers/splatterknife.recipe +++ b/recipes/starbound/weapons/daggers/splatterknife.recipe @@ -1,6 +1,6 @@ { - "input" : [["sb_refinedrubium",3],["sb_meatchunks",7],["bone",7]], + "input": [["refinedviolium",3],["sb_meatchunks",7],["bone",7]], //originally used impervium and fleshstrand - "output" : ["sb_splatterknife",1,{"crafted":true}], - "groups" : ["craftingseparator","weapons","all"] + "output": ["sb_splatterknife",1,{"crafted":true}], + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/daggers/steelspoon.recipe b/recipes/starbound/weapons/daggers/steelspoon.recipe index 387f07bc..74933094 100644 --- a/recipes/starbound/weapons/daggers/steelspoon.recipe +++ b/recipes/starbound/weapons/daggers/steelspoon.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",2],"silverbar"], - "output" : "sb_steelspoon", - "groups" : ["craftinganvil2","weapons"] + "input": [["sb_steelbar",2],"silverbar"], + "output": "sb_steelspoon", + "groups": ["craftinganvil2","weapons"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/explosiveglove.recipe b/recipes/starbound/weapons/explosiveglove.recipe index 368b5e78..d4aa3218 100644 --- a/recipes/starbound/weapons/explosiveglove.recipe +++ b/recipes/starbound/weapons/explosiveglove.recipe @@ -1,5 +1,5 @@ { - "input" : ["gauntlet","upgrademodule",["scorchedcore",15]], - "output" : "sb_explosiveglove", - "groups" : ["craftinganvil","weapons","all"] + "input": ["gauntlet","upgrademodule",["scorchedcore",15]], + "output": "sb_explosiveglove", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t1.recipe b/recipes/starbound/weapons/hammers/apex/t1.recipe index 378a70f9..420030f4 100644 --- a/recipes/starbound/weapons/hammers/apex/t1.recipe +++ b/recipes/starbound/weapons/hammers/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_apextier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_apextier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t2.recipe b/recipes/starbound/weapons/hammers/apex/t2.recipe index cf5a864a..08a6f7b3 100644 --- a/recipes/starbound/weapons/hammers/apex/t2.recipe +++ b/recipes/starbound/weapons/hammers/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_apextier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_apextier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t3.recipe b/recipes/starbound/weapons/hammers/apex/t3.recipe index eccad52a..c47aeed2 100644 --- a/recipes/starbound/weapons/hammers/apex/t3.recipe +++ b/recipes/starbound/weapons/hammers/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_apextier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_apextier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t4.recipe b/recipes/starbound/weapons/hammers/apex/t4.recipe index 4b6866ea..89384e3c 100644 --- a/recipes/starbound/weapons/hammers/apex/t4.recipe +++ b/recipes/starbound/weapons/hammers/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_apextier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_apextier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t5a.recipe b/recipes/starbound/weapons/hammers/apex/t5a.recipe index bbd2832e..02f9bdcb 100644 --- a/recipes/starbound/weapons/hammers/apex/t5a.recipe +++ b/recipes/starbound/weapons/hammers/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_apextier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_apextier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t5m.recipe b/recipes/starbound/weapons/hammers/apex/t5m.recipe index 71239ebf..9c6f7a96 100644 --- a/recipes/starbound/weapons/hammers/apex/t5m.recipe +++ b/recipes/starbound/weapons/hammers/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_apextier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_apextier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t5s.recipe b/recipes/starbound/weapons/hammers/apex/t5s.recipe index 17025c5f..4e9326c1 100644 --- a/recipes/starbound/weapons/hammers/apex/t5s.recipe +++ b/recipes/starbound/weapons/hammers/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_apextier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_apextier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t6a.recipe b/recipes/starbound/weapons/hammers/apex/t6a.recipe index 78ee1eeb..695e9a2b 100644 --- a/recipes/starbound/weapons/hammers/apex/t6a.recipe +++ b/recipes/starbound/weapons/hammers/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_apextier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_apextier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t6m.recipe b/recipes/starbound/weapons/hammers/apex/t6m.recipe index 9db616d0..e3b28079 100644 --- a/recipes/starbound/weapons/hammers/apex/t6m.recipe +++ b/recipes/starbound/weapons/hammers/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_apextier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_apextier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/apex/t6s.recipe b/recipes/starbound/weapons/hammers/apex/t6s.recipe index ace2ca48..a504c385 100644 --- a/recipes/starbound/weapons/hammers/apex/t6s.recipe +++ b/recipes/starbound/weapons/hammers/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_apextier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t1.recipe b/recipes/starbound/weapons/hammers/avian/t1.recipe index c36f0dd7..e75c7548 100644 --- a/recipes/starbound/weapons/hammers/avian/t1.recipe +++ b/recipes/starbound/weapons/hammers/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_aviantier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_aviantier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t2.recipe b/recipes/starbound/weapons/hammers/avian/t2.recipe index 0d4899c6..5d53d633 100644 --- a/recipes/starbound/weapons/hammers/avian/t2.recipe +++ b/recipes/starbound/weapons/hammers/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_aviantier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_aviantier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t3.recipe b/recipes/starbound/weapons/hammers/avian/t3.recipe index 0c426d04..c73a6dba 100644 --- a/recipes/starbound/weapons/hammers/avian/t3.recipe +++ b/recipes/starbound/weapons/hammers/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_aviantier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_aviantier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t4.recipe b/recipes/starbound/weapons/hammers/avian/t4.recipe index 86e07f8c..51d8e923 100644 --- a/recipes/starbound/weapons/hammers/avian/t4.recipe +++ b/recipes/starbound/weapons/hammers/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_aviantier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_aviantier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t5a.recipe b/recipes/starbound/weapons/hammers/avian/t5a.recipe index a30357d7..10b600f4 100644 --- a/recipes/starbound/weapons/hammers/avian/t5a.recipe +++ b/recipes/starbound/weapons/hammers/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_aviantier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_aviantier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t5m.recipe b/recipes/starbound/weapons/hammers/avian/t5m.recipe index 89ea90d5..eca669dd 100644 --- a/recipes/starbound/weapons/hammers/avian/t5m.recipe +++ b/recipes/starbound/weapons/hammers/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_aviantier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_aviantier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t5s.recipe b/recipes/starbound/weapons/hammers/avian/t5s.recipe index a7fe4d34..0eb87dc5 100644 --- a/recipes/starbound/weapons/hammers/avian/t5s.recipe +++ b/recipes/starbound/weapons/hammers/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_aviantier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_aviantier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t6a.recipe b/recipes/starbound/weapons/hammers/avian/t6a.recipe index fcdc9f32..4fdf490d 100644 --- a/recipes/starbound/weapons/hammers/avian/t6a.recipe +++ b/recipes/starbound/weapons/hammers/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_aviantier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_aviantier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t6m.recipe b/recipes/starbound/weapons/hammers/avian/t6m.recipe index be1236e7..677c9bec 100644 --- a/recipes/starbound/weapons/hammers/avian/t6m.recipe +++ b/recipes/starbound/weapons/hammers/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_aviantier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_aviantier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/avian/t6s.recipe b/recipes/starbound/weapons/hammers/avian/t6s.recipe index 1de52169..040edf83 100644 --- a/recipes/starbound/weapons/hammers/avian/t6s.recipe +++ b/recipes/starbound/weapons/hammers/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/bonehammer.recipe b/recipes/starbound/weapons/hammers/bonehammer.recipe index bd2c5816..24b5714f 100644 --- a/recipes/starbound/weapons/hammers/bonehammer.recipe +++ b/recipes/starbound/weapons/hammers/bonehammer.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",10],["bone",25]], - "output" : ["sb_bonehammer",1,{"crafted":true}], - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",10],["bone",25]], + "output": ["sb_bonehammer",1,{"crafted":true}], + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/cactislammer.recipe b/recipes/starbound/weapons/hammers/cactislammer.recipe index c0bf9e30..30c6979a 100644 --- a/recipes/starbound/weapons/hammers/cactislammer.recipe +++ b/recipes/starbound/weapons/hammers/cactislammer.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",10],["cacti",25]], - "output" : ["sb_cactislammer",1,{"crafted":true}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",10],["cacti",25]], + "output": ["sb_cactislammer",1,{"crafted":true}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t1.recipe b/recipes/starbound/weapons/hammers/floran/t1.recipe index 86c416cb..ec8493aa 100644 --- a/recipes/starbound/weapons/hammers/floran/t1.recipe +++ b/recipes/starbound/weapons/hammers/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_florantier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_florantier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t2.recipe b/recipes/starbound/weapons/hammers/floran/t2.recipe index aae68658..07946936 100644 --- a/recipes/starbound/weapons/hammers/floran/t2.recipe +++ b/recipes/starbound/weapons/hammers/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_florantier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_florantier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t3.recipe b/recipes/starbound/weapons/hammers/floran/t3.recipe index 0f676911..c5749c4c 100644 --- a/recipes/starbound/weapons/hammers/floran/t3.recipe +++ b/recipes/starbound/weapons/hammers/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_florantier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_florantier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t4.recipe b/recipes/starbound/weapons/hammers/floran/t4.recipe index 566fe93d..6a811229 100644 --- a/recipes/starbound/weapons/hammers/floran/t4.recipe +++ b/recipes/starbound/weapons/hammers/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_florantier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_florantier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t5a.recipe b/recipes/starbound/weapons/hammers/floran/t5a.recipe index 99a43dbc..0e07477f 100644 --- a/recipes/starbound/weapons/hammers/floran/t5a.recipe +++ b/recipes/starbound/weapons/hammers/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_florantier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_florantier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t5m.recipe b/recipes/starbound/weapons/hammers/floran/t5m.recipe index d36763f1..daf1b143 100644 --- a/recipes/starbound/weapons/hammers/floran/t5m.recipe +++ b/recipes/starbound/weapons/hammers/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_florantier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_florantier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t5s.recipe b/recipes/starbound/weapons/hammers/floran/t5s.recipe index 323fa6ee..dc2fb136 100644 --- a/recipes/starbound/weapons/hammers/floran/t5s.recipe +++ b/recipes/starbound/weapons/hammers/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_florantier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_florantier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t6a.recipe b/recipes/starbound/weapons/hammers/floran/t6a.recipe index 10b86791..180f0722 100644 --- a/recipes/starbound/weapons/hammers/floran/t6a.recipe +++ b/recipes/starbound/weapons/hammers/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_florantier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_florantier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t6m.recipe b/recipes/starbound/weapons/hammers/floran/t6m.recipe index eb66fe2d..9e7df7f7 100644 --- a/recipes/starbound/weapons/hammers/floran/t6m.recipe +++ b/recipes/starbound/weapons/hammers/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_florantier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_florantier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/floran/t6s.recipe b/recipes/starbound/weapons/hammers/floran/t6s.recipe index 2d4b08e2..4cdf671a 100644 --- a/recipes/starbound/weapons/hammers/floran/t6s.recipe +++ b/recipes/starbound/weapons/hammers/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_florantier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t1.recipe b/recipes/starbound/weapons/hammers/glitch/t1.recipe index 62ec62f1..c9217600 100644 --- a/recipes/starbound/weapons/hammers/glitch/t1.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_glitchtier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_glitchtier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t2.recipe b/recipes/starbound/weapons/hammers/glitch/t2.recipe index 3e933763..595570e1 100644 --- a/recipes/starbound/weapons/hammers/glitch/t2.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_glitchtier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_glitchtier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t3.recipe b/recipes/starbound/weapons/hammers/glitch/t3.recipe index 902f34e8..bf134e06 100644 --- a/recipes/starbound/weapons/hammers/glitch/t3.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_glitchtier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_glitchtier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t4.recipe b/recipes/starbound/weapons/hammers/glitch/t4.recipe index f5ac3c01..4f5e3a3a 100644 --- a/recipes/starbound/weapons/hammers/glitch/t4.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_glitchtier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_glitchtier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t5a.recipe b/recipes/starbound/weapons/hammers/glitch/t5a.recipe index 9a3cf547..e4c4fb4a 100644 --- a/recipes/starbound/weapons/hammers/glitch/t5a.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_glitchtier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_glitchtier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t5m.recipe b/recipes/starbound/weapons/hammers/glitch/t5m.recipe index 623c8934..7742a419 100644 --- a/recipes/starbound/weapons/hammers/glitch/t5m.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_glitchtier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_glitchtier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t5s.recipe b/recipes/starbound/weapons/hammers/glitch/t5s.recipe index 55d82399..ff525859 100644 --- a/recipes/starbound/weapons/hammers/glitch/t5s.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_glitchtier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_glitchtier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t6a.recipe b/recipes/starbound/weapons/hammers/glitch/t6a.recipe index f8b4005e..116d9e5b 100644 --- a/recipes/starbound/weapons/hammers/glitch/t6a.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_glitchtier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_glitchtier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t6m.recipe b/recipes/starbound/weapons/hammers/glitch/t6m.recipe index 1118e303..7b4d5e9c 100644 --- a/recipes/starbound/weapons/hammers/glitch/t6m.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_glitchtier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_glitchtier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/glitch/t6s.recipe b/recipes/starbound/weapons/hammers/glitch/t6s.recipe index 2b473b85..6b3a98d6 100644 --- a/recipes/starbound/weapons/hammers/glitch/t6s.recipe +++ b/recipes/starbound/weapons/hammers/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t1.recipe b/recipes/starbound/weapons/hammers/human/t1.recipe index 27b93191..00a68315 100644 --- a/recipes/starbound/weapons/hammers/human/t1.recipe +++ b/recipes/starbound/weapons/hammers/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_humantier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_humantier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t2.recipe b/recipes/starbound/weapons/hammers/human/t2.recipe index 63ff728f..bed8f412 100644 --- a/recipes/starbound/weapons/hammers/human/t2.recipe +++ b/recipes/starbound/weapons/hammers/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_humantier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_humantier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t3.recipe b/recipes/starbound/weapons/hammers/human/t3.recipe index 9202fcc1..20b92e35 100644 --- a/recipes/starbound/weapons/hammers/human/t3.recipe +++ b/recipes/starbound/weapons/hammers/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_humantier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_humantier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t4.recipe b/recipes/starbound/weapons/hammers/human/t4.recipe index cb0c95f4..10410b82 100644 --- a/recipes/starbound/weapons/hammers/human/t4.recipe +++ b/recipes/starbound/weapons/hammers/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_humantier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_humantier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t5a.recipe b/recipes/starbound/weapons/hammers/human/t5a.recipe index 1a332a0c..5e507ab4 100644 --- a/recipes/starbound/weapons/hammers/human/t5a.recipe +++ b/recipes/starbound/weapons/hammers/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_humantier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_humantier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t5m.recipe b/recipes/starbound/weapons/hammers/human/t5m.recipe index 30ceb0f9..8dc140ad 100644 --- a/recipes/starbound/weapons/hammers/human/t5m.recipe +++ b/recipes/starbound/weapons/hammers/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_humantier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_humantier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t5s.recipe b/recipes/starbound/weapons/hammers/human/t5s.recipe index 5b1f664e..aa762466 100644 --- a/recipes/starbound/weapons/hammers/human/t5s.recipe +++ b/recipes/starbound/weapons/hammers/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_humantier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_humantier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t6a.recipe b/recipes/starbound/weapons/hammers/human/t6a.recipe index 214afa27..a277af74 100644 --- a/recipes/starbound/weapons/hammers/human/t6a.recipe +++ b/recipes/starbound/weapons/hammers/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_humantier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_humantier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t6m.recipe b/recipes/starbound/weapons/hammers/human/t6m.recipe index 09790faf..f9aef71b 100644 --- a/recipes/starbound/weapons/hammers/human/t6m.recipe +++ b/recipes/starbound/weapons/hammers/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_humantier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_humantier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/human/t6s.recipe b/recipes/starbound/weapons/hammers/human/t6s.recipe index 7bef4f83..3e6a8c31 100644 --- a/recipes/starbound/weapons/hammers/human/t6s.recipe +++ b/recipes/starbound/weapons/hammers/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_humantier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t1.recipe b/recipes/starbound/weapons/hammers/hylotl/t1.recipe index a8edc283..2848ab6c 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t1.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_hylotltier1hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_hylotltier1hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t2.recipe b/recipes/starbound/weapons/hammers/hylotl/t2.recipe index 32c6b829..b0680bc5 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t2.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_hylotltier2hammer", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_hylotltier2hammer", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t3.recipe b/recipes/starbound/weapons/hammers/hylotl/t3.recipe index 40a70565..70db088a 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t3.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_hylotltier3hammer", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_hylotltier3hammer", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t4.recipe b/recipes/starbound/weapons/hammers/hylotl/t4.recipe index 761601b1..821a3f6d 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t4.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_hylotltier4hammer", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_hylotltier4hammer", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t5a.recipe b/recipes/starbound/weapons/hammers/hylotl/t5a.recipe index 8b7b02e2..54406d35 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_hylotltier5ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_hylotltier5ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t5m.recipe b/recipes/starbound/weapons/hammers/hylotl/t5m.recipe index ef0f8f80..2eeaa1fe 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_hylotltier5mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_hylotltier5mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t5s.recipe b/recipes/starbound/weapons/hammers/hylotl/t5s.recipe index 61f6aca4..225fa42c 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_hylotltier5shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_hylotltier5shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t6a.recipe b/recipes/starbound/weapons/hammers/hylotl/t6a.recipe index 3bac395b..36f8bc84 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_hylotltier6ahammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_hylotltier6ahammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t6m.recipe b/recipes/starbound/weapons/hammers/hylotl/t6m.recipe index 7d5f11e2..cca17676 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_hylotltier6mhammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_hylotltier6mhammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/hylotl/t6s.recipe b/recipes/starbound/weapons/hammers/hylotl/t6s.recipe index 5cb9c649..b56faa34 100644 --- a/recipes/starbound/weapons/hammers/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/hammers/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6shammer", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6shammer", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/smashroom.recipe b/recipes/starbound/weapons/hammers/smashroom.recipe index ef3d1ccb..759847b8 100644 --- a/recipes/starbound/weapons/hammers/smashroom.recipe +++ b/recipes/starbound/weapons/hammers/smashroom.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",10],["shroom",25]], - "output" : ["sb_smashroom",1,{"crafted":true}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",10],["shroom",25]], + "output": ["sb_smashroom",1,{"crafted":true}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/tarhammer.recipe b/recipes/starbound/weapons/hammers/tarhammer.recipe index 53f232a6..1efddbd1 100644 --- a/recipes/starbound/weapons/hammers/tarhammer.recipe +++ b/recipes/starbound/weapons/hammers/tarhammer.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",10],["tarball",12],["bone",12]], - "output" : ["sb_tarhammer",1,{"crafted":true}], - "groups" : ["weapons","craftinganvil","all"] + "input": [["tungstenbar",10],["tarball",12],["bone",12]], + "output": ["sb_tarhammer",1,{"crafted":true}], + "groups": ["weapons","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/terminite.txt b/recipes/starbound/weapons/hammers/terminite.txt index 4f0676fc..ff310e94 100644 --- a/recipes/starbound/weapons/hammers/terminite.txt +++ b/recipes/starbound/weapons/hammers/terminite.txt @@ -1,6 +1,6 @@ { - "input" : [["sb_refinedrubium",10],["bugshell",25]], + "input": [["violiumcompound",10],["bugshell",25]], //500 hive - "output" : ["sb_terminite",1,{"level":5,"seed":1}], - "groups" : ["craftingseparator","weapons","all"] + "output": ["sb_terminite",1,{"level":5,"seed":1}], + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/aegisaltpistol.recipe b/recipes/starbound/weapons/handguns/aegisaltpistol.recipe index 4587f39b..8725d7e3 100644 --- a/recipes/starbound/weapons/handguns/aegisaltpistol.recipe +++ b/recipes/starbound/weapons/handguns/aegisaltpistol.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],"durasteelbar"], - "output" : "sb_aegisaltpistol", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",3],"durasteelbar"], + "output": "sb_aegisaltpistol", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/alienlaser.txt b/recipes/starbound/weapons/handguns/alienlaser.txt index f58b774d..41466edb 100644 --- a/recipes/starbound/weapons/handguns/alienlaser.txt +++ b/recipes/starbound/weapons/handguns/alienlaser.txt @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",4],["alienwoodsap",15]], - "output" : ["sb_alienlaser",1,{"level":4}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["durasteelbar",4],["alienwoodsap",15]], + "output": ["sb_alienlaser",1,{"level":4}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/blowgun.txt b/recipes/starbound/weapons/handguns/blowgun.txt index ad203744..7f435aaa 100644 --- a/recipes/starbound/weapons/handguns/blowgun.txt +++ b/recipes/starbound/weapons/handguns/blowgun.txt @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",4],["reed",15]], - "output" : ["sb_blowgun",1,{"seed":1,"level":2}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",4],["reed",15]], + "output": ["sb_blowgun",1,{"seed":1,"level":2}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/feroziumpistol.recipe b/recipes/starbound/weapons/handguns/feroziumpistol.recipe index 8ffb7a14..2d22610f 100644 --- a/recipes/starbound/weapons/handguns/feroziumpistol.recipe +++ b/recipes/starbound/weapons/handguns/feroziumpistol.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",4]], - "output" : "sb_feroziumpistol", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",4]], + "output": "sb_feroziumpistol", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/heatray.recipe b/recipes/starbound/weapons/handguns/heatray.recipe index 925ac4e2..101a4dd3 100644 --- a/recipes/starbound/weapons/handguns/heatray.recipe +++ b/recipes/starbound/weapons/handguns/heatray.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",2],["solariumstar",2],"smallbattery"], - "output" : ["sb_heatray",1,{"crafted":true}], - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",2],["solariumstar",2],"smallbattery"], + "output": ["sb_heatray",1,{"crafted":true}], + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/icechucker.txt b/recipes/starbound/weapons/handguns/icechucker.txt index 70f8f300..893e9fc3 100644 --- a/recipes/starbound/weapons/handguns/icechucker.txt +++ b/recipes/starbound/weapons/handguns/icechucker.txt @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",4],["icecrystal",15]], - "output" : ["sb_icechucker",1,{"seed":1,"level":3}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",4],["icecrystal",15]], + "output": ["sb_icechucker",1,{"seed":1,"level":3}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t1.recipe b/recipes/starbound/weapons/handguns/nova/t1.recipe index 34628715..0521c60a 100644 --- a/recipes/starbound/weapons/handguns/nova/t1.recipe +++ b/recipes/starbound/weapons/handguns/nova/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_novatier1revolver", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_novatier1revolver", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t2.recipe b/recipes/starbound/weapons/handguns/nova/t2.recipe index 84798095..3b2a021b 100644 --- a/recipes/starbound/weapons/handguns/nova/t2.recipe +++ b/recipes/starbound/weapons/handguns/nova/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],"copperbar"], - "output" : "sb_novatier2revolver", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],"copperbar"], + "output": "sb_novatier2revolver", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t3.recipe b/recipes/starbound/weapons/handguns/nova/t3.recipe index 8cea74f8..0d49f04a 100644 --- a/recipes/starbound/weapons/handguns/nova/t3.recipe +++ b/recipes/starbound/weapons/handguns/nova/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],"copperbar"], - "output" : "sb_novatier3revolver", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],"copperbar"], + "output": "sb_novatier3revolver", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t4.recipe b/recipes/starbound/weapons/handguns/nova/t4.recipe index 9cf72a67..6fe66917 100644 --- a/recipes/starbound/weapons/handguns/nova/t4.recipe +++ b/recipes/starbound/weapons/handguns/nova/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],"copperbar"], - "output" : "sb_novatier4revolver", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],"copperbar"], + "output": "sb_novatier4revolver", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t5a.recipe b/recipes/starbound/weapons/handguns/nova/t5a.recipe index 3a7888e5..f6b4058a 100644 --- a/recipes/starbound/weapons/handguns/nova/t5a.recipe +++ b/recipes/starbound/weapons/handguns/nova/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],"durasteelbar"], - "output" : "sb_novatier5arevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",3],"durasteelbar"], + "output": "sb_novatier5arevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t5m.recipe b/recipes/starbound/weapons/handguns/nova/t5m.recipe index fb5dba05..3788a64b 100644 --- a/recipes/starbound/weapons/handguns/nova/t5m.recipe +++ b/recipes/starbound/weapons/handguns/nova/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],"durasteelbar"], - "output" : "sb_novatier5mrevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_refinedrubium",3],"durasteelbar"], + "output": "sb_novatier5mrevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t5s.recipe b/recipes/starbound/weapons/handguns/nova/t5s.recipe index e052de9a..b025a438 100644 --- a/recipes/starbound/weapons/handguns/nova/t5s.recipe +++ b/recipes/starbound/weapons/handguns/nova/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],"durasteelbar"], - "output" : "sb_novatier5srevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedviolium",3],"durasteelbar"], + "output": "sb_novatier5srevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t6a.recipe b/recipes/starbound/weapons/handguns/nova/t6a.recipe index 97cae082..3b3da91f 100644 --- a/recipes/starbound/weapons/handguns/nova/t6a.recipe +++ b/recipes/starbound/weapons/handguns/nova/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],"solariumstar"], - "output" : "sb_novatier6arevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",3],"solariumstar"], + "output": "sb_novatier6arevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t6m.recipe b/recipes/starbound/weapons/handguns/nova/t6m.recipe index 3947bd23..16812dc4 100644 --- a/recipes/starbound/weapons/handguns/nova/t6m.recipe +++ b/recipes/starbound/weapons/handguns/nova/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],"solariumstar"], - "output" : "sb_novatier6mrevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_ceruliumcompound",3],"solariumstar"], + "output": "sb_novatier6mrevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/nova/t6s.recipe b/recipes/starbound/weapons/handguns/nova/t6s.recipe index 2da1ef72..e96fcc9a 100644 --- a/recipes/starbound/weapons/handguns/nova/t6s.recipe +++ b/recipes/starbound/weapons/handguns/nova/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],"solariumstar"], - "output" : "sb_novatier6srevolver", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_imperviumcompound",3],"solariumstar"], + "output": "sb_novatier6srevolver", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/handguns/tranquilizergun.recipe b/recipes/starbound/weapons/handguns/tranquilizergun.recipe index bb8d18d1..25ea85f9 100644 --- a/recipes/starbound/weapons/handguns/tranquilizergun.recipe +++ b/recipes/starbound/weapons/handguns/tranquilizergun.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",4],["biosample",15]], - "output" : ["sb_tranquilizergun",1,{"crafted":true}], - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",4],["biosample",15]], + "output": ["sb_tranquilizergun",1,{"crafted":true}], + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/aegisaltrifle.recipe b/recipes/starbound/weapons/longguns/aegisaltrifle.recipe index 675fbea0..cfdbd695 100644 --- a/recipes/starbound/weapons/longguns/aegisaltrifle.recipe +++ b/recipes/starbound/weapons/longguns/aegisaltrifle.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_aegisaltrifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_aegisaltrifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/aegisaltshotgun.recipe b/recipes/starbound/weapons/longguns/aegisaltshotgun.recipe index c5ae5820..21e477d6 100644 --- a/recipes/starbound/weapons/longguns/aegisaltshotgun.recipe +++ b/recipes/starbound/weapons/longguns/aegisaltshotgun.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_aegisaltshotgun", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_aegisaltshotgun", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/corrosivegun.recipe b/recipes/starbound/weapons/longguns/corrosivegun.recipe index 155310ab..8e35c66f 100644 --- a/recipes/starbound/weapons/longguns/corrosivegun.recipe +++ b/recipes/starbound/weapons/longguns/corrosivegun.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",10],["alienwoodsap",25]], - "output" : ["sb_corrosivegun",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["durasteelbar",10],["alienwoodsap",25]], + "output": ["sb_corrosivegun",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/feroziumrifle.recipe b/recipes/starbound/weapons/longguns/feroziumrifle.recipe index 71d2fcf2..b8fe2679 100644 --- a/recipes/starbound/weapons/longguns/feroziumrifle.recipe +++ b/recipes/starbound/weapons/longguns/feroziumrifle.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",10]], - "output" : "sb_feroziumrifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_feroziumrifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/feroziumrocket.recipe b/recipes/starbound/weapons/longguns/feroziumrocket.recipe index fc19173b..9d1b64d9 100644 --- a/recipes/starbound/weapons/longguns/feroziumrocket.recipe +++ b/recipes/starbound/weapons/longguns/feroziumrocket.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",10]], - "output" : "sb_feroziumrocket", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_feroziumrocket", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/feroziumsniper.recipe b/recipes/starbound/weapons/longguns/feroziumsniper.recipe index 5e7d2f93..d6a23bd8 100644 --- a/recipes/starbound/weapons/longguns/feroziumsniper.recipe +++ b/recipes/starbound/weapons/longguns/feroziumsniper.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",10]], - "output" : "sb_feroziumsniper", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_feroziumsniper", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/irradiatedlauncher.recipe b/recipes/starbound/weapons/longguns/irradiatedlauncher.recipe index c750be6e..a6d9617e 100644 --- a/recipes/starbound/weapons/longguns/irradiatedlauncher.recipe +++ b/recipes/starbound/weapons/longguns/irradiatedlauncher.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["uraniumrod",4],["toxicwaste",15]], - "output" : ["sb_irradiatedlauncher",1,{"crafted":true}], - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["uraniumrod",4],["toxicwaste",15]], + "output": ["sb_irradiatedlauncher",1,{"crafted":true}], + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t1.recipe b/recipes/starbound/weapons/longguns/nova/t1.recipe index e75091a8..62a25c85 100644 --- a/recipes/starbound/weapons/longguns/nova/t1.recipe +++ b/recipes/starbound/weapons/longguns/nova/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_novatier1rifle", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_novatier1rifle", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t2.recipe b/recipes/starbound/weapons/longguns/nova/t2.recipe index 30e5cd17..d22da800 100644 --- a/recipes/starbound/weapons/longguns/nova/t2.recipe +++ b/recipes/starbound/weapons/longguns/nova/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_novatier2rifle", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_novatier2rifle", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t3.recipe b/recipes/starbound/weapons/longguns/nova/t3.recipe index cc0d2357..bb814239 100644 --- a/recipes/starbound/weapons/longguns/nova/t3.recipe +++ b/recipes/starbound/weapons/longguns/nova/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_novatier3rifle", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_novatier3rifle", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t4.recipe b/recipes/starbound/weapons/longguns/nova/t4.recipe index 16b822eb..1bd767d6 100644 --- a/recipes/starbound/weapons/longguns/nova/t4.recipe +++ b/recipes/starbound/weapons/longguns/nova/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_novatier4rifle", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_novatier4rifle", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t5a.recipe b/recipes/starbound/weapons/longguns/nova/t5a.recipe index ec01e97b..010c515e 100644 --- a/recipes/starbound/weapons/longguns/nova/t5a.recipe +++ b/recipes/starbound/weapons/longguns/nova/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4]], - "output" : "sb_novatier5arifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4]], + "output": "sb_novatier5arifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t5m.recipe b/recipes/starbound/weapons/longguns/nova/t5m.recipe index 8a4d368b..5bf47e9d 100644 --- a/recipes/starbound/weapons/longguns/nova/t5m.recipe +++ b/recipes/starbound/weapons/longguns/nova/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4]], - "output" : "sb_novatier5mrifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4]], + "output": "sb_novatier5mrifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t5s.recipe b/recipes/starbound/weapons/longguns/nova/t5s.recipe index 33f2ef43..52174265 100644 --- a/recipes/starbound/weapons/longguns/nova/t5s.recipe +++ b/recipes/starbound/weapons/longguns/nova/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4]], - "output" : "sb_novatier5srifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4]], + "output": "sb_novatier5srifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t6a.recipe b/recipes/starbound/weapons/longguns/nova/t6a.recipe index 78c0b3c1..6e7b6ba0 100644 --- a/recipes/starbound/weapons/longguns/nova/t6a.recipe +++ b/recipes/starbound/weapons/longguns/nova/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_novatier6arifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_novatier6arifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t6m.recipe b/recipes/starbound/weapons/longguns/nova/t6m.recipe index 6b0b17fa..85ca5436 100644 --- a/recipes/starbound/weapons/longguns/nova/t6m.recipe +++ b/recipes/starbound/weapons/longguns/nova/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_novatier6mrifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_novatier6mrifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/nova/t6s.recipe b/recipes/starbound/weapons/longguns/nova/t6s.recipe index 04419804..69be45fa 100644 --- a/recipes/starbound/weapons/longguns/nova/t6s.recipe +++ b/recipes/starbound/weapons/longguns/nova/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_novatier6srifle", - "groups" : ["craftingaccelerator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_novatier6srifle", + "groups": ["craftingaccelerator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/thornyneedler.recipe b/recipes/starbound/weapons/longguns/thornyneedler.recipe index 8fb01073..d68bbda8 100644 --- a/recipes/starbound/weapons/longguns/thornyneedler.recipe +++ b/recipes/starbound/weapons/longguns/thornyneedler.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",10],["thornfruit",3]], - "output" : ["sb_thornyneedler",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",10],["thornfruit",3]], + "output": ["sb_thornyneedler",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shields/frostshield.recipe b/recipes/starbound/weapons/shields/frostshield.recipe index 5dca8d77..f24b57be 100644 --- a/recipes/starbound/weapons/shields/frostshield.recipe +++ b/recipes/starbound/weapons/shields/frostshield.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",5],["snowflake",15]], - "output" : ["frostshield",1,{"sb_crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["titaniumbar",5],["snowflake",15]], + "output": ["frostshield",1,{"sb_crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shields/mushroomshield.recipe b/recipes/starbound/weapons/shields/mushroomshield.recipe index d8f9848c..732b472f 100644 --- a/recipes/starbound/weapons/shields/mushroomshield.recipe +++ b/recipes/starbound/weapons/shields/mushroomshield.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",5],["shroom",15]], - "output" : ["mushroomshield",1,{"sb_crafted":true}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",5],["shroom",15]], + "output": ["mushroomshield",1,{"sb_crafted":true}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t1.recipe b/recipes/starbound/weapons/shortswords/apex/t1.recipe index 43fee184..0840e528 100644 --- a/recipes/starbound/weapons/shortswords/apex/t1.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_apextier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_apextier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t2.recipe b/recipes/starbound/weapons/shortswords/apex/t2.recipe index b3b9ded6..925588d6 100644 --- a/recipes/starbound/weapons/shortswords/apex/t2.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_apextier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_apextier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t3.recipe b/recipes/starbound/weapons/shortswords/apex/t3.recipe index 78ca393f..95e8476b 100644 --- a/recipes/starbound/weapons/shortswords/apex/t3.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_apextier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_apextier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t4.recipe b/recipes/starbound/weapons/shortswords/apex/t4.recipe index b3875e7d..b260b9c8 100644 --- a/recipes/starbound/weapons/shortswords/apex/t4.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_apextier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_apextier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t5a.recipe b/recipes/starbound/weapons/shortswords/apex/t5a.recipe index 5d547f71..f2424572 100644 --- a/recipes/starbound/weapons/shortswords/apex/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_apextier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_apextier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t5m.recipe b/recipes/starbound/weapons/shortswords/apex/t5m.recipe index 86b5362a..ee8fe63f 100644 --- a/recipes/starbound/weapons/shortswords/apex/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_apextier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_apextier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t5s.recipe b/recipes/starbound/weapons/shortswords/apex/t5s.recipe index 32917c83..04be8218 100644 --- a/recipes/starbound/weapons/shortswords/apex/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_apextier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_apextier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t6a.recipe b/recipes/starbound/weapons/shortswords/apex/t6a.recipe index f129e4aa..bec55751 100644 --- a/recipes/starbound/weapons/shortswords/apex/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_apextier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t6m.recipe b/recipes/starbound/weapons/shortswords/apex/t6m.recipe index f7e85bd0..3cac1d41 100644 --- a/recipes/starbound/weapons/shortswords/apex/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_apextier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/apex/t6s.recipe b/recipes/starbound/weapons/shortswords/apex/t6s.recipe index 23676c6d..7b45cee8 100644 --- a/recipes/starbound/weapons/shortswords/apex/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_apextier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_apextier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t1.recipe b/recipes/starbound/weapons/shortswords/avian/t1.recipe index 036cfe21..17299cfe 100644 --- a/recipes/starbound/weapons/shortswords/avian/t1.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_aviantier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_aviantier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t2.recipe b/recipes/starbound/weapons/shortswords/avian/t2.recipe index 5a399aeb..8030f85e 100644 --- a/recipes/starbound/weapons/shortswords/avian/t2.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_aviantier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_aviantier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t3.recipe b/recipes/starbound/weapons/shortswords/avian/t3.recipe index 039b58a0..9b346917 100644 --- a/recipes/starbound/weapons/shortswords/avian/t3.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_aviantier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_aviantier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t4.recipe b/recipes/starbound/weapons/shortswords/avian/t4.recipe index c2f1c8a5..8472f9ac 100644 --- a/recipes/starbound/weapons/shortswords/avian/t4.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_aviantier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_aviantier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t5a.recipe b/recipes/starbound/weapons/shortswords/avian/t5a.recipe index fb192f25..97b87214 100644 --- a/recipes/starbound/weapons/shortswords/avian/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_aviantier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_aviantier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t5m.recipe b/recipes/starbound/weapons/shortswords/avian/t5m.recipe index 15585094..a5e1d097 100644 --- a/recipes/starbound/weapons/shortswords/avian/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_aviantier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_aviantier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t5s.recipe b/recipes/starbound/weapons/shortswords/avian/t5s.recipe index 7c0d181f..9c34a225 100644 --- a/recipes/starbound/weapons/shortswords/avian/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_aviantier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_aviantier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t6a.recipe b/recipes/starbound/weapons/shortswords/avian/t6a.recipe index fb628fde..caaa252b 100644 --- a/recipes/starbound/weapons/shortswords/avian/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t6m.recipe b/recipes/starbound/weapons/shortswords/avian/t6m.recipe index a27179f6..9c6ba50b 100644 --- a/recipes/starbound/weapons/shortswords/avian/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/avian/t6s.recipe b/recipes/starbound/weapons/shortswords/avian/t6s.recipe index a10690e2..42b81e1d 100644 --- a/recipes/starbound/weapons/shortswords/avian/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_aviantier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_aviantier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/cutarrh.recipe b/recipes/starbound/weapons/shortswords/cutarrh.recipe index e7d91aaf..522a5fff 100644 --- a/recipes/starbound/weapons/shortswords/cutarrh.recipe +++ b/recipes/starbound/weapons/shortswords/cutarrh.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",5],["greenslime",15]], - "output" : ["sb_cutarrh",1,{"crafted":true}], - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",5],["greenslime",15]], + "output": ["sb_cutarrh",1,{"crafted":true}], + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t1.recipe b/recipes/starbound/weapons/shortswords/floran/t1.recipe index 4fe5d667..a600f32e 100644 --- a/recipes/starbound/weapons/shortswords/floran/t1.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_florantier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_florantier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t2.recipe b/recipes/starbound/weapons/shortswords/floran/t2.recipe index 7e1f7933..6317c9b3 100644 --- a/recipes/starbound/weapons/shortswords/floran/t2.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_florantier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_florantier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t3.recipe b/recipes/starbound/weapons/shortswords/floran/t3.recipe index 30f832ee..a2fb4ae7 100644 --- a/recipes/starbound/weapons/shortswords/floran/t3.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_florantier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_florantier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t4.recipe b/recipes/starbound/weapons/shortswords/floran/t4.recipe index 765195d7..4ca0ce34 100644 --- a/recipes/starbound/weapons/shortswords/floran/t4.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_florantier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_florantier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t5a.recipe b/recipes/starbound/weapons/shortswords/floran/t5a.recipe index b2730e4f..5d169856 100644 --- a/recipes/starbound/weapons/shortswords/floran/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_florantier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_florantier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t5m.recipe b/recipes/starbound/weapons/shortswords/floran/t5m.recipe index e383eb0c..587e34f5 100644 --- a/recipes/starbound/weapons/shortswords/floran/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_florantier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_florantier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t5s.recipe b/recipes/starbound/weapons/shortswords/floran/t5s.recipe index d0961be8..c4509239 100644 --- a/recipes/starbound/weapons/shortswords/floran/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_florantier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_florantier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t6a.recipe b/recipes/starbound/weapons/shortswords/floran/t6a.recipe index 9defc878..2ced67ee 100644 --- a/recipes/starbound/weapons/shortswords/floran/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_florantier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t6m.recipe b/recipes/starbound/weapons/shortswords/floran/t6m.recipe index 5cb16d95..fcb2e05f 100644 --- a/recipes/starbound/weapons/shortswords/floran/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_florantier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/floran/t6s.recipe b/recipes/starbound/weapons/shortswords/floran/t6s.recipe index 269f28ca..bb5e2e03 100644 --- a/recipes/starbound/weapons/shortswords/floran/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_florantier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_florantier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t1.recipe b/recipes/starbound/weapons/shortswords/glitch/t1.recipe index 5b132dd0..20549577 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t1.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_glitchtier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_glitchtier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t2.recipe b/recipes/starbound/weapons/shortswords/glitch/t2.recipe index ae541692..70fad11a 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t2.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_glitchtier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_glitchtier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t3.recipe b/recipes/starbound/weapons/shortswords/glitch/t3.recipe index 694cbcb1..3243bfce 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t3.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_glitchtier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_glitchtier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t4.recipe b/recipes/starbound/weapons/shortswords/glitch/t4.recipe index 68f33b7f..5c7591e7 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t4.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_glitchtier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_glitchtier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t5a.recipe b/recipes/starbound/weapons/shortswords/glitch/t5a.recipe index eb7e26b1..38724858 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_glitchtier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_glitchtier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t5m.recipe b/recipes/starbound/weapons/shortswords/glitch/t5m.recipe index 4545a189..6ecd954b 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_glitchtier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_glitchtier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t5s.recipe b/recipes/starbound/weapons/shortswords/glitch/t5s.recipe index f9b5b170..6be28fc3 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_glitchtier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_glitchtier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t6a.recipe b/recipes/starbound/weapons/shortswords/glitch/t6a.recipe index 0ec237b0..dcc8df3e 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t6m.recipe b/recipes/starbound/weapons/shortswords/glitch/t6m.recipe index 96ee6c0c..7e765d00 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/glitch/t6s.recipe b/recipes/starbound/weapons/shortswords/glitch/t6s.recipe index d86fa113..16c0717f 100644 --- a/recipes/starbound/weapons/shortswords/glitch/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_glitchtier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_glitchtier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t1.recipe b/recipes/starbound/weapons/shortswords/human/t1.recipe index c5da10e8..25872a66 100644 --- a/recipes/starbound/weapons/shortswords/human/t1.recipe +++ b/recipes/starbound/weapons/shortswords/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_humantier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_humantier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t2.recipe b/recipes/starbound/weapons/shortswords/human/t2.recipe index 141bcff0..5cdae82b 100644 --- a/recipes/starbound/weapons/shortswords/human/t2.recipe +++ b/recipes/starbound/weapons/shortswords/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_humantier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_humantier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t3.recipe b/recipes/starbound/weapons/shortswords/human/t3.recipe index 0b88c4ab..b7fd741b 100644 --- a/recipes/starbound/weapons/shortswords/human/t3.recipe +++ b/recipes/starbound/weapons/shortswords/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_humantier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_humantier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t4.recipe b/recipes/starbound/weapons/shortswords/human/t4.recipe index 329ecf7e..489be4f1 100644 --- a/recipes/starbound/weapons/shortswords/human/t4.recipe +++ b/recipes/starbound/weapons/shortswords/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_humantier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_humantier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t5a.recipe b/recipes/starbound/weapons/shortswords/human/t5a.recipe index 25a26a75..782a3189 100644 --- a/recipes/starbound/weapons/shortswords/human/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_humantier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_humantier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t5m.recipe b/recipes/starbound/weapons/shortswords/human/t5m.recipe index 2661f1f8..c21aa409 100644 --- a/recipes/starbound/weapons/shortswords/human/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_humantier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_humantier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t5s.recipe b/recipes/starbound/weapons/shortswords/human/t5s.recipe index 2c973724..293d3f92 100644 --- a/recipes/starbound/weapons/shortswords/human/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_humantier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_humantier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t6a.recipe b/recipes/starbound/weapons/shortswords/human/t6a.recipe index 2fde30ec..14929e63 100644 --- a/recipes/starbound/weapons/shortswords/human/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_humantier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t6m.recipe b/recipes/starbound/weapons/shortswords/human/t6m.recipe index 0a82e9e0..38a120b5 100644 --- a/recipes/starbound/weapons/shortswords/human/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_humantier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/human/t6s.recipe b/recipes/starbound/weapons/shortswords/human/t6s.recipe index e107749b..ebed0cae 100644 --- a/recipes/starbound/weapons/shortswords/human/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_humantier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_humantier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t1.recipe b/recipes/starbound/weapons/shortswords/hylotl/t1.recipe index 0248381e..7df5bc92 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t1.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",3],["darkwoodmaterial",2]], - "output" : "sb_hylotltier1shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",3],["darkwoodmaterial",2]], + "output": "sb_hylotltier1shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t2.recipe b/recipes/starbound/weapons/shortswords/hylotl/t2.recipe index 85533b36..2bb5c008 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t2.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",3],["copperbar",2]], - "output" : "sb_hylotltier2shortsword", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",3],["copperbar",2]], + "output": "sb_hylotltier2shortsword", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t3.recipe b/recipes/starbound/weapons/shortswords/hylotl/t3.recipe index 35fe5245..f39d7a99 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t3.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",3],["copperbar",2]], - "output" : "sb_hylotltier3shortsword", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",3],["copperbar",2]], + "output": "sb_hylotltier3shortsword", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t4.recipe b/recipes/starbound/weapons/shortswords/hylotl/t4.recipe index 3a86b628..9d5a67e3 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t4.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",3],["copperbar",2]], - "output" : "sb_hylotltier4shortsword", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",3],["copperbar",2]], + "output": "sb_hylotltier4shortsword", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t5a.recipe b/recipes/starbound/weapons/shortswords/hylotl/t5a.recipe index 6ed91afe..deb55d0c 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",3],["durasteelbar",2]], - "output" : "sb_hylotltier5ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",3],["durasteelbar",2]], + "output": "sb_hylotltier5ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t5m.recipe b/recipes/starbound/weapons/shortswords/hylotl/t5m.recipe index cc1beda2..7aa4006f 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["durasteelbar",2]], - "output" : "sb_hylotltier5mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",3],["durasteelbar",2]], + "output": "sb_hylotltier5mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t5s.recipe b/recipes/starbound/weapons/shortswords/hylotl/t5s.recipe index 932dbd6b..2e293ff4 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",3],["durasteelbar",2]], - "output" : "sb_hylotltier5sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",3],["durasteelbar",2]], + "output": "sb_hylotltier5sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t6a.recipe b/recipes/starbound/weapons/shortswords/hylotl/t6a.recipe index 6bbbe1b9..852705c8 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6ashortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6ashortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t6m.recipe b/recipes/starbound/weapons/shortswords/hylotl/t6m.recipe index 76834020..2a4655a8 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6mshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6mshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/hylotl/t6s.recipe b/recipes/starbound/weapons/shortswords/hylotl/t6s.recipe index 1aab34d3..d03bf0ac 100644 --- a/recipes/starbound/weapons/shortswords/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/shortswords/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",3],["solariumstar",2]], - "output" : "sb_hylotltier6sshortsword", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",3],["solariumstar",2]], + "output": "sb_hylotltier6sshortsword", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/mushroomsword.recipe b/recipes/starbound/weapons/shortswords/mushroomsword.recipe index 0f04fef8..3f828b81 100644 --- a/recipes/starbound/weapons/shortswords/mushroomsword.recipe +++ b/recipes/starbound/weapons/shortswords/mushroomsword.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",5],["shroom",15],"phasematter"], - "output" : ["sb_mushroomsword",1,{"crafted":true}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",5],["shroom",15],"phasematter"], + "output": ["sb_mushroomsword",1,{"crafted":true}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/mushroomsword2.recipe b/recipes/starbound/weapons/shortswords/mushroomsword2.recipe index 7da704fe..5f59b4d0 100644 --- a/recipes/starbound/weapons/shortswords/mushroomsword2.recipe +++ b/recipes/starbound/weapons/shortswords/mushroomsword2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",5],["shroom",15],"venomsample"], - "output" : ["sb_mushroomsword2",1,{"crafted":true}], - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",5],["shroom",15],"venomsample"], + "output": ["sb_mushroomsword2",1,{"crafted":true}], + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt b/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt index 84f85a42..a7290fcb 100644 --- a/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt +++ b/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",5],["wildvines",15]], - "output" : ["sb_undergrowthtrimmer",1,{"crafted":true}], - "groups" : ["craftinganvil2","weapons","all"] + "input": [["durasteelbar",5],["wildvines",15]], + "output": ["sb_undergrowthtrimmer",1,{"crafted":true}], + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t1.recipe b/recipes/starbound/weapons/spears/apex/t1.recipe index 8a6fd82b..462e53f4 100644 --- a/recipes/starbound/weapons/spears/apex/t1.recipe +++ b/recipes/starbound/weapons/spears/apex/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_apextier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_apextier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t2.recipe b/recipes/starbound/weapons/spears/apex/t2.recipe index 3c14da1e..addb75d8 100644 --- a/recipes/starbound/weapons/spears/apex/t2.recipe +++ b/recipes/starbound/weapons/spears/apex/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_apextier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_apextier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t3.recipe b/recipes/starbound/weapons/spears/apex/t3.recipe index 115fc9b7..debf8804 100644 --- a/recipes/starbound/weapons/spears/apex/t3.recipe +++ b/recipes/starbound/weapons/spears/apex/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_apextier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_apextier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t4.recipe b/recipes/starbound/weapons/spears/apex/t4.recipe index 2b99fecb..3e5d6821 100644 --- a/recipes/starbound/weapons/spears/apex/t4.recipe +++ b/recipes/starbound/weapons/spears/apex/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_apextier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_apextier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t5a.recipe b/recipes/starbound/weapons/spears/apex/t5a.recipe index 0d157262..138888b4 100644 --- a/recipes/starbound/weapons/spears/apex/t5a.recipe +++ b/recipes/starbound/weapons/spears/apex/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_apextier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_apextier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t5m.recipe b/recipes/starbound/weapons/spears/apex/t5m.recipe index 1a863111..d1b547fd 100644 --- a/recipes/starbound/weapons/spears/apex/t5m.recipe +++ b/recipes/starbound/weapons/spears/apex/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_apextier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_apextier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t5s.recipe b/recipes/starbound/weapons/spears/apex/t5s.recipe index 4775602c..b4ece19f 100644 --- a/recipes/starbound/weapons/spears/apex/t5s.recipe +++ b/recipes/starbound/weapons/spears/apex/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_apextier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_apextier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t6a.recipe b/recipes/starbound/weapons/spears/apex/t6a.recipe index 1af1473c..e0905d86 100644 --- a/recipes/starbound/weapons/spears/apex/t6a.recipe +++ b/recipes/starbound/weapons/spears/apex/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_apextier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t6m.recipe b/recipes/starbound/weapons/spears/apex/t6m.recipe index 713c8cd4..9295b2ec 100644 --- a/recipes/starbound/weapons/spears/apex/t6m.recipe +++ b/recipes/starbound/weapons/spears/apex/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_apextier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/apex/t6s.recipe b/recipes/starbound/weapons/spears/apex/t6s.recipe index e66c4535..71ed847c 100644 --- a/recipes/starbound/weapons/spears/apex/t6s.recipe +++ b/recipes/starbound/weapons/spears/apex/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_apextier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_apextier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t1.recipe b/recipes/starbound/weapons/spears/avian/t1.recipe index 13c9c4a3..6e12323c 100644 --- a/recipes/starbound/weapons/spears/avian/t1.recipe +++ b/recipes/starbound/weapons/spears/avian/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_aviantier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_aviantier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t2.recipe b/recipes/starbound/weapons/spears/avian/t2.recipe index ba2a65fa..3b0a1e25 100644 --- a/recipes/starbound/weapons/spears/avian/t2.recipe +++ b/recipes/starbound/weapons/spears/avian/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_aviantier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_aviantier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t3.recipe b/recipes/starbound/weapons/spears/avian/t3.recipe index dc4d93ff..976d213b 100644 --- a/recipes/starbound/weapons/spears/avian/t3.recipe +++ b/recipes/starbound/weapons/spears/avian/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_aviantier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_aviantier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t4.recipe b/recipes/starbound/weapons/spears/avian/t4.recipe index eb71798b..0a4f8add 100644 --- a/recipes/starbound/weapons/spears/avian/t4.recipe +++ b/recipes/starbound/weapons/spears/avian/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_aviantier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_aviantier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t5a.recipe b/recipes/starbound/weapons/spears/avian/t5a.recipe index 2b6d536a..c61a8d26 100644 --- a/recipes/starbound/weapons/spears/avian/t5a.recipe +++ b/recipes/starbound/weapons/spears/avian/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_aviantier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_aviantier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t5m.recipe b/recipes/starbound/weapons/spears/avian/t5m.recipe index b2b510bc..c6e2d619 100644 --- a/recipes/starbound/weapons/spears/avian/t5m.recipe +++ b/recipes/starbound/weapons/spears/avian/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_aviantier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_aviantier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t5s.recipe b/recipes/starbound/weapons/spears/avian/t5s.recipe index b9984133..3a75a91a 100644 --- a/recipes/starbound/weapons/spears/avian/t5s.recipe +++ b/recipes/starbound/weapons/spears/avian/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_aviantier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_aviantier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t6a.recipe b/recipes/starbound/weapons/spears/avian/t6a.recipe index 554e3fde..5e52ba32 100644 --- a/recipes/starbound/weapons/spears/avian/t6a.recipe +++ b/recipes/starbound/weapons/spears/avian/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t6m.recipe b/recipes/starbound/weapons/spears/avian/t6m.recipe index 10e3a261..638e5553 100644 --- a/recipes/starbound/weapons/spears/avian/t6m.recipe +++ b/recipes/starbound/weapons/spears/avian/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/avian/t6s.recipe b/recipes/starbound/weapons/spears/avian/t6s.recipe index 79ea1c40..94daf17a 100644 --- a/recipes/starbound/weapons/spears/avian/t6s.recipe +++ b/recipes/starbound/weapons/spears/avian/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_aviantier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_aviantier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t1.recipe b/recipes/starbound/weapons/spears/floran/t1.recipe index d67b2c23..ad462c81 100644 --- a/recipes/starbound/weapons/spears/floran/t1.recipe +++ b/recipes/starbound/weapons/spears/floran/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_florantier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_florantier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t2.recipe b/recipes/starbound/weapons/spears/floran/t2.recipe index b3475aec..0af06750 100644 --- a/recipes/starbound/weapons/spears/floran/t2.recipe +++ b/recipes/starbound/weapons/spears/floran/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_florantier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_florantier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t3.recipe b/recipes/starbound/weapons/spears/floran/t3.recipe index 08c57f00..db4cf2e0 100644 --- a/recipes/starbound/weapons/spears/floran/t3.recipe +++ b/recipes/starbound/weapons/spears/floran/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_florantier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_florantier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t4.recipe b/recipes/starbound/weapons/spears/floran/t4.recipe index 45c0f580..5f54177e 100644 --- a/recipes/starbound/weapons/spears/floran/t4.recipe +++ b/recipes/starbound/weapons/spears/floran/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_florantier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_florantier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t5a.recipe b/recipes/starbound/weapons/spears/floran/t5a.recipe index 578a5cd3..95e58df5 100644 --- a/recipes/starbound/weapons/spears/floran/t5a.recipe +++ b/recipes/starbound/weapons/spears/floran/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_florantier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_florantier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t5m.recipe b/recipes/starbound/weapons/spears/floran/t5m.recipe index 337eb5b7..5f716fe5 100644 --- a/recipes/starbound/weapons/spears/floran/t5m.recipe +++ b/recipes/starbound/weapons/spears/floran/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_florantier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_florantier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t5s.recipe b/recipes/starbound/weapons/spears/floran/t5s.recipe index 8746186a..79bd48a4 100644 --- a/recipes/starbound/weapons/spears/floran/t5s.recipe +++ b/recipes/starbound/weapons/spears/floran/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_florantier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_florantier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t6a.recipe b/recipes/starbound/weapons/spears/floran/t6a.recipe index b8261648..1fcfca59 100644 --- a/recipes/starbound/weapons/spears/floran/t6a.recipe +++ b/recipes/starbound/weapons/spears/floran/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_florantier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t6m.recipe b/recipes/starbound/weapons/spears/floran/t6m.recipe index 624b5aae..8e76f4ec 100644 --- a/recipes/starbound/weapons/spears/floran/t6m.recipe +++ b/recipes/starbound/weapons/spears/floran/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_florantier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/floran/t6s.recipe b/recipes/starbound/weapons/spears/floran/t6s.recipe index 2dd7464b..0a5508d4 100644 --- a/recipes/starbound/weapons/spears/floran/t6s.recipe +++ b/recipes/starbound/weapons/spears/floran/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_florantier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_florantier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/frostspear.recipe b/recipes/starbound/weapons/spears/frostspear.recipe index cbb79d22..d681d2a7 100644 --- a/recipes/starbound/weapons/spears/frostspear.recipe +++ b/recipes/starbound/weapons/spears/frostspear.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",10],["snowflake",25]], - "output" : ["sb_frostspear",1,{"crafted":true}], - "groups" : ["weapons","craftinganvil2","all"] + "input": [["titaniumbar",10],["snowflake",25]], + "output": ["sb_frostspear",1,{"crafted":true}], + "groups": ["weapons","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t1.recipe b/recipes/starbound/weapons/spears/glitch/t1.recipe index b96ab447..1490dd59 100644 --- a/recipes/starbound/weapons/spears/glitch/t1.recipe +++ b/recipes/starbound/weapons/spears/glitch/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_glitchtier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_glitchtier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t2.recipe b/recipes/starbound/weapons/spears/glitch/t2.recipe index 8765040a..96918364 100644 --- a/recipes/starbound/weapons/spears/glitch/t2.recipe +++ b/recipes/starbound/weapons/spears/glitch/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_glitchtier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_glitchtier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t3.recipe b/recipes/starbound/weapons/spears/glitch/t3.recipe index 4497645e..f72d974c 100644 --- a/recipes/starbound/weapons/spears/glitch/t3.recipe +++ b/recipes/starbound/weapons/spears/glitch/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_glitchtier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_glitchtier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t4.recipe b/recipes/starbound/weapons/spears/glitch/t4.recipe index 1cfcba5d..9daf961f 100644 --- a/recipes/starbound/weapons/spears/glitch/t4.recipe +++ b/recipes/starbound/weapons/spears/glitch/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_glitchtier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_glitchtier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t5a.recipe b/recipes/starbound/weapons/spears/glitch/t5a.recipe index 1af0f5d2..5ee5e31f 100644 --- a/recipes/starbound/weapons/spears/glitch/t5a.recipe +++ b/recipes/starbound/weapons/spears/glitch/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_glitchtier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_glitchtier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t5m.recipe b/recipes/starbound/weapons/spears/glitch/t5m.recipe index d1cc857d..2d5ad193 100644 --- a/recipes/starbound/weapons/spears/glitch/t5m.recipe +++ b/recipes/starbound/weapons/spears/glitch/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_glitchtier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_glitchtier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t5s.recipe b/recipes/starbound/weapons/spears/glitch/t5s.recipe index c706bcd5..bf53274e 100644 --- a/recipes/starbound/weapons/spears/glitch/t5s.recipe +++ b/recipes/starbound/weapons/spears/glitch/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_glitchtier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_glitchtier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t6a.recipe b/recipes/starbound/weapons/spears/glitch/t6a.recipe index 311b6600..4278dd18 100644 --- a/recipes/starbound/weapons/spears/glitch/t6a.recipe +++ b/recipes/starbound/weapons/spears/glitch/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t6m.recipe b/recipes/starbound/weapons/spears/glitch/t6m.recipe index 1d46e224..6c8ea7c6 100644 --- a/recipes/starbound/weapons/spears/glitch/t6m.recipe +++ b/recipes/starbound/weapons/spears/glitch/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/glitch/t6s.recipe b/recipes/starbound/weapons/spears/glitch/t6s.recipe index e568c0dc..d9e0049c 100644 --- a/recipes/starbound/weapons/spears/glitch/t6s.recipe +++ b/recipes/starbound/weapons/spears/glitch/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_glitchtier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_glitchtier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hackman.recipe b/recipes/starbound/weapons/spears/hackman.recipe index 538b4283..28a8aa2b 100644 --- a/recipes/starbound/weapons/spears/hackman.recipe +++ b/recipes/starbound/weapons/spears/hackman.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",10],["crystal",12],["crystalplant",12]], - "output" : ["sb_hackman",1,{"crafted":true}], - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",10],["crystal",12],["crystalplant",12]], + "output": ["sb_hackman",1,{"crafted":true}], + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t1.recipe b/recipes/starbound/weapons/spears/human/t1.recipe index 85f27016..fc3aed82 100644 --- a/recipes/starbound/weapons/spears/human/t1.recipe +++ b/recipes/starbound/weapons/spears/human/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_humantier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_humantier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t2.recipe b/recipes/starbound/weapons/spears/human/t2.recipe index b00a6f27..8b657b3f 100644 --- a/recipes/starbound/weapons/spears/human/t2.recipe +++ b/recipes/starbound/weapons/spears/human/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_humantier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_humantier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t3.recipe b/recipes/starbound/weapons/spears/human/t3.recipe index 3a25ea51..25f3d76c 100644 --- a/recipes/starbound/weapons/spears/human/t3.recipe +++ b/recipes/starbound/weapons/spears/human/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_humantier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_humantier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t4.recipe b/recipes/starbound/weapons/spears/human/t4.recipe index b9f3b694..2891bc55 100644 --- a/recipes/starbound/weapons/spears/human/t4.recipe +++ b/recipes/starbound/weapons/spears/human/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_humantier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_humantier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t5a.recipe b/recipes/starbound/weapons/spears/human/t5a.recipe index c5245602..7d77f708 100644 --- a/recipes/starbound/weapons/spears/human/t5a.recipe +++ b/recipes/starbound/weapons/spears/human/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_humantier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_humantier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t5m.recipe b/recipes/starbound/weapons/spears/human/t5m.recipe index 99e49824..a995256b 100644 --- a/recipes/starbound/weapons/spears/human/t5m.recipe +++ b/recipes/starbound/weapons/spears/human/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_humantier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_humantier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t5s.recipe b/recipes/starbound/weapons/spears/human/t5s.recipe index 8b7e837a..7d58a60a 100644 --- a/recipes/starbound/weapons/spears/human/t5s.recipe +++ b/recipes/starbound/weapons/spears/human/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_humantier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_humantier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t6a.recipe b/recipes/starbound/weapons/spears/human/t6a.recipe index 531c5e6b..2de47ff1 100644 --- a/recipes/starbound/weapons/spears/human/t6a.recipe +++ b/recipes/starbound/weapons/spears/human/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_humantier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t6m.recipe b/recipes/starbound/weapons/spears/human/t6m.recipe index 202a50c4..4617f637 100644 --- a/recipes/starbound/weapons/spears/human/t6m.recipe +++ b/recipes/starbound/weapons/spears/human/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], - "output" : "sb_humantier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4],"cryonicextract"], + "output": "sb_humantier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/human/t6s.recipe b/recipes/starbound/weapons/spears/human/t6s.recipe index b7369f8f..c7afc62e 100644 --- a/recipes/starbound/weapons/spears/human/t6s.recipe +++ b/recipes/starbound/weapons/spears/human/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_humantier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_humantier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t1.recipe b/recipes/starbound/weapons/spears/hylotl/t1.recipe index 5fb3251c..1f68c1dc 100644 --- a/recipes/starbound/weapons/spears/hylotl/t1.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t1.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",6],["darkwoodmaterial",4]], - "output" : "sb_hylotltier1spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["ironbar",6],["darkwoodmaterial",4]], + "output": "sb_hylotltier1spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t2.recipe b/recipes/starbound/weapons/spears/hylotl/t2.recipe index 5d868555..057116e1 100644 --- a/recipes/starbound/weapons/spears/hylotl/t2.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t2.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["copperbar",4]], - "output" : "sb_hylotltier2spear", - "groups" : ["craftinganvil","weapons","all"] + "input": [["tungstenbar",6],["copperbar",4]], + "output": "sb_hylotltier2spear", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t3.recipe b/recipes/starbound/weapons/spears/hylotl/t3.recipe index 7df006ce..c7637f59 100644 --- a/recipes/starbound/weapons/spears/hylotl/t3.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t3.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",6],["copperbar",4]], - "output" : "sb_hylotltier3spear", - "groups" : ["craftinganvil2","weapons","all"] + "input": [["sb_steelbar",6],["copperbar",4]], + "output": "sb_hylotltier3spear", + "groups": ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t4.recipe b/recipes/starbound/weapons/spears/hylotl/t4.recipe index 7da74b90..85f13b70 100644 --- a/recipes/starbound/weapons/spears/hylotl/t4.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t4.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",6],["copperbar",4]], - "output" : "sb_hylotltier4spear", - "groups" : ["craftinganvil3","weapons","all"] + "input": [["durasteelbar",6],["copperbar",4]], + "output": "sb_hylotltier4spear", + "groups": ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t5a.recipe b/recipes/starbound/weapons/spears/hylotl/t5a.recipe index 645fc10e..f824075a 100644 --- a/recipes/starbound/weapons/spears/hylotl/t5a.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t5a.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], - "output" : "sb_hylotltier5aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedaegisalt",6],["durasteelbar",4],"venomsample"], + "output": "sb_hylotltier5aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t5m.recipe b/recipes/starbound/weapons/spears/hylotl/t5m.recipe index d31d3924..cc93f303 100644 --- a/recipes/starbound/weapons/spears/hylotl/t5m.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t5m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], - "output" : "sb_hylotltier5mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_refinedrubium",6],["durasteelbar",4],"scorchedcore"], + "output": "sb_hylotltier5mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t5s.recipe b/recipes/starbound/weapons/spears/hylotl/t5s.recipe index 926ae4f4..84be403c 100644 --- a/recipes/starbound/weapons/spears/hylotl/t5s.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t5s.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",6],["durasteelbar",4],"staticcell"], - "output" : "sb_hylotltier5sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["refinedviolium",6],["durasteelbar",4],"staticcell"], + "output": "sb_hylotltier5sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t6a.recipe b/recipes/starbound/weapons/spears/hylotl/t6a.recipe index 0fa79d89..60972675 100644 --- a/recipes/starbound/weapons/spears/hylotl/t6a.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t6a.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6aspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_feroziumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6aspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t6m.recipe b/recipes/starbound/weapons/spears/hylotl/t6m.recipe index baa9b157..bedd7858 100644 --- a/recipes/starbound/weapons/spears/hylotl/t6m.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t6m.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6mspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_ceruliumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6mspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hylotl/t6s.recipe b/recipes/starbound/weapons/spears/hylotl/t6s.recipe index e5d90d78..4211f890 100644 --- a/recipes/starbound/weapons/spears/hylotl/t6s.recipe +++ b/recipes/starbound/weapons/spears/hylotl/t6s.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumcompound",6],["solariumstar",4]], - "output" : "sb_hylotltier6sspear", - "groups" : ["craftingseparator","weapons","all"] + "input": [["sb_imperviumcompound",6],["solariumstar",4]], + "output": "sb_hylotltier6sspear", + "groups": ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/rainbowspear.recipe b/recipes/starbound/weapons/spears/rainbowspear.recipe index 1a8adc76..3af97b16 100644 --- a/recipes/starbound/weapons/spears/rainbowspear.recipe +++ b/recipes/starbound/weapons/spears/rainbowspear.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",10],["rainbowwood",25]], - "output" : ["sb_rainbowspear",1,{"crafted":true}], - "groups" : ["weapons","craftinganvil2","all"] + "input": [["titaniumbar",10],["rainbowwood",25]], + "output": ["sb_rainbowspear",1,{"crafted":true}], + "groups": ["weapons","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/sabertoothspear.recipe b/recipes/starbound/weapons/spears/sabertoothspear.recipe index b5ca6b5b..0ec00b38 100644 --- a/recipes/starbound/weapons/spears/sabertoothspear.recipe +++ b/recipes/starbound/weapons/spears/sabertoothspear.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",10],["tarball",12],["bone",12]], - "output" : ["sb_sabertoothspear",1,{"crafted":true}], - "groups" : ["weapons","craftinganvil","all"] + "input": [["tungstenbar",10],["tarball",12],["bone",12]], + "output": ["sb_sabertoothspear",1,{"crafted":true}], + "groups": ["weapons","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/biostaff.recipe b/recipes/starbound/weapons/staves/biostaff.recipe index a609d29a..1a8cdb09 100644 --- a/recipes/starbound/weapons/staves/biostaff.recipe +++ b/recipes/starbound/weapons/staves/biostaff.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery",["glowfibre",25]], - "output" : ["sb_biostaff",1,{"crafted":true}], - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery",["glowfibre",25]], + "output": ["sb_biostaff",1,{"crafted":true}], + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/apexsteelstaff1.recipe b/recipes/starbound/weapons/staves/racial/apexsteelstaff1.recipe index 5f8c1524..64c7ac77 100644 --- a/recipes/starbound/weapons/staves/racial/apexsteelstaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/apexsteelstaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_apexsteelstaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_apexsteelstaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/apexsteelstaff2.recipe b/recipes/starbound/weapons/staves/racial/apexsteelstaff2.recipe index 4e6b4a87..e2041e38 100644 --- a/recipes/starbound/weapons/staves/racial/apexsteelstaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/apexsteelstaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_apexsteelstaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_apexsteelstaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/aviancrystalstaff1.recipe b/recipes/starbound/weapons/staves/racial/aviancrystalstaff1.recipe index 72c95345..bdace52a 100644 --- a/recipes/starbound/weapons/staves/racial/aviancrystalstaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/aviancrystalstaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_aviancrystalstaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_aviancrystalstaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/aviancrystalstaff2.recipe b/recipes/starbound/weapons/staves/racial/aviancrystalstaff2.recipe index d2a0a8fb..09255ab5 100644 --- a/recipes/starbound/weapons/staves/racial/aviancrystalstaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/aviancrystalstaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_aviancrystalstaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_aviancrystalstaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/floranleafstaff1.recipe b/recipes/starbound/weapons/staves/racial/floranleafstaff1.recipe index 594a4fb4..9becbd8d 100644 --- a/recipes/starbound/weapons/staves/racial/floranleafstaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/floranleafstaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_floranleafstaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_floranleafstaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/floranleafstaff2.recipe b/recipes/starbound/weapons/staves/racial/floranleafstaff2.recipe index adfcf0aa..bedff6a9 100644 --- a/recipes/starbound/weapons/staves/racial/floranleafstaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/floranleafstaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_floranleafstaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_floranleafstaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/glitchglitchstaff1.recipe b/recipes/starbound/weapons/staves/racial/glitchglitchstaff1.recipe index 1c9aca98..5e908d75 100644 --- a/recipes/starbound/weapons/staves/racial/glitchglitchstaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/glitchglitchstaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_glitchglitchstaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_glitchglitchstaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/glitchglitchstaff2.recipe b/recipes/starbound/weapons/staves/racial/glitchglitchstaff2.recipe index e03271fe..f9ceb5bb 100644 --- a/recipes/starbound/weapons/staves/racial/glitchglitchstaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/glitchglitchstaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [ + "input": [ ["sb_glitchglitchstaff1",0], ["smallbattery",0,{"shortdescription":"44-84773|2\\|/","inventoryIcon":"smallbattery.png?flipxy?hueshift=8?scale=1.1"}], ["syntheticmaterial",0,{"shortdescription":"{\"itemName\":\"syntheticmaterial\",\"price\":200,\"rarity\":\"Uncommon\",\"category\":\"craftingMaterial\",\"inventoryIcon\":\"syntheticmaterial.png\",\"description\":\"A square of synthetic material.\",\"shortdescription\":\"Synthetic Material\",\"itemTags\":[\"reagent\"]}","inventoryIcon":"syntheticmaterial.png?flipxy?hueshift=28?scale=0.9"}], @@ -11,6 +11,6 @@ // ["perfectlygenericitem",0,{"rarity":"common","shortdescription":"/interface/windowconfig/playerinventory.config","inventoryIcon":"/interface/inventory.png"}], ["perfectlygenericitem",0,{"rarity":"common","shortdescription":"commonuncommonrarelegendaryessentialredgray","inventoryIcon":[{"position":[0,4],"image":"/interface/inventory/itemborderuncommon.png"},{"position":[4,0],"image":"/interface/inventory/itemborderrare.png"},{"position":[4,4],"image":"/interface/inventory/itemborderlegendary.png"},{"position":[4,-4],"image":"/interface/inventory/itemborderessential.png"},{"position":[-4,4],"image":"/interface/inventory/redborder.png"},{"position":[-4,-4],"image":"/interface/inventory/grayborder.png"},{"position":[-1,1],"image":"/interface/inventory/itembordercommon.png"}]}] ], - "output" : "sb_glitchglitchstaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "output": "sb_glitchglitchstaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/humanplasmastaff1.recipe b/recipes/starbound/weapons/staves/racial/humanplasmastaff1.recipe index b33f684b..650ef086 100644 --- a/recipes/starbound/weapons/staves/racial/humanplasmastaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/humanplasmastaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_humanplasmastaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_humanplasmastaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/humanplasmastaff2.recipe b/recipes/starbound/weapons/staves/racial/humanplasmastaff2.recipe index 7fc3858a..bdffadb2 100644 --- a/recipes/starbound/weapons/staves/racial/humanplasmastaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/humanplasmastaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_humanplasmastaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_humanplasmastaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/hylotlaquastaff1.recipe b/recipes/starbound/weapons/staves/racial/hylotlaquastaff1.recipe index 7381527b..4a71f1c3 100644 --- a/recipes/starbound/weapons/staves/racial/hylotlaquastaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/hylotlaquastaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_hylotlaquastaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_hylotlaquastaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/hylotlaquastaff2.recipe b/recipes/starbound/weapons/staves/racial/hylotlaquastaff2.recipe index 70278b83..8f0b22ab 100644 --- a/recipes/starbound/weapons/staves/racial/hylotlaquastaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/hylotlaquastaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_hylotlaquastaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_hylotlaquastaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/novakidlightstaff1.recipe b/recipes/starbound/weapons/staves/racial/novakidlightstaff1.recipe index f6f5f152..a55898a1 100644 --- a/recipes/starbound/weapons/staves/racial/novakidlightstaff1.recipe +++ b/recipes/starbound/weapons/staves/racial/novakidlightstaff1.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery"], - "output" : "sb_novakidlightstaff1", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery"], + "output": "sb_novakidlightstaff1", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/racial/novakidlightstaff2.recipe b/recipes/starbound/weapons/staves/racial/novakidlightstaff2.recipe index c3da702c..8172fc6c 100644 --- a/recipes/starbound/weapons/staves/racial/novakidlightstaff2.recipe +++ b/recipes/starbound/weapons/staves/racial/novakidlightstaff2.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumcompound",12],"battery"], - "output" : "sb_novakidlightstaff2", - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["sb_ceruliumcompound",12],"battery"], + "output": "sb_novakidlightstaff2", + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/scistaff.recipe b/recipes/starbound/weapons/staves/scistaff.recipe new file mode 100644 index 00000000..1b30fb87 --- /dev/null +++ b/recipes/starbound/weapons/staves/scistaff.recipe @@ -0,0 +1,5 @@ +{ + "input": [["refinedferozium",6],["durasteelbar",6],"battery",["icecrystal",25]], + "output": ["sb_scistaff",1,{"crafted":true}], + "groups": ["craftingmanipulator","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/scistaff.txt b/recipes/starbound/weapons/staves/scistaff.txt deleted file mode 100644 index cef84df3..00000000 --- a/recipes/starbound/weapons/staves/scistaff.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery",["icecrystal",25]], - "output" : ["sb_scistaff",1,{"crafted":true}], - "groups" : ["craftingmanipulator","weapons","all"] -} \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/slimestaff.recipe b/recipes/starbound/weapons/staves/slimestaff.recipe index a11457c0..204c6b3f 100644 --- a/recipes/starbound/weapons/staves/slimestaff.recipe +++ b/recipes/starbound/weapons/staves/slimestaff.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery",["greenslime",25]], - "output" : ["sb_slimestaff",1,{"crafted":true}], - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery",["greenslime",25]], + "output": ["sb_slimestaff",1,{"crafted":true}], + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/uraniumrodstaff.recipe b/recipes/starbound/weapons/staves/uraniumrodstaff.recipe index e1aff2e9..6061b368 100644 --- a/recipes/starbound/weapons/staves/uraniumrodstaff.recipe +++ b/recipes/starbound/weapons/staves/uraniumrodstaff.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery",["uraniumrod",6],["toxicwaste",25]], - "output" : ["sb_uraniumrodstaff",1,{"crafted":true}], - "groups" : ["craftingmanipulator","weapons","all"] + "input": [["refinedferozium",6],["durasteelbar",6],"battery",["uraniumrod",6],["toxicwaste",25]], + "output": ["sb_uraniumrodstaff",1,{"crafted":true}], + "groups": ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/wormerang.recipe b/recipes/starbound/weapons/wormerang.recipe index 3aac00cf..f14db6ab 100644 --- a/recipes/starbound/weapons/wormerang.recipe +++ b/recipes/starbound/weapons/wormerang.recipe @@ -1,5 +1,5 @@ { - "input" : ["boomerang","upgrademodule",["sharpenedclaw",15]], - "output" : "wormerang", - "groups" : ["craftinganvil","weapons","all"] + "input": ["boomerang","upgrademodule",["sharpenedclaw",15]], + "output": "wormerang", + "groups": ["craftinganvil","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/forcepad.recipe b/recipes/starbound/wire/mechanics/forcepad.recipe index ee9ea7f0..c323d2cb 100644 --- a/recipes/starbound/wire/mechanics/forcepad.recipe +++ b/recipes/starbound/wire/mechanics/forcepad.recipe @@ -1,5 +1,5 @@ { - "input" : ["platinumbar","smallbattery"], - "output" : "sb_forcepad", - "groups" : ["craftingwiring","mechanics","all"] + "input": ["platinumbar","smallbattery"], + "output": "sb_forcepad", + "groups": ["craftingwiring","mechanics","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe index 899b4486..87322cd0 100644 --- a/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe +++ b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",6],["ironbar",6]], - "output" : "mechanicalelevatorlong", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["copperbar",6],["ironbar",6]], + "output": "mechanicalelevatorlong", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe index 19493113..01f62b96 100644 --- a/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe +++ b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe @@ -1,5 +1,5 @@ { - "input" : [["copperbar",3],["ironbar",3]], - "output" : "mechanicalelevatorshort", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["copperbar",3],["ironbar",3]], + "output": "mechanicalelevatorshort", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe index b173e996..129285c0 100644 --- a/recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe +++ b/recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",8],["climbingrope",10]], - "output" : "sb_steelelevatorlong", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["sb_steelbar",8],["climbingrope",10]], + "output": "sb_steelelevatorlong", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe index 501a9d9c..d46738de 100644 --- a/recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe +++ b/recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_steelbar",4],["climbingrope",5]], - "output" : "sb_steelelevatorshort", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["sb_steelbar",4],["climbingrope",5]], + "output": "sb_steelelevatorshort", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe index b22c3082..51ad35ac 100644 --- a/recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe +++ b/recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",50],["climbingrope",10]], - "output" : "woodenelevatorlong", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["darkwoodmaterial",50],["climbingrope",10]], + "output": "woodenelevatorlong", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe index b4457f5c..0a252004 100644 --- a/recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe +++ b/recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe @@ -1,5 +1,5 @@ { - "input" : [["darkwoodmaterial",25],["climbingrope",5]], - "output" : "woodenelevatorshort", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] + "input": [["darkwoodmaterial",25],["climbingrope",5]], + "output": "woodenelevatorshort", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe index 36fe139a..9ae29f5c 100644 --- a/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe +++ b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",8],["wire",10],"smallbattery"], - "output" : "durasteelelevatorlong", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture2","all"] + "input": [["durasteelbar",8],["wire",10],"smallbattery"], + "output": "durasteelelevatorlong", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture2","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe index faaefd4d..3391d9db 100644 --- a/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe +++ b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",4],["wire",5],"smallbattery"], - "output" : "durasteelelevatorshort", - "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture2","all"] + "input": [["durasteelbar",4],["wire",5],"smallbattery"], + "output": "durasteelelevatorshort", + "groups": ["craftingwiring","mechanics","decoration","craftingfurniture2","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/pump.recipe b/recipes/starbound/wire/mechanics/pump.recipe index d64d0ff2..8f13efed 100644 --- a/recipes/starbound/wire/mechanics/pump.recipe +++ b/recipes/starbound/wire/mechanics/pump.recipe @@ -1,5 +1,5 @@ { - "input" : ["liquidsensor",["tungstenbar",2],"smallbattery","wire","siliconboard"], - "output" : "sb_pump", - "groups" : ["craftingwiring","mechanics","all"] + "input": ["liquidsensor",["tungstenbar",2],"smallbattery","wire","siliconboard"], + "output": "sb_pump", + "groups": ["craftingwiring","mechanics","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/standingturret.recipe b/recipes/starbound/wire/mechanics/standingturret.recipe index 03c82e11..4021ddde 100644 --- a/recipes/starbound/wire/mechanics/standingturret.recipe +++ b/recipes/starbound/wire/mechanics/standingturret.recipe @@ -1,5 +1,5 @@ { - "input" : ["siliconboard","sb_steelbar",["durasteelbar",2]],//laserdiode - "output" : "sb_standingturret", - "groups" : ["craftingwiring","mechanics","all"] + "input": ["siliconboard","sb_steelbar",["durasteelbar",2]],//laserdiode + "output": "sb_standingturret", + "groups": ["craftingwiring","mechanics","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/switches/ironswitch.recipe b/recipes/starbound/wire/switches/ironswitch.recipe index c8c096f1..2917ccad 100644 --- a/recipes/starbound/wire/switches/ironswitch.recipe +++ b/recipes/starbound/wire/switches/ironswitch.recipe @@ -1,5 +1,5 @@ { - "input" : ["ironbar","copperbar",["wire",5],"smallbattery"], - "output" : "ironswitch", - "groups" : ["craftingwiring", "switches", "all"] + "input": ["ironbar","copperbar",["wire",5],"smallbattery"], + "output": "ironswitch", + "groups": ["craftingwiring", "switches", "all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/switches/tier10switch.recipe b/recipes/starbound/wire/switches/tier10switch.recipe index 09fccc3e..16f3b411 100644 --- a/recipes/starbound/wire/switches/tier10switch.recipe +++ b/recipes/starbound/wire/switches/tier10switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_imperviumbar",2],["wire",5],["smallbattery",2]], - "output" : "executiveswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_imperviumbar",2],["wire",5],["smallbattery",2]], + "output": "executiveswitch", + "groups": ["craftingwiring","switches","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/switches/tier5switch.recipe b/recipes/starbound/wire/switches/tier5switch.recipe index 60e34684..f8e306e0 100644 --- a/recipes/starbound/wire/switches/tier5switch.recipe +++ b/recipes/starbound/wire/switches/tier5switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_aegisaltbar",2],["wire",5],["smallbattery",2]], - "output" : "sereneswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_aegisaltbar",2],["wire",5],["smallbattery",2]], + "output": "sereneswitch", + "groups": ["craftingwiring","switches","all"] } diff --git a/recipes/starbound/wire/switches/tier6switch.recipe b/recipes/starbound/wire/switches/tier6switch.recipe index a75d0f23..f9b343c4 100644 --- a/recipes/starbound/wire/switches/tier6switch.recipe +++ b/recipes/starbound/wire/switches/tier6switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_feroziumbar",2],["wire",5],["smallbattery",2]], - "output" : "geometricswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_feroziumbar",2],["wire",5],["smallbattery",2]], + "output": "geometricswitch", + "groups": ["craftingwiring","switches","all"] } diff --git a/recipes/starbound/wire/switches/tier7switch.recipe b/recipes/starbound/wire/switches/tier7switch.recipe index c7647fc3..d225bad0 100644 --- a/recipes/starbound/wire/switches/tier7switch.recipe +++ b/recipes/starbound/wire/switches/tier7switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_ceruliumbar",2],["wire",5],["smallbattery",2]], - "output" : "waveswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_ceruliumbar",2],["wire",5],["smallbattery",2]], + "output": "waveswitch", + "groups": ["craftingwiring","switches","all"] } diff --git a/recipes/starbound/wire/switches/tier8switch.recipe b/recipes/starbound/wire/switches/tier8switch.recipe index 264afef6..e69594d4 100644 --- a/recipes/starbound/wire/switches/tier8switch.recipe +++ b/recipes/starbound/wire/switches/tier8switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_violiumbar",2],["wire",5],["smallbattery",2]], - "output" : "opulentswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_violiumbar",2],["wire",5],["smallbattery",2]], + "output": "opulentswitch", + "groups": ["craftingwiring","switches","all"] } diff --git a/recipes/starbound/wire/switches/tier9switch.recipe b/recipes/starbound/wire/switches/tier9switch.recipe index 41edcbad..ca00d968 100644 --- a/recipes/starbound/wire/switches/tier9switch.recipe +++ b/recipes/starbound/wire/switches/tier9switch.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_rubiumbar",2],["wire",5],["smallbattery",2]], - "output" : "doomswitch", - "groups" : ["craftingwiring","switches","all"] + "input": [["sb_rubiumbar",2],["wire",5],["smallbattery",2]], + "output": "doomswitch", + "groups": ["craftingwiring","switches","all"] } diff --git a/sb_commands.lua b/sb_commands.lua index 3b1eb8f9..9ec3a9fe 100644 --- a/sb_commands.lua +++ b/sb_commands.lua @@ -1,9 +1,9 @@ local v = {} -local sb_command = command or function() return nil end -local ini = init or function() end +local originalCommand = command or function() return nil end +local originalInit = init or function() end -function init() ini() require("/scripts/sb_assetmissing.lua") sb_techType() end -function command(a,b,d) if sb_command then if sb_command(a,b,d) ~= nil then return sb_command(a,b,d) end end if v[a] then return v[a](b,d) else return string.format(root.assetJson("/sb_commands.config").noSuchCommand,a) end end +function init() originalInit() require("/scripts/sb_assetmissing.lua") sb_techType() end +function command(a,b,d) if originalCommand then if originalCommand(a,b,d) ~= nil then return originalCommand(a,b,d) end end if v[a] then return v[a](b,d) else return string.format(root.assetJson("/sb_commands.config").noSuchCommand,a) end end local function cutColors(text) return string.gsub(string.gsub(text, "(%^.-%;)", ""),("\n"),"") end @@ -50,17 +50,9 @@ function v.itemID(_,it,detailed) local text = root.assetJson("/sb_commands.confi end end -function v.sb_foodvalue(_,it) local text = root.assetJson("/sb_commands.config") - it=it[1] or "alienmeat" - if not sb_itemExists(it) then return string.format(text.itemID.noItem,it) else - local item = root.itemConfig(it) - return (item.config.shortdescription or "???")..": "..(item.config.foodValue or 0).." (Price: "..(item.config.price or 0)..")" - end -end - function v.sb_foodweight(_,it) local text = root.assetJson("/sb_commands.config") s="^#ff0;" - it=it or {"aliensteak"} + it=it or {"cookedalienmeat"} it=type(it)=="table" and it or {it} for i = 1, #it do if not sb_itemExists(it[i]) then s = s..string.format(text.itemID.noItem,it[i]).."\n^#ff0;" else diff --git a/sb_inspection.config b/sb_inspection.config index 2e9dbf80..017f7c9d 100644 --- a/sb_inspection.config +++ b/sb_inspection.config @@ -1,32 +1,47 @@ { - "prefixes" : { - "glitch" : "Analytical. " + "prefixes": { + "glitch": "Analytical. " }, - "nouns" : { - "male" : {"guy","himself","he","his"}, - "female" : {"gal","herself","she","her"}, - "other" : {"person","theirself","them","their"} + "nouns": { + "male": { + "guy", + "himself", + "he", + "his" + }, + "female": { + "gal", + "herself", + "she", + "her" + }, + "other": { + "person", + "theirself", + "them", + "their" + } }, - "noDesc" : { - "player" : "This %s seems to have nothing to say for %s.", - "item" : "I'm not sure what that is", - "npc" : "Some funny-looking person.", - "monster" : "It's obvious what that is.", - "vehicle" : "Some vehicle." + "noDesc": { + "player": "This %s seems to have nothing to say for %s.", + "item": "I'm not sure what that is", + "npc": "Some funny-looking person.", + "monster": "It's obvious what that is.", + "vehicle": "Some vehicle." }, - "nothingThereText" : { - "human" : { - "Nothing of interest here.", - "Nothing to see here.", - "Nope, didn't find anything.", - "Oh. My. God! It's a... wait... nope sorry, nothing.", - "My god, it's full of nothing.", - "If at first you don't succeed keep looking at the nothing.", - "You try hard to make something out there, but fail.", - "Nada, nothing, zilch, zip." + "nothingThereText": { + "human": { + "Nothing of interest here.", + "Nothing to see here.", + "Nope, didn't find anything.", + "Oh. My. God! It's a... wait... nope sorry, nothing.", + "My god, it's full of nothing.", + "If at first you don't succeed keep looking at the nothing.", + "You try hard to make something out there, but fail.", + "Nada, nothing, zilch, zip." } } -} \ No newline at end of file +} diff --git a/sb_projectiles.config b/sb_projectiles.config index 27d4fc75..25e5c839 100644 --- a/sb_projectiles.config +++ b/sb_projectiles.config @@ -1,4 +1,4 @@ -{ "airburstelectricbullet" : ["Electric Burst",{"rarity":"uncommon"}], "airburstfirebullet" : ["Fire Burst",{"rarity":"uncommon"}], "airbursticebullet" : ["Ice Burst",{"rarity":"uncommon"}], "airburstpoisonbullet" : ["Poison Burst",{"rarity":"uncommon"}], "bouncybullet" : "Bouncy Bullet", "explosivebullet" : "Explosive Bullet", "fast" : "Fast Bullet", "standardbullet" : "Bullet", - "huntingbullet" : "Hunting Bullet", - "piercingbullet" : ["Piercing Bullet",{"rarity":"uncommon"}], "sb_homingbullet" : ["Homing Bullet",{"rarity":"uncommon"}] +{ "airburstelectricbullet": ["Electric Burst",{"rarity":"uncommon"}], "airburstfirebullet": ["Fire Burst",{"rarity":"uncommon"}], "airbursticebullet": ["Ice Burst",{"rarity":"uncommon"}], "airburstpoisonbullet": ["Poison Burst",{"rarity":"uncommon"}], "bouncybullet": "Bouncy Bullet", "explosivebullet": "Explosive Bullet", "fast": "Fast Bullet", "standardbullet": "Bullet", + "huntingbullet": "Hunting Bullet", + "piercingbullet": ["Piercing Bullet",{"rarity":"uncommon"}], "sb_homingbullet": ["Homing Bullet",{"rarity":"uncommon"}] } \ No newline at end of file diff --git a/scripts/actions/monsters/sb_farmable.lua b/scripts/actions/monsters/sb_farmable.lua index 9c22f484..317e70d7 100644 --- a/scripts/actions/monsters/sb_farmable.lua +++ b/scripts/actions/monsters/sb_farmable.lua @@ -1,6 +1,5 @@ -require "/scripts/vec2.lua" -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() message.setHandler("sb_feedFluffalo",function(_,_,feed) local spawnPosition = vec2.add(mcontroller.position(), vec2.mul({0,0}, {mcontroller.facingDirection(), 1})) local s = feed.."fluffalo"..(config.getParameter("behavior","") == "farmablebaby" and "baby" or "") diff --git a/scripts/activeitem/sb_held.lua b/scripts/activeitem/sb_held.lua index ec0066d5..a6a9d46c 100644 --- a/scripts/activeitem/sb_held.lua +++ b/scripts/activeitem/sb_held.lua @@ -1,13 +1,13 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end function init() - ini() + originalInit() activeItem.setArmAngle(root.assetJson("/betabound.config:heldItemArmAngle")) end function update(...) - updat(...) + originalUpdate(...) local _, aimDirection = activeItem.aimAngleAndDirection(0, activeItem.ownerAimPosition()) activeItem.setFacingDirection(aimDirection) end \ No newline at end of file diff --git a/scripts/activeitem/sb_info.lua b/scripts/activeitem/sb_info.lua index 6b6368ee..26fd1b42 100644 --- a/scripts/activeitem/sb_info.lua +++ b/scripts/activeitem/sb_info.lua @@ -1,6 +1,6 @@ -local ini = init or function() end +local originalInit = init or function() end function init() activeItem.setScriptedAnimationParameter("hand", activeItem.hand()) - ini() + originalInit() end \ No newline at end of file diff --git a/scripts/animations/sb_info.lua b/scripts/animations/sb_info.lua index 0beb956d..b2574671 100644 --- a/scripts/animations/sb_info.lua +++ b/scripts/animations/sb_info.lua @@ -1,9 +1,9 @@ -local ini = init or function() end +local originalInit = init or function() end function init() handOffset = animationConfig.animationParameter("hand") == "alt" and 3 or 2 textDirectives = root.assetJson("/betabound.config:infoItemTextDirectives") - ini() + originalInit() end function addText(text, position, backingDirectives, textOffset, color) diff --git a/scripts/assets/sb_postload.lua b/scripts/assets/sb_postload.lua index 21224c06..bba7fe7d 100644 --- a/scripts/assets/sb_postload.lua +++ b/scripts/assets/sb_postload.lua @@ -1,3 +1,4 @@ +--mining tools local files = assets.byExtension("miningtool") local path = "/betabound/d1e48968b51d4616893aac83fe0c509c.patch" assets.add(path, '{"canBeRepaired":true}') @@ -7,4 +8,6 @@ for i = 1, #files do if durabilityPerUse > 0 and type(assets.json(files[i]).canBeRepaired) ~= "boolean" then assets.patch(files[i], path) end -end \ No newline at end of file +end + +--food buff recipe groups (TODO) \ No newline at end of file diff --git a/scripts/augments/sb_paint.lua b/scripts/augments/sb_paint.lua index 4bfc4fa2..94286844 100644 --- a/scripts/augments/sb_paint.lua +++ b/scripts/augments/sb_paint.lua @@ -3,7 +3,11 @@ require "/scripts/augments/item.lua" function apply(input) local output = Item.new(input) if root.itemConfig(output.name).config.materialId then - output:setInstanceValue("materialHueShift",config.getParameter("sb_paint",0)) - return output:descriptor(), 1 + local newHueshift = config.getParameter("sb_paint", 0) + local oldHueshift = output:instanceValue("materialHueShift", 1) + if newHueshift ~= oldHueshift then + output:setInstanceValue("materialHueShift", newHueshift) + return output:descriptor(), 1 + end end end \ No newline at end of file diff --git a/scripts/augments/sb_randomability.lua b/scripts/augments/sb_randomability.lua new file mode 100644 index 00000000..0c53ff77 --- /dev/null +++ b/scripts/augments/sb_randomability.lua @@ -0,0 +1,73 @@ +require "/scripts/augments/item.lua" + +function apply(input) + local output = Item.new(input) + if output:instanceValue("sb_builder", output:instanceValue("builder", "")):find("unrand") + or output:instanceValue("sb_disallowAbilityMods", not output:instanceValue("twoHanded", true)) + or string.find(output:instanceValue("tooltipKind", "base"), "sup") --Supper's Combat Overhaul weapons tend to just eat the ability items. Possibly for the same reason as the Thorny Needler...? + then return output:descriptor(), 0 end + local slots = config.getParameter("slots") + local quantity = 0 + for h = 1, #slots do + local slot = slots[h].."AbilityType" + slotName = slot:match("[a-z]+").."Abilities" + local currentAbility = output:instanceValue(slot, "1") + valid = false + local itemName = output:instanceValue("itemName") + + for i = 1, 10 do + newAbility = getRandomAbility(itemName) + if newAbility and newAbility ~= currentAbility then + break + end + end + + if newAbility then + valid = true + local elementalConfig = root.assetJson(root.assetJson("/items/buildscripts/weaponabilities.config")[newAbility]).ability.elementalConfig + if elementalConfig then + acceptedElements = {} + for k, v in pairs(elementalConfig) do + for _, _ in pairs(v) do --we have to do this because there's no table.size and one *elemental* vanilla ability has a blank elemental config for *physical* + acceptedElements[#acceptedElements+1] = k + break + end + end + end + end + + if acceptedElements then + local isValidElement = false + local element = output:instanceValue("elementalType", "physical") + for i = 1, #acceptedElements do + if element == acceptedElements[i] then + isValidElement = true + break + end + end + if not isValidElement then valid = false end + end + + if valid and newAbility ~= currentAbility then + output:setInstanceValue(slot, newAbility) + quantity = 1 + end + end + return output:descriptor(), quantity +end + +function getRandomAbility(itemName) + local abilities = false + local builderConfig = root.itemConfig(itemName) + builderConfig = builderConfig and builderConfig.config.builderConfig or nil + if builderConfig then + for i = 1, #builderConfig do + local possibleAbilities = builderConfig[i][slotName] + if possibleAbilities then + abilities = possibleAbilities[math.random(#possibleAbilities)] + break + end + end + end + return abilities +end \ No newline at end of file diff --git a/scripts/player/sb_blueprints.lua b/scripts/player/sb_items.lua similarity index 100% rename from scripts/player/sb_blueprints.lua rename to scripts/player/sb_items.lua diff --git a/scripts/player/sb_main.lua b/scripts/player/sb_main.lua index 657b1f38..9a357346 100644 --- a/scripts/player/sb_main.lua +++ b/scripts/player/sb_main.lua @@ -4,8 +4,26 @@ function init() -- if not entity then status.addPersistentEffect("sb_entity","sb_entity") end -- entity = math.betabound_entity - message.setHandler("sb_peacekeeperteleporter", function(_,a,b) --if a == false then return end - local bountyData = player.getProperty("bountyStation",nil) + --Suit tech. TODO: clean this up. give names to variables + message.setHandler("sb_implant_unequip", function(_, fromSelf) + if fromSelf == false then return end + status.clearPersistentEffects("sb_bioimplant") + player.setProperty("sb_bioimplant") + end) + + message.setHandler("sb_implant", function(_, fromSelf, b) + if fromSelf == false then return end + if b == nil then return end + if type(b) == "string" then b = {b,root.techConfig(b).sb_effect} end + if type(b[2]) == "string" then b[2] = {b[2]} end + status.clearPersistentEffects("sb_bioimplant") + player.setProperty("sb_bioimplant",b[1]) + if b[2] ~= nil then status.setPersistentEffects("sb_bioimplant",b[2]) end + end) + + --Peacekeeper Teleporter + message.setHandler("sb_peacekeeperteleporter", function(_, _, b) + local bountyData = player.getProperty("bountyStation", nil) bountyData = bountyData[player.serverUuid()] or nil local interactData = root.assetJson(b[2]) if bountyData and bountyData ~= '{}' then @@ -14,32 +32,40 @@ function init() local systemObjects = root.assetJson("/system_objects.config") local n = worldId:find(":")+1 local rank = worldId:sub(n,worldId:find(":",n)-1) - dest = {deploy = player.getProperty("mechUnlocked",false), name=systemObjects[rank].parameters.displayName,planetName="",warpAction=worldId,icon=rank} + dest = { + deploy = player.getProperty("mechUnlocked", false), + name = systemObjects[rank].parameters.displayName, + planetName = "", + warpAction = worldId, + icon = rank + } end end - if bountyData and dest then interactData.destinations[1] = dest --#interactData.destinations+1 - else interactData.destinations = nil + if bountyData and dest then + interactData.destinations[1] = dest --#interactData.destinations+1 + else + interactData.destinations = nil end player.interact(b[1],interactData,b[3]) end) - message.setHandler("sb_implant_unequip", function(_,a) if a == false then return end - status.clearPersistentEffects("sb_bioimplant") - player.setProperty("sb_bioimplant") - end) - - message.setHandler("sb_implant", function(_, a, b) - if a == false then return end - if b == nil then return end - if type(b) == "string" then b = {b,root.techConfig(b).sb_effect} end - if type(b[2]) == "string" then b[2] = {b[2]} end - status.clearPersistentEffects("sb_bioimplant") - player.setProperty("sb_bioimplant",b[1]) - if b[2] ~= nil then status.setPersistentEffects("sb_bioimplant",b[2]) end + --Random Fountain + message.setHandler("sb_randomfountain", function(_, _, args) + if args then + if type(args) == "string" then + status.addEphemeralEffect(args) + else + status.addEphemeralEffect(args[1], args[2]) + end + if player.emote then + player.emote("eat") + end + end end) - message.setHandler("/sb_maketechavailable", function(_, a, b) - if a == false then return end + --SE commands + message.setHandler("/sb_maketechavailable", function(_, fromSelf, b) + if fromSelf == false then return end if b == nil or type(b) ~= "string" then return end local suits = player.getProperty("sb_availableBioimplants") if #suits == 0 then suits = {b} else suits[#suits+1] = b end @@ -47,8 +73,8 @@ function init() return "Added "..b.." to player's visible techs" end) - message.setHandler("/sb_enabletech", function(_, a, b) - if a == false then return end + message.setHandler("/sb_enabletech", function(_, fromSelf, b) + if fromSelf == false then return end if b == nil or type(b) ~= "string" then return end local suits = player.getProperty("sb_bioimplants") if #suits == 0 then suits = {b} else suits[#suits+1] = b end @@ -56,8 +82,8 @@ function init() return "Player tech "..b.." enabled" end) - message.setHandler("/sb_showhunger", function(_, a) - if interface and a then + message.setHandler("/sb_showhunger", function(_, fromSelf) + if interface and fromSelf then interface.queueMessage(string.format(root.assetJson("/betabound.config:showHunger"), math.floor(status.resource("food")).."/"..math.floor(status.resourceMax("food")))) end end) diff --git a/scripts/player/sb_pets.lua b/scripts/player/sb_pets.lua new file mode 100644 index 00000000..011a19fa --- /dev/null +++ b/scripts/player/sb_pets.lua @@ -0,0 +1,30 @@ +local originalInit = init +function init() originalInit() + sb_pets = {} + message.setHandler("pets.sb_callPodPets", function() + local pets = playerCompanions.getCompanions("pets") + for i = 1, #pets do + local podUuid = pets[i].podUuid + petSpawner.pods[podUuid]:recall() + sb_pets[#sb_pets+1] = podUuid + end + sb_skipUpdate = true + end) +end + +local updat = update +function update(dt) + --This is to fix pets not being resummoned if triggered on the same frame as an update cycle + if sb_skipUpdate then + sb_skipUpdate = false + else + updat(dt) + if #sb_pets > 0 then + local playerPosition = world.entityPosition(player.id()) + for i = 1, #sb_pets do + petSpawner.pods[sb_pets[i]]:release(playerPosition) + end + sb_pets = {} + end + end +end \ No newline at end of file diff --git a/scripts/sb_statusProjectileObject.lua b/scripts/sb_statusProjectileObject.lua new file mode 100644 index 00000000..f084cad2 --- /dev/null +++ b/scripts/sb_statusProjectileObject.lua @@ -0,0 +1,11 @@ +local originalInit = init or function() end +function init() + originalInit() + sb_spawnProjectile = world.spawnProjectile + world.spawnProjectile = function(projectileName, position, sourceEntityId, direction, trackSourceEntity, parameters) + if parameters and parameters.sb_positionOffset and position then + position = {position[1] + parameters.sb_positionOffset[1], position[2] + parameters.sb_positionOffset[2]} + end + return sb_spawnProjectile(projectileName, position, sourceEntityId, direction, trackSourceEntity, parameters) + end +end \ No newline at end of file diff --git a/scripts/sb_versioning/procgenWeaponRecipes.json b/scripts/sb_versioning/procgenWeaponRecipes.json index b1bee053..5ad63eed 100644 --- a/scripts/sb_versioning/procgenWeaponRecipes.json +++ b/scripts/sb_versioning/procgenWeaponRecipes.json @@ -28,5 +28,6 @@ ["sb_slimestaff",1,{"level":5,"seed":1}], ["sb_uraniumrodstaff",1,{"level":5,"seed":1}], ["harpoongun",1,{"level":3}], + ["harpoongun",1,{"crafted":true}], ["sb_firebow",1,{"seed":1,"level":3}] ] \ No newline at end of file diff --git a/scripts/sb_versioning/versioncheck.lua b/scripts/sb_versioning/versioncheck.lua index 84107a93..cb101708 100644 --- a/scripts/sb_versioning/versioncheck.lua +++ b/scripts/sb_versioning/versioncheck.lua @@ -1,16 +1,17 @@ -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() local t = player.equippedTech t = {t("head"),t("body"),t("legs")} for f = 1, 3 do if t[f] then if not root.hasTech(t[f]) then player.unequipTech(t[f]) end end end - local currentVersion = 32 + local currentVersion = 33 if player.introComplete() then local playerVersion = player.getProperty("betabound", {}).version or status.statusProperty("xrc_0018z", 0) if playerVersion < currentVersion then - sb.logInfo(string.format("[Betabound] Updating this character from %s to %s!", playerVersion, currentVersion)) + sb.logInfo(string.format("[Betabound] Okay! Updating this character from %s to %s!", playerVersion, currentVersion)) require("/scripts/sb_versioning/versioning.lua") sb_doVersioning(currentVersion, playerVersion) + sb.logInfo(string.format("[Betabound] Done! Updated this character from %s to %s!", playerVersion, currentVersion)) end end end \ No newline at end of file diff --git a/scripts/sb_versioning/versioning.lua b/scripts/sb_versioning/versioning.lua index 1db644fe..6cd23734 100644 --- a/scripts/sb_versioning/versioning.lua +++ b/scripts/sb_versioning/versioning.lua @@ -2,7 +2,7 @@ xrc0018 = {} local function blue(a) if type(a)=="string" then a={a} end for i = 1, #a do player.giveBlueprint(a[i]) end end local function quest(a,b) if type(b)=="string" then b={b} end if player.hasCompletedQuest(a) then for i = 1, #b do player.giveItem(b[i]) end end end local function boxQuest(a,b) if player.hasCompletedQuest(a) then IB[#IB+1] = b end end -local function giveBox() if #IB > 0 then player.giveItem({"sb_itembox",1,{description=string.format("/betabound.config:changedQuestRewardsDescription", #IB),items=IB}}) end end +local function giveBox() if #IB > 0 then player.giveItem({"sb_itembox",1,{description=string.format(root.assetJson("/betabound.config:changedQuestRewardsDescription"), #IB),items=IB}}) end end local function updateNote(a) local b = root.assetJson("/betabound.config") a = b.updateNotes[a] @@ -14,16 +14,16 @@ end local function reunlockRecipes(a) if type(a) == "string" then a = {a} end for i = 1, #a do - sb.logInfo("Attempting to update recipe for: "..a[i][1]) if player.blueprintKnown(a[i]) then local recipes = root.recipesForItem(a[i][1]) for j = 1, #recipes do player.giveBlueprint(recipes[j].output) - sb.logInfo("Updated!") + sb.logInfo("Updated recipe for: "..a[i][1]) end end end ---[[ for k, v in pairs(a) do +--[[ + for k, v in pairs(a) do for k2, v2 in pairs(v) do sb.logInfo(sb.print(v2)) if player.blueprintKnown(v2) then @@ -169,7 +169,6 @@ xrc0018[23]=function() player.setProperty("eesTransmutations", b) end end -xrc0018[24]=function() player.startQuest("sb_techunlocks") end xrc0018[25]=function() if player.blueprintKnown("sb_frostshield") then player.giveItem("frostshield-recipe") end if player.blueprintKnown("sb_mushroomshield") then player.giveItem("mushroomshield-recipe") end @@ -204,7 +203,7 @@ xrc0018[26]=function() end end ---The tech binding stations no longer allow players to equip techs. Give them a techconsole so they have one +--27: The tech binding stations no longer allow players to equip techs. Give them a techconsole so they have one --Give players an ammo guide if they missed it (returning player) --We use to have two scripts like this. One was shitty, so I'm ditching it completely now. If there are returning players from when that script was still used, run its code before deleting the version tracker xrc0018[27]=function() @@ -230,9 +229,7 @@ xrc0018[30]=function() player.setProperty("sb_bioimplants", {}) end end -xrc0018[31]=function() - reunlockRecipes(root.assetJson("/scripts/sb_versioning/procgenWeaponRecipes.json")) -end +--32: Merge Betabound status properties to a single player property xrc0018[32]=function() if not newPlayer then status.setStatusProperty("xrc_0018z", nil) @@ -248,10 +245,23 @@ xrc0018[32]=function() if player.hasCompletedQuest("destroyruin") then player.consumeCurrency("sb_questActive:destroyruin", 1) end + player.startQuest("sb_techunlocks") +end + +--31: Convert parametered weapon recipes to new format +--33: Convert harpoon gun +xrc0018[33]=function() + reunlockRecipes(root.assetJson("/scripts/sb_versioning/procgenWeaponRecipes.json")) end function sb_doVersioning(cv,yv) newPlayer = yv == 0 + --player.getProperty doesn't return the default if the saved value exists as nil, so set it so the tech unlock quest doesnt break + local betaboundStorage = player.getProperty("betabound") + if type(betaboundStorage) == "nil" then + player.setProperty("betabound", {}) + end + for i = yv, cv-1 do if xrc0018[i+1] then xrc0018[i+1]() diff --git a/scripts/weaponassembly/betabound.lua b/scripts/weaponassembly/betabound.lua index e166fc6b..13dc0b65 100644 --- a/scripts/weaponassembly/betabound.lua +++ b/scripts/weaponassembly/betabound.lua @@ -1,19 +1,19 @@ -local sbisValidWeapon = isValidWeapon or function() end -local sbbuildShortDescription = buildShortDescription or function() return "Weapon" end +local originalIsValidWeapon = isValidWeapon or function() end +local originalBuildShortDescription = buildShortDescription or function() return "Weapon" end function isValidWeapon(weapon) if weapon then local sb_itemConfig = root.itemConfig(weapon).config - if ((sb_itemConfig.builder == "/items/buildscripts/starbound/buildweapon.lua" or sb_itemConfig.sb_builder == "/items/buildscripts/buildweapon.lua") and not root.itemConfig(weapon).config.sb_waBan) or sbisValidWeapon(weapon) then + if ((sb_itemConfig.builder == "/items/buildscripts/starbound/buildweapon.lua" or sb_itemConfig.sb_builder == "/items/buildscripts/buildweapon.lua") and not root.itemConfig(weapon).config.sb_waBan) or originalIsValidWeapon(weapon) then return true end end - return sbisValidWeapon(weapon) + return originalIsValidWeapon(weapon) end function buildShortDescription(partName, weaponConfig) --I'm sure it's fine right now, but shouldn't we be making use of what we're replacing? local name = (weaponConfig.shortdescription or "") - --local name = string.gsub(string.format("%s%s",weaponConfig.shortdescription,string.gsub(sbbuildShortDescription(partName, weaponConfig), "(%w+)","",1))," "," ") + --local name = string.gsub(string.format("%s%s",weaponConfig.shortdescription,string.gsub(originalBuildShortDescription(partName, weaponConfig), "(%w+)","",1))," "," ") --surely there's a better way to do this. this loops i*3 times! local rarities = {"Common","Uncommon","Rare","Legendary","Essential"} for i = 1, #rarities do name=name:gsub(rarities[i].." ","") end @@ -21,4 +21,5 @@ function buildShortDescription(partName, weaponConfig) --I'm sure it's fine righ return name end --I am aware that you can dupe weapons with this but I want to sleep right now ---HOW CAN YOU DUPE WEAPONS WITH IT?? \ No newline at end of file +--HOW CAN YOU DUPE WEAPONS WITH IT?? +--ok so reload the game with the item in the interface. no i am not fixing this \ No newline at end of file diff --git a/scripts/weaponassembly/betabound_painter.lua b/scripts/weaponassembly/betabound_painter.lua new file mode 100644 index 00000000..0c2d1989 --- /dev/null +++ b/scripts/weaponassembly/betabound_painter.lua @@ -0,0 +1,7 @@ +local originalIsValidWeapon = isValidWeapon or function() end + +function isValidWeapon(weapon) + if weapon then + return (root.itemConfig(weapon).config.sb_builder or "") == "/items/buildscripts/buildweapon.lua" or originalIsValidWeapon(weapon) + end +end \ No newline at end of file diff --git a/spawntypes/sb_spawngroups.spawntypes b/spawntypes/sb_spawngroups.spawntypes index 54c62f93..16115dbd 100644 --- a/spawntypes/sb_spawngroups.spawntypes +++ b/spawntypes/sb_spawngroups.spawntypes @@ -1,131 +1,122 @@ [ //just ignore dense. it means something completely different now (x2 spawnchance) { - "name" : "sb_passiveSmallBiped", - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" + "name": "sb_passiveSmallBiped", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "smallbiped"] ], - "monsterParameters" : { - "aggressive" : false + "monsterParameters": { + "aggressive": false } }, - - { - "name" : "sb_aggroSmallBiped", - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" + "name": "sb_aggroSmallBiped", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "smallbiped"] ], - "monsterParameters" : { - "aggressive" : true + "monsterParameters": { + "aggressive": true } }, - { - "name" : "sb_passiveSmallQuadruped", - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" + "name": "sb_passiveSmallQuadruped", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "smallquadruped"] ], - "monsterParameters" : { - "aggressive" : false + "monsterParameters": { + "aggressive": false } }, - { - "name" : "sb_aggroSmallQuadruped", - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" + "name": "sb_aggroSmallQuadruped", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "smallquadruped"] ], - "monsterParameters" : { - "aggressive" : true + "monsterParameters": { + "aggressive": true } }, - - { - "name" : "sb_aggroLargeQuadruped", - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" + "name": "sb_aggroLargeQuadruped", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "largequadruped"] ], - "monsterParameters" : { - "aggressive" : true + "monsterParameters": { + "aggressive": true } }, - { - "name" : "sb_aggroHugeBiped", - "spawnParameters" : { - "area" : "surface", - "region" : "exposed", - "time" : "all" + "name": "sb_aggroHugeBiped", + "spawnParameters": { + "area": "surface", + "region": "exposed", + "time": "all" }, - "groupSize" : [1, 1], - "spawnChance" : 1, - "monsterType" : [ + "groupSize": [1, 1], + "spawnChance": 1, + "monsterType": [ [1, "sb_hugebiped"] ], - "monsterParameters" : { - "aggressive" : true + "monsterParameters": { + "aggressive": true } }, - - { - "name" : "sb_smallFishCave", - "spawnParameters" : { - "area" : "liquid", - "region" : "all", - "time" : "all" + "name": "sb_smallFishCave", + "spawnParameters": { + "area": "liquid", + "region": "all", + "time": "all" }, - "groupSize" : [1, 2], - "spawnChance" : 0.03, - "monsterType" : [ + "groupSize": [1, 2], + "spawnChance": 0.03, + "monsterType": [ [1, "fish"] ], - "monsterParameters" : { - "aggressive" : false + "monsterParameters": { + "aggressive": false } } -] \ No newline at end of file +] diff --git a/species/human.species.patch b/species/human.species.patch index 0b4d801d..bc14c597 100644 --- a/species/human.species.patch +++ b/species/human.species.patch @@ -37,7 +37,6 @@ {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_candyapple"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_icecream"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_lollypop"}}, -{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_butter"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_toffeeapple"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_alienburger"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_burrito"}}, diff --git a/species/novakid.species.patch b/species/novakid.species.patch index 51fd6c1c..832574d3 100644 --- a/species/novakid.species.patch +++ b/species/novakid.species.patch @@ -10,7 +10,6 @@ {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_dirtea"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_ricewine"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_applepie"}}, -{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_butter"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_alienburger"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_chilistew"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_hamsandwich"}}, diff --git a/species/sb_recipes.config b/species/sb_recipes.config index 2c29a68b..850cd70d 100644 --- a/species/sb_recipes.config +++ b/species/sb_recipes.config @@ -1,7 +1,7 @@ { - "species" : ["avian","glitch","human","floran","apex","hylotl","novakid"], - "unknownSpeciesRecipes" : "human", - "weaponTiers" : [1, 4], - "branchingWeaponTiers" : 2, - "weapons" : ["sb_%stier%sbroadsword","sb_%stier%sdagger","sb_%stier%saxe","sb_%stier%sspear","sb_%stier%shammer","sb_%stier%sshortsword"] -} \ No newline at end of file + "species": ["avian", "glitch", "human", "floran", "apex", "hylotl", "novakid"], + "unknownSpeciesRecipes": "human", + "weaponTiers": [1, 4], + "branchingWeaponTiers": 2, + "weapons": ["sb_%stier%sbroadsword", "sb_%stier%sdagger", "sb_%stier%saxe", "sb_%stier%sspear", "sb_%stier%shammer", "sb_%stier%sshortsword"] +} diff --git a/stats/effects/erchiussickness/sb_erchiussickness.lua b/stats/effects/erchiussickness/sb_erchiussickness.lua index 7d2bd498..9125ba9b 100644 --- a/stats/effects/erchiussickness/sb_erchiussickness.lua +++ b/stats/effects/erchiussickness/sb_erchiussickness.lua @@ -1,10 +1,10 @@ -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() world.sb_entityHasCountOfItem = world.entityHasCountOfItem world.entityHasCountOfItem = function(entityId, itemDescriptor, exactMatch) return itemDescriptor == "solidfuel" and - world.sb_entityHasCountOfItem(entityId, itemDescriptor, exactMatch) + - world.sb_entityHasCountOfItem(entityId, "supermatter", false) or - world.sb_entityHasCountOfItem(entityId, itemDescriptor, exactMatch) + world.sb_entityHasCountOfItem(entityId, itemDescriptor, exactMatch) + + world.sb_entityHasCountOfItem(entityId, "supermatter", false) or + world.sb_entityHasCountOfItem(entityId, itemDescriptor, exactMatch) end end \ No newline at end of file diff --git a/stats/effects/food/wellfed/sb_wellfed.lua b/stats/effects/food/wellfed/sb_wellfed.lua index 2785bcf5..62868256 100644 --- a/stats/effects/food/wellfed/sb_wellfed.lua +++ b/stats/effects/food/wellfed/sb_wellfed.lua @@ -1,6 +1,5 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end -function init() ini() +function init() originalInit() effect.addStatModifierGroup({{stat = config.getParameter("sb_stat", "maxHealth"), effectiveMultiplier = config.getParameter("sb_amount", 1.1)}}) end \ No newline at end of file diff --git a/stats/effects/foodpoison/foodpoison.animation.patch b/stats/effects/foodpoison/foodpoison.animation.patch index 2d895899..5b2d7ea4 100644 --- a/stats/effects/foodpoison/foodpoison.animation.patch +++ b/stats/effects/foodpoison/foodpoison.animation.patch @@ -1,11 +1,15 @@ -[{"op":"add","path":"/particleEmitters/sb_poisonsicknessparticles", - "value" : { - "active" : true, - "emissionRate" : 0.25, - "particles" : [ - {"particle":"poisonsicknessdust"}, - {"particle":"poisonsicknessdust2"} - ] +[{ + "op": "add", + "path": "/particleEmitters/sb_poisonsicknessparticles", + "value": { + "active": true, + "emissionRate": 0.25, + "particles": [{ + "particle": "poisonsicknessdust" + }, { + "particle": "poisonsicknessdust2" } + ] } -] \ No newline at end of file + } +] diff --git a/stats/effects/levitation/sb_levitation.lua b/stats/effects/levitation/sb_levitation.lua index 02623f71..4894a3e1 100644 --- a/stats/effects/levitation/sb_levitation.lua +++ b/stats/effects/levitation/sb_levitation.lua @@ -1,5 +1,5 @@ -local sb_activateVisualEffects = activateVisualEffects or function() end -function activateVisualEffects() sb_activateVisualEffects() +local originalActivateVisualEffects = activateVisualEffects or function() end +function activateVisualEffects() originalActivateVisualEffects() if self.protectionBonus then effect.setParentDirectives(config.getParameter("sb_directives")) end diff --git a/stats/effects/minibossglow/sb_minibossglow.lua b/stats/effects/minibossglow/sb_minibossglow.lua index f0c1663d..29db6a86 100644 --- a/stats/effects/minibossglow/sb_minibossglow.lua +++ b/stats/effects/minibossglow/sb_minibossglow.lua @@ -1,4 +1,4 @@ -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() animator.setParticleEmitterOffsetRegion("sb_minibossparticles", mcontroller.boundBox()) end \ No newline at end of file diff --git a/stats/effects/thorns/sb_thorns.lua b/stats/effects/thorns/sb_thorns.lua index 1ab8867b..acb6278f 100644 --- a/stats/effects/thorns/sb_thorns.lua +++ b/stats/effects/thorns/sb_thorns.lua @@ -1,5 +1,5 @@ -local ini = init or function() end -function init() ini() +local originalInit = init or function() end +function init() originalInit() local fade = config.getParameter("sb_fadeColor") local border = config.getParameter("border") local directives = "" diff --git a/stats/effects/weakpoison/weakpoison.animation.patch b/stats/effects/weakpoison/weakpoison.animation.patch index 657ea900..6e737b36 100644 --- a/stats/effects/weakpoison/weakpoison.animation.patch +++ b/stats/effects/weakpoison/weakpoison.animation.patch @@ -1,13 +1,19 @@ -[{"op":"add","path":"/particleEmitters/sb_poisonsicknessparticles", - "value" : { - "active" : true, - "emissionRate" : 0.6, - "particles" : [ - {"particle":"poisonsicknessdust"}, - {"particle":"poisonsicknessdust2"}, - {"particle":"poisonsicknessdust"}, - {"particle":"poisonsicknessdust2"} - ] +[{ + "op": "add", + "path": "/particleEmitters/sb_poisonsicknessparticles", + "value": { + "active": true, + "emissionRate": 0.6, + "particles": [{ + "particle": "poisonsicknessdust" + }, { + "particle": "poisonsicknessdust2" + }, { + "particle": "poisonsicknessdust" + }, { + "particle": "poisonsicknessdust2" } + ] } -] \ No newline at end of file + } +] diff --git a/stats/effects/wet/sb_wet.lua b/stats/effects/wet/sb_wet.lua index 4f8bd505..fbe9cc83 100644 --- a/stats/effects/wet/sb_wet.lua +++ b/stats/effects/wet/sb_wet.lua @@ -1,7 +1,7 @@ -local ini = init or function() end -local updat = update or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end -function init() ini() +function init() originalInit() sb_entityId = entity.id() effect.setParentDirectives("fade=0072ff=0.1") effect.addStatModifierGroup({ @@ -9,7 +9,7 @@ function init() ini() }) end -function update(dt) updat(dt) +function update(dt) originalUpdate(dt) if math.random(25) == 1 then world.spawnProjectile("sb_wet", mcontroller.position(), sb_entityId) end diff --git a/stats/sb_effects/brainextractor.lua b/stats/sb_effects/brainextractor.lua index 54629e92..97026038 100644 --- a/stats/sb_effects/brainextractor.lua +++ b/stats/sb_effects/brainextractor.lua @@ -8,6 +8,7 @@ function init() effect.addStatModifierGroup({{stat = "healthRegen", effectiveMultiplier = 0}}) end +--The code works how it is since it checks for a value set in init, but keep in mind the comment in extradrops-drops.lua for the extradrops tech function uninit() if not status.resourcePositive("health") then if brain then diff --git a/stats/sb_effects/brainextractor.statuseffect b/stats/sb_effects/brainextractor.statuseffect index 8520cc4b..58aa89c1 100644 --- a/stats/sb_effects/brainextractor.statuseffect +++ b/stats/sb_effects/brainextractor.statuseffect @@ -3,6 +3,7 @@ "effectConfig": { "color": "fade=BE89B4=0.5", "brainPool": "sb_brain", + //A brainMap entry can be either a number (to use the value in `brainPool`) or a pool name "brainMap": { "sb_robotboss": "artificialbrain", "smallflying": 1, diff --git a/stats/sb_effects/damaging/beamout.animation b/stats/sb_effects/damaging/beamout.animation index 1bf4db5a..30ee434f 100644 --- a/stats/sb_effects/damaging/beamout.animation +++ b/stats/sb_effects/damaging/beamout.animation @@ -1,54 +1,54 @@ { - "animatedParts" : { - "stateTypes" : { - "teleport" : { - "default" : "none", - "states" : { - "none" : { }, - "beamOut" : { - "frames" : 12, - "cycle" : 0.75, - "mode" : "transition", - "transition" : "none", - "properties" : { - "immediateSound" : "/sfx/tools/teleport_up.ogg" + "animatedParts": { + "stateTypes": { + "teleport": { + "default": "none", + "states": { + "none": {}, + "beamOut": { + "frames": 12, + "cycle": 0.75, + "mode": "transition", + "transition": "none", + "properties": { + "immediateSound": "/sfx/tools/teleport_up.ogg" }, - "frameProperties" : { - "multiply" : [ "ffffffff", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00" ] + "frameProperties": { + "multiply": ["ffffffff", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00", "ffffff00"] } } } } }, - "parts" : { - "base" : { - "properties" : { - "fullbright" : true, - "centered" : true + "parts": { + "base": { + "properties": { + "fullbright": true, + "centered": true }, - "partStates" : { - "teleport" : { - "none" : { }, - "beamOut" : { - "properties" : { - "image" : "/animations/teleport/playerwarpout.png:" + "partStates": { + "teleport": { + "none": {}, + "beamOut": { + "properties": { + "image": "/animations/teleport/playerwarpout.png:" } } } } }, - "beam" : { - "properties" : { - "fullbright" : true, - "centered" : true, - "offset" : [0, 30] + "beam": { + "properties": { + "fullbright": true, + "centered": true, + "offset": [0, 30] }, - "partStates" : { - "teleport" : { - "beamOut" : { - "properties" : { - "image" : "/animations/teleport/playerwarpoutbeam.png:?scalenearest=1;60;" + "partStates": { + "teleport": { + "beamOut": { + "properties": { + "image": "/animations/teleport/playerwarpoutbeam.png:?scalenearest=1;60;" } } } @@ -56,8 +56,8 @@ } } }, - "globalTagDefaults" : { - "effectDirectives" : "", - "species" : "" + "globalTagDefaults": { + "effectDirectives": "", + "species": "" } } diff --git a/stats/sb_effects/damaging/bleed.animation b/stats/sb_effects/damaging/bleed.animation index 495b8ff3..7bd5d072 100644 --- a/stats/sb_effects/damaging/bleed.animation +++ b/stats/sb_effects/damaging/bleed.animation @@ -1,46 +1,44 @@ { - "particleEmitters" : { - "blood" : { - "active" : true, - "emissionRate" : 60, - "particles" : [ - { - "particle" : { - "type" : "ember", - "color" : [255, 0, 0, 255], - "position" : [0.25, 0.1], - "initialVelocity" : [3, 0], - "finalVelocity" : [0, -50], - "approach" : [0, 50], - "size" : 1, - "layer" : "middle", - "timeToLive" : 0.2, - "variance" : { - "position" : [0, 0], - "initialVelocity" : [3, 0] + "particleEmitters": { + "blood": { + "active": true, + "emissionRate": 60, + "particles": [{ + "particle": { + "type": "ember", + "color": [255, 0, 0, 255], + "position": [0.25, 0.1], + "initialVelocity": [3, 0], + "finalVelocity": [0, -50], + "approach": [0, 50], + "size": 1, + "layer": "middle", + "timeToLive": 0.2, + "variance": { + "position": [0, 0], + "initialVelocity": [3, 0] }, - "flippable" : true + "flippable": true } - }, - { - "particle" : { - "type" : "ember", - "color" : [255, 0, 0, 255], - "position" : [0.25, 0.1], - "initialVelocity" : [0.1, -5], - "finalVelocity" : [0, 0], - "approach" : [0, -20], - "size" : 1, - "layer" : "middle", - "timeToLive" : 0.2, - "variance" : { - "position" : [0, 0], - "initialVelocity" : [0, 3] + }, { + "particle": { + "type": "ember", + "color": [255, 0, 0, 255], + "position": [0.25, 0.1], + "initialVelocity": [0.1, -5], + "finalVelocity": [0, 0], + "approach": [0, -20], + "size": 1, + "layer": "middle", + "timeToLive": 0.2, + "variance": { + "position": [0, 0], + "initialVelocity": [0, 3] }, - "flippable" : true + "flippable": true } } ] } } -} \ No newline at end of file +} diff --git a/stats/sb_effects/energyregen/energyregen.animation b/stats/sb_effects/energyregen/energyregen.animation index 8e766bd9..c19def47 100644 --- a/stats/sb_effects/energyregen/energyregen.animation +++ b/stats/sb_effects/energyregen/energyregen.animation @@ -1,30 +1,29 @@ { - "particleEmitters" : { - "energy" : { - "active" : true, - "emissionRate" : 5, - "particles" : [ - { - "particle" : { - "type" : "ember", - "size" : 1, - "color" : [30, 250, 30, 230], - "destructionAction" : "shrink", - "destructionTime" : 0.3, - "fade" : 0.9, - "position" : [0, 0], - "offsetRegion" : [0, 0, 0, 0], - "initialVelocity" : [0, 6], - "finalVelocity" : [0, 3], - "approach" : [0, 20], - "timeToLive" : 0.3, - "variance" : { - "size" : 0.5, - "initialVelocity" : [2, 1] + "particleEmitters": { + "energy": { + "active": true, + "emissionRate": 5, + "particles": [{ + "particle": { + "type": "ember", + "size": 1, + "color": [30, 250, 30, 230], + "destructionAction": "shrink", + "destructionTime": 0.3, + "fade": 0.9, + "position": [0, 0], + "offsetRegion": [0, 0, 0, 0], + "initialVelocity": [0, 6], + "finalVelocity": [0, 3], + "approach": [0, 20], + "timeToLive": 0.3, + "variance": { + "size": 0.5, + "initialVelocity": [2, 1] } } } ] } } -} \ No newline at end of file +} diff --git a/stats/sb_effects/foodheal/foodheal.animation b/stats/sb_effects/foodheal/foodheal.animation index 92c536f8..f26aad08 100644 --- a/stats/sb_effects/foodheal/foodheal.animation +++ b/stats/sb_effects/foodheal/foodheal.animation @@ -1,29 +1,28 @@ { - "particleEmitters" : { - "healing" : { - "active" : true, - "emissionRate" : 3, - "particles" : [ - { - "particle" : { - "type" : "animated", - "mode" : "LoopForever", - "animation" : "/animations/statuseffects/heal/heal.animation", - "size" : 1, - "color" : [250, 30, 30, 230], - "fade" : 0.9, - "position" : [0, 0], - "offsetRegion" : [0, 0, 0, 0], - "initialVelocity" : [0, 1], - "finalVelocity" : [0, 5], - "approach" : [0, 10], - "timeToLive" : 0.6, - "variance" : { - "initialVelocity" : [0.5, 1.0] + "particleEmitters": { + "healing": { + "active": true, + "emissionRate": 3, + "particles": [{ + "particle": { + "type": "animated", + "mode": "LoopForever", + "animation": "/animations/statuseffects/heal/heal.animation", + "size": 1, + "color": [250, 30, 30, 230], + "fade": 0.9, + "position": [0, 0], + "offsetRegion": [0, 0, 0, 0], + "initialVelocity": [0, 1], + "finalVelocity": [0, 5], + "approach": [0, 10], + "timeToLive": 0.6, + "variance": { + "initialVelocity": [0.5, 1.0] } } } ] } } -} \ No newline at end of file +} diff --git a/stats/sb_effects/frozenburning.animation b/stats/sb_effects/frozenburning.animation index 7aaf401c..e19ffc33 100644 --- a/stats/sb_effects/frozenburning.animation +++ b/stats/sb_effects/frozenburning.animation @@ -1,44 +1,41 @@ { - "particleEmitters" : { - "flames" : { - "active" : true, - "emissionRate" : 7.0, - "particles" : [ - { - "particle" : "sb_frozenburningdust" + "particleEmitters": { + "flames": { + "active": true, + "emissionRate": 7, + "particles": [{ + "particle": "sb_frozenburningdust" } ] }, - "frozenfiretrail" : { - "active" : true, - "emissionRate" : 15.0, - "particles" : [ - { - "particle" : "sb_frozenfiretrail" - }, - { - "particle" : { - "type" : "ember", - "size" : 1.0, - "color" : [215, 143, 255, 150], - "fade" : 0.9, - "destructionAction" : "shrink", - "destructionTime" : 0.8, - "position" : [0.0, 0.0], - "offsetRegion" : [0, 0, 0, 0], - "initialVelocity" : [0, -1.0], - "finalVelocity" : [0, -1.0], - "timeToLive" : 0.6 + "frozenfiretrail": { + "active": true, + "emissionRate": 15, + "particles": [{ + "particle": "sb_frozenfiretrail" + }, { + "particle": { + "type": "ember", + "size": 1, + "color": [215, 143, 255, 150], + "fade": 0.9, + "destructionAction": "shrink", + "destructionTime": 0.8, + "position": [0.0, 0.0], + "offsetRegion": [0, 0, 0, 0], + "initialVelocity": [0, -1], + "finalVelocity": [0, -1], + "timeToLive": 0.6 } } ] } }, - "lights" : { - "glow" : { - "active" : true, - "position" : [0, 0], - "color" : [151, 76, 191] + "lights": { + "glow": { + "active": true, + "position": [0, 0], + "color": [151, 76, 191] } } -} \ No newline at end of file +} diff --git a/stats/sb_effects/movement/encumbered.lua b/stats/sb_effects/movement/encumbered.lua index 2eed5e11..98a3f9ae 100644 --- a/stats/sb_effects/movement/encumbered.lua +++ b/stats/sb_effects/movement/encumbered.lua @@ -1,6 +1,6 @@ local controlModifiers, p -local ini = init -function init() if ini and type(ini)=="function" then ini() end +local originalInit = init +function init() if ini and type(ini)=="function" then originalInit() end controlModifiers = mcontroller.controlModifiers p = {runningSuppressed=true,speedModifier=config.getParameter("percentage",0.7)} end diff --git a/stats/sb_effects/movement/tranquilized.lua b/stats/sb_effects/movement/tranquilized.lua index 173d8ff8..3dcd6532 100644 --- a/stats/sb_effects/movement/tranquilized.lua +++ b/stats/sb_effects/movement/tranquilized.lua @@ -1,5 +1,5 @@ -local ini = init -function init() if ini and type(ini)=="function" then ini() end +local originalInit = init +function init() if ini and type(ini)=="function" then originalInit() end tick = config.getParameter("tick",0.002) modifier = config.getParameter("start",1) min = config.getParameter("min",0.35) diff --git a/stats/sb_player_primary.lua b/stats/sb_player_primary.lua index 96112181..40a42d49 100644 --- a/stats/sb_player_primary.lua +++ b/stats/sb_player_primary.lua @@ -1,11 +1,11 @@ require "/scripts/sb_uimessage.lua" -local ini = init or function() end -local updat = update or function() end -local applyDamageReques = applyDamageRequest or function() end -local overheadBar = overheadBars or function() end +local originalInit = init or function() end +local originalUpdate = update or function() end +local originalApplyDamageRequest = applyDamageRequest or function() end +local originalOverheadBars = overheadBars or function() end -function init() ini() +function init() originalInit() player = math.betabound_player sb_shieldAlpha = {0,0,0,0} sb_lastHunger = math.floor(status.resourcePercentage("food")*100) @@ -14,7 +14,7 @@ function init() ini() sb_hungerPopups = root.assetJson("/betabound.config:hungerPopups") end -function update(dt) updat(dt) +function update(dt) originalUpdate(dt) if player and not starExtensions then animator.setAnimationState("sb_flames", not player.isLounging() and not mcontroller.zeroG() and mcontroller.yVelocity() <= -170 and "flames" or "none") end @@ -53,18 +53,18 @@ function applyDamageRequest(damageRequest) local maxReduction = math.min(damageRequest.damage, (status.resource("energy")/2) * forceFieldStrength) status.overConsumeResource("energy", maxReduction) damageRequest.damage = damageRequest.damage - maxReduction - return applyDamageReques(damageRequest) + return originalApplyDamageRequest(damageRequest) end if status.resourcePositive("sb_shieldStaminaT") then if damageRequest.sourceEntityId == -65536 then --NOTE: this does not block self-inflicted projectile damage such as bombs - applyDamageReques(damageRequest) + originalApplyDamageRequest(damageRequest) else damageRequest.damage = 0 - return applyDamageReques(damageRequest) + return originalApplyDamageRequest(damageRequest) end end - if damageRequest.hitType ~= "ShieldHit" or damageRequest.sourceEntityId == -65536 then return applyDamageReques(damageRequest) end + if damageRequest.hitType ~= "ShieldHit" or damageRequest.sourceEntityId == -65536 then return originalApplyDamageRequest(damageRequest) end local oldDamage = damageRequest.damage damageRequest.damage = damageRequest.damage + root.evalFunction2("protection", damageRequest.damage, status.stat("protection"))/4 if damageRequest.damage <= 0 then return {} end @@ -74,7 +74,7 @@ function applyDamageRequest(damageRequest) return sb_applyShieldDamage("R",damageRequest) else damageRequest.damage = oldDamage - return applyDamageReques(damageRequest) + return originalApplyDamageRequest(damageRequest) end end @@ -95,7 +95,7 @@ end function overheadBars() if not player then player = math.betabound_player end - local bars = overheadBar() + local bars = originalOverheadBars() sb.setLogMap("sb_shields","%s (%s), %s (%s), %s",status.resource("sb_shieldStaminaL"),status.stat("sb_shieldHealthL"),status.resource("sb_shieldStaminaR"),status.stat("sb_shieldHealthR"),status.resource("sb_forceFieldStrength")) sb.setLogMap("sb_techtier","%s",player and player.getProperty("sb_techTier","-") or "UNAVAILABLE") diff --git a/tech/dash/airdash.animation.patch b/tech/dash/airdash.animation.patch new file mode 100644 index 00000000..e41bdb17 --- /dev/null +++ b/tech/dash/airdash.animation.patch @@ -0,0 +1,50 @@ +[ + [{ + "op": "add", + "path": "/animatedParts/stateTypes/sb_recharge", + "value": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 5, + "cycle": 0.15, + "mode": "transition", + "transition": "off" + } + } + } + } + ], + [{ + "op": "test", + "path": "/animatedParts/parts", + "inverse": true + }, { + "op": "add", + "path": "/animatedParts/parts", + "value": {} + } + ], + [{ + "op": "add", + "path": "/animatedParts/parts/sb_recharge", + "value": { + "properties": { + "centered": true, + "fullbright": true + }, + "partStates": { + "sb_recharge": { + "on": { + "properties": { + "image": "recharge.png:" + } + }, + "off": {} + } + } + } + } + ] +] diff --git a/tech/dash/airdash.tech.patch b/tech/dash/airdash.tech.patch new file mode 100644 index 00000000..a2575cc2 --- /dev/null +++ b/tech/dash/airdash.tech.patch @@ -0,0 +1,4 @@ +[ +[{"op":"add","path":"/sb_hasRechargeAnimation","value":true}], +[{"op":"add","path":"/scripts/-","value":"sb_dash.lua"}] +] \ No newline at end of file diff --git a/tech/dash/blinkdash.animation.patch b/tech/dash/blinkdash.animation.patch new file mode 100644 index 00000000..e41bdb17 --- /dev/null +++ b/tech/dash/blinkdash.animation.patch @@ -0,0 +1,50 @@ +[ + [{ + "op": "add", + "path": "/animatedParts/stateTypes/sb_recharge", + "value": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 5, + "cycle": 0.15, + "mode": "transition", + "transition": "off" + } + } + } + } + ], + [{ + "op": "test", + "path": "/animatedParts/parts", + "inverse": true + }, { + "op": "add", + "path": "/animatedParts/parts", + "value": {} + } + ], + [{ + "op": "add", + "path": "/animatedParts/parts/sb_recharge", + "value": { + "properties": { + "centered": true, + "fullbright": true + }, + "partStates": { + "sb_recharge": { + "on": { + "properties": { + "image": "recharge.png:" + } + }, + "off": {} + } + } + } + } + ] +] diff --git a/tech/dash/blinkdash.tech.patch b/tech/dash/blinkdash.tech.patch new file mode 100644 index 00000000..a2575cc2 --- /dev/null +++ b/tech/dash/blinkdash.tech.patch @@ -0,0 +1,4 @@ +[ +[{"op":"add","path":"/sb_hasRechargeAnimation","value":true}], +[{"op":"add","path":"/scripts/-","value":"sb_dash.lua"}] +] \ No newline at end of file diff --git a/tech/dash/dash.animation.patch b/tech/dash/dash.animation.patch new file mode 100644 index 00000000..e41bdb17 --- /dev/null +++ b/tech/dash/dash.animation.patch @@ -0,0 +1,50 @@ +[ + [{ + "op": "add", + "path": "/animatedParts/stateTypes/sb_recharge", + "value": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 5, + "cycle": 0.15, + "mode": "transition", + "transition": "off" + } + } + } + } + ], + [{ + "op": "test", + "path": "/animatedParts/parts", + "inverse": true + }, { + "op": "add", + "path": "/animatedParts/parts", + "value": {} + } + ], + [{ + "op": "add", + "path": "/animatedParts/parts/sb_recharge", + "value": { + "properties": { + "centered": true, + "fullbright": true + }, + "partStates": { + "sb_recharge": { + "on": { + "properties": { + "image": "recharge.png:" + } + }, + "off": {} + } + } + } + } + ] +] diff --git a/tech/dash/dash.tech.patch b/tech/dash/dash.tech.patch new file mode 100644 index 00000000..a2575cc2 --- /dev/null +++ b/tech/dash/dash.tech.patch @@ -0,0 +1,4 @@ +[ +[{"op":"add","path":"/sb_hasRechargeAnimation","value":true}], +[{"op":"add","path":"/scripts/-","value":"sb_dash.lua"}] +] \ No newline at end of file diff --git a/tech/dash/sb_dash.lua b/tech/dash/sb_dash.lua new file mode 100644 index 00000000..7713464c --- /dev/null +++ b/tech/dash/sb_dash.lua @@ -0,0 +1,14 @@ +local originalInit = init or function() end + +function init() + originalInit() + if config.getParameter("sb_hasRechargeAnimation") then + tech.sb_setParentDirectives = tech.setParentDirectives + tech.setParentDirectives = function(directives) + if (directives or 0) == self.rechargeDirectives then + animator.setAnimationState("sb_recharge", "on") + end + return tech.sb_setParentDirectives(directives) + end + end +end \ No newline at end of file diff --git a/tech/dash/sb_sprint.lua b/tech/dash/sb_sprint.lua index 76a3782b..c4ec8e0e 100644 --- a/tech/dash/sb_sprint.lua +++ b/tech/dash/sb_sprint.lua @@ -1,4 +1,4 @@ -local ini = init or function() end +local originalInit = init or function() end function init() status.sb_setPersistentEffects = status.setPersistentEffects @@ -6,5 +6,5 @@ function init() if effectCategory == "movementAbility" then return end return status.sb_setPersistentEffects(effectCategory, effects) end - ini() + originalInit() end \ No newline at end of file diff --git a/tech/starbound/absorption/absorption.lua b/tech/starbound/absorption/absorption.lua index 19e50578..4fc4777c 100644 --- a/tech/starbound/absorption/absorption.lua +++ b/tech/starbound/absorption/absorption.lua @@ -11,7 +11,7 @@ function update(dt) for _, notification in ipairs(damageNotifications) do if notification.targetEntityId then if notification.sourceEntityId ~= notification.targetEntityId and (notification.healthLost > minimumDamage) and (notification.healthLost*multiplier) > 0 then - status.addEphemeralEffect(effect,notification.healthLost*multiplier) + status.addEphemeralEffect(effect,notification.healthLost*multiplier) end end end diff --git a/tech/starbound/automobile/car/car.animation b/tech/starbound/automobile/car/car.animation index 35756a86..6c991e4d 100644 --- a/tech/starbound/automobile/car/car.animation +++ b/tech/starbound/automobile/car/car.animation @@ -1,107 +1,96 @@ { - "animatedParts" : { - "stateTypes" : { - "movement" : { - "default" : "idle", - "states" : { - "idle" : { - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_idle_loop.ogg" + "animatedParts": { + "stateTypes": { + "movement": { + "default": "idle", + "states": { + "idle": { + "properties": { + "persistentSound": "/sfx/tech/hoverbike_idle_loop.ogg" } }, - "jump" : { - "frames" : 2, - "cycle" : 0.5, - "mode" : "end", - "properties" : { - "immediateSound" : "/sfx/tech/mech_jump3.ogg" - }, - "_frameProperties" : { - "stateNudge" : [ [0.8, -1.2], [-0.8, -1.2], [0, 0.376], [0, 0.376] ] + "jump": { + "frames": 2, + "cycle": 0.5, + "mode": "end", + "properties": { + "immediateSound": "/sfx/tech/mech_jump3.ogg" } }, - "fall" : { - "frames" : 2, - "cycle" : 0.5, - "mode" : "end", - "_frameProperties" : { - "stateNudge" : [ [0.8, -1.2], [-0.8, -1.2], [0, 0.126], [0, 0] ] - } + "fall": { + "frames": 2, + "cycle": 0.5, + "mode": "end" }, - "walk" : { - "frames" : 4, - "cycle" : 0.5, - "mode" : "loop", - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_drive_loop.ogg" - }, - "_frameProperties" : { - "stateNudge" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "walk": { + "frames": 4, + "cycle": 0.5, + "mode": "loop", + "properties": { + "persistentSound": "/sfx/tech/hoverbike_drive_loop.ogg" } }, - "backWalk" : { - "frames" : 4, - "cycle" : 0.5, - "mode" : "loop", - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_drive_loop.ogg" - }, - "_frameProperties" : { - "stateNudge" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "backWalk": { + "frames": 4, + "cycle": 0.5, + "mode": "loop", + "properties": { + "persistentSound": "/sfx/tech/hoverbike_drive_loop.ogg" } } } - }}, - "parts" : { - "foreground" : { - "properties" : { - "centered" : true, - "zLevel" : 5 + } + }, + "parts": { + "foreground": { + "properties": { + "centered": true, + "zLevel": 5 }, - "partStates" : { - "movement" : { - "idle" : { - "properties" : { - "image" : "foreground.png:move." + "partStates": { + "movement": { + "idle": { + "properties": { + "image": "foreground.png:move." }, - "_frameProperties" : { - "offset" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "_frameProperties": { + "offset": [[0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2]] } }, - "jump" : { - "properties" : { - "image" : "foreground.png:jump." + "jump": { + "properties": { + "image": "foreground.png:jump." }, - "_frameProperties" : { - "offset" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "_frameProperties": { + "offset": [[0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2]] } }, - "fall" : { - "properties" : { - "image" : "foreground.png:fall." + "fall": { + "properties": { + "image": "foreground.png:fall." }, - "_frameProperties" : { - "offset" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "_frameProperties": { + "offset": [[0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2]] } }, - "walk" : { - "properties" : { - "image" : "foreground.png:move." + "walk": { + "properties": { + "image": "foreground.png:move." }, - "_frameProperties" : { - "offset" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "_frameProperties": { + "offset": [[0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2]] } }, - "backWalk" : { - "properties" : { - "image" : "foreground.png:bmove." + "backWalk": { + "properties": { + "image": "foreground.png:bmove." }, - "_frameProperties" : { - "offset" : [ [0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2] ] + "_frameProperties": { + "offset": [[0.8, -0.75], [-0.8, -1.2], [0.8, -1.2], [0.8, -1.2]] } } } @@ -109,68 +98,84 @@ } } }, - "lights" : { - "dashboardGlow" : { - "active" : true, - "position" : [0, -1], - "color" : [250, 250, 200], - "pointLight" : true, - "pointAngle" : -5, - "pointBeam" : 5 + "lights": { + "dashboardGlow": { + "active": true, + "position": [0, -1], + "color": [250, 250, 200], + "pointLight": true, + "pointAngle": -5, + "pointBeam": 5 }, - "headlightBeam" : { - "active" : true, - "position" : [2, -1], - "color" : [250, 250, 200], - "pointLight" : true, - "pointAngle" : -5, - "pointBeam" : 5 + "headlightBeam": { + "active": true, + "position": [2, -1], + "color": [250, 250, 200], + "pointLight": true, + "pointAngle": -5, + "pointBeam": 5 } }, - "particleEmitters" : { - "mechActivateParticles" : { - "offsetRegion" : [-0.53, 0.090, -0.53, 0.090], -//I hate this. I hate it so much. I hate it even more because I am the only person who can do this solely because I refuse to let anyone else do it. I've got to do this six or seven more times, too. - "particles" : [{"particle":"sb_warpin_car"}] + "particleEmitters": { + "mechActivateParticles": { + "offsetRegion": [-0.53, 0.090, -0.53, 0.090], + //I hate this. I hate it so much. I hate it even more because I am the only person who can do this solely because I refuse to let anyone else do it. I've got to do this six or seven more times, too. + "particles": [{ + "particle": "sb_warpin_car" + } + ] }, - "mechDeactivateParticles" : { - "offsetRegion" : [-0.53, 0.090, -0.53, 0.090], - "particles" : [{"particle":"sb_warpout_car"}] + "mechDeactivateParticles": { + "offsetRegion": [-0.53, 0.090, -0.53, 0.090], + "particles": [{ + "particle": "sb_warpout_car" + } + ] }, - "mechSmokeB" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [-2.25, -2.70, -2.0, -3.10], - "particles" : [ - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"} + "mechSmokeB": { + "active": false, + "emissionRate": 15, + "offsetRegion": [-2.25, -2.70, -2.0, -3.10], + "particles": [{ + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + } ] }, - "mechSmokeF" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [0.8, -2.70, 1.05, -3.10], - "particles" : [ - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"} + "mechSmokeF": { + "active": false, + "emissionRate": 15, + "offsetRegion": [0.8, -2.70, 1.05, -3.10], + "particles": [{ + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + } ] }, - "mechNoEnergy" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [2.8, -0.90, 3.05, -1.40], - "particles" : [ - { "particle" : "burningvehiclesmokefront"}, - { "particle" : "burningvehiclesmokefront"} + "mechNoEnergy": { + "active": false, + "emissionRate": 15, + "offsetRegion": [2.8, -0.90, 3.05, -1.40], + "particles": [{ + "particle": "burningvehiclesmokefront" + }, { + "particle": "burningvehiclesmokefront" + } ] } }, - "sounds" : { - "warp" : [ "/sfx/tech/vehicle_disappear1.ogg" ], - "fail" : [ "/sfx/interface/clickon_error.ogg" ] + "sounds": { + "warp": ["/sfx/tech/vehicle_disappear1.ogg"], + "fail": ["/sfx/interface/clickon_error.ogg"] } } diff --git a/tech/starbound/automobile/car/car.tech b/tech/starbound/automobile/car/car.tech index eb18b8d8..71701be2 100644 --- a/tech/starbound/automobile/car/car.tech +++ b/tech/starbound/automobile/car/car.tech @@ -1,51 +1,54 @@ { - "name" : "sb_humancar", - "type" : "head", - "scripts" : ["/tech/starbound/vehicle.lua"], - "animator" : "car.animation", - "rarity" : "legendary", - "icon" : "/tech/starbound/humancar.png", - "description" : "^#0F0;[F]^reset; Traverses rough terrain quicker. It can also jump!", - "shortDescription" : "Car", + "name": "sb_humancar", + "type": "head", + "scripts": ["/tech/starbound/vehicle.lua"], + "animator": "car.animation", + "rarity": "legendary", + "icon": "/tech/starbound/humancar.png", + "description": "^#0F0;[F]^reset; Traverses rough terrain quicker. It can also jump!", + "shortDescription": "Car", - "mechCustomMovementParameters" : { -// "collisionPoly" : [[-2.35, -2.5], [-1.95, -3], [3.45, -3], [3.85, -2.5], [3.85, 0.45], [3.45, 0.85], [-1.95, 0.85], [-2.35, 0.45]], - "collisionPoly" : [[-2.35, -2], [-1.95, -2.5], [3.45, -2.5], [3.85, -2], [3.85, 0.95], [3.45, 1.35], [-1.95, 1.35], [-2.35, 0.95]], - "mass" : 5, - "groundFriction" : 0.1, - "ambulatingGroundFriction" : 6, - "skiddingGroundFriction" : 10, - "groundForce" : 260, - "airForce" : 50, - "liquidForce" : 70, - "walkSpeed" : 6, - "runSpeed" : 90, - "airJumpProfile" : { - "jumpSpeed" : 20, - "jumpControlForce" : 800, - "jumpInitialPercentage" : 0.45, - "jumpHoldTime" : 0.15 + "mechCustomMovementParameters": { + // "collisionPoly": [[-2.35, -2.5], [-1.95, -3], [3.45, -3], [3.85, -2.5], [3.85, 0.45], [3.45, 0.85], [-1.95, 0.85], [-2.35, 0.45]], + "collisionPoly": [[-2.35, -2], [-1.95, -2.5], [3.45, -2.5], [3.85, -2], [3.85, 0.95], [3.45, 1.35], [-1.95, 1.35], [-2.35, 0.95]], + "mass": 5, + "groundFriction": 0.1, + "ambulatingGroundFriction": 6, + "skiddingGroundFriction": 10, + "groundForce": 260, + "airForce": 50, + "liquidForce": 70, + "walkSpeed": 6, + "runSpeed": 90, + "airJumpProfile": { + "jumpSpeed": 20, + "jumpControlForce": 800, + "jumpInitialPercentage": 0.45, + "jumpHoldTime": 0.15 }, - "liquidJumpProfile" : { - "jumpSpeed" : 8, - "jumpControlForce" : 400, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.1 + "liquidJumpProfile": { + "jumpSpeed": 8, + "jumpControlForce": 400, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.1 } }, - "warpDirectives" : "?fade=CCF=0.25", - "energyCostPerSecond" : 0.5, - "mechTransformPositionChange" : [0, 0], -//"parentOffset" : {"jump":[0,0.5],"fall":[-0.25, 0.7]}, - "parentRotation" : {"jump":0.25,"fall":0.7}, - "mechAction" : "honk", - "mechCollisionTest" : [-3.5, -2.5, 3.5, 3], - "mechAimLimit" : 40, - "mechFireCycle" : 1, - "suppressTools" : true, - "mechProjectile" : "carhorn", - "mechProjectileConfig" : { - "power" : 0 + "warpDirectives": "?fade=CCF=0.25", + "energyCostPerSecond": 0.5, + "mechTransformPositionChange": [0, 0], + //"parentOffset": {"jump":[0,0.5],"fall":[-0.25, 0.7]}, + "parentRotation": { + "jump": 0.25, + "fall": 0.7 + }, + "mechAction": "honk", + "mechCollisionTest": [-3.5, -2.5, 3.5, 3], + "mechAimLimit": 40, + "mechFireCycle": 1, + "suppressTools": true, + "mechProjectile": "carhorn", + "mechProjectileConfig": { + "power": 0 } -} \ No newline at end of file +} diff --git a/tech/starbound/automobile/car/warpin.animation b/tech/starbound/automobile/car/warpin.animation index 916a642c..bce50b29 100644 --- a/tech/starbound/automobile/car/warpin.animation +++ b/tech/starbound/automobile/car/warpin.animation @@ -1,7 +1,7 @@ { - "frames" : "warp.png", - "variants" : 1, - "frameNumber" : 8, - "animationCycle" : 0.33, - "offset" : [0, 0] + "frames": "warp.png", + "variants": 1, + "frameNumber": 8, + "animationCycle": 0.33, + "offset": [0, 0] } diff --git a/tech/starbound/automobile/car/warpout.animation b/tech/starbound/automobile/car/warpout.animation index a477050f..08cfd6ab 100644 --- a/tech/starbound/automobile/car/warpout.animation +++ b/tech/starbound/automobile/car/warpout.animation @@ -1,7 +1,7 @@ { - "frames" : "warp.png", - "variants" : 2, - "frameNumber" : 16, - "animationCycle" : 0.33, - "offset" : [0, 0] + "frames": "warp.png", + "variants": 2, + "frameNumber": 16, + "animationCycle": 0.33, + "offset": [0, 0] } diff --git a/tech/starbound/automobile/jeep/humanjeep.animation b/tech/starbound/automobile/jeep/humanjeep.animation index c5abf3bc..9bafff31 100644 --- a/tech/starbound/automobile/jeep/humanjeep.animation +++ b/tech/starbound/automobile/jeep/humanjeep.animation @@ -1,159 +1,148 @@ { - "animatedParts" : { - "stateTypes" : { - "movement" : { - "default" : "idle", - "states" : { - "idle" : { - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_idle_loop.ogg" + "animatedParts": { + "stateTypes": { + "movement": { + "default": "idle", + "states": { + "idle": { + "properties": { + "persistentSound": "/sfx/tech/hoverbike_idle_loop.ogg" } }, - "jump" : { - "frames" : 2, - "cycle" : 0.5, - "mode" : "end", - "properties" : { - "immediateSound" : "/sfx/tech/mech_jump3.ogg" - }, - "frameProperties" : { - "stateNudge" : [ [0.8, -1.25], [0.8, -1.25], [0, 0.376], [0, 0.376] ] + "jump": { + "frames": 2, + "cycle": 0.5, + "mode": "end", + "properties": { + "immediateSound": "/sfx/tech/mech_jump3.ogg" } }, - "fall" : { - "frames" : 2, - "cycle" : 0.5, - "mode" : "end", - "frameProperties" : { - "stateNudge" : [ [0.8, -1.25], [0.8, -1.25], [0, 0.126], [0, 0] ] - } + "fall": { + "frames": 2, + "cycle": 0.5, + "mode": "end" }, - "walk" : { - "frames" : 4, - "cycle" : 0.5, - "mode" : "loop", - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_drive_loop.ogg" - }, - "frameProperties" : { - "stateNudge" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "walk": { + "frames": 4, + "cycle": 0.5, + "mode": "loop", + "properties": { + "persistentSound": "/sfx/tech/hoverbike_drive_loop.ogg" } }, - "backWalk" : { - "frames" : 4, - "cycle" : 0.5, - "mode" : "loop", - "properties" : { - "persistentSound" : "/sfx/tech/hoverbike_drive_loop.ogg" - }, - "frameProperties" : { - "stateNudge" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "backWalk": { + "frames": 4, + "cycle": 0.5, + "mode": "loop", + "properties": { + "persistentSound": "/sfx/tech/hoverbike_drive_loop.ogg" } } } - }}, - "parts" : { - "background" : { - "properties" : { - "centered" : true, - "zLevel" : -1 + } + }, + "parts": { + "background": { + "properties": { + "centered": true, + "zLevel": -1 }, - "partStates" : { - "movement" : { - "idle" : { - "properties" : { - "image" : "background.png:move." + "partStates": { + "movement": { + "idle": { + "properties": { + "image": "background.png:move." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "jump" : { - "properties" : { - "image" : "background.png:jump." + "jump": { + "properties": { + "image": "background.png:jump." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "fall" : { - "properties" : { - "image" : "background.png:fall." + "fall": { + "properties": { + "image": "background.png:fall." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "walk" : { - "properties" : { - "image" : "background.png:move." + "walk": { + "properties": { + "image": "background.png:move." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "backWalk" : { - "properties" : { - "image" : "background.png:bmove." + "backWalk": { + "properties": { + "image": "background.png:bmove." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } } } } }, - "foreground" : { - "properties" : { - "centered" : true, - "zLevel" : 5 + "foreground": { + "properties": { + "centered": true, + "zLevel": 5 }, - "partStates" : { - "movement" : { - "idle" : { - "properties" : { - "image" : "foreground.png:move." + "partStates": { + "movement": { + "idle": { + "properties": { + "image": "foreground.png:move." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "jump" : { - "properties" : { - "image" : "foreground.png:jump." + "jump": { + "properties": { + "image": "foreground.png:jump." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "fall" : { - "properties" : { - "image" : "foreground.png:fall." + "fall": { + "properties": { + "image": "foreground.png:fall." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "walk" : { - "properties" : { - "image" : "foreground.png:move." + "walk": { + "properties": { + "image": "foreground.png:move." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } }, - "backWalk" : { - "properties" : { - "image" : "foreground.png:bmove." + "backWalk": { + "properties": { + "image": "foreground.png:bmove." }, - "frameProperties" : { - "offset" : [ [0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25] ] + "frameProperties": { + "offset": [[0.8, -1.25], [0.8, -1.25], [0.8, -1.25], [0.8, -1.25]] } } } @@ -161,69 +150,85 @@ } } }, - "lights" : { - "dashboardGlow" : { - "active" : true, - "position" : [0, -1], - "color" : [250, 250, 200], - "pointLight" : true, - "pointAngle" : -5, - "pointBeam" : 5 + "lights": { + "dashboardGlow": { + "active": true, + "position": [0, -1], + "color": [250, 250, 200], + "pointLight": true, + "pointAngle": -5, + "pointBeam": 5 }, - "headlightBeam" : { - "active" : true, - "position" : [2, -1], - "color" : [250, 250, 200], - "pointLight" : true, - "pointAngle" : -5, - "pointBeam" : 5 + "headlightBeam": { + "active": true, + "position": [2, -1], + "color": [250, 250, 200], + "pointLight": true, + "pointAngle": -5, + "pointBeam": 5 } }, - "particleEmitters" : { - "mechActivateParticles" : { - "active" : false, - "offsetRegion" : [0.05, -0.68, 0.05, -0.68], - "particles" : [{"particle":"sb_warpin_jeep"}] + "particleEmitters": { + "mechActivateParticles": { + "active": false, + "offsetRegion": [0.05, -0.68, 0.05, -0.68], + "particles": [{ + "particle": "sb_warpin_jeep" + } + ] }, - "mechDeactivateParticles" : { - "active" : false, - "offsetRegion" : [0, -0.6, 0, -0.6], - "particles" : [{"particle":"sb_warpout_jeep"}] + "mechDeactivateParticles": { + "active": false, + "offsetRegion": [0, -0.6, 0, -0.6], + "particles": [{ + "particle": "sb_warpout_jeep" + } + ] }, - "mechSmokeB" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [-2.25, -2.70, -2.0, -3.10], - "particles" : [ - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"} + "mechSmokeB": { + "active": false, + "emissionRate": 15, + "offsetRegion": [-2.25, -2.70, -2.0, -3.10], + "particles": [{ + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + } ] }, - "mechSmokeF" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [0.8, -2.70, 1.05, -3.10], - "particles" : [ - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"}, - { "particle" : "tinyrocketsmoke"} + "mechSmokeF": { + "active": false, + "emissionRate": 15, + "offsetRegion": [0.8, -2.70, 1.05, -3.10], + "particles": [{ + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + }, { + "particle": "tinyrocketsmoke" + } ] }, - "mechNoEnergy" : { - "active" : false, - "emissionRate" : 15, - "offsetRegion" : [2.8, -0.90, 3.05, -1.40], - "particles" : [ - { "particle" : "burningvehiclesmokefront"}, - { "particle" : "burningvehiclesmokefront"} + "mechNoEnergy": { + "active": false, + "emissionRate": 15, + "offsetRegion": [2.8, -0.90, 3.05, -1.40], + "particles": [{ + "particle": "burningvehiclesmokefront" + }, { + "particle": "burningvehiclesmokefront" + } ] } }, - "sounds" : { - "warp" : [ "/sfx/tech/vehicle_disappear1.ogg" ], - "fail" : [ "/sfx/interface/clickon_error.ogg" ] + "sounds": { + "warp": ["/sfx/tech/vehicle_disappear1.ogg"], + "fail": ["/sfx/interface/clickon_error.ogg"] } } diff --git a/tech/starbound/automobile/jeep/humanjeep.tech b/tech/starbound/automobile/jeep/humanjeep.tech index 88b7e858..a77ecaa3 100644 --- a/tech/starbound/automobile/jeep/humanjeep.tech +++ b/tech/starbound/automobile/jeep/humanjeep.tech @@ -44,7 +44,7 @@ "energyCostPerSecond": 0.5, "warpDirectives": "?fade=CCF=0.25", "mechTransformPositionChange": [0, 0.5], - //"parentOffset" : [-1, 0.7], + //"parentOffset": [-1, 0.7], "mechAction": "honk", "mechCollisionTest": [-3.5, -2.5, 3.5, 3], "mechAimLimit": 40, diff --git a/tech/starbound/automobile/jeep/warpin.animation b/tech/starbound/automobile/jeep/warpin.animation index 916a642c..bce50b29 100644 --- a/tech/starbound/automobile/jeep/warpin.animation +++ b/tech/starbound/automobile/jeep/warpin.animation @@ -1,7 +1,7 @@ { - "frames" : "warp.png", - "variants" : 1, - "frameNumber" : 8, - "animationCycle" : 0.33, - "offset" : [0, 0] + "frames": "warp.png", + "variants": 1, + "frameNumber": 8, + "animationCycle": 0.33, + "offset": [0, 0] } diff --git a/tech/starbound/automobile/jeep/warpout.animation b/tech/starbound/automobile/jeep/warpout.animation index a477050f..08cfd6ab 100644 --- a/tech/starbound/automobile/jeep/warpout.animation +++ b/tech/starbound/automobile/jeep/warpout.animation @@ -1,7 +1,7 @@ { - "frames" : "warp.png", - "variants" : 2, - "frameNumber" : 16, - "animationCycle" : 0.33, - "offset" : [0, 0] + "frames": "warp.png", + "variants": 2, + "frameNumber": 16, + "animationCycle": 0.33, + "offset": [0, 0] } diff --git a/tech/starbound/booster/bubbleboost.tech b/tech/starbound/booster/bubbleboost.tech index 864e62aa..3b8dc65a 100644 --- a/tech/starbound/booster/bubbleboost.tech +++ b/tech/starbound/booster/bubbleboost.tech @@ -4,7 +4,7 @@ "rarity": "Legendary", "icon": "/tech/starbound/bubbleboost.png", - "description": "Hold ^#0f0;[SPACE]^reset; and a direction in the air to fly around with this Bubble Boost tech.", + "description": "Hold ^#0f0;[SPACE]^reset; and a direction in the air to fly around in a bubble!", "sb_briefDescription": "Hold ^#0f0;[SPACE]^reset; and a direction in the air to fly around!", "sb_longDescription": "It just screams 'December 2013,' doesn't it?", "shortDescription": "Bubble Boost", diff --git a/tech/starbound/booster/cameramanboost.animation b/tech/starbound/booster/cameramanboost.animation index 1ea68603..fa9cb164 100644 --- a/tech/starbound/booster/cameramanboost.animation +++ b/tech/starbound/booster/cameramanboost.animation @@ -1,20 +1,20 @@ { - "animatedParts" : { - "stateTypes" : { - "boosting" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : {} + "animatedParts": { + "stateTypes": { + "boosting": { + "default": "off", + "states": { + "off": {}, + "on": {} } } } }, - "particleEmitters" : { - "boostParticles" : { - "emissionRate" : 0, - "particles" : [] + "particleEmitters": { + "boostParticles": { + "emissionRate": 0, + "particles": [] } } -} \ No newline at end of file +} diff --git a/tech/starbound/booster/cameramanboost.tech b/tech/starbound/booster/cameramanboost.tech index 908b085e..605b0def 100644 --- a/tech/starbound/booster/cameramanboost.tech +++ b/tech/starbound/booster/cameramanboost.tech @@ -1,17 +1,17 @@ { - "name" : "sb_cameramanboost", - "type" : "legs", + "name": "sb_cameramanboost", + "type": "legs", - "rarity" : "Legendary", - "icon" : "/interface/x.png", - "description" : "Press and hold Jump in the air to float around with this Cameraman Boost tech.", - "sb_briefDescription" : "Press and hold Jump in the air to float around.", - "shortDescription" : "Cameraman Boost", + "rarity": "Legendary", + "icon": "/interface/x.png", + "description": "Press and hold Jump in the air to float around with this Cameraman Boost tech.", + "sb_briefDescription": "Press and hold Jump in the air to float around.", + "shortDescription": "Cameraman Boost", - "scripts" : ["booster.lua"], - "animator" : "cameramanboost.animation", + "scripts": ["booster.lua"], + "animator": "cameramanboost.animation", - "boostControlForce" : 1500, - "boostSpeed" : 8, - "energyUsagePerSecond" : 0 -} \ No newline at end of file + "boostControlForce": 1500, + "boostSpeed": 8, + "energyUsagePerSecond": 0 +} diff --git a/tech/starbound/bounce/bounce.animation b/tech/starbound/bounce/bounce.animation index 02561940..a73324bc 100644 --- a/tech/starbound/bounce/bounce.animation +++ b/tech/starbound/bounce/bounce.animation @@ -1,23 +1,23 @@ { - "animatedParts" : { - "stateTypes" : { - "bouncing" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : {} + "animatedParts": { + "stateTypes": { + "bouncing": { + "default": "off", + "states": { + "off": {}, + "on": {} } } }, - "parts" : { - "bubble" : { - "partStates" : { - "bouncing" : { - "on" : { - "properties" : { - "centered" : true, - "image" : "bubble.png" + "parts": { + "bubble": { + "partStates": { + "bouncing": { + "on": { + "properties": { + "centered": true, + "image": "bubble.png" } } } @@ -25,9 +25,10 @@ } } }, - - "sounds" : { - "activate" : ["/sfx/tech/tech_doublejump.ogg"], - "deactivate" : ["/sfx/tech/tech_blink2.ogg"] + + "sounds": { + "activate": ["/sfx/tech/tech_doublejump.ogg"], + "deactivate": ["/sfx/tech/tech_blink2.ogg"], + "bounce": ["/sfx/projectiles/petball_bounce.ogg"] } -} \ No newline at end of file +} diff --git a/tech/starbound/bounce/bounce.lua b/tech/starbound/bounce/bounce.lua index 22ddaa4a..32228d6c 100644 --- a/tech/starbound/bounce/bounce.lua +++ b/tech/starbound/bounce/bounce.lua @@ -1,7 +1,9 @@ +--TODO: get the bounce sfx to work at high speeds function init() energyUsageRate = config.getParameter("energyUsageRate") bounceCollisionPoly = config.getParameter("bounceCollisionPoly") bounceFactor = config.getParameter("bounceFactor") + --wasColliding = false end function input(args) @@ -17,13 +19,14 @@ function update(args) and not tech.parentLounging() and world.resolvePolyCollision(bounceCollisionPoly, mcontroller.position(), 1) and status.overConsumeResource("energy", energyUsageRate * args.dt) then - activate() + activate() elseif action == "deactivate" or (active and (not status.overConsumeResource("energy", energyUsageRate * args.dt) or tech.parentLounging())) then deactivate() end if active then + --local colliding = mcontroller.isColliding() mcontroller.controlParameters({ standingPoly = bounceCollisionPoly, crouchingPoly = bounceCollisionPoly, @@ -31,6 +34,10 @@ function update(args) bounceFactor = bounceFactor, jumpSpeed = 0 }) + --[[if colliding and not wasColliding then + animator.playSound("bounce") + end + wasColliding = colliding]] end lastAction = args.moves["special1"] end diff --git a/tech/starbound/dash/dash.animation b/tech/starbound/dash/dash.animation index 1a1521d2..572ebf8b 100644 --- a/tech/starbound/dash/dash.animation +++ b/tech/starbound/dash/dash.animation @@ -1,13 +1,13 @@ { - "animatedParts" : { - "stateTypes" : { - "dashing" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : { - "properties" : { - "immediateSound" : "/sfx/tech/tech_dash.ogg" + "animatedParts": { + "stateTypes": { + "dashing": { + "default": "off", + "states": { + "off": {}, + "on": { + "properties": { + "immediateSound": "/sfx/tech/tech_dash.ogg" } } } @@ -15,24 +15,22 @@ } }, - "particleEmitters" : { - "dashParticles" : { - "emissionRate" : 40, - "particles" : [ - { - "particle" : "dash", - "flip" : true + "particleEmitters": { + "dashParticles": { + "emissionRate": 40, + "particles": [{ + "particle": "dash", + "flip": true } ] }, - "crouchdashParticles" : { - "emissionRate" : 40, - "particles" : [ - { - "particle" : "sb_crouchdash", - "flip" : true + "crouchdashParticles": { + "emissionRate": 40, + "particles": [{ + "particle": "sb_crouchdash", + "flip": true } ] } } -} \ No newline at end of file +} diff --git a/tech/starbound/dash/dash.lua b/tech/starbound/dash/dash.lua index 8bed189c..b8a6fc9e 100644 --- a/tech/starbound/dash/dash.lua +++ b/tech/starbound/dash/dash.lua @@ -6,7 +6,6 @@ function init() dashLastInput = 0 dashTapLast = 0 dashTapTimer = 0 - dashCooldown = 0 dashCooldownTimer = 0 rechargeEffectTimer = 0 dashControlForce = config.getParameter("dashControlForce", 5) @@ -16,6 +15,7 @@ function init() energyUsage = config.getParameter("energyUsage", 0) groundOnly = config.getParameter("groundOnly", true) canCrouchDash = config.getParameter("canCrouchDash", false) + hasRechargeAnimation = config.getParameter("hasRechargeAnimation") rechargeDirectives = config.getParameter("rechargeDirectives", "") rechargeEffectTime = config.getParameter("rechargeEffectTime", 0.1) maximumDoubleTapTime = config.getParameter("maximumDoubleTapTime", 0.2) @@ -70,10 +70,11 @@ function update(args) if dashCooldownTimer > 0 then dashCooldownTimer = dashCooldownTimer - args.dt - if dashCooldownTimer <= 0 then + if dashCooldownTimer <= 0 and hasRechargeAnimation then rechargeEffectTimer = rechargeEffectTime tech.setParentDirectives(rechargeDirectives) animator.playSound("recharge") + animator.setAnimationState("recharge", "on") end end diff --git a/tech/starbound/dash/ftlboost.animation b/tech/starbound/dash/ftlboost.animation index cb2be8d2..1ad57522 100644 --- a/tech/starbound/dash/ftlboost.animation +++ b/tech/starbound/dash/ftlboost.animation @@ -11,6 +11,39 @@ } } } + }, + "recharge": { + "default": "off", + "states": { + "off": {}, + "on": { + "frames": 5, + "cycle": 0.15, + "mode": "transition", + "transition": "off" + } + } + } + }, + + "parts": { + "recharge": { + "properties": { + "centered": true, + "fullbright": true + }, + + "partStates": { + "recharge": { + "on": { + "properties": { + "image": "/tech/dash/recharge.png:" + } + }, + + "off": {} + } + } } } }, @@ -78,8 +111,7 @@ }, { "particle": "gravitybubbledot", "offset": [1, 1] - }, - { + }, { "particle": "gravitybubbledotwhite", "offset": [-1, -1] }, { diff --git a/tech/starbound/dash/ftlboost.tech b/tech/starbound/dash/ftlboost.tech index 6763ab38..739362ad 100644 --- a/tech/starbound/dash/ftlboost.tech +++ b/tech/starbound/dash/ftlboost.tech @@ -1,23 +1,24 @@ { - "name" : "sb_ftlboost", - "type" : "body", + "name": "sb_ftlboost", + "type": "body", - "rarity" : "Legendary", - "icon" : "/tech/starbound/ftlboost.png", - "description" : "Double tap ^#0f0;[A]^reset;/^#0f0;[D]^reset; to dash faster than light! Cooldown: 1.3s", - "sb_briefDescription" : "Double tap ^#0f0;[A]^reset;/^#0f0;[D]^reset; to dash! Cooldown: 1.3s", - "shortDescription" : "FTL Boost", - "chipCost" : 14, + "rarity": "Legendary", + "icon": "/tech/starbound/ftlboost.png", + "description": "Double tap ^#0f0;[A]^reset;/^#0f0;[D]^reset; to dash faster than light! Cooldown: 1.3s", + "sb_briefDescription": "Double tap ^#0f0;[A]^reset;/^#0f0;[D]^reset; to dash! Cooldown: 1.3s", + "shortDescription": "FTL Boost", + "chipCost": 14, - "scripts" : ["dash.lua"], - "animator" : "ftlboost.animation", + "scripts": ["dash.lua"], + "animator": "ftlboost.animation", - "maximumDoubleTapTime" : 0.2, - "dashControlForce" : 50000, - "dashSpeed" : 500, - "dashDuration" : 0.15, - "dashCooldown" : 1.3, - "groundOnly" : true, - "stopAfterDash" : true, - "rechargeDirectives" : "?fade=CCCCFFFF=0.25" -} \ No newline at end of file + "maximumDoubleTapTime": 0.2, + "dashControlForce": 50000, + "dashSpeed": 500, + "dashDuration": 0.15, + "dashCooldown": 1.3, + "groundOnly": true, + "stopAfterDash": true, + "rechargeDirectives": "?fade=CCCCFFFF=0.25", + "hasRechargeAnimation": true +} diff --git a/tech/starbound/dash/recharge.frames b/tech/starbound/dash/recharge.frames deleted file mode 100644 index 23eec135..00000000 --- a/tech/starbound/dash/recharge.frames +++ /dev/null @@ -1,7 +0,0 @@ -{ - "frameGrid" : { - "size" : [24, 24], - "dimensions" : [5, 1] - } -} - diff --git a/tech/starbound/dash/recharge.png b/tech/starbound/dash/recharge.png deleted file mode 100644 index d1533fdb..00000000 Binary files a/tech/starbound/dash/recharge.png and /dev/null differ diff --git a/tech/starbound/equip.activeitem b/tech/starbound/equip.activeitem index 2f585b30..0927f010 100644 --- a/tech/starbound/equip.activeitem +++ b/tech/starbound/equip.activeitem @@ -1,17 +1,24 @@ { - "itemName" : "sb_equip", - "price" : 50, - "tooltipKind" : "sb_object", - "tooltipFields" : {"rarityLabel":""}, - "category" : "tech", - "animation" : "lockin.animation", - "inventoryIcon" : [{"image":"/tech/starbound/banana3.png"},{"image":"/tech/starbound/convert.png"}], - "rarity" : "uncommon", - "durability" : 5, - "durabilityHit" : 5, - "techModule" : "", - "description" : "A specialised tech drive used for quickly equipping specific tech.", - "shortdescription" : "Tech Equipper", - "scripts" : ["equip.lua"], - "builder" : "/items/buildscripts/starbound/updatetech.lua" -} \ No newline at end of file + "itemName": "sb_equip", + "price": 50, + "tooltipKind": "sb_object", + "tooltipFields": { + "rarityLabel": "" + }, + "category": "tech", + "animation": "lockin.animation", + "inventoryIcon": [{ + "image": "/tech/starbound/banana3.png" + }, { + "image": "/tech/starbound/convert.png" + } + ], + "rarity": "uncommon", + "durability": 5, + "durabilityHit": 5, + "techModule": "", + "description": "A specialised tech drive used for quickly equipping specific tech.", + "shortdescription": "Tech Equipper", + "scripts": ["equip.lua"], + "builder": "/items/buildscripts/starbound/updatetech.lua" +} diff --git a/tech/starbound/explosiveprotection/explosiveprotection.animation b/tech/starbound/explosiveprotection/explosiveprotection.animation index db754c62..685b98ae 100644 --- a/tech/starbound/explosiveprotection/explosiveprotection.animation +++ b/tech/starbound/explosiveprotection/explosiveprotection.animation @@ -1,85 +1,90 @@ { - "animatedParts" : { - "stateTypes" : { - "recharge" : { - "priority" : 2, - "default" : "off", - "states" : { - "off" : { - "frames" : 1 + "animatedParts": { + "stateTypes": { + "recharge": { + "priority": 2, + "default": "off", + "states": { + "off": { + "frames": 1 }, - "recharge" : { - "frames" : 4, - "cycle" : 0.2, - "mode" : "transition", - "transition" : "off", - "properties" : { - "immediateSound" : "/sfx/tech/tech_dash_cooldown2.ogg" + "recharge": { + "frames": 4, + "cycle": 0.2, + "mode": "transition", + "transition": "off", + "properties": { + "immediateSound": "/sfx/tech/tech_dash_cooldown2.ogg" } } } } }, - "parts" : { - "recharge" : { - "properties" : { - "zLevel" : 5, - "centered" : true, - "offset" : [0, 0] + "parts": { + "recharge": { + "properties": { + "zLevel": 5, + "centered": true, + "offset": [0, 0] }, - "partStates" : { - "recharge" : { - "recharge" : { - "properties" : { - "image" : "/tech/starbound/dash/recharge.png:" + "partStates": { + "recharge": { + "recharge": { + "properties": { + "image": "/tech/starbound/dash/recharge.png:" } }, - "off" : { - } + "off": {} } } } } }, - "particleEmitters" : { - "energy" : { - "enabled" : false, - "emissionRate" : 0, - "particles" : [ - {"particle" : "fireswoosh1"}, - {"particle" : "fireswoosh2"}, - {"particle" : "fireswoosh3"}, - {"particle" : "fireswoosh1"}, - {"particle" : "fireswoosh1"}, - {"particle" : "fireswoosh2"}, - {"particle" : "fireswoosh3"}, - { - "particle" : { - "type" : "ember", - "size" : 1, - "color" : [198, 42, 0, 230], - "destructionAction" : "shrink", - "destructionTime" : 0.3, - "fade" : 0.9, - "position" : [0, 0], - "offsetRegion" : [0, 0, 0, 0], - "initialVelocity" : [0, 6], - "finalVelocity" : [0, 3], - "approach" : [0, 20], - "timeToLive" : 0.3, - "variance" : { - "size" : 0.5, - "initialVelocity" : [2, 1] + "particleEmitters": { + "energy": { + "enabled": false, + "emissionRate": 0, + "particles": [{ + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + }, { + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh1" + }, { + "particle": "fireswoosh2" + }, { + "particle": "fireswoosh3" + }, { + "particle": { + "type": "ember", + "size": 1, + "color": [198, 42, 0, 230], + "destructionAction": "shrink", + "destructionTime": 0.3, + "fade": 0.9, + "position": [0, 0], + "offsetRegion": [0, 0, 0, 0], + "initialVelocity": [0, 6], + "finalVelocity": [0, 3], + "approach": [0, 20], + "timeToLive": 0.3, + "variance": { + "size": 0.5, + "initialVelocity": [2, 1] } } } ] } }, - "sounds" : { - "activate" : ["/sfx/tech/tech_doublejump.ogg"], - "beep" : ["/sfx/npc/boss/apeboss_missile.ogg"], - "explode" : ["/sfx/tech/mech_explosion_windup.ogg"] + "sounds": { + "activate": ["/sfx/tech/tech_doublejump.ogg"], + "beep": ["/sfx/npc/boss/apeboss_missile.ogg"], + "explode": ["/sfx/tech/mech_explosion_windup.ogg"] } -} \ No newline at end of file +} diff --git a/tech/starbound/explosiveprotection/explosiveprotection.lua b/tech/starbound/explosiveprotection/explosiveprotection.lua index e4e2b502..56072931 100644 --- a/tech/starbound/explosiveprotection/explosiveprotection.lua +++ b/tech/starbound/explosiveprotection/explosiveprotection.lua @@ -24,11 +24,11 @@ function update(dt) if notification.targetEntityId then local damage = notification.damageDealt if notification.sourceEntityId ~= notification.targetEntityId and cooldown <= 0 and damage > 0 then - if storedDamage <= 0 then - animator.setParticleEmitterActive("energy", true) - animator.playSound("activate") - end - storedDamage = storedDamage + damage + if storedDamage <= 0 then + animator.setParticleEmitterActive("energy", true) + animator.playSound("activate") + end + storedDamage = storedDamage + damage end end end diff --git a/tech/starbound/extradrops.png b/tech/starbound/extradrops.png new file mode 100644 index 00000000..ef206102 Binary files /dev/null and b/tech/starbound/extradrops.png differ diff --git a/tech/starbound/extradrops/extradrops-drops.lua b/tech/starbound/extradrops/extradrops-drops.lua new file mode 100644 index 00000000..815bd2c1 --- /dev/null +++ b/tech/starbound/extradrops/extradrops-drops.lua @@ -0,0 +1,47 @@ +function init() + entityTypeName = world.entityTypeName(entity.id()) + local health = world.entityHealth(entity.id()) + if (health and world.entityHealth(entity.id())[2] < config.getParameter("minimumHealth", 3.5)) or not entityTypeName or not health then + effect.expire() + return + end + treasurePool = config.getParameter("treasurePool", entityTypeName.."Treasure") + treasurePool = root.isTreasurePool(treasurePool) and treasurePool or findTreasurePool() + rolls = config.getParameter("rolls", 2) + weight = config.getParameter("weight", 40) + level = math.max(1, world.threatLevel()) +end + +function uninit() + --You can kill Small Po from a larger po with a flamethrower before they're fully initialized, which specifically breaks world.entityHealth but not world.entityExists? + --But world.entityHealth doesn't seem to work in uninit anyway, so we can only check for a value set in init + if not rolls then + return + end + + if not status.resourcePositive("health") then + for i = 1, rolls do + if math.random(100) <= weight then + local items = root.createTreasure(treasurePool, level, sb.staticRandomI32(os.clock())) + if #items > 0 then + world.spawnItem(items[math.random(#items)], entity.position()) + end + end + end + effect.expire() + end +end + +function findTreasurePool() + local treasurePool = world.entityType(entity.id()) == "npc" and root.npcConfig(entityTypeName).dropPools + if treasurePool then + if #treasurePool > 0 then + treasurePool = treasurePool[math.random(#treasurePool)] + else + treasurePool = "empty" + end + else + treasurePool = entityTypeName.."treasure" --Check for treasure but with a lowercase 'T' + end + return (treasurePool and root.isTreasurePool(treasurePool) and treasurePool) or config.getParameter("defaultTreasurePool") +end \ No newline at end of file diff --git a/tech/starbound/extradrops/extradrops-essenceDrop.statuseffect b/tech/starbound/extradrops/extradrops-essenceDrop.statuseffect new file mode 100644 index 00000000..d4a9160b --- /dev/null +++ b/tech/starbound/extradrops/extradrops-essenceDrop.statuseffect @@ -0,0 +1,9 @@ +{ + "name": "sb_extradrops-essenceDrop", + "effectConfig": { + "treasurePool": "essenceDrop", + "rolls": 1 + }, + "defaultDuration": 10, + "scripts": ["extradrops-drops.lua"] +} diff --git a/tech/starbound/extradrops/extradrops-items.statuseffect b/tech/starbound/extradrops/extradrops-items.statuseffect new file mode 100644 index 00000000..0a29bb82 --- /dev/null +++ b/tech/starbound/extradrops/extradrops-items.statuseffect @@ -0,0 +1,8 @@ +{ + "name": "sb_extradrops-items", + "effectConfig": { + "defaultTreasurePool": "noMeatMonsterTreasure" + }, + "defaultDuration": 10, + "scripts": ["extradrops-drops.lua"] +} diff --git a/tech/starbound/extradrops/extradrops-player.lua b/tech/starbound/extradrops/extradrops-player.lua new file mode 100644 index 00000000..cfe0a7b0 --- /dev/null +++ b/tech/starbound/extradrops/extradrops-player.lua @@ -0,0 +1,19 @@ +function init() + effects = config.getParameter("effects") + id = entity.id() +end + +function update(dt) + local damageNotificationsOutgoing, nextStep = status.inflictedDamageSince(queryDamageSince) + queryDamageSince = nextStep + for _, notification in ipairs(damageNotificationsOutgoing) do + if notification.targetEntityId then + if notification.sourceEntityId ~= notification.targetEntityId then + world.sendEntityMessage(notification.targetEntityId, "applyStatusEffect", effects[1]) + if world.entityCurrency(id, "essence") > 0 then + world.sendEntityMessage(notification.targetEntityId, "applyStatusEffect", effects[2]) + end + end + end + end +end \ No newline at end of file diff --git a/tech/starbound/extradrops/extradrops-player.statuseffect b/tech/starbound/extradrops/extradrops-player.statuseffect new file mode 100644 index 00000000..4da3f29b --- /dev/null +++ b/tech/starbound/extradrops/extradrops-player.statuseffect @@ -0,0 +1,10 @@ +{ + "name": "sb_extradrops-player", + "effectConfig": { + "effects": ["sb_extradrops-items", "sb_extradrops-essenceDrop"] + }, + "defaultDuration": 1, + "scripts": ["extradrops-player.lua"], + "label": "Scavenger", + "icon": "/tech/starbound/extradrops.png" +} diff --git a/tech/starbound/extradrops/extradrops.tech b/tech/starbound/extradrops/extradrops.tech new file mode 100644 index 00000000..431dd6ad --- /dev/null +++ b/tech/starbound/extradrops/extradrops.tech @@ -0,0 +1,12 @@ +{ + "name": "sb_extradrops", + "type": "head", + "icon": "/tech/starbound/extradrops.png", + "scripts": [], + "sb_effect": "sb_extradrops-player", + "sb_suitImage": "?replace;73daff=b58651;27abff=946941;117ee4=7a4e34;1f45d4=5a3223", + "rarity": "Legendary", + "chipCost": 8, + "description": "Slain enemies have a chance to drop extra treasure.", + "shortDescription": "Scavenger" +} diff --git a/tech/starbound/groundsmash/groundsmash.lua b/tech/starbound/groundsmash/groundsmash.lua index 29104bdf..fc636d72 100644 --- a/tech/starbound/groundsmash/groundsmash.lua +++ b/tech/starbound/groundsmash/groundsmash.lua @@ -1,21 +1,23 @@ -local ini = init or function() end -local updat = update or function() end +--These hooks are here for the waterball tech +local originalInit = init or function() end +local originalUpdate = update or function() end + +function init() + originalInit() -function init() ini() - lastVelocity = 0 - doubleTapTimer = 0 groundsmashActive = false inputDown = false + lastVelocity = 0 + doubleTapTimer = 0 landingTimer = 0 - groundsmashSpeed = config.getParameter("groundsmashSpeed",250) - groundsmashControlForce = config.getParameter("groundsmashControlForce",400) - knockbackSpeed = config.getParameter("knockbackSpeed",50) - knockbackRadius = config.getParameter("knockbackRadius",5) - maxDoubleTapTime = config.getParameter("maxDoubleTapTime",0.2) - knockbackOffset = config.getParameter("knockbackOffset",{0,-2}) - energyUsage = config.getParameter("energyCostPerSmash",0) + groundsmashSpeed = config.getParameter("groundsmashSpeed", 250) + groundsmashControlForce = config.getParameter("groundsmashControlForce", 400) + knockbackSpeed = config.getParameter("knockbackSpeed", 50) + knockbackRadius = config.getParameter("knockbackRadius", 5) + maxDoubleTapTime = config.getParameter("maxDoubleTapTime", 0.2) + energyUsage = config.getParameter("energyCostPerSmash", 0) + knockbackOffset = config.getParameter("knockbackOffset", {0, -2}) - --script.setUpdateDelta(1) animator.setParticleEmitterOffsetRegion("landParticles", {0, -2, 0, -2}) --Dust cloud near feet end @@ -36,15 +38,16 @@ function input(args) end end -function update(args) updat(args) +function update(args) + originalUpdate(args) if input(args) == "groundsmash" - and not mcontroller.onGround() - and not groundsmashActive - and not mcontroller.liquidMovement() - and not mcontroller.flying() - and not mcontroller.zeroG() - and status.overConsumeResource("energy",energyUsage) then - + and not groundsmashActive + and not mcontroller.onGround() + and not mcontroller.liquidMovement() + and not mcontroller.flying() + and not mcontroller.zeroG() + and status.overConsumeResource("energy", energyUsage) + then animator.playSound("falling") groundsmashActive = true end @@ -55,20 +58,22 @@ function update(args) updat(args) animator.setParticleEmitterActive("fallParticles", true) status.addEphemeralEffect("nofalldamage") status.addEphemeralEffect("sb_grit") - if mcontroller.yVelocity() < lastVelocity then lastVelocity = mcontroller.yVelocity() end - if mcontroller.yVelocity() > lastVelocity then groundsmashActive = false end - elseif groundsmashActive or (groundsmashActive and (lastVelocity+30 > mcontroller.yVelocity()) and not mcontroller.isNullColliding()) then + local currentVelocity = mcontroller.yVelocity() + if currentVelocity < lastVelocity then + lastVelocity = mcontroller.yVelocity() + elseif mcontroller.yVelocity() > lastVelocity then + groundsmashActive = false + end + elseif groundsmashActive or (groundsmashActive and (lastVelocity + 30 > mcontroller.yVelocity()) and not mcontroller.isNullColliding()) then --what the fuck is this `lastVelocity + 30` shit animator.burstParticleEmitter("landParticles", true) animator.playSound("landing") groundsmashActive = false lastVelocity = 0 ---mcontroller.addMomentum({0,-lastVelocity+groundsmashSpeed}) - --TODO: Use force region here when/if we have radial ones. Is there a way for us to be immune to it? + --CF TODO: Use force region here when/if we have radial ones. Is there a way for us to be immune to it? local position = vec2.add(mcontroller.position(), knockbackOffset) local nearEntities = world.entityQuery(position, knockbackRadius, {validTargetOf = entity.id(), includedTypes = {"monster", "npc", "player"}}) - -- if mcontroller.velocity()[2] > lastVelocity then groundsmashActive = false end for _, entityId in pairs(nearEntities) do local entityPosition = world.entityPosition(entityId) local toEntity = world.distance(entityPosition, position) diff --git a/tech/starbound/groundsmash/groundsmash.tech b/tech/starbound/groundsmash/groundsmash.tech index b7e9555d..73b7aefa 100644 --- a/tech/starbound/groundsmash/groundsmash.tech +++ b/tech/starbound/groundsmash/groundsmash.tech @@ -1,23 +1,23 @@ { - "name" : "sb_groundsmash", - "type" : "body", + "name": "sb_groundsmash", + "type": "body", - "scripts" : ["/scripts/vec2.lua", "groundsmash.lua"], - "animator" : "groundsmash.animation", + "scripts": ["/scripts/vec2.lua", "groundsmash.lua"], + "animator": "groundsmash.animation", - "energyCostPerSmash" : 26, - "groundsmashSpeed" : 250, - "groundsmashLandingTime" : 0.2, - "groundsmashControlForce" : 400, + "energyCostPerSmash": 26, + "groundsmashSpeed": 250, + "groundsmashLandingTime": 0.2, + "groundsmashControlForce": 400, - "rarity" : "Legendary", - "icon" : "/tech/starbound/groundsmash.png", - "description" : "Double tap ^#0f0;[DOWN]^reset; in the air and smash the ground!", - "shortDescription" : "Ground Smash", + "rarity": "Legendary", + "icon": "/tech/starbound/groundsmash.png", + "description": "Double tap ^#0f0;[DOWN]^reset; in the air and smash the ground!", + "shortDescription": "Ground Smash", - "knockbackSpeed" : 30, - "knockbackOffset" : [0, -2], - "knockbackRadius" : 5, + "knockbackSpeed": 30, + "knockbackOffset": [0, -2], + "knockbackRadius": 5, - "maxDoubleTapTime" : 0.2 + "maxDoubleTapTime": 0.2 } \ No newline at end of file diff --git a/tech/starbound/jetpack/gravitybubble.tech b/tech/starbound/jetpack/gravitybubble.tech index d051ae71..d6f3d188 100644 --- a/tech/starbound/jetpack/gravitybubble.tech +++ b/tech/starbound/jetpack/gravitybubble.tech @@ -1,17 +1,17 @@ { - "name" : "sb_gravitybubble", - "type" : "legs", + "name": "sb_gravitybubble", + "type": "legs", - "rarity" : "Legendary", - "icon" : "/tech/starbound/gravityball.png", - "description" : "Press and hold ^#0f0;[SPACE]^reset; midair to freeze gravity.", - "sb_longDescription" : "Useful for building!", - "shortDescription" : "Gravity Bubble", + "rarity": "Legendary", + "icon": "/tech/starbound/gravityball.png", + "description": "Press and hold ^#0f0;[SPACE]^reset; midair to freeze gravity.", + "sb_longDescription": "Useful for building!", + "shortDescription": "Gravity Bubble", - "scripts" : ["jetpack.lua"], - "animator" : "gravitybubble.animation", + "scripts": ["jetpack.lua"], + "animator": "gravitybubble.animation", - "jetpackSpeed" : 0, - "jetpackControlForce" : 2000, - "energyUsagePerSecond" : 20 -} \ No newline at end of file + "jetpackSpeed": 0, + "jetpackControlForce": 2000, + "energyUsagePerSecond": 20 +} diff --git a/tech/starbound/jetpack/hover.tech b/tech/starbound/jetpack/hover.tech index 9cd32cb3..5582ee9c 100644 --- a/tech/starbound/jetpack/hover.tech +++ b/tech/starbound/jetpack/hover.tech @@ -1,18 +1,18 @@ { - "name" : "sb_hover", - "type" : "legs", + "name": "sb_hover", + "type": "legs", - "rarity" : "Legendary", - "icon" : "/tech/starbound/hover.png", - "description" : "Neutralise both gravity and inertia!", - "shortDescription" : "Gravity Neutraliser", + "rarity": "Legendary", + "icon": "/tech/starbound/hover.png", + "description": "Neutralise both gravity and inertia!", + "shortDescription": "Gravity Neutraliser", - "scripts" : ["jetpack.lua"], - "animator" : "hover.animation", + "scripts": ["jetpack.lua"], + "animator": "hover.animation", - "jetpackSpeed" : 0, - "jetpackControlForce" : 2000, - "energyUsagePerSecond" : 25, - "controlXYApproachVelocity" : true, - "enableZeroG" : true -} \ No newline at end of file + "jetpackSpeed": 0, + "jetpackControlForce": 2000, + "energyUsagePerSecond": 25, + "controlXYApproachVelocity": true, + "enableZeroG": true +} diff --git a/tech/starbound/lightrig/lightrig.animation b/tech/starbound/lightrig/lightrig.animation index 5ef463dc..f3275938 100644 --- a/tech/starbound/lightrig/lightrig.animation +++ b/tech/starbound/lightrig/lightrig.animation @@ -1,39 +1,39 @@ { - "lights" : { - "lightright" : { - "active" : false, - "position" : [-1, -1], - "color" : [150, 150, 120], - "pointLight" : true, - "pointAngle" : 0, - "pointBeam" : 0.4 + "lights": { + "lightright": { + "active": false, + "position": [-1, -1], + "color": [150, 150, 120], + "pointLight": true, + "pointAngle": 0, + "pointBeam": 0.4 }, - "lightup" : { - "active" : false, - "position" : [0, -1], - "color" : [150, 150, 120], - "pointLight" : true, - "pointAngle" : 90, - "pointBeam" : 0.4 + "lightup": { + "active": false, + "position": [0, -1], + "color": [150, 150, 120], + "pointLight": true, + "pointAngle": 90, + "pointBeam": 0.4 }, - "lightleft" : { - "active" : false, - "position" : [1, -1], - "color" : [150, 150, 120], - "pointLight" : true, - "pointAngle" : 180, - "pointBeam" : 0.4 + "lightleft": { + "active": false, + "position": [1, -1], + "color": [150, 150, 120], + "pointLight": true, + "pointAngle": 180, + "pointBeam": 0.4 }, - "lightdown" : { - "active" : false, - "position" : [0, 0], - "color" : [150, 150, 120], - "pointLight" : true, - "pointAngle" : 270, - "pointBeam" : 0.4 + "lightdown": { + "active": false, + "position": [0, 0], + "color": [150, 150, 120], + "pointLight": true, + "pointAngle": 270, + "pointBeam": 0.4 } }, - "sounds" : { - "toggle" : ["/sfx/tools/flashlight_toggle.ogg"] + "sounds": { + "toggle": ["/sfx/tools/flashlight_toggle.ogg"] } -} \ No newline at end of file +} diff --git a/tech/starbound/lightrig/lightrig.tech b/tech/starbound/lightrig/lightrig.tech index b6d077cc..84ce004c 100644 --- a/tech/starbound/lightrig/lightrig.tech +++ b/tech/starbound/lightrig/lightrig.tech @@ -4,7 +4,7 @@ "rarity": "Legendary", "icon": "/tech/starbound/lightrig.png", "description": "Double tap ^green;any direction^reset; to toggle a directional spotlight!", - //"sb_longDescription" : "Disables energy regeneration while active.", + //"sb_longDescription": "Disables energy regeneration while active.", "shortDescription": "Light Rig", "chipCost": 3, "scripts": ["lightrig.lua"], diff --git a/tech/starbound/lockin.activeitem b/tech/starbound/lockin.activeitem index 8dc6ce53..8624b7b9 100644 --- a/tech/starbound/lockin.activeitem +++ b/tech/starbound/lockin.activeitem @@ -1,17 +1,25 @@ { - "itemName" : "sb_lockin", - "price" : 50, - "tooltipKind" : "sb_object", - "tooltipFields" : {"rarityLabel":"","objectImage":"/tech/starbound/convert.png"}, - "category" : "tech", - "animation" : "lockin.animation", - "inventoryIcon" : [{"image":"/tech/starbound/banana3.png"},{"image":"/tech/starbound/convert.png"}], - "rarity" : "uncommon", - "durability" : 5, - "durabilityHit" : 5, - "techModules" : ["",""], - "description" : "A specialised tech drive used for quickly swapping between installed tech.", - "shortdescription" : "Tech Swapper", - "scripts" : ["lockin.lua"], - "builder" : "/items/buildscripts/starbound/updatetech.lua" -} \ No newline at end of file + "itemName": "sb_lockin", + "price": 50, + "tooltipKind": "sb_object", + "tooltipFields": { + "rarityLabel": "", + "objectImage": "/tech/starbound/convert.png" + }, + "category": "tech", + "animation": "lockin.animation", + "inventoryIcon": [{ + "image": "/tech/starbound/banana3.png" + }, { + "image": "/tech/starbound/convert.png" + } + ], + "rarity": "uncommon", + "durability": 5, + "durabilityHit": 5, + "techModules": ["", ""], + "description": "A specialised tech drive used for quickly swapping between installed tech.", + "shortdescription": "Tech Swapper", + "scripts": ["lockin.lua"], + "builder": "/items/buildscripts/starbound/updatetech.lua" +} diff --git a/tech/starbound/magnet/magnet.tech b/tech/starbound/magnet/magnet.tech index c1bc3dec..901d07b0 100644 --- a/tech/starbound/magnet/magnet.tech +++ b/tech/starbound/magnet/magnet.tech @@ -5,7 +5,7 @@ "scripts": [], "sb_effect": "sb_magnet", "sb_suitImage": "?replace;73daff=fa0000;27abff=db0000;117ee4=bc0000;1f45d4=770000", - //"sb_suitImage" : "?replace;73daff=ececec;27abff=ccc;117ee4=bdbdbd;1f45d4=aeaeae", + //"sb_suitImage": "?replace;73daff=ececec;27abff=ccc;117ee4=bdbdbd;1f45d4=aeaeae", "rarity": "Legendary", "chipCost": 8, "description": "Attracts nearby items.", diff --git a/tech/starbound/mech/apexmech.tech b/tech/starbound/mech/apexmech.tech index c75e4116..0def2be9 100644 --- a/tech/starbound/mech/apexmech.tech +++ b/tech/starbound/mech/apexmech.tech @@ -1,65 +1,71 @@ { - "name" : "sb_apexmech", - "type" : "head", - "scripts" : ["/tech/starbound/vehicle.lua"], - "animator" : "mech.animation", - "rarity" : "legendary", - "icon" : "/tech/starbound/apexmech.png", - "shortDescription" : "Apex Mech", - "description" : "^#0F0;[F]^reset; Use this tech, spawn a mech, then destroy things.", + "name": "sb_apexmech", + "type": "head", + "scripts": ["/tech/starbound/vehicle.lua"], + "animator": "mech.animation", + "rarity": "legendary", + "icon": "/tech/starbound/apexmech.png", + "shortDescription": "Apex Mech", + "description": "^#0F0;[F]^reset; Use this tech, spawn a mech, then destroy things.", - "mechStats" : [ - {"stat":"breathProtection","amount":1}, - {"stat":"fallDamageMultiplier","effectiveMultiplier":0}, - {"stat":"grit","amount":9} + "mechStats": [{ + "stat": "breathProtection", + "amount": 1 + }, { + "stat": "fallDamageMultiplier", + "effectiveMultiplier": 0 + }, { + "stat": "grit", + "amount": 9 + } ], - "mechCustomMovementParameters" : { //3x 3.7 - "collisionPoly" : [ [-3.5, -2.5], [-2, -5], [2, -5], [3.5, -2.5], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2] ], - "crouchingPoly" : [ [-3.5, -2.5], [-2, -5], [2, -5], [3.5, -2.5], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2] ], - "mass" : 5, + "mechCustomMovementParameters": { //3x 3.7 + "collisionPoly": [[-3.5, -2.5], [-2, -5], [2, -5], [3.5, -2.5], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "crouchingPoly": [[-3.5, -2.5], [-2, -5], [2, -5], [3.5, -2.5], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "mass": 5, - "groundFriction" : 50, - "ambulatingGroundFriction" : 0, - "skiddingGroundFriction" : 0, + "groundFriction": 50, + "ambulatingGroundFriction": 0, + "skiddingGroundFriction": 0, - "groundForce" : 60, - "airForce" : 50, - "liquidForce" : 70, + "groundForce": 60, + "airForce": 50, + "liquidForce": 70, - "walkSpeed" : 24, - "runSpeed" : 24, + "walkSpeed": 24, + "runSpeed": 24, - "airJumpProfile" : { - "jumpSpeed" : 60, - "jumpControlForce" : 800, - "jumpInitialPercentage" : 0.45, - "jumpHoldTime" : 0.15 + "airJumpProfile": { + "jumpSpeed": 60, + "jumpControlForce": 800, + "jumpInitialPercentage": 0.45, + "jumpHoldTime": 0.15 }, - "liquidJumpProfile" : { - "jumpSpeed" : 60, - "jumpControlForce" : 400, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.15, - "multiJump" : false + "liquidJumpProfile": { + "jumpSpeed": 60, + "jumpControlForce": 400, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.15, + "multiJump": false } }, - "energyCostPerSecond" : 0.5, - "warpDirectives" : "?fade=CCFF=0.25", - "walkOffset" : [[0, 0.375], [0, 0.125], [0, 0], [0, 0.125], [0, 0.25], [0, 0.375], [0, 0.125], [0, 0], [0, 0.125], [0, 0.25]], - "mechTransformPositionChange" : [0, 0], - "parentOffset" : [2, 1.2], - "suppressTools" : true, - "mechCollisionTest" : [-3.5, -2.5, 3.5, 5], - "mechType" : "apex", - "mechGunType" : "human", - "mechAimLimit" : 40, - "mechBackGunAngle" : 3.1, - "mechFireCycle" : 0.5, - "mechProjectile" : "neotommygunbullet", - "mechProjectileConfig" : { - "power" : 3 + "energyCostPerSecond": 0.5, + "warpDirectives": "?fade=CCFF=0.25", + "walkOffset": [[0, 0.375], [0, 0.125], [0, 0], [0, 0.125], [0, 0.25], [0, 0.375], [0, 0.125], [0, 0], [0, 0.125], [0, 0.25]], + "mechTransformPositionChange": [0, 0], + "parentOffset": [2, 1.2], + "suppressTools": true, + "mechCollisionTest": [-3.5, -2.5, 3.5, 5], + "mechType": "apex", + "mechGunType": "human", + "mechAimLimit": 40, + "mechBackGunAngle": 3.1, + "mechFireCycle": 0.5, + "mechProjectile": "neotommygunbullet", + "mechProjectileConfig": { + "power": 3 } -} \ No newline at end of file +} diff --git a/tech/starbound/mech/glitchmech.tech b/tech/starbound/mech/glitchmech.tech index a18b18fd..9d8431cc 100644 --- a/tech/starbound/mech/glitchmech.tech +++ b/tech/starbound/mech/glitchmech.tech @@ -1,64 +1,68 @@ { - "name" : "sb_glitchmech", - "type" : "head", - "scripts" : ["/tech/starbound/vehicle.lua"], - "animator" : "glitchmech.animation", - "rarity" : "legendary", - "icon" : "/tech/starbound/glitchmech.png", - "shortDescription" : "Glitch Mech", - "description" : "^#0F0;[F]^reset; Use this tech, spawn a mech, then destroy things.", + "name": "sb_glitchmech", + "type": "head", + "scripts": ["/tech/starbound/vehicle.lua"], + "animator": "glitchmech.animation", + "rarity": "legendary", + "icon": "/tech/starbound/glitchmech.png", + "shortDescription": "Glitch Mech", + "description": "^#0F0;[F]^reset; Use this tech, spawn a mech, then destroy things.", - "mechStats" : [ - {"stat":"fallDamageMultiplier","effectiveMultiplier":0}, - {"stat":"grit","amount":9} + "mechStats": [{ + "stat": "fallDamageMultiplier", + "effectiveMultiplier": 0 + }, { + "stat": "grit", + "amount": 9 + } ], - "mechCustomMovementParameters" : { //3x 3.7 - "collisionPoly" : [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], - "crouchingPoly" : [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], - "mass" : 5, + "mechCustomMovementParameters": { //3x 3.7 + "collisionPoly": [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "crouchingPoly": [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "mass": 5, - "groundFriction" : 50, - "ambulatingGroundFriction" : 6, - "skiddingGroundFriction" : 10, + "groundFriction": 50, + "ambulatingGroundFriction": 6, + "skiddingGroundFriction": 10, - "groundForce" : 160, - "airForce" : 50, - "liquidForce" : 70, + "groundForce": 160, + "airForce": 50, + "liquidForce": 70, - "walkSpeed" : 8, - "runSpeed" : 8, + "walkSpeed": 8, + "runSpeed": 8, - "airJumpProfile" : { - "jumpSpeed" : 50, - "jumpControlForce" : 400, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.15 + "airJumpProfile": { + "jumpSpeed": 50, + "jumpControlForce": 400, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.15 }, - "liquidJumpProfile" : { - "jumpSpeed" : 30, - "jumpControlForce" : 400, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.15, - "multiJump" : false + "liquidJumpProfile": { + "jumpSpeed": 30, + "jumpControlForce": 400, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.15, + "multiJump": false } }, - "energyCostPerSecond" : 0.5, - "warpDirectives" : "?fade=CCFF=0.25", - "mechTransformPositionChange" : [0, 0], - "parentOffset" : [0.25, 3.2], //0.5 - "suppressTools" : true, - "mechCollisionTest" : [-3.5, -2.5, 3.5, 5], - "mechArmOffset" : [-2.4,0], - "mechType" : "glitch", - "mechGunType" : "glitch", - "mechAimLimit" : 40, - "mechBackGunAngle" : 3.1, - "mechFireCycle" : 0.25, - "mechProjectile" : ["flame"], - "mechProjectileConfig" : { - "power" : 5 + "energyCostPerSecond": 0.5, + "warpDirectives": "?fade=CCFF=0.25", + "mechTransformPositionChange": [0, 0], + "parentOffset": [0.25, 3.2], //0.5 + "suppressTools": true, + "mechCollisionTest": [-3.5, -2.5, 3.5, 5], + "mechArmOffset": [-2.4, 0], + "mechType": "glitch", + "mechGunType": "glitch", + "mechAimLimit": 40, + "mechBackGunAngle": 3.1, + "mechFireCycle": 0.25, + "mechProjectile": ["flame"], + "mechProjectileConfig": { + "power": 5 } -} \ No newline at end of file +} diff --git a/tech/starbound/mech/humanmech.tech b/tech/starbound/mech/humanmech.tech index 51c6880d..91980ed1 100644 --- a/tech/starbound/mech/humanmech.tech +++ b/tech/starbound/mech/humanmech.tech @@ -1,66 +1,74 @@ { - "name" : "sb_humanmech", - "type" : "head", - "scripts" : ["/tech/starbound/vehicle.lua"], - "animator" : "mech.animation", - "rarity" : "legendary", - "icon" : "/tech/starbound/humanmech.png", - "shortDescription" : "Human Mech", - "description" : "^#0F0;[F]^reset; Use this tech, spawn a mech, then destroy things.",// ^#0F0;[SHIFT]^reset; to swap weapons.", + "name": "sb_humanmech", + "type": "head", + "scripts": ["/tech/starbound/vehicle.lua"], + "animator": "mech.animation", + "rarity": "legendary", + "icon": "/tech/starbound/humanmech.png", + "shortDescription": "Human Mech", + "description": "^#0F0;[F]^reset; Summons an Earthcorp X5C-1 Versitile Scout mech.", // ^#0F0;[SHIFT]^reset; to swap weapons.", - "mechStats" : [ - {"stat":"breathProtection","amount":1}, - {"stat":"fallDamageMultiplier","effectiveMultiplier":0.1}, - {"stat":"maxHealth","amount":90}, - {"stat":"grit","amount":9} + "mechStats": [{ + "stat": "breathProtection", + "amount": 1 + }, { + "stat": "fallDamageMultiplier", + "effectiveMultiplier": 0.1 + }, { + "stat": "maxHealth", + "amount": 90 + }, { + "stat": "grit", + "amount": 9 + } ], - "mechCustomMovementParameters" : { //3x 3.7 - "collisionPoly" : [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], - "crouchingPoly" : [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], - "mass" : 5, + "mechCustomMovementParameters": { //3x 3.7 + "collisionPoly": [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "crouchingPoly": [[-3.5, -2.0], [-2, -4.5], [2, -4.5], [3.5, -2.0], [3.5, 2], [2, 3], [-2, 3], [-3.5, 2]], + "mass": 5, - "groundFriction" : 50, - "ambulatingGroundFriction" : 0, - "skiddingGroundFriction" : 0, + "groundFriction": 50, + "ambulatingGroundFriction": 0, + "skiddingGroundFriction": 0, - "groundForce" : 60, - "airForce" : 50, - "liquidForce" : 70, + "groundForce": 60, + "airForce": 50, + "liquidForce": 70, - "walkSpeed" : 12, - "runSpeed" : 12, + "walkSpeed": 12, + "runSpeed": 12, - "airJumpProfile" : { - "jumpSpeed" : 90, - "jumpControlForce" : 800, - "jumpInitialPercentage" : 0.45, - "jumpHoldTime" : 0.15 + "airJumpProfile": { + "jumpSpeed": 90, + "jumpControlForce": 800, + "jumpInitialPercentage": 0.45, + "jumpHoldTime": 0.15 }, - "liquidJumpProfile" : { - "jumpSpeed" : 60, - "jumpControlForce" : 400, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.15, - "multiJump" : false + "liquidJumpProfile": { + "jumpSpeed": 60, + "jumpControlForce": 400, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.15, + "multiJump": false } }, - "energyCostPerSecond" : 0.5, - "warpDirectives" : "?fade=CCFF=0.25", - "mechTransformPositionChange" : [0, 0], - "parentOffset" : [2, 1.2], - "lightActive" : true, - "suppressTools" : true, - "mechCollisionTest" : [-3.5, -2.5, 3.5, 5], - "mechType" : "human", - "mechGunType" : "human", - "mechAimLimit" : 40, - "mechBackGunAngle" : 3.1, - "mechFireCycle" : 0.25, - "mechProjectile" : ["bullet-1","flame"], - "mechProjectileConfig" : { - "power" : 5 + "energyCostPerSecond": 0.5, + "warpDirectives": "?fade=CCFF=0.25", + "mechTransformPositionChange": [0, 0], + "parentOffset": [2, 1.2], + "lightActive": true, + "suppressTools": true, + "mechCollisionTest": [-3.5, -2.5, 3.5, 5], + "mechType": "human", + "mechGunType": "human", + "mechAimLimit": 40, + "mechBackGunAngle": 3.1, + "mechFireCycle": 0.25, + "mechProjectile": ["bullet-1", "flame"], + "mechProjectileConfig": { + "power": 5 } -} \ No newline at end of file +} diff --git a/tech/starbound/miningdrill/miningdrill.tech b/tech/starbound/miningdrill/miningdrill.tech index 99b26ea3..ae872d6d 100644 --- a/tech/starbound/miningdrill/miningdrill.tech +++ b/tech/starbound/miningdrill/miningdrill.tech @@ -5,7 +5,7 @@ "icon": "/tech/starbound/miningdrill.png", "description": "Double tap ^green;any direction^reset; to toggle a directional mining drill!", "sb_briefDescription": "Double tap ^green;any direction^reset; to toggle a directional drill!", - //"sb_longDescription" : " ^green;[SHIFT]^reset; for a smaller radius.", + //"sb_longDescription": " ^green;[SHIFT]^reset; for a smaller radius.", "shortDescription": "Mining Drill", "scripts": ["miningdrill.lua"], "scriptDelta": 1, diff --git a/tech/starbound/morphball/balldash.tech b/tech/starbound/morphball/balldash.tech index fc00a3fe..9b64dad5 100644 --- a/tech/starbound/morphball/balldash.tech +++ b/tech/starbound/morphball/balldash.tech @@ -11,7 +11,7 @@ "animator": "morphball.animation", "transformedMovementParameters": { - // "collisionPoly" : [[-0.75, -0.75], [0.75, -0.75], [0.75, 0.75], [-0.75, 0.75]], + // "collisionPoly": [[-0.75, -0.75], [0.75, -0.75], [0.75, 0.75], [-0.75, 0.75]], "collisionPoly": [[-0.85, -0.45], [-0.45, -0.85], [0.45, -0.85], [0.85, -0.45], [0.85, 0.45], [0.45, 0.85], [-0.45, 0.85], [-0.85, 0.45]], "groundForce": 450, diff --git a/tech/starbound/morphball/morphball.lua b/tech/starbound/morphball/morphball.lua index 24a898c6..a1fce3e9 100644 --- a/tech/starbound/morphball/morphball.lua +++ b/tech/starbound/morphball/morphball.lua @@ -1,20 +1,20 @@ require "/tech/starbound/morphball/distortionsphere.lua" -local updat = update or function() end +local originalUpdate = update or function() end function init() initCommonParameters() - bombProjectile = config.getParameter("ballBombProjectile","sb_morphballbomb") - bombCooldownTimer = config.getParameter("ballBombCooldown",0.5) + bombProjectile = config.getParameter("ballBombProjectile", "sb_morphballbomb") + bombCooldownTimer = config.getParameter("ballBombCooldown", 0.5) bombCooldownTime = bombCooldownTimer - bombParameters = config.getParameter("ballBombProjectileParameters",{}) - energyCostPerBomb = config.getParameter("energyCostPerBomb",15) + bombParameters = config.getParameter("ballBombProjectileParameters", {}) + energyCostPerBomb = config.getParameter("energyCostPerBomb", 15) end function update(args) - updat(args) + originalUpdate(args) bombCooldownTimer = bombCooldownTimer - args.dt if active and args.moves["primaryFire"] and bombCooldownTimer <= 0 and status.overConsumeResource("energy", energyCostPerBomb) then - world.spawnProjectile(bombProjectile,entity.position(),entity.id(),{0,0},false,bombParameters) + world.spawnProjectile(bombProjectile, entity.position(), entity.id(), {0,0}, false, bombParameters) bombCooldownTimer = bombCooldownTime end end \ No newline at end of file diff --git a/tech/starbound/morphball/morphball.tech b/tech/starbound/morphball/morphball.tech index 9907a0ca..ad7ab39e 100644 --- a/tech/starbound/morphball/morphball.tech +++ b/tech/starbound/morphball/morphball.tech @@ -1,44 +1,44 @@ { - "name" : "sb_morphball", - "type" : "head", + "name": "sb_morphball", + "type": "head", - "rarity" : "Legendary", - "icon" : "/tech/starbound/morphball.png", - "description" : "Stop, drop and roll with this incredible Morphball tech! ^#0f0;[F]^reset; Drop bombs with ^#0f0;[RMB]^reset;!", - "sb_briefDescription" : "Roll around with ^#0f0;[F]^reset;! Drop bombs with ^#0f0;[RMB]^reset;!", - "shortDescription" : "Morphball", + "rarity": "Legendary", + "icon": "/tech/starbound/morphball.png", + "description": "Stop, drop and roll with this incredible Morphball tech! ^#0f0;[F]^reset; Drop bombs with ^#0f0;[RMB]^reset;!", + "sb_briefDescription": "Roll around with ^#0f0;[F]^reset;! Drop bombs with ^#0f0;[RMB]^reset;!", + "shortDescription": "Morphball", - "scripts" : ["morphball.lua"], - "animator" : "morphball.animation", + "scripts": ["morphball.lua"], + "animator": "morphball.animation", - "transformedMovementParameters" : { - "collisionPoly" : [[-0.85, -0.45], [-0.45, -0.85], [0.45, -0.85], [0.85, -0.45], [0.85, 0.45], [0.45, 0.85], [-0.45, 0.85], [-0.85, 0.45]], + "transformedMovementParameters": { + "collisionPoly": [[-0.85, -0.45], [-0.45, -0.85], [0.45, -0.85], [0.85, -0.45], [0.85, 0.45], [0.45, 0.85], [-0.45, 0.85], [-0.85, 0.45]], - "groundForce" : 450, - "normalGroundFriction" : 1.5, - "ambulatingGroundFriction" : 0.2, - "slopeSlidingFactor" : 3.0, + "groundForce": 450, + "normalGroundFriction": 1.5, + "ambulatingGroundFriction": 0.2, + "slopeSlidingFactor": 3.0, - "airJumpProfile" : { - "jumpSpeed" : 10, - "jumpControlForce" : 800, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.1 + "airJumpProfile": { + "jumpSpeed": 10, + "jumpControlForce": 800, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.1 }, - "liquidJumpProfile" : { - "jumpSpeed" : 6, - "jumpControlForce" : 800, - "jumpInitialPercentage" : 0.75, - "jumpHoldTime" : 0.1 + "liquidJumpProfile": { + "jumpSpeed": 6, + "jumpControlForce": 800, + "jumpInitialPercentage": 0.75, + "jumpHoldTime": 0.1 } }, - "ballSpeed" : 14, - "energyCost" : 50, - "ballTransformHeightChange" : -1.7, - "ballDeactivateCollisionTest" : [-0.75, -0.75, 0.75, 2.97], - "ballRadius" : 1, - "ballFrames" : 8, - "ballBombCooldown" : 0.5 -} \ No newline at end of file + "ballSpeed": 14, + "energyCost": 50, + "ballTransformHeightChange": -1.7, + "ballDeactivateCollisionTest": [-0.75, -0.75, 0.75, 2.97], + "ballRadius": 1, + "ballFrames": 8, + "ballBombCooldown": 0.5 +} diff --git a/tech/starbound/morphball/waterball.animation b/tech/starbound/morphball/waterball.animation index 3e5f9930..a67fd8a0 100644 --- a/tech/starbound/morphball/waterball.animation +++ b/tech/starbound/morphball/waterball.animation @@ -105,6 +105,7 @@ "landing": ["/sfx/gun/grenadeblast2.ogg"], "activate": ["/sfx/tech/tech_sphere_transform.ogg"], "deactivate": ["/sfx/tech/tech_sphere_transform.ogg"], - "forceDeactivate": ["/sfx/tech/tech_sonicsphere_charge1.ogg"] + "forceDeactivate": ["/sfx/tech/tech_sonicsphere_charge1.ogg"], + "splash": ["/sfx/projectiles/waterballoon1.ogg", "/sfx/projectiles/waterballoon2.ogg", "/sfx/projectiles/waterballoon3.ogg", "/sfx/projectiles/waterballoon4.ogg", "/sfx/projectiles/waterballoon5.ogg", "/sfx/projectiles/waterballoon6.ogg"] } } diff --git a/tech/starbound/morphball/waterball.lua b/tech/starbound/morphball/waterball.lua index 0f2ae735..f1c85ebf 100644 --- a/tech/starbound/morphball/waterball.lua +++ b/tech/starbound/morphball/waterball.lua @@ -1,9 +1,9 @@ -local ini = init or function() end -local updat = update or function() end ---todo: sfx for bouncing? +local originalInit = init or function() end -function init() ini() rotationFrame = 1 end -function update(args) updat(args) end +function init() originalInit() + rotationFrame = 1 + playedSplashSound = false +end function updateRotationFrame(dt) angle = math.fmod(math.pi * 2 + angle + angularVelocity * dt, math.pi * 2) @@ -13,6 +13,14 @@ function updateRotationFrame(dt) moving = moving > 2 if moving then rotationFrame = math.floor(angle / math.pi * ballFrames) % ballFrames + if rotationFrame == 3 then + if not playedSplashSound and mcontroller.onGround() then + playedSplashSound = true + animator.playSound("splash") + end + else + playedSplashSound = false + end elseif rotationFrame ~= 0 then rotationFrame = math.floor(angle / math.pi * rotationFrame) % ballFrames end diff --git a/tech/starbound/movement/jump.tech b/tech/starbound/movement/jump.tech index 902f7a60..4ac7aab1 100644 --- a/tech/starbound/movement/jump.tech +++ b/tech/starbound/movement/jump.tech @@ -5,8 +5,8 @@ "scripts": [], "sb_effect": "sb_jumptech", "sb_suitImage": "?replace;73daff=46def5;27abff=0dd3f1;117ee4=0bbad4;1f45d4=044751", - //"sb_suitImage" : "?replace;73daff=6d99da;27abff=5588d4;117ee4=344495;1f45d4=1a1c51", augment - //"sb_suitImage" : "?replace;73daff=28daf5;27abff=0dd3ef;117ee4=0bbad4;1f45d4=09a0b7", bad + //"sb_suitImage": "?replace;73daff=6d99da;27abff=5588d4;117ee4=344495;1f45d4=1a1c51", augment + //"sb_suitImage": "?replace;73daff=28daf5;27abff=0dd3ef;117ee4=0bbad4;1f45d4=09a0b7", bad "rarity": "Rare", "description": "Provides a boost in jumping power.", "shortDescription": "Jump+" diff --git a/tech/starbound/movement/speed.tech b/tech/starbound/movement/speed.tech index 41f53bf9..a548773b 100644 --- a/tech/starbound/movement/speed.tech +++ b/tech/starbound/movement/speed.tech @@ -5,8 +5,8 @@ "scripts": [], "sb_effect": "sb_speedtech", "sb_suitImage": "?replace;73daff=7bf04c;27abff=66ee30;117ee4=34ad14;1f45d4=0b6804", - //"sb_suitImage" : "?replace;73daff=5aef9f;27abff=3eef8c;117ee4=22ea7b;1f45d4=15d96c", bad - //"sb_suitImage" : "?replace;73daff=92f5bf;27abff=5af09d;117ee4=22ea7b;1f45d4=0c8542", + //"sb_suitImage": "?replace;73daff=5aef9f;27abff=3eef8c;117ee4=22ea7b;1f45d4=15d96c", bad + //"sb_suitImage": "?replace;73daff=92f5bf;27abff=5af09d;117ee4=22ea7b;1f45d4=0c8542", "rarity": "Rare", "description": "Provides a boost in movement speed.", "shortDescription": "Speed+" diff --git a/tech/starbound/regen/regeneration.tech b/tech/starbound/regen/regeneration.tech index 5e2b15be..334aece9 100644 --- a/tech/starbound/regen/regeneration.tech +++ b/tech/starbound/regen/regeneration.tech @@ -10,7 +10,7 @@ "shortDescription": "Regeneration", "regenRate": 10, - //"energyUsageRate" : 30, + //"energyUsageRate": 30, "resource": "health", "glow": "F003" } diff --git a/tech/starbound/shield/shield.animation b/tech/starbound/shield/shield.animation index 37ffb441..253b2eb3 100644 --- a/tech/starbound/shield/shield.animation +++ b/tech/starbound/shield/shield.animation @@ -46,25 +46,25 @@ "shield": { "on": { "properties": { - "image": "/tech/starbound/shield/shieldbubble.png:on.", + "image": "shieldbubble.png:on.", "fullbright": true } }, "recharge": { "properties": { - "image": "/tech/starbound/dash/recharge.png:", + "image": "/tech/dash/recharge.png:", "fullbright": true } }, "off": { "properties": { - "image": "/tech/starbound/shield/shieldbubble.png:flicker.", + "image": "shieldbubble.png:flicker.", "fullbright": true } }, "fulloff": { "properties": { - "image": "/tech/starbound/shield/shieldbubble.png:off" + "image": "shieldbubble.png:off" } } } diff --git a/tech/starbound/shield/shield.tech b/tech/starbound/shield/shield.tech index 779e65e9..8322cdd2 100644 --- a/tech/starbound/shield/shield.tech +++ b/tech/starbound/shield/shield.tech @@ -5,7 +5,7 @@ "scripts": [], "sb_effect": "sb_shield", "sb_suitImage": "?replace;73daff=fff;27abff=def8ff;117ee4=6ae1ff;1f45d4=2cd5ff", - //"sb_suitImage" : "?replace;73daff=fde189;27abff=fdc92f;117ee4=fd6911;1f45d4=cf4e02", + //"sb_suitImage": "?replace;73daff=fde189;27abff=fdc92f;117ee4=fd6911;1f45d4=cf4e02", "rarity": "Legendary", "tooltipKind": "sb_object4", "description": "A temporary shield which uses energy to absorb all outside damage. It is activated upon taking damage.", diff --git a/tech/starbound/tank/tank.lua b/tech/starbound/tank/tank.lua index f6220fec..33987cd3 100644 --- a/tech/starbound/tank/tank.lua +++ b/tech/starbound/tank/tank.lua @@ -8,7 +8,7 @@ function init() end function update(dt) - --TODO: How's it feel if we set it to not running and not walking rather than a velocity check, just in case someone uses a moving platform or is pushed? + --TODO: How's it feel if we set it to not running and not walking rather than a velocity check, just in case someone uses a moving platform or is pushed? I don't thhink platforms affect what velocity checks return if math.floor(mcontroller.velocity()[1]) == 0 and not mcontroller.falling() and not mcontroller.jumping() then effect.setParentDirectives(glow) animator.setParticleEmitterActive("boost", true) diff --git a/tech/starbound/tech.config b/tech/starbound/tech.config index 0d6b12ac..17710432 100644 --- a/tech/starbound/tech.config +++ b/tech/starbound/tech.config @@ -14,14 +14,14 @@ ,"sb_bubbleboost" ,"sb_humanjeep" ,"sb_boat" -// ,"sb_humancar" -// ,"sb_humanhoverbike" //hey also use the hoverbike from Rho, not the vanilla one +//,"sb_humancar" +//,"sb_humanhoverbike" //hey also use the hoverbike from Rho, not the vanilla one ,"sb_groundsmash" ,"sb_lightrig" ,"sb_miningdrill" -// ,"sb_glitchmech" -// ,"sb_humanmech" -// ,"sb_apexmech" +//,"sb_glitchmech" +//,"sb_humanmech" +//,"sb_apexmech" ,"sb_hylotlmech" ,"thea-acrobaticdodge" ,"thea-acrobaticjump" @@ -44,4 +44,5 @@ ,"sb_absorption" ,"sb_spiked" ,"sb_explosiveprotection" + ,"sb_extradrops" ] \ No newline at end of file diff --git a/terrestrial_worlds.config.patch b/terrestrial_worlds.config.patch index efc62e7f..416569a2 100644 --- a/terrestrial_worlds.config.patch +++ b/terrestrial_worlds.config.patch @@ -14,8 +14,6 @@ [{"op":"test","path":"/useSecondaryEnvironmentBiomeIndex","value":false},{"op":"replace","path":"/useSecondaryEnvironmentBiomeIndex","value":true}] //My final design decision is YES because I'm not sure why it's stupid aside from the lag spikes! -//,[{"op":"add","path":"/regionTypes/tentacle/caveLiquid/-","value":"sb_tentaclejuice"}] No poison conflicts with bg and is too easy - //MAKE BIOMES SPAWN ,[{"op":"add","path":"/regionTypes/volcanic/subRegion/-","value":"sb_crystalline"}] @@ -40,7 +38,6 @@ "caveLiquid": ["lava"], "blockSelector": ["remixedMildSurface"], "fgCaveSelector": ["surfaceCaves"], - "subRegion": [], "bgCaveSelector": ["empty"] } } @@ -52,7 +49,6 @@ "biome": [[0, ["sb_rust"]]], "blockSelector": ["remixedMildSurface"], "fgCaveSelector": ["surfaceCaves"], - "subRegion": [], "bgCaveSelector": ["empty"] } } @@ -152,6 +148,8 @@ "fgCaveSelector": ["surfaceCaves"], "bgCaveSelector": ["empty"], "biome": [[0,["sb_tentacle"]]], + //I played around with moving subRegion to the main planet, and even making a sb_tentacle2 in this file, but Planet Search refuses to acknowledge it + //Anyway, we'll have to move this to the planet definition if we make tentacle surface minibiomes "subRegion" : ["forest", "desert", "garden", "jungle", "savannah", "snow", "tundra", "volcanic"] //2=arid } }, diff --git a/treasure/Missions/floranmission1.treasurepools.patch b/treasure/Missions/floranmission1.treasurepools.patch index f3944206..43cd7e51 100644 --- a/treasure/Missions/floranmission1.treasurepools.patch +++ b/treasure/Missions/floranmission1.treasurepools.patch @@ -1,3 +1,5 @@ [ [{"op":"add","path":"/florantreasurelore/0/1/fill/-","value":{"pool":"sb_florantreasureMusic"}}], -[{"op":"test","path":"/florantreasurelore/0/1/pool/1/item/0","value":"durasteelbar"},{"op":"replace","path":"/florantreasurelore/0/1/pool/1/item/0","value":"tungstenbar"}]] \ No newline at end of file +[{"op":"test","path":"/florantreasurelore/0/1/pool/1/item/0","value":"durasteelbar"},{"op":"replace","path":"/florantreasurelore/0/1/pool/1/item/0","value":"titaniumbar"}], +[{"op":"add","path":"/florangladiatortreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_bonehammer"}}] +] \ No newline at end of file diff --git a/treasure/biome.treasurepools.patch b/treasure/biome.treasurepools.patch index 1eef013d..4d23f0aa 100644 --- a/treasure/biome.treasurepools.patch +++ b/treasure/biome.treasurepools.patch @@ -5,6 +5,8 @@ // Forest // ================================ [{"op":"add","path":"/forestTreasure/0/1/pool/-","value":{"weight":0.03,"pool":"sb_forestMusic"}}] +,[{"op":"add","path":"/forestTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_deathstick"}}] +,[{"op":"add","path":"/forestTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_deathstick-recipe"}}] // ================================ // Desert @@ -117,6 +119,7 @@ ,[{"op":"add","path":"/springTreasure/0/1/pool/-","value":{"weight":0.3,"item":"pollenpump"}}] ,[{"op":"add","path":"/springTreasure/0/1/pool/-","value":{"weight":0.3,"item":"pollenpump-recipe"}}] ,[{"op":"add","path":"/springTreasure/0/1/pool/-","value":{"weight":0.3,"item":"flowerstatue-recipe"}}] +,[{"op":"add","path":"/springTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_naturecapeback"}}] // ================================ // Oasis @@ -353,7 +356,8 @@ // ================================ - // OLD AND BUSTED - Sandstone + // "OLD AND BUSTED" - Sandstone + // This is is used in the desert pool // ================================ //,[{"op":"test","path":"/sandstoneTreasure/0/1/poolRounds/0/1","value":1},{"op":"replace","path":"/sandstoneTreasure/0/1/poolRounds/0/1","value":2}] //,[{"op":"test","path":"/sandstoneTreasure/0/1/poolRounds/1/1","value":2},{"op":"replace","path":"/sandstoneTreasure/0/1/poolRounds/1/1","value":3}] @@ -366,7 +370,7 @@ // ================================ - // OLD AND BUSTED - Geometric + // "OLD AND BUSTED" - Geometric // ================================ ,[{"op":"test","path":"/geometricTreasure/0/1/pool/0/item","value":"geometricchair-recipe"},{"op":"replace","path":"/geometricTreasure/0/1/pool/0/item","value":"sb_geometricchair-recipe"}] ,[{"op":"test","path":"/geometricTreasure/0/1/pool/1/item","value":"geometricchest-recipe"},{"op":"replace","path":"/geometricTreasure/0/1/pool/1/item","value":"sb_geometricchest-recipe"}] @@ -374,5 +378,7 @@ ,[{"op":"test","path":"/geometricTreasure/0/1/pool/3/item","value":"geometricscreen-recipe"},{"op":"replace","path":"/geometricTreasure/0/1/pool/3/item","value":"sb_geometricscreen-recipe"}] ,[{"op":"test","path":"/geometricTreasure/0/1/pool/4/item","value":"geometrictable-recipe"},{"op":"replace","path":"/geometricTreasure/0/1/pool/4/item","value":"sb_geometrictable-recipe"}] +,[{"op":"add","path":"/geometricTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_scistaff-recipe"}}] +,[{"op":"add","path":"/geometricTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_scistaff"}}] ,[{"op":"add","path":"/geometricTreasure/0/1/pool/-","value":{"weight":1,"item":["icecrystal",15]}}] ] \ No newline at end of file diff --git a/treasure/common.treasurepools.patch b/treasure/common.treasurepools.patch index e396a4a5..2a45cce5 100644 --- a/treasure/common.treasurepools.patch +++ b/treasure/common.treasurepools.patch @@ -410,6 +410,7 @@ IF BOTH ARE YES, THEN CONGRATS! SHOVE IT UNDER 'RARE' //[{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_eyeaxe"}}], [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_rainbowspear"}}], [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_rustsword"}}], + [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_deathstick"}}], //Dungeon Melee [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_shiv"}}], @@ -538,6 +539,7 @@ IF BOTH ARE YES, THEN CONGRATS! SHOVE IT UNDER 'RARE' [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_boulderstaff"}}], [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_slimestaff"}}], [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_uraniumrodstaff"}}], + [{"op":"add","path":"/rareMelee/0/1/pool/-","value":{"weight":0.007,"item":"sb_scistaff"}}], //Unique diff --git a/treasure/largedungeons.treasurepools.patch b/treasure/largedungeons.treasurepools.patch index 905ef53b..b41e4f59 100644 --- a/treasure/largedungeons.treasurepools.patch +++ b/treasure/largedungeons.treasurepools.patch @@ -1,6 +1,4 @@ [ -[{"op":"add","path":"/apexcityChestTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"apexcityLore"}}], -[{"op":"add","path":"/apexcityTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"apexcityLore"}}], // ================================ @@ -22,13 +20,17 @@ // ================================ // Apex City Apartments // ================================ +[{"op":"add","path":"/apexcityChestTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"apexcityLore"}}], +[{"op":"add","path":"/apexcityTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"apexcityLore"}}], + [{"op":"test","path":"/apexcityRareTreasure/0/1/fill","inverse":true},{"op":"add","path":"/apexcityRareTreasure/0/1/fill","value":[]}], -[{"op":"add","path":"/apexcityTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_apexBlueprints"}}], [{"op":"add","path":"/apexcityRareTreasure/0/1/fill/-","value":{"item":"sb_townproblems-codex"}}], + +[{"op":"add","path":"/apexcityTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_apexBlueprints"}}], + [{"op":"add","path":"/apexcityLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_townadvert-codex"}}], [{"op":"add","path":"/apexcityLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_apexorigins-codex"}}], [{"op":"add","path":"/apexcityLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_townheadline"}}], -[{"op":"add","path":"/apexcityRareTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_townproblems-codex"}}], // ================================ @@ -40,6 +42,7 @@ // Avian Tomb // ================================ [{"op":"add","path":"/aviantombTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_avianBlueprints"}}], +[{"op":"add","path":"/aviantombTreasure/0/1/pool/-","value":{"weight":0.025,"pool":"aviantombLore"}}], //Boost lore drop because it's absurdly low in vanilla [{"op":"add","path":"/aviantombLore/0/1/pool/-","value":{"weight":0.33,"item":"sb_tombwords"}}], // ================================ @@ -101,6 +104,7 @@ // Human Prison // ================================ [{"op":"add","path":"/humanprisonTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_humanBlueprints"}}], + [{"op":"add","path":"/humanprisonLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_prisoncasebook1-codex"}}], [{"op":"add","path":"/humanprisonLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_prisoncasebook2-codex"}}], [{"op":"add","path":"/humanprisonLore/0/1/pool/-","value":{"weight":0.2,"item":"sb_prisoncasebook3-codex"}}], @@ -138,6 +142,7 @@ // ================================ [{"op":"add","path":"/novakidvillageTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_novakidBlueprints"}}], [{"op":"add","path":"/novakidvillageTreasure/0/1/pool/-","value":{"weight":0.003,"item":"harmonica"}}], + [{"op":"add","path":"/novakidvillageLore/0/1/pool/-","value":{"weight":0.33,"item":"sb_novakidorigins-codex"}}], // ================================ @@ -148,9 +153,11 @@ // Old Sewer // ================================ [{"op":"add","path":"/glitchsewerTreasure/0/1/pool/-","value":{"weight":0.05,"pool":"sb_glitchBlueprints"}}], + [{"op":"add","path":"/glitchsewerChestTreasure/0/1/pool/-","value":{"weight":0.02,"item":"gasmaskhead"}}], [{"op":"add","path":"/glitchsewerChestTreasure/0/1/pool/-","value":{"weight":0.02,"item":["craftsmenchest",1,{"colorIndex":1}]}}], [{"op":"add","path":"/glitchsewerChestTreasure/0/1/pool/-","value":{"weight":0.02,"item":["craftsmenlegs",1,{"colorIndex":1}]}}], + [{"op":"add","path":"/glitchsewerLore/0/1/pool/-","value":{"weight":0.5,"item":"sb_sewerbattleground-codex"}}], [{"op":"add","path":"/glitchsewerLore/0/1/pool/-","value":{"weight":0.5,"item":"sb_sewerconstructfree-codex"}}], [{"op":"add","path":"/glitchsewerLore/0/1/pool/-","value":{"weight":0.5,"item":"sb_sewerferrying-codex"}}], diff --git a/treasure/monster.treasurepools.patch b/treasure/monster.treasurepools.patch index 97cadcc8..5dc5b31c 100644 --- a/treasure/monster.treasurepools.patch +++ b/treasure/monster.treasurepools.patch @@ -25,6 +25,12 @@ ,[{"op":"test","path":"/narfinTreasure/0/1/fill","inverse":true},{"op":"add","path":"/narfinTreasure/0/1/fill","value":[]}] ,[{"op":"add","path":"/narfinTreasure/0/1/fill/-","value":{"pool":"sb_narfinTreasure"}}] +,[{"op":"test","path":"/crabcanoTreasure/0/1/fill","inverse":true},{"op":"add","path":"/crabcanoTreasure/0/1/fill","value":[]}] +,[{"op":"add","path":"/crabcanoTreasure/0/1/fill/-","value":{"pool":"sb_crabcanoTreasure"}}] + +,[{"op":"test","path":"/trictusTreasure/0/1/fill","inverse":true},{"op":"add","path":"/trictusTreasure/0/1/fill","value":[]}] +,[{"op":"add","path":"/trictusTreasure/0/1/fill/-","value":{"pool":"sb_trictusTreasure"}}] + ,[{"op":"add","path":"/poptopTreasure/0/1/pool/-","value":{"weight":0.15,"pool":"sb_poptopMusic"}}] diff --git a/treasure/npcdrops.treasurepools.patch b/treasure/npcdrops.treasurepools.patch index b42228ee..9cd7646a 100644 --- a/treasure/npcdrops.treasurepools.patch +++ b/treasure/npcdrops.treasurepools.patch @@ -1,5 +1,5 @@ [ -[{"op":"add","path":"/villagertreasure/0/1/pool/-","value":{"weight":0.25,"pool":"food"}}] +[{"op":"add","path":"/villagertreasure/0/1/pool/-","value":{"weight":0.1,"pool":"food"}}] ,[{"op":"add","path":"/castlelordtreasure/0/1/pool/-","value":{"weight":0.01,"item":"sb_uncommonbroadsword"}}] ,[{"op":"add","path":"/castlelordtreasure/0/1/pool/-","value":{"weight":0.01,"item":"sb_glitchlordshield"}}] diff --git a/treasure/sb_common.treasurepools b/treasure/sb_common.treasurepools index 05d4e82b..a5e1db12 100644 --- a/treasure/sb_common.treasurepools +++ b/treasure/sb_common.treasurepools @@ -109,9 +109,8 @@ "sb_liquidtentaclejuice": [ [0, { "pool": [ - {"weight": 0.2, "item": ["sb_liquidtentaclejuice", 5]}, - {"weight": 0.6, "item": ["sb_liquidtentaclejuice", 10]}, - {"weight": 0.2, "item": ["sb_liquidtentaclejuice", 10]} + {"weight": 0.7, "item": ["sb_liquidtentaclejuice", 5]}, + {"weight": 0.3, "item": ["sb_liquidtentaclejuice", 10]} ] }] ], @@ -173,7 +172,7 @@ }] ], - "sb_brain": [ //TODO: unused i think + "sb_brain": [ //this is used [0, { "pool": [ {"weight": 0.6, "item": "brain"}, diff --git a/treasure/sb_cropharvest.treasurepools b/treasure/sb_cropharvest.treasurepools index be6d4bb2..b251f5b5 100644 --- a/treasure/sb_cropharvest.treasurepools +++ b/treasure/sb_cropharvest.treasurepools @@ -23,6 +23,7 @@ ] } ] ], + //unfortunately we can't put the deathstick here since it's laggy "sb_treeHarvest": [ [0, { "pool": [ diff --git a/treasure/sb_food.treasurepools b/treasure/sb_food.treasurepools index 3b408a40..ce5f6008 100644 --- a/treasure/sb_food.treasurepools +++ b/treasure/sb_food.treasurepools @@ -212,7 +212,7 @@ ,{"weight" : 0.7, "item" : "sb_orangejam"} ,{"weight" : 0.65, "item" : "sb_orangepie"} ,{"weight" : 0.6, "item" : "sb_orangetart"} - ,{"weight" : 0.65, "item" : "sb_peanutbutterjar"} + ,{"weight" : 0.7, "item" : "sb_peanutbutterjar"} ,{"weight" : 0.55, "item" : "sb_pussplumpie"} ,{"weight" : 0.65, "item" : "sb_thornjam"} ,{"weight" : 0.75, "item" : "sb_toffee"} diff --git a/treasure/sb_monster.treasurepools b/treasure/sb_monster.treasurepools index 2005af87..3a9f9e66 100644 --- a/treasure/sb_monster.treasurepools +++ b/treasure/sb_monster.treasurepools @@ -20,12 +20,14 @@ ], "sb_weaklingTentacleTreasure" : [ [0, { - "pool" : [ - {"weight" : 0.60, "item" : ["sb_liquidtentaclejuice",3]}, - {"weight" : 0.35, "item" : "sb_liquidtentaclejuice"}, - {"weight" : 0.05, "item" : "rawtentacle"}, - {"weight" : 0.003, "item" : ["sb_musicsheet",1,{"music":"crystal-battle1"}]} - ] + "fill" : [ + {"pool" : "sb_tentacleTreasure"} + ], + "poolRounds" : [ + [0.75, 0], + [0.25, 1] + ], + "allowDuplication" : false }] ], "sb_envprobeTreasure" : [ @@ -93,5 +95,31 @@ [0.1, 3] ] }] + ], + "sb_crabcanoTreasure" : [ + [1, { + "pool" : [ + {"weight" : 1, "item" : "volatilepowder"} + ], + "poolRounds" : [ + [0.6, 0], + [0.2, 1], + [0.1, 2], + [0.1, 3] + ] + }] + ], + "sb_trictusTreasure" : [ + [1, { + "pool" : [ + {"weight" : 1, "item" : "cacti"} + ], + "poolRounds" : [ + [0.6, 0], + [0.2, 1], + [0.1, 2], + [0.1, 3] + ] + }] ] } \ No newline at end of file diff --git a/treasure/sb_monstercrafting.treasurepools b/treasure/sb_monstercrafting.treasurepools new file mode 100644 index 00000000..9806747b --- /dev/null +++ b/treasure/sb_monstercrafting.treasurepools @@ -0,0 +1,25 @@ +{ + "sb_venomSample": [ + [0, { + "pool": [ + {"weight": 0.2, "item": "venomsample"} + ], + "poolRounds": [ + [0.20, 0], + [0.80, 1] + ] + }] + ], + "sb_weaklingVenomSample": [ + [0, { + "fill": [ + {"pool": "sb_venomSample"} + ], + "poolRounds": [ + [0.75, 0], + [0.25, 1] + ], + "allowDuplication": false + }] + ] +} \ No newline at end of file diff --git a/treasure/sb_wreck.treasurepools b/treasure/sb_wreck.treasurepools index 702cb7e3..eeab8de5 100644 --- a/treasure/sb_wreck.treasurepools +++ b/treasure/sb_wreck.treasurepools @@ -1,102 +1,102 @@ { - "sb_wreckLoungeTreasure" : [ + "sb_wreckLoungeTreasure": [ [0, { - "fill" : [ - {"pool" : "vendingtreasure"} + "fill": [ + {"pool": "vendingtreasure"} ], - "pool" : [ - {"weight" : 1, "pool" : "sb_wreckLoungeAvianTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeGlitchTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeHumanTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeFloranTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeApexTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeHylotlTreasure"}, - {"weight" : 1, "pool" : "sb_wreckLoungeNovakidTreasure"} + "pool": [ + {"weight": 1, "pool": "sb_wreckLoungeAvianTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeGlitchTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeHumanTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeFloranTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeApexTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeHylotlTreasure"}, + {"weight": 1, "pool": "sb_wreckLoungeNovakidTreasure"} ], - "poolRounds" : 1, - "allowDuplication" : false + "poolRounds": 1, + "allowDuplication": false }] ], - "sb_wreckLoungeAvianTreasure" : [ + "sb_wreckLoungeAvianTreasure": [ [0, { - "fill" : [ - {"item" : "sb_avianprologue-codex"}, - {"item" : "sb_aviannotes-codex"}, - {"item" : "flagavian"}, - {"item" : ["sb_scandata",1,{"recipe":"avianshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"avianshiphatch"}]} + "fill": [ + {"item": "sb_avianprologue-codex"}, + {"item": "sb_aviannotes-codex"}, + {"item": "flagavian"}, + {"item": ["sb_scandata",1,{"recipe":"avianshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"avianshiphatch"}]} ] }] ], - "sb_wreckLoungeGlitchTreasure" : [ + "sb_wreckLoungeGlitchTreasure": [ [0, { - "fill" : [ - {"item" : "sb_glitchnotes-codex"}, - {"item" : "sb_glitchprologue-codex"}, - {"item" : "flagglitch"}, - {"item" : ["sb_scandata",1,{"recipe":"glitchshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"glitchshiphatch"}]} + "fill": [ + {"item": "sb_glitchnotes-codex"}, + {"item": "sb_glitchprologue-codex"}, + {"item": "flagglitch"}, + {"item": ["sb_scandata",1,{"recipe":"glitchshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"glitchshiphatch"}]} ] }] ], - "sb_wreckLoungeHumanTreasure" : [ + "sb_wreckLoungeHumanTreasure": [ [0, { - "fill" : [ - {"item" : "sb_humanprologue-codex"}, - {"item" : "sb_humanescape-codex"}, - {"item" : "flaghuman"}, - {"item" : ["sb_scandata",1,{"recipe":"humanshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"humanshiphatch"}]} + "fill": [ + {"item": "sb_humanprologue-codex"}, + {"item": "sb_humanescape-codex"}, + {"item": "flaghuman"}, + {"item": ["sb_scandata",1,{"recipe":"humanshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"humanshiphatch"}]} ] }] ], - "sb_wreckLoungeFloranTreasure" : [ + "sb_wreckLoungeFloranTreasure": [ [0, { - "fill" : [ - {"item" : "sb_floranprologue-codex"}, - {"item" : "sb_floranambition-codex"}, - {"item" : "flagfloran"}, - {"item" : ["sb_scandata",1,{"recipe":"floranshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"floranshiphatch"}]} + "fill": [ + {"item": "sb_floranprologue-codex"}, + {"item": "sb_floranambition-codex"}, + {"item": "flagfloran"}, + {"item": ["sb_scandata",1,{"recipe":"floranshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"floranshiphatch"}]} ] }] ], - "sb_wreckLoungeApexTreasure" : [ + "sb_wreckLoungeApexTreasure": [ [0, { - "fill" : [ - {"item" : "sb_apexprologue-codex"}, - {"item" : "sb_apexplea-codex"}, - {"item" : "flagapex"}, - {"item" : ["sb_scandata",1,{"recipe":"apexshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"apexshiphatch"}]} + "fill": [ + {"item": "sb_apexprologue-codex"}, + {"item": "sb_apexplea-codex"}, + {"item": "flagapex"}, + {"item": ["sb_scandata",1,{"recipe":"apexshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"apexshiphatch"}]} ] }] ], - "sb_wreckLoungeHylotlTreasure" : [ + "sb_wreckLoungeHylotlTreasure": [ [0, { - "fill" : [ - {"item" : "sb_hylotlprologue-codex"}, - {"item" : "sb_hylotldirective-codex"}, - {"item" : "flaghylotl"}, - {"item" : ["sb_scandata",1,{"recipe":"hylotlshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"hylotlshiphatch"}]} + "fill": [ + {"item": "sb_hylotlprologue-codex"}, + {"item": "sb_hylotldirective-codex"}, + {"item": "flaghylotl"}, + {"item": ["sb_scandata",1,{"recipe":"hylotlshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"hylotlshiphatch"}]} ] }] ], - "sb_wreckLoungeNovakidTreasure" : [ + "sb_wreckLoungeNovakidTreasure": [ [0, { - "fill" : [ - {"item" : "sb_novakidprologue-codex"}, - {"item" : "flagnovakid"}, - {"item" : ["sb_scandata",1,{"recipe":"novakidshipdoor"}]}, - {"item" : ["sb_scandata",1,{"recipe":"novakidshiphatch"}]} + "fill": [ + {"item": "sb_novakidprologue-codex"}, + {"item": "flagnovakid"}, + {"item": ["sb_scandata",1,{"recipe":"novakidshipdoor"}]}, + {"item": ["sb_scandata",1,{"recipe":"novakidshiphatch"}]} ] }] ] diff --git a/weather.config.patch b/weather.config.patch index cb253a27..6b66afff 100644 --- a/weather.config.patch +++ b/weather.config.patch @@ -1,4 +1,5 @@ [ +//add new weather [{ "op": "add", "path": "/sb_tentacle", @@ -12,6 +13,8 @@ ] } ], + +//modify existing weather [{ "op": "add", "path": "/moon/-",